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

Commit 1115ef9

Browse files
nonhermitiannonhermitian
authored
Merge pull request #991 from mtreinish/fix-pulse-0.15.0
Fix terra 0.15.0 compat with pulse tutorials
2 parents 66f7905 + 1a9fa47 commit 1115ef9

7 files changed

Lines changed: 62 additions & 55 deletions

‎tutorials/pulse/1_getting_started_with_pulse.ipynb‎

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

‎tutorials/pulse/2_building_pulse_instructions.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@
355355
{
356356
"data": {
357357
"text/html": [
358-
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.3 (default, Apr 24 2020, 18:51:23) \n",
359-
"[Clang 11.0.3 (clang-1103.0.32.62)]</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'>Fri Aug 07 15:30:19 2020 EDT</td></tr></table>"
358+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.8.5 (default, Jul 27 2020, 08:42:51) \n",
359+
"[GCC 10.1.0]</td></tr><tr><td>OS</td><td>Linux</td></tr><tr><td>CPUs</td><td>32</td></tr><tr><td>Memory (Gb)</td><td>125.72603988647461</td></tr><tr><td colspan='2'>Sun Aug 09 12:26:12 2020 EDT</td></tr></table>"
360360
],
361361
"text/plain": [
362362
"<IPython.core.display.HTML object>"
@@ -408,7 +408,7 @@
408408
"name": "python",
409409
"nbconvert_exporter": "python",
410410
"pygments_lexer": "ipython3",
411-
"version": "3.7.3"
411+
"version": "3.8.5"
412412
}
413413
},
414414
"nbformat": 4,

‎tutorials/pulse/3_building_pulse_schedules.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@
250250
{
251251
"data": {
252252
"text/html": [
253-
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.3 (default, Apr 24 2020, 18:51:23) \n",
254-
"[Clang 11.0.3 (clang-1103.0.32.62)]</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'>Fri Aug 07 15:30:59 2020 EDT</td></tr></table>"
253+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.8.5 (default, Jul 27 2020, 08:42:51) \n",
254+
"[GCC 10.1.0]</td></tr><tr><td>OS</td><td>Linux</td></tr><tr><td>CPUs</td><td>32</td></tr><tr><td>Memory (Gb)</td><td>125.72603988647461</td></tr><tr><td colspan='2'>Sun Aug 09 12:26:36 2020 EDT</td></tr></table>"
255255
],
256256
"text/plain": [
257257
"<IPython.core.display.HTML object>"
@@ -296,7 +296,7 @@
296296
"name": "python",
297297
"nbconvert_exporter": "python",
298298
"pygments_lexer": "ipython3",
299-
"version": "3.7.3"
299+
"version": "3.8.5"
300300
},
301301
"varInspector": {
302302
"cols": {

‎tutorials/pulse/4_adding_measurements.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@
212212
{
213213
"data": {
214214
"text/html": [
215-
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.3 (default, Apr 24 2020, 18:51:23) \n",
216-
"[Clang 11.0.3 (clang-1103.0.32.62)]</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'>Fri Aug 07 15:51:42 2020 EDT</td></tr></table>"
215+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.8.5 (default, Jul 27 2020, 08:42:51) \n",
216+
"[GCC 10.1.0]</td></tr><tr><td>OS</td><td>Linux</td></tr><tr><td>CPUs</td><td>32</td></tr><tr><td>Memory (Gb)</td><td>125.72603988647461</td></tr><tr><td colspan='2'>Sun Aug 09 12:27:28 2020 EDT</td></tr></table>"
217217
],
218218
"text/plain": [
219219
"<IPython.core.display.HTML object>"
@@ -258,7 +258,7 @@
258258
"name": "python",
259259
"nbconvert_exporter": "python",
260260
"pygments_lexer": "ipython3",
261-
"version": "3.7.3"
261+
"version": "3.8.5"
262262
},
263263
"varInspector": {
264264
"cols": {

‎tutorials/pulse/5_gathering_system_information.ipynb‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -383,26 +383,26 @@
383383
"output_type": "stream",
384384
"text": [
385385
"<InstructionScheduleMap(1Q instructions:\n",
386-
" q0: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
387-
" q1: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
388-
" q2: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
389-
" q3: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
390-
" q4: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
391-
" q5: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
392-
" q6: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
393-
" q7: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
394-
" q8: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
395-
" q9: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
396-
" q10: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
397-
" q11: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
398-
" q12: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
399-
" q13: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
400-
" q14: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
401-
" q15: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
402-
" q16: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
403-
" q17: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
404-
" q18: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
405-
" q19: {'id', 'u2', 'u1', 'MEAS', 'x', 'u3'}\n",
386+
" q0: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
387+
" q1: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
388+
" q2: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
389+
" q3: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
390+
" q4: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
391+
" q5: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
392+
" q6: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
393+
" q7: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
394+
" q8: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
395+
" q9: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
396+
" q10: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
397+
" q11: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
398+
" q12: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
399+
" q13: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
400+
" q14: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
401+
" q15: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
402+
" q16: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
403+
" q17: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
404+
" q18: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
405+
" q19: {'MEAS', 'u2', 'x', 'id', 'u3', 'u1'}\n",
406406
"Multi qubit instructions:\n",
407407
" (0, 1): {'cx'}\n",
408408
" (1, 0): {'cx'}\n",
@@ -557,8 +557,8 @@
557557
{
558558
"data": {
559559
"text/html": [
560-
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.3 (default, Apr 24 2020, 18:51:23) \n",
561-
"[Clang 11.0.3 (clang-1103.0.32.62)]</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'>Fri Aug 07 15:52:15 2020 EDT</td></tr></table>"
560+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.8.5 (default, Jul 27 2020, 08:42:51) \n",
561+
"[GCC 10.1.0]</td></tr><tr><td>OS</td><td>Linux</td></tr><tr><td>CPUs</td><td>32</td></tr><tr><td>Memory (Gb)</td><td>125.72603988647461</td></tr><tr><td colspan='2'>Sun Aug 09 12:28:33 2020 EDT</td></tr></table>"
562562
],
563563
"text/plain": [
564564
"<IPython.core.display.HTML object>"
@@ -603,7 +603,7 @@
603603
"name": "python",
604604
"nbconvert_exporter": "python",
605605
"pygments_lexer": "ipython3",
606-
"version": "3.7.3"
606+
"version": "3.8.5"
607607
},
608608
"varInspector": {
609609
"cols": {

‎tutorials/pulse/6_pulse_scheduler.ipynb‎

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

‎tutorials/pulse/7_pulse_simulator_duffing_model.ipynb‎

Lines changed: 20 additions & 13 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)