Skip to content

Commit cc6ca98

Browse files
AbeCoullAbeCoull
authored
Merge branch 'main' into oqc
2 parents 28b8fcd + e7cacb8 commit cc6ca98

File tree

63 files changed

+2411
-2128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2411
-2128
lines changed

‎.github/workflows/conda-build.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
uses: actions/setup-python@v5
2727
with:
2828
python-version: 3.11.x
29+
- name: Pull Docker image
30+
run: |
31+
docker image pull public.ecr.aws/codebuild/local-builds:latest
2932
- name: Build conda environment
3033
run: |
31-
./nbi/codebuild_build.sh -i public.ecr.aws/codebuild/amazonlinux2-x86_64-standard:5.0 -a envs -b nbi/buildspec.yml
34+
./nbi/codebuild_build.sh -i public.ecr.aws/codebuild/local-builds:latest -a envs -b nbi/buildspec.yml

‎examples/advanced_circuits_algorithms/Grover/Grover.ipynb

+14-8
Large diffs are not rendered by default.

‎examples/advanced_circuits_algorithms/Quantum_Amplitude_Amplification/Quantum_Amplitude_Amplification.ipynb

+12-8
Large diffs are not rendered by default.

‎examples/advanced_circuits_algorithms/Quantum_Fourier_Transform/Quantum_Fourier_Transform.ipynb

+22-12
Large diffs are not rendered by default.

‎examples/advanced_circuits_algorithms/Quantum_Phase_Estimation/Quantum_Phase_Estimation.ipynb

+30-18
Large diffs are not rendered by default.

‎examples/advanced_circuits_algorithms/Randomness/Randomness_Generation.ipynb

