Merge branch 'master' into fix-tests

Author: mtreinish

qiskit/advanced/terra/terra_parallel_tools.ipynb

@@ -83,7 +83,7 @@
     "import math\n",
     "import numpy as np\n",
     "from qiskit.quantum_info.random import random_unitary \n",
-    "from qiskit.quantum_info.synthesis import two_qubit_kak"
+    "from qiskit.quantum_info.synthesis import two_qubit_cnot_decompose"
    ]
   },
   {
@@ -128,14 +128,14 @@
     "        for k in range(math.floor(width/2)):\n",
     "            qubits = [int(perm[2*k]), int(perm[2*k+1])]\n",
     "            U = random_unitary(4)            \n",
-    "            for gate in two_qubit_kak(U):\n",
+    "            for gate in two_qubit_cnot_decompose(U):\n",
     "                gate_name = gate[0].name\n",
     "                gate_params = gate[0].params\n",
     "                # The first qubit argument used in gate\n",
-    "                i0 = qubits[gate[1][0][1]]\n",
+    "                i0 = qubits[gate[1][0].index]\n",
     "                if gate_name == \"cx\":\n",
     "                    # The second qubit argument used in gate\n",
-    "                    i1 = qubits[gate[1][1][1]]\n",
+    "                    i1 = qubits[gate[1][1].index]\n",
     "                    qc.cx(q[i0], q[i1])\n",
     "                elif gate_name == \"u1\":\n",
     "                    qc.u1(gate_params[2], q[i0])\n",
@@ -204,13 +204,6 @@
     "HTMLProgressBar()\n",
     "parallel_map(build_qv_circuit, np.arange(num_circuits), task_args=(seeds, width, depth));"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
@@ -230,7 +223,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.4"
   },
   "varInspector": {
    "cols": {