Merge branch 'master' into discriminator_tutorial

nonhermitian · web-flow · commit b5781b8838d4 · 2020-02-18T17:10:14.000-05:00
diff --git a/qiskit/advanced/aer/1_aer_provider.ipynb b/qiskit/advanced/aer/1_aer_provider.ipynb
diff --git a/qiskit/advanced/aer/2_device_noise_simulation.ipynb b/qiskit/advanced/aer/2_device_noise_simulation.ipynb
diff --git a/qiskit/advanced/aer/3_building_noise_models.ipynb b/qiskit/advanced/aer/3_building_noise_models.ipynb
diff --git a/qiskit/advanced/aer/4_custom_gate_noise.ipynb b/qiskit/advanced/aer/4_custom_gate_noise.ipynb
diff --git a/qiskit/advanced/aer/5_noise_transformation.ipynb b/qiskit/advanced/aer/5_noise_transformation.ipynb
@@ -27,11 +27,11 @@
    "source": [
     "## Introduction\n",
     "\n",
-    "This notebook shows how to use the Qiskit Aer `noise.utils.approximate_quantum_error` and `noise.utils. approximate_noise_model` to transform quantum noise channels into a different, more suitable, noise channel.\n",
+    "This notebook shows how to use the Qiskit Aer utility functions `approximate_quantum_error` and `approximate_noise_model` to transform quantum noise channels into a different, more suitable, noise channel.\n",
     "\n",
     "Our guiding example is Clifford simulation. A Clifford simulator can efficiently simulate quantum computations which include gates only from a limited, non-universal set of gates (the Clifford gates). Not all quantum noises can be added to such simulations; hence, we aim to find a \"close\" noise channel which can be simulated in a Clifford simulator.\n",
     "\n",
-    "We begin by importing the transformation functions."
+    "We begin by importing the transformation functions from the Aer provider utilities"
    ]
   },
   {
@@ -45,8 +45,8 @@
    },
    "outputs": [],
    "source": [
-    "from qiskit.providers.aer.noise.utils import approximate_quantum_error\n",
-    "from qiskit.providers.aer.noise.utils import approximate_noise_model"
+    "from qiskit.providers.aer.utils import approximate_quantum_error\n",
+    "from qiskit.providers.aer.utils import approximate_noise_model"
    ]
   },
   {
@@ -69,23 +69,12 @@
    },
    "outputs": [],
    "source": [
-    "from qiskit.providers.aer.noise.errors.standard_errors import amplitude_damping_error\n",
-    "from qiskit.providers.aer.noise.errors.standard_errors import reset_error\n",
-    "from qiskit.providers.aer.noise.errors.standard_errors import pauli_error"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-08-19T17:13:36.691234Z",
-     "start_time": "2019-08-19T17:13:36.688533Z"
-    }
-   },
-   "outputs": [],
-   "source": [
-    "import numpy as np"
+    "import numpy as np\n",
+    "\n",
+    "# Import Aer QuantumError functions that will be used\n",
+    "from qiskit.providers.aer.noise import amplitude_damping_error\n",
+    "from qiskit.providers.aer.noise import reset_error\n",
+    "from qiskit.providers.aer.noise import pauli_error"
    ]
   },
   {
@@ -98,7 +87,7 @@
     "\n",
     "Given quantum channels $\\mathcal{E}_{1},\\dots,\\mathcal{E}_{r}$, and probabilities $p_1, p_2, \\dots, p_r$ such that $0\\le p_i \\le 1$ and $p_1+\\dots +p_r = 1$, a new quantum channel $\\mathcal{C}_\\mathcal{E}$ can be constructed such that $\\mathcal{C}_\\mathcal{E}(\\rho)$ has the effect of choosing the channel $\\mathcal{E}_i$ with probability $p_i$ and applying it to $\\rho$.\n",
     "\n",
-    "The noise transformation module solves the following optimization problem: Given a channel $\\mathcal{C}$ (\"goal\") and a list of channels $\\mathcal{E}_{1},\\dots,\\mathcal{E}_{r}$, find the probabilities $p_1, p_2, \\dots, p_r$ minimizing $D(\\mathcal{C}, \\mathcal{C}_\\mathcal{E})$ according to some distance metric $D$ (the Hilbert-Schmidt metric is currently used).\n",
+    "The noise transformation function solves the following optimization problem: Given a channel $\\mathcal{C}$ (\"goal\") and a list of channels $\\mathcal{E}_{1},\\dots,\\mathcal{E}_{r}$, find the probabilities $p_1, p_2, \\dots, p_r$ minimizing $D(\\mathcal{C}, \\mathcal{C}_\\mathcal{E})$ according to some distance metric $D$ (the Hilbert-Schmidt metric is currently used).\n",
     "\n",
     "To ensure the approximation is honest, in the sense that the approximate error channel serves as an \"upper bound\" for the actual error channel, we add the additional honesty constraint:\n",
     "\n",
@@ -148,7 +137,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "metadata": {
     "ExecuteTime": {
      "end_time": "2019-08-19T17:13:36.791986Z",
@@ -171,7 +160,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {
     "ExecuteTime": {
      "end_time": "2019-08-19T17:13:36.812282Z",
@@ -224,7 +213,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 5,
    "metadata": {
     "ExecuteTime": {
      "end_time": "2019-08-19T17:13:37.367331Z",
@@ -265,7 +254,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 6,
    "metadata": {
     "ExecuteTime": {
      "end_time": "2019-08-19T17:13:38.083970Z",
@@ -307,7 +296,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 7,
    "metadata": {
     "ExecuteTime": {
      "end_time": "2019-08-19T17:13:57.085790Z",
@@ -318,7 +307,8 @@
     {
      "data": {
       "text/html": [
-       "<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.14.0</td></tr><tr><td>Terra</td><td>0.11.0</td></tr><tr><td>Aer</td><td>0.3.4</td></tr><tr><td>Ignis</td><td>0.2.0</td></tr><tr><td>Aqua</td><td>0.6.1</td></tr><tr><td>IBM Q Provider</td><td>0.4.4</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Aug  9 2019, 18:34:13) [MSC v.1915 64 bit (AMD64)]</td></tr><tr><td>OS</td><td>Windows</td></tr><tr><td>CPUs</td><td>2</td></tr><tr><td>Memory (Gb)</td><td>7.9987335205078125</td></tr><tr><td colspan='2'>Tue Dec 10 15:59:30 2019 Eastern Standard Time</td></tr></table>"
+       "<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>None</td></tr><tr><td>Terra</td><td>0.12.0.dev0+c028a28</td></tr><tr><td>Aer</td><td>0.4.0</td></tr><tr><td>Ignis</td><td>0.3.0.dev0+829207f</td></tr><tr><td>Aqua</td><td>0.7.0.dev0+2776c5d</td></tr><tr><td>IBM Q Provider</td><td>0.4.6rc1</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.3 | packaged by conda-forge | (default, Jul  1 2019, 14:38:56) \n",
+       "[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>6</td></tr><tr><td>Memory (Gb)</td><td>32.0</td></tr><tr><td colspan='2'>Wed Feb 05 11:32:35 2020 EST</td></tr></table>"
       ],
       "text/plain": [
        "<IPython.core.display.HTML object>"
@@ -330,7 +320,7 @@
     {
      "data": {
       "text/html": [
-       "<div style='width: 100%; background-color:#d5d9e0;padding-left: 10px; padding-bottom: 10px; padding-right: 10px; padding-top: 5px'><h3>This code is a part of Qiskit</h3><p>&copy; Copyright IBM 2017, 2019.</p><p>This code is licensed under the Apache License, Version 2.0. You may<br>obtain a copy of this license in the LICENSE.txt file in the root directory<br> of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.<p>Any modifications or derivative works of this code must retain this<br>copyright notice, and modified files need to carry a notice indicating<br>that they have been altered from the originals.</p></div>"
+       "<div style='width: 100%; background-color:#d5d9e0;padding-left: 10px; padding-bottom: 10px; padding-right: 10px; padding-top: 5px'><h3>This code is a part of Qiskit</h3><p>&copy; Copyright IBM 2017, 2020.</p><p>This code is licensed under the Apache License, Version 2.0. You may<br>obtain a copy of this license in the LICENSE.txt file in the root directory<br> of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.<p>Any modifications or derivative works of this code must retain this<br>copyright notice, and modified files need to carry a notice indicating<br>that they have been altered from the originals.</p></div>"
       ],
       "text/plain": [
        "<IPython.core.display.HTML object>"
@@ -370,7 +360,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.4"
+   "version": "3.7.5"
   },
   "varInspector": {
    "cols": {
diff --git a/qiskit/advanced/aqua/chemistry/dissociation_profile_of_molecule.ipynb b/qiskit/advanced/aqua/chemistry/dissociation_profile_of_molecule.ipynb
@@ -33,7 +33,7 @@
    "source": [
     "### Introduction\n",
     "\n",
-    "One of the most compelling possibilities of quantum computation is the the simulation of other quantum systems. Quantum simulation of quantum systems encompasses a wide range of tasks, including most significantly:\n",
+    "One of the most compelling possibilities of quantum computation is the simulation of other quantum systems. Quantum simulation of quantum systems encompasses a wide range of tasks, including most significantly:\n",
     "    \n",
     "1. Simulation of the time evolution of quantum systems.\n",
     "\n",
diff --git a/qiskit/advanced/aqua/linear_systems_of_equations.ipynb b/qiskit/advanced/aqua/linear_systems_of_equations.ipynb
@@ -359,7 +359,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Compared to the the first example, the circuit depth is increased approximately by a factor of 6"
+    "Compared to the first example, the circuit depth is increased approximately by a factor of 6"
    ]
   },
   {
diff --git a/qiskit/advanced/ignis/1b_calibrating_a_two_qubit_gate.ipynb b/qiskit/advanced/ignis/1b_calibrating_a_two_qubit_gate.ipynb
@@ -20,7 +20,7 @@
     }
    },
    "source": [
-    "# Calibrating a two qubit gate"
+    "# Calibrating a two-qubit gate"
    ]
   },
   {
diff --git a/qiskit/advanced/ignis/5a_randomized_benchmarking.ipynb b/qiskit/advanced/ignis/5a_randomized_benchmarking.ipynb
@@ -628,7 +628,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The **two qubit Clifford gate error** gives measured errors in the basis gates that were used to construct the Clifford. \n",
+    "The **two-qubit Clifford gate error** gives measured errors in the basis gates that were used to construct the Clifford. \n",
     "It assumes that the error in the underlying gates is depolarizing. It outputs the error per a 2-qubit Clifford.\n",
     "\n",
     "The input to this function is:\n",
@@ -800,7 +800,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We count again the number of **gates per Clifford** as before, and calculate the **two qubit Clifford gate error**, using the predicted primitive gate errors from the coherence limit."
+    "We count again the number of **gates per Clifford** as before, and calculate the **two-qubit Clifford gate error**, using the predicted primitive gate errors from the coherence limit."
    ]
   },
   {
diff --git a/qiskit/advanced/ignis/6a_state_tomography.ipynb b/qiskit/advanced/ignis/6a_state_tomography.ipynb
@@ -463,7 +463,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this example, we have a three qubit system where one of the qubits will be an ancilla for performing state tomography, i.e. only perform tomography when the third qubit is in the state \"1\". The circuit is setup in such a way that after conditional tomography we will get a Bell state on the first two qubits.\n",
+    "In this example, we have a three-qubit system where one of the qubits will be an ancilla for performing state tomography, i.e. only perform tomography when the third qubit is in the state \"1\". The circuit is setup in such a way that after conditional tomography we will get a Bell state on the first two qubits.\n",
     "\n",
     "First make a 3Q GHZ state with no classical measurements."
    ]
diff --git a/qiskit/advanced/terra/1_advanced_circuits.ipynb b/qiskit/advanced/terra/1_advanced_circuits.ipynb
@@ -678,7 +678,7 @@
     "              backend=BasicAer.get_backend('qasm_simulator'),\n",
     "              parameter_binds=[{theta: theta_val} for theta_val in theta_range])\n",
     "\n",
-    "# Note: Bind labels are not presrved in executed experiments.\n",
+    "# Note: Bind labels are not preserved in executed experiments.\n",
     "counts = [job.result().get_counts(i) for i in range(len(job.result().results))]\n"
    ]
   },
diff --git a/qiskit/advanced/terra/4_transpiler_passes_and_passmanager.ipynb b/qiskit/advanced/terra/4_transpiler_passes_and_passmanager.ipynb
@@ -1120,7 +1120,7 @@
    "source": [
     "## Transpiler Logging <a name='logging'></a>\n",
     "\n",
-    "Due to the complexity of the internal operations that the transpiler is performing it's likely that you'll end up in a situation where you'd like to debug an issue or just understand more of what is happening inside the transpiler when you call it. To facilitate this the transpiler emits log messages as part of it's normal operation. This logging uses the Python standard library `logging` module to emit the log messages. Python's standard logging was used because it allows Qiskit-Terra's logging to integrate in a standard way with other applications and libraries.\n",
+    "Due to the complexity of the internal operations that the transpiler is performing it's likely that you'll end up in a situation where you'd like to debug an issue or just understand more of what is happening inside the transpiler when you call it. To facilitate this the transpiler emits log messages as part of its normal operation. This logging uses the Python standard library `logging` module to emit the log messages. Python's standard logging was used because it allows Qiskit-Terra's logging to integrate in a standard way with other applications and libraries.\n",
     "\n",
     "For a more thorough introduction to Python logging refer to the [official documentation](https://docs.python.org/3/library/logging.html) and the tutorials and cookbook linked off of there."
    ]
@@ -1140,7 +1140,7 @@
    "source": [
     "### Configuring Python Standard Library Logging\n",
     "\n",
-    "By default Python Stadnard Logging only prints log messages at the `WARNING`, `ERROR`, or `CRITICAL` log levels.\n",
+    "By default Python Standard Logging only prints log messages at the `WARNING`, `ERROR`, or `CRITICAL` log levels.\n",
     "Since none of the logs emitted by the transpiler use these log levels (they're all informative) you need to configure logging.\n",
     "\n",
     "The simplest way to do this is to just run:"
diff --git a/qiskit/advanced/terra/5_pulse_schedules.ipynb b/qiskit/advanced/terra/5_pulse_schedules.ipynb
@@ -74,7 +74,7 @@
     "As all channels correspond to physical channels on a device, they have an `index` which specifies their corresponding device channel.\n",
     "\n",
     "The fundamental channel types are: \n",
-    "- `DriveChannel`: Qubit drive channel. The index channel corresponds to the system qubit index.\n",
+    "- `DriveChannel`: Qubit drive channel. The channel index corresponds to the system qubit index.\n",
     "- `MeasureChannel`: Qubit stimulus channel. The channel index corresponds to the system qubit index.\n",
     "- `ControlChannel`: Arbitrary control channel with action specified by Hamiltonian provided by device. The function of this channel must be extracted from the system Hamiltonian.\n",
     "- `AcquireChannel`: Qubit acquisition channel. The channel index corresponds to the system qubit index.\n",
@@ -340,7 +340,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "All `Command`s have a `duration` attribute. This may be fixed as for the case of the `FrameChange` having zero duration, or dependent on the command as is the case for the `SamplePulse` who's duration is defined by the number of samples in the pulse."
+    "All `Command`s have a `duration` attribute. This may be fixed as for the case of the `FrameChange` having zero duration, or dependent on the command as is the case for the `SamplePulse` whose duration is defined by the number of samples in the pulse."
    ]
   },
   {
@@ -442,7 +442,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "`Instructions` can also be plotted"
+    "`Instructions` can also be plotted."
    ]
   },
   {
diff --git a/qiskit/fundamentals/2_plotting_data_in_qiskit.ipynb b/qiskit/fundamentals/2_plotting_data_in_qiskit.ipynb
@@ -74,7 +74,7 @@
     "\n",
     "`plot_histogram(data)`\n",
     "\n",
-    "As an example we make a 2 qubit Bell state"
+    "As an example we make a 2-qubit Bell state"
    ]
   },
   {
@@ -170,7 +170,7 @@
     }
    ],
    "source": [
-    "# Execute 2 qubit Bell state again\n",
+    "# Execute 2-qubit Bell state again\n",
     "second_result = execute(circ, backend, shots=1000).result()\n",
     "second_counts  = second_result.get_counts(circ)\n",
     "# Plot results with legend\n",
@@ -211,7 +211,7 @@
    "source": [
     "### Sorting counts by distance from target state\n",
     "\n",
-    "Suppose you have an algorithm that encodes the solution into a single bit-string, ex. `1011`.  When running on a real quantum device, unavoidable (but sometimes correctable) noise can corrupt the answer.  The effect of the noise if often better seen if we sort the output bit-strings as a function of some 'distance' from the target bit string.  The `plot_histogram` function supports the `hamming` distance metric as demonstrated below:"
+    "Suppose you have an algorithm that encodes the solution into a single bit-string, ex. `1011`.  When running on a real quantum device, unavoidable (but sometimes correctable) noise can corrupt the answer.  The effect of the noise is often better seen if we sort the output bit-strings as a function of some 'distance' from the target bit string.  The `plot_histogram` function supports the `hamming` distance metric as demonstrated below:"
    ]
   },
   {
diff --git a/qiskit/fundamentals/4_quantum_circuit_properties.ipynb b/qiskit/fundamentals/4_quantum_circuit_properties.ipynb
@@ -360,7 +360,7 @@
    "source": [
     "## Unitary Factors <a name=\"unitary\"></a>\n",
     "\n",
-    "The circuit we are focusing on here is a 12 qubit circuit.  However, does this circuit actually require a 12 qubit quantum computer to run?  That is to say, can we compute  the same result by running a collection of smaller circuits individually?\n",
+    "The circuit we are focusing on here is a 12-qubit circuit.  However, does this circuit actually require a 12-qubit quantum computer to run?  That is to say, can we compute  the same result by running a collection of smaller circuits individually?\n",
     "\n",
     "In the limit where only single-qubit gates are performed, it should be clear that each qubit is controlled independently of the rest, and thus we can run each qubit independently and still get the desired result.  Thus, the question becomes are there enough entangling gates in the circuit to have all qubits interacting?  Again, this is best understood in terms of diagrams.  Below, we track the sets of qubits that interact amongst themselves via CNOT gates at each layer in the circuit."
    ]
@@ -386,7 +386,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We can see that at the end of the computation there are three independent sets of qubits.  Thus, our 12 qubit computation is actual two two qubit calculations and a single eight qubit computation.  We can verify this via qiskit:"
+    "We can see that at the end of the computation there are three independent sets of qubits.  Thus, our 12-qubit computation is actual two two-qubit calculations and a single eight-qubit computation.  We can verify this via qiskit:"
    ]
   },
   {
@@ -422,7 +422,7 @@
     "\n",
     "Several of the circuit properties introduced so far change when adding classical registers and measurements.\n",
     "\n",
-    "Lets add measurements to the circuit above."
+    "Let's add measurements to the circuit above."
    ]
   },
   {
diff --git a/qiskit/fundamentals/5_using_the_transpiler.ipynb b/qiskit/fundamentals/5_using_the_transpiler.ipynb
@@ -477,7 +477,7 @@
    "source": [
     "### Toffoli Gate Decomposition\n",
     "\n",
-    "A Toffoli, or controlled-controlled-not gate, is a three qubit gate.  Given that our basis gate set includes only single- and two-qubit gates, it is obvious that this gate must be decomposed.  This decomposition is quite costly."
+    "A Toffoli, or controlled-controlled-not gate, is a three-qubit gate.  Given that our basis gate set includes only single- and two-qubit gates, it is obvious that this gate must be decomposed.  This decomposition is quite costly."
    ]
   },
   {
@@ -1476,7 +1476,7 @@
    "source": [
     "If it is possible to perform CNOT gates in both directions on all pairs of qubits, then this matrix is symmetric.\n",
     "\n",
-    "We are free to construct our own device topology by defining our own `coupling_map` and using it in `transpile`.  For example, a five qubit linear nearest-neighbor (LNN) topology supporting bi-directional CNOT gates is written as:"
+    "We are free to construct our own device topology by defining our own `coupling_map` and using it in `transpile`.  For example, a five-qubit linear nearest-neighbor (LNN) topology supporting bi-directional CNOT gates is written as:"
    ]
   },
   {
@@ -1562,7 +1562,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Or we can write a directional five qubit '+' shaped topology, with all directional CNOT gates pointing to the center as:"
+    "Or we can write a directional five-qubit '+' shaped topology, with all directional CNOT gates pointing to the center as:"
    ]
   },
   {
diff --git a/qiskit/fundamentals/7_summary_of_quantum_operations.ipynb b/qiskit/fundamentals/7_summary_of_quantum_operations.ipynb

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@`
`359`	`359`	`"cell_type": "markdown",`
`360`	`360`	`"metadata": {},`
`361`	`361`	`"source": [`
`362`		`- "Compared to the the first example, the circuit depth is increased approximately by a factor of 6"`
	`362`	`+ "Compared to the first example, the circuit depth is increased approximately by a factor of 6"`
`363`	`363`	`]`
`364`	`364`	`},`
`365`	`365`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`}`
`21`	`21`	`},`
`22`	`22`	`"source": [`
`23`		`- "# Calibrating a two qubit gate"`
	`23`	`+ "# Calibrating a two-qubit gate"`
`24`	`24`	`]`
`25`	`25`	`},`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@`
`463`	`463`	`"cell_type": "markdown",`
`464`	`464`	`"metadata": {},`
`465`	`465`	`"source": [`
`466`		`- "In this example, we have a three qubit system where one of the qubits will be an ancilla for performing state tomography, i.e. only perform tomography when the third qubit is in the state \"1\". The circuit is setup in such a way that after conditional tomography we will get a Bell state on the first two qubits.\n",`
	`466`	`+ "In this example, we have a three-qubit system where one of the qubits will be an ancilla for performing state tomography, i.e. only perform tomography when the third qubit is in the state \"1\". The circuit is setup in such a way that after conditional tomography we will get a Bell state on the first two qubits.\n",`
`467`	`467`	`"\n",`
`468`	`468`	`"First make a 3Q GHZ state with no classical measurements."`
`469`	`469`	`]`