+6-6
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@
558558
"(CVXPY) Aug 29 02:34:14 PM: Optimal value: 6.075e-01\n",
559559
"(CVXPY) Aug 29 02:34:14 PM: Compilation took 3.600e-02 seconds\n",
560560
"(CVXPY) Aug 29 02:34:14 PM: Solver (including time spent in interface) took 4.619e-01 seconds\n",
561-
"\u001B[1mThe coditional min-entropy is: 0.7190235372097491\n",
561+
"\u001b[1mThe coditional min-entropy is: 0.7190235372097491\n",
562562
"As a comparison, the unconditional min-entropy is: 0.9439714610772487\n"
563563
]
564564
}
@@ -955,18 +955,18 @@
955955
{
956956
"cell_type": "code",
957957
"execution_count": null,
958-
"outputs": [],
959-
"source": [],
960958
"metadata": {
961959
"collapsed": false
962-
}
960+
},
961+
"outputs": [],
962+
"source": []
963963
}
964964
],
965965
"metadata": {
966966
"kernelspec": {
967-
"display_name": "Python 3.8.10 ('venv': venv)",
967+
"display_name": "conda_braket",
968968
"language": "python",
969-
"name": "python3"
969+
"name": "conda_braket"
970970
},
971971
"language_info": {
972972
"codemirror_mode": {

‎examples/advanced_circuits_algorithms/Simons_Algorithm/Simons_Algorithm.ipynb

+16-12
Large diffs are not rendered by default.

‎examples/analog_hamiltonian_simulation/00_Introduction_of_Analog_Hamiltonian_Simulation_with_Rydberg_Atoms.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -524,9 +524,9 @@
524524
],
525525
"metadata": {
526526
"kernelspec": {
527-
"display_name": "Python 3 (ipykernel)",
527+
"display_name": "conda_braket",
528528
"language": "python",
529-
"name": "python3"
529+
"name": "conda_braket"
530530
},
531531
"language_info": {
532532
"codemirror_mode": {

‎examples/analog_hamiltonian_simulation/01_Introduction_to_Aquila.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -929,9 +929,9 @@
929929
],
930930
"metadata": {
931931
"kernelspec": {
932-
"display_name": "Python 3 (ipykernel)",
932+
"display_name": "conda_braket",
933933
"language": "python",
934-
"name": "python3"
934+
"name": "conda_braket"
935935
},
936936
"language_info": {
937937
"codemirror_mode": {

‎examples/analog_hamiltonian_simulation/02_Ordered_phases_in_Rydberg_systems.ipynb

+38-20
Large diffs are not rendered by default.

‎examples/analog_hamiltonian_simulation/03_Parallel_tasks_on_Aquila.ipynb

+24-11
Large diffs are not rendered by default.

‎examples/analog_hamiltonian_simulation/04_Maximum_Independent_Sets_with_Analog_Hamiltonian_Simulation.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -527,9 +527,9 @@
527527
],
528528
"metadata": {
529529
"kernelspec": {
530-
"display_name": "Python 3 (ipykernel)",
530+
"display_name": "conda_braket",
531531
"language": "python",
532-
"name": "python3"
532+
"name": "conda_braket"
533533
},
534534
"language_info": {
535535
"codemirror_mode": {

‎examples/analog_hamiltonian_simulation/05_Running_Analog_Hamiltonian_Simulation_with_local_simulator.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,9 @@
395395
],
396396
"metadata": {
397397
"kernelspec": {
398-
"display_name": "Python 3 (ipykernel)",
398+
"display_name": "conda_braket",
399399
"language": "python",
400-
"name": "python3"
400+
"name": "conda_braket"
401401
},
402402
"language_info": {
403403
"codemirror_mode": {

‎examples/analog_hamiltonian_simulation/06_Analog_Hamiltonian_simulation_with_PennyLane.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -836,9 +836,9 @@
836836
],
837837
"metadata": {
838838
"kernelspec": {
839-
"display_name": "Python 3 (ipykernel)",
839+
"display_name": "conda_braket",
840840
"language": "python",
841-
"name": "python3"
841+
"name": "conda_braket"
842842
},
843843
"language_info": {
844844
"codemirror_mode": {

‎examples/braket_features/Allocating_Qubits_on_QPU_Devices.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -513,9 +513,9 @@
513513
],
514514
"metadata": {
515515
"kernelspec": {
516-
"display_name": "Python 3.8.10 ('venv': venv)",
516+
"display_name": "conda_braket",
517517
"language": "python",
518-
"name": "python3"
518+
"name": "conda_braket"
519519
},
520520
"language_info": {
521521
"codemirror_mode": {

‎examples/braket_features/Error_Mitigation_on_Amazon_Braket.ipynb

+2-3
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@
446446
"kernelspec": {
447447
"display_name": "tket",
448448
"language": "python",
449-
"name": "python3"
449+
"name": "conda_braket"
450450
},
451451
"language_info": {
452452
"codemirror_mode": {
@@ -459,8 +459,7 @@
459459
"nbconvert_exporter": "python",
460460
"pygments_lexer": "ipython3",
461461
"version": "3.9.5"
462-
},
463-
"orig_nbformat": 4
462+
}
464463
},
465464
"nbformat": 4,
466465
"nbformat_minor": 2

‎examples/braket_features/Getting_Devices_and_Checking_Device_Properties.ipynb

+76-11
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@
6060
"outputs": [
6161
{
6262
"data": {
63-
"text/plain": "[Device('name': SV1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/sv1),\n Device('name': TN1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/tn1),\n Device('name': dm1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/dm1)]"
63+
"text/plain": [
64+
"[Device('name': SV1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/sv1),\n",
65+
" Device('name': TN1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/tn1),\n",
66+
" Device('name': dm1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/dm1)]"
67+
]
6468
},
6569
"execution_count": 2,
6670
"metadata": {},
@@ -84,7 +88,25 @@
8488
"outputs": [
8589
{
8690
"data": {
87-
"text/plain": "[Device('name': Advantage_system1.1, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system1),\n Device('name': Advantage_system3.2, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system3),\n Device('name': Advantage_system4.1, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system4),\n Device('name': Advantage_system6.1, 'arn': arn:aws:braket:us-west-2::device/qpu/d-wave/Advantage_system6),\n Device('name': Aquila, 'arn': arn:aws:braket:us-east-1::device/qpu/quera/Aquila),\n Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n Device('name': Aspen-10, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-10),\n Device('name': Aspen-11, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-11),\n Device('name': Aspen-8, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-8),\n Device('name': Aspen-9, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-9),\n Device('name': Aspen-M-1, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-1),\n Device('name': Aspen-M-2, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-2),\n Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3),\n Device('name': Borealis, 'arn': arn:aws:braket:us-east-1::device/qpu/xanadu/Borealis),\n Device('name': DW_2000Q_6, 'arn': arn:aws:braket:::device/qpu/d-wave/DW_2000Q_6),\n Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony),\n Device('name': Lucy, 'arn': arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy)]"
91+
"text/plain": [
92+
"[Device('name': Advantage_system1.1, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system1),\n",
93+
" Device('name': Advantage_system3.2, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system3),\n",
94+
" Device('name': Advantage_system4.1, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system4),\n",
95+
" Device('name': Advantage_system6.1, 'arn': arn:aws:braket:us-west-2::device/qpu/d-wave/Advantage_system6),\n",
96+
" Device('name': Aquila, 'arn': arn:aws:braket:us-east-1::device/qpu/quera/Aquila),\n",
97+
" Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n",
98+
" Device('name': Aspen-10, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-10),\n",
99+
" Device('name': Aspen-11, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-11),\n",
100+
" Device('name': Aspen-8, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-8),\n",
101+
" Device('name': Aspen-9, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-9),\n",
102+
" Device('name': Aspen-M-1, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-1),\n",
103+
" Device('name': Aspen-M-2, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-2),\n",
104+
" Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3),\n",
105+
" Device('name': Borealis, 'arn': arn:aws:braket:us-east-1::device/qpu/xanadu/Borealis),\n",
106+
" Device('name': DW_2000Q_6, 'arn': arn:aws:braket:::device/qpu/d-wave/DW_2000Q_6),\n",
107+
" Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony),\n",
108+
" Device('name': Lucy, 'arn': arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy)]"
109+
]
88110
},
89111
"execution_count": 3,
90112
"metadata": {},
@@ -116,7 +138,9 @@
116138
"outputs": [
117139
{
118140
"data": {
119-
"text/plain": "[Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony)]"
141+
"text/plain": [
142+
"[Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony)]"
143+
]
120144
},
121145
"execution_count": 4,
122146
"metadata": {},
@@ -147,7 +171,9 @@
147171
"outputs": [
148172
{
149173
"data": {
150-
"text/plain": "[Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3)]"
174+
"text/plain": [
175+
"[Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3)]"
176+
]
151177
},
152178
"execution_count": 5,
153179
"metadata": {},
@@ -178,7 +204,15 @@
178204
"outputs": [
179205
{
180206
"data": {
181-
"text/plain": "[Device('name': Aquila, 'arn': arn:aws:braket:us-east-1::device/qpu/quera/Aquila),\n Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3),\n Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony),\n Device('name': SV1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/sv1),\n Device('name': TN1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/tn1),\n Device('name': dm1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/dm1)]"
207+
"text/plain": [
208+
"[Device('name': Aquila, 'arn': arn:aws:braket:us-east-1::device/qpu/quera/Aquila),\n",
209+
" Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n",
210+
" Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3),\n",
211+
" Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony),\n",
212+
" Device('name': SV1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/sv1),\n",
213+
" Device('name': TN1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/tn1),\n",
214+
" Device('name': dm1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/dm1)]"
215+
]
182216
},
183217
"execution_count": 6,
184218
"metadata": {},
@@ -202,7 +236,9 @@
202236
"outputs": [
203237
{
204238
"data": {
205-
"text/plain": "[Device('name': Lucy, 'arn': arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy)]"
239+
"text/plain": [
240+
"[Device('name': Lucy, 'arn': arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy)]"
241+
]
206242
},
207243
"execution_count": 7,
208244
"metadata": {},
@@ -233,7 +269,10 @@
233269
"outputs": [
234270
{
235271
"data": {
236-
"text/plain": "[Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony)]"
272+
"text/plain": [
273+
"[Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n",
274+
" Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony)]"
275+
]
237276
},
238277
"execution_count": 8,
239278
"metadata": {},
@@ -264,7 +303,28 @@
264303
"outputs": [
265304
{
266305
"data": {
267-
"text/plain": "[Device('name': TN1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/tn1),\n Device('name': SV1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/sv1),\n Device('name': dm1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/dm1),\n Device('name': Advantage_system3.2, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system3),\n Device('name': Advantage_system6.1, 'arn': arn:aws:braket:us-west-2::device/qpu/d-wave/Advantage_system6),\n Device('name': Advantage_system4.1, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system4),\n Device('name': Advantage_system1.1, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system1),\n Device('name': DW_2000Q_6, 'arn': arn:aws:braket:::device/qpu/d-wave/DW_2000Q_6),\n Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony),\n Device('name': Lucy, 'arn': arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy),\n Device('name': Aquila, 'arn': arn:aws:braket:us-east-1::device/qpu/quera/Aquila),\n Device('name': Aspen-10, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-10),\n Device('name': Aspen-M-2, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-2),\n Device('name': Aspen-8, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-8),\n Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3),\n Device('name': Aspen-9, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-9),\n Device('name': Aspen-M-1, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-1),\n Device('name': Aspen-11, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-11),\n Device('name': Borealis, 'arn': arn:aws:braket:us-east-1::device/qpu/xanadu/Borealis)]"
306+
"text/plain": [
307+
"[Device('name': TN1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/tn1),\n",
308+
" Device('name': SV1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/sv1),\n",
309+
" Device('name': dm1, 'arn': arn:aws:braket:::device/quantum-simulator/amazon/dm1),\n",
310+
" Device('name': Advantage_system3.2, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system3),\n",
311+
" Device('name': Advantage_system6.1, 'arn': arn:aws:braket:us-west-2::device/qpu/d-wave/Advantage_system6),\n",
312+
" Device('name': Advantage_system4.1, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system4),\n",
313+
" Device('name': Advantage_system1.1, 'arn': arn:aws:braket:::device/qpu/d-wave/Advantage_system1),\n",
314+
" Device('name': DW_2000Q_6, 'arn': arn:aws:braket:::device/qpu/d-wave/DW_2000Q_6),\n",
315+
" Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n",
316+
" Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony),\n",
317+
" Device('name': Lucy, 'arn': arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy),\n",
318+
" Device('name': Aquila, 'arn': arn:aws:braket:us-east-1::device/qpu/quera/Aquila),\n",
319+
" Device('name': Aspen-10, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-10),\n",
320+
" Device('name': Aspen-M-2, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-2),\n",
321+
" Device('name': Aspen-8, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-8),\n",
322+
" Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3),\n",
323+
" Device('name': Aspen-9, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-9),\n",
324+
" Device('name': Aspen-M-1, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-1),\n",
325+
" Device('name': Aspen-11, 'arn': arn:aws:braket:::device/qpu/rigetti/Aspen-11),\n",
326+
" Device('name': Borealis, 'arn': arn:aws:braket:us-east-1::device/qpu/xanadu/Borealis)]"
327+
]
268328
},
269329
"execution_count": 9,
270330
"metadata": {},
@@ -295,7 +355,12 @@
295355
"outputs": [
296356
{
297357
"data": {
298-
"text/plain": "[Device('name': Aquila, 'arn': arn:aws:braket:us-east-1::device/qpu/quera/Aquila),\n Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3),\n Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony)]"
358+
"text/plain": [
359+
"[Device('name': Aquila, 'arn': arn:aws:braket:us-east-1::device/qpu/quera/Aquila),\n",
360+
" Device('name': Aria 1, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1),\n",
361+
" Device('name': Aspen-M-3, 'arn': arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3),\n",
362+
" Device('name': Harmony, 'arn': arn:aws:braket:us-east-1::device/qpu/ionq/Harmony)]"
363+
]
299364
},
300365
"execution_count": 10,
301366
"metadata": {},
@@ -1970,9 +2035,9 @@
19702035
],
19712036
"metadata": {
19722037
"kernelspec": {
1973-
"name": "python3",
2038+
"display_name": "conda_braket",
19742039
"language": "python",
1975-
"display_name": "Python 3"
2040+
"name": "conda_braket"
19762041
},
19772042
"language_info": {
19782043
"codemirror_mode": {

0 commit comments

Comments
 (0)