Skip to content
This repository was archived by the owner on Aug 21, 2023. It is now read-only.

Commit 6da1d46

Browse files
nonhermitiannonhermitian
authored
Merge branch 'master' into master
2 parents b91b790 + 5c18c22 commit 6da1d46

9 files changed

Lines changed: 1780 additions & 842 deletions

‎qiskit/advanced/aer/2_device_noise_simulation.ipynb‎

Lines changed: 1285 additions & 349 deletions
Large diffs are not rendered by default.

‎qiskit/advanced/terra/1_advanced_circuits.ipynb‎

Lines changed: 34 additions & 38 deletions
Large diffs are not rendered by default.

‎qiskit/advanced/terra/4_transpiler_passes_and_passmanager.ipynb‎

Lines changed: 163 additions & 198 deletions
Large diffs are not rendered by default.

‎qiskit/advanced/terra/6_creating_a_provider.ipynb‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
" hadamard_list[qubit] = (1 + hadamard_list[qubit])%2\n",
8686
" \n",
8787
" # Calculate the result for each basis state\n",
88-
" result = [0]*(2**number_of_qubits)\n",
88+
" result = [int(shots/(2**hadamard_list.count(1)))]*(2**number_of_qubits)\n",
8989
" for i in range(2**number_of_qubits):\n",
9090
" # Example: when i is 2, \n",
9191
" # the basis_state is 01000\n",
@@ -95,8 +95,6 @@
9595
" if hadamard_list[qubit] == 0 and basis_state[qubit] == '1':\n",
9696
" result[i] = 0\n",
9797
" break\n",
98-
" if hadamard_list[qubit] == 1:\n",
99-
" result[i] += int(shots/(2**(1 + hadamard_list.count(1))))\n",
10098
" \n",
10199
" return result\n",
102100
"\n",
@@ -284,7 +282,7 @@
284282
"name": "stdout",
285283
"output_type": "stream",
286284
"text": [
287-
"{'0010': 256, '0110': 256, '0000': 256, '0100': 256}\n"
285+
"{'0000': 256, '0010': 256, '0100': 256, '0110': 256}\n"
288286
]
289287
}
290288
],
@@ -375,9 +373,9 @@
375373
"output_type": "stream",
376374
"text": [
377375
"Hadamard simulator:\n",
378-
"{'0010': 256, '0110': 256, '0000': 256, '0100': 256}\n",
376+
"{'0000': 256, '0010': 256, '0100': 256, '0110': 256}\n",
379377
"Aer simulator:\n",
380-
"{'0010': 274, '0110': 262, '0000': 261, '0100': 227}\n"
378+
"{'0000': 252, '0010': 266, '0100': 237, '0110': 269}\n"
381379
]
382380
}
383381
],
@@ -403,7 +401,7 @@
403401
},
404402
{
405403
"cell_type": "code",
406-
"execution_count": 8,
404+
"execution_count": 7,
407405
"metadata": {
408406
"ExecuteTime": {
409407
"end_time": "2019-08-21T09:35:24.611599Z",
@@ -414,8 +412,8 @@
414412
{
415413
"data": {
416414
"text/html": [
417-
"<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.9.0</td></tr><tr><td>Aer</td><td>0.3.0</td></tr><tr><td>Ignis</td><td>0.2.0</td></tr><tr><td>Aqua</td><td>0.5.6</td></tr><tr><td>IBM Q Provider</td><td>0.3.2rc1</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Aug 13 2019, 15:17:50) \n",
418-
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Wed Aug 21 05:35:24 2019 EDT</td></tr></table>"
415+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.12.2</td></tr><tr><td>Terra</td><td>0.9.1</td></tr><tr><td>Aer</td><td>0.3.0</td></tr><tr><td>Ignis</td><td>0.2.0</td></tr><tr><td>Aqua</td><td>0.5.5</td></tr><tr><td>IBM Q Provider</td><td>0.3.3</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Sep 7 2019, 18:27:02) \n",
416+
"[Clang 10.0.1 (clang-1001.0.46.4)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Tue Oct 15 11:12:52 2019 CDT</td></tr></table>"
419417
],
420418
"text/plain": [
421419
"<IPython.core.display.HTML object>"

‎qiskit/fundamentals/1_getting_started_with_qiskit.ipynb‎

Lines changed: 26 additions & 29 deletions
Large diffs are not rendered by default.

‎qiskit/fundamentals/2_plotting_data_in_qiskit.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
}
288288
],
289289
"source": [
290-
"backend = provider.get_backend('ibmqx4')\n",
290+
"backend = provider.get_backend('ibmqx2')\n",
291291
"exp_job = execute(qc, backend)\n",
292292
"job_monitor(exp_job)\n",
293293
"exp_counts = exp_job.result().get_counts()\n",
@@ -1035,7 +1035,7 @@
10351035
"name": "python",
10361036
"nbconvert_exporter": "python",
10371037
"pygments_lexer": "ipython3",
1038-
"version": "3.7.3"
1038+
"version": "3.7.4"
10391039
},
10401040
"varInspector": {
10411041
"cols": {

‎qiskit/fundamentals/3_the_ibmq_account.ipynb‎

Lines changed: 87 additions & 75 deletions
Large diffs are not rendered by default.

‎qiskit/fundamentals/5_using_the_transpiler.ipynb‎

Lines changed: 159 additions & 125 deletions
Large diffs are not rendered by default.

‎qiskit/fundamentals/6_qiskit_jupyter_tools.ipynb‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
},
6060
{
6161
"cell_type": "code",
62-
"execution_count": null,
62+
"execution_count": 2,
6363
"metadata": {
6464
"ExecuteTime": {
6565
"end_time": "2019-08-09T14:27:22.788139Z",
@@ -73,7 +73,7 @@
7373
},
7474
{
7575
"cell_type": "code",
76-
"execution_count": 5,
76+
"execution_count": 3,
7777
"metadata": {
7878
"ExecuteTime": {
7979
"end_time": "2019-08-09T14:27:41.857406Z",
@@ -98,7 +98,7 @@
9898
},
9999
{
100100
"cell_type": "code",
101-
"execution_count": 2,
101+
"execution_count": 4,
102102
"metadata": {
103103
"ExecuteTime": {
104104
"end_time": "2019-08-09T14:26:08.275802Z",
@@ -158,7 +158,7 @@
158158
},
159159
{
160160
"cell_type": "code",
161-
"execution_count": 7,
161+
"execution_count": 5,
162162
"metadata": {
163163
"ExecuteTime": {
164164
"end_time": "2019-08-09T14:28:39.111265Z",
@@ -167,7 +167,7 @@
167167
},
168168
"outputs": [],
169169
"source": [
170-
"backend = provider.get_backend('ibmqx4')\n",
170+
"backend = provider.get_backend('ibmqx2')\n",
171171
"\n",
172172
"qc = QuantumCircuit(2, 2)\n",
173173
"qc.h(0)\n",
@@ -186,7 +186,7 @@
186186
},
187187
{
188188
"cell_type": "code",
189-
"execution_count": 8,
189+
"execution_count": 6,
190190
"metadata": {
191191
"ExecuteTime": {
192192
"end_time": "2019-08-09T14:31:46.991455Z",
@@ -216,7 +216,7 @@
216216
},
217217
{
218218
"cell_type": "code",
219-
"execution_count": 10,
219+
"execution_count": 7,
220220
"metadata": {
221221
"ExecuteTime": {
222222
"end_time": "2019-08-09T14:33:10.432853Z",
@@ -238,7 +238,7 @@
238238
},
239239
{
240240
"cell_type": "code",
241-
"execution_count": 11,
241+
"execution_count": 8,
242242
"metadata": {
243243
"ExecuteTime": {
244244
"end_time": "2019-08-09T14:34:40.067963Z",
@@ -249,7 +249,7 @@
249249
{
250250
"data": {
251251
"application/vnd.jupyter.widget-view+json": {
252-
"model_id": "4900638520de4e838ae122577e83d844",
252+
"model_id": "eb2db0b41d284fd8b559f066dc8b7119",
253253
"version_major": 2,
254254
"version_minor": 0
255255
},
@@ -263,10 +263,10 @@
263263
{
264264
"data": {
265265
"text/plain": [
266-
"<IBMQBackend('ibmqx4') from IBMQ(hub='ibm-q', group='open', project='main')>"
266+
"<IBMQBackend('ibmqx2') from IBMQ(hub='ibm-q', group='open', project='main')>"
267267
]
268268
},
269-
"execution_count": 11,
269+
"execution_count": 8,
270270
"metadata": {},
271271
"output_type": "execute_result"
272272
}
@@ -293,7 +293,7 @@
293293
},
294294
{
295295
"cell_type": "code",
296-
"execution_count": 12,
296+
"execution_count": 9,
297297
"metadata": {
298298
"ExecuteTime": {
299299
"end_time": "2019-08-09T14:37:26.795312Z",
@@ -304,7 +304,7 @@
304304
{
305305
"data": {
306306
"application/vnd.jupyter.widget-view+json": {
307-
"model_id": "859c2618fd86410c8a59a48aaeec2e9d",
307+
"model_id": "d39e3abfc6b3432a8a6e43392ed622f6",
308308
"version_major": 2,
309309
"version_minor": 0
310310
},
@@ -329,7 +329,7 @@
329329
},
330330
{
331331
"cell_type": "code",
332-
"execution_count": 13,
332+
"execution_count": 10,
333333
"metadata": {
334334
"ExecuteTime": {
335335
"end_time": "2019-08-09T14:39:13.642631Z",
@@ -340,8 +340,8 @@
340340
{
341341
"data": {
342342
"text/html": [
343-
"<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.9.0</td></tr><tr><td>Aer</td><td>0.3.0</td></tr><tr><td>Ignis</td><td>0.2.0</td></tr><tr><td>Aqua</td><td>0.5.6</td></tr><tr><td>IBM Q Provider</td><td>0.3.1</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.3 (default, Mar 27 2019, 16:54:48) \n",
344-
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Fri Aug 09 10:39:13 2019 EDT</td></tr></table>"
343+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.12.1</td></tr><tr><td>Terra</td><td>0.9.0</td></tr><tr><td>Aer</td><td>0.3.0</td></tr><tr><td>Ignis</td><td>0.2.0</td></tr><tr><td>Aqua</td><td>0.5.5</td></tr><tr><td>IBM Q Provider</td><td>0.3.3</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Sep 7 2019, 18:27:02) \n",
344+
"[Clang 10.0.1 (clang-1001.0.46.4)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Fri Oct 04 12:59:50 2019 CDT</td></tr></table>"
345345
],
346346
"text/plain": [
347347
"<IPython.core.display.HTML object>"
@@ -392,7 +392,7 @@
392392
"name": "python",
393393
"nbconvert_exporter": "python",
394394
"pygments_lexer": "ipython3",
395-
"version": "3.7.3"
395+
"version": "3.7.4"
396396
},
397397
"varInspector": {
398398
"cols": {

0 commit comments

Comments
 (0)