From 198b5ea1ef4d891427572e188f13124c8f894200 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:13:50 -0400 Subject: [PATCH 1/3] Replace Aspen-M-3 with Ankaa-2 --- src/device.jl | 3 ++- test/device.jl | 2 +- test/integ_tests/cost_tracking.jl | 2 +- test/integ_tests/device_creation.jl | 2 +- test/task.jl | 2 +- test/task_batch.jl | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/device.jl b/src/device.jl index 242a5f24..f5ce9cc1 100644 --- a/src/device.jl +++ b/src/device.jl @@ -73,7 +73,7 @@ Base.convert(::Type{String}, d::_Lucy) = "arn:aws:braket:eu-west-2::device/qpu/o struct Garnet <: IQMDevice end Base.convert(::Type{String}, d::Garnet) = "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet" -for (d, d_arn) in zip((:_Aspen8, :_Aspen9, :_Aspen10, :_Aspen11, :_AspenM1, :_AspenM2, :AspenM3), +for (d, d_arn) in zip((:_Aspen8, :_Aspen9, :_Aspen10, :_Aspen11, :_AspenM1, :_AspenM2, :_AspenM3, Ankaa2), ("arn:aws:braket:::device/qpu/rigetti/Aspen-8", "arn:aws:braket:::device/qpu/rigetti/Aspen-9", "arn:aws:braket:::device/qpu/rigetti/Aspen-10", @@ -81,6 +81,7 @@ for (d, d_arn) in zip((:_Aspen8, :_Aspen9, :_Aspen10, :_Aspen11, :_AspenM1, :_As "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-1", "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-2", "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3", + "arn:aws:braket:us-west-1::device/qpu/rigetti/Ankaa-2", )) @eval begin struct $d <: RigettiDevice end diff --git a/test/device.jl b/test/device.jl index 09d64aba..f2c98831 100644 --- a/test/device.jl +++ b/test/device.jl @@ -34,7 +34,7 @@ MOCK_GATE_MODEL_QPU_CAPABILITIES_1 = """{ }""" MOCK_GATE_MODEL_QPU_1() = """{ - "deviceName": "Aspen-10", + "deviceName": "Ankaa-2", "deviceType": "QPU", "providerName": "provider1", "deviceStatus": "OFFLINE", diff --git a/test/integ_tests/cost_tracking.jl b/test/integ_tests/cost_tracking.jl index c0cc9cc6..8b49f3d9 100644 --- a/test/integ_tests/cost_tracking.jl +++ b/test/integ_tests/cost_tracking.jl @@ -7,7 +7,7 @@ using AWS: @service, AWSConfig, global_aws_config circuit = Circuit([(H, 0)]) t = Braket.Tracker() n_available = 0 - for arn = ("arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy", "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet", "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3", "arn:aws:braket:us-east-1::device/qpu/ionq/Harmony") + for arn = ("arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy", "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet", "arn:aws:braket:us-west-1::device/qpu/rigetti/Ankaa-2", "arn:aws:braket:us-east-1::device/qpu/ionq/Harmony") d = AwsDevice(arn) if Braket.isavailable(d) d(circuit, shots=10) diff --git a/test/integ_tests/device_creation.jl b/test/integ_tests/device_creation.jl index 9214711a..3caf752c 100644 --- a/test/integ_tests/device_creation.jl +++ b/test/integ_tests/device_creation.jl @@ -1,6 +1,6 @@ using Braket, Test -RIGETTI_ARN = "arn:aws:braket:::device/qpu/rigetti/Aspen-M-3" +RIGETTI_ARN = "arn:aws:braket:::device/qpu/rigetti/Ankaa-2" IONQ_ARN = "arn:aws:braket:us-east-1::device/qpu/ionq/Aria-1" SIMULATOR_ARN = "arn:aws:braket:::device/quantum-simulator/amazon/sv1" IQM_ARN = "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet" diff --git a/test/task.jl b/test/task.jl index 3cf176c1..2ba4c128 100644 --- a/test/task.jl +++ b/test/task.jl @@ -113,7 +113,7 @@ zero_shots_result(task_mtd, add_mtd) = Braket.GateModelTaskResult( oq3_program() = Braket.OpenQasmProgram(Braket.header_dict[Braket.OpenQasmProgram], bell_qasm, nothing) bell_circ() = (c = Circuit(); c=H(c, 0); c=CNot(c, 0, 1); return c) bell_prog() = Braket.Program(bell_circ()) - RIGETTI_ARN = "arn:aws:braket:::device/qpu/rigetti/Aspen-M-3" + RIGETTI_ARN = "arn:aws:braket:::device/qpu/rigetti/Ankaa-2" IONQ_ARN = "arn:aws:braket:::device/qpu/ionq/ionQdevice" SV1_ARN = "arn:aws:braket:::device/quantum-simulator/amazon/sv1" IQM_ARN = "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet" diff --git a/test/task_batch.jl b/test/task_batch.jl index 39ad68b8..96fd146e 100644 --- a/test/task_batch.jl +++ b/test/task_batch.jl @@ -11,7 +11,7 @@ mock_result(c) = Braket.GateModelTaskResult( Braket.AdditionalMetadata(Braket.Program(c), nothing, nothing, nothing, nothing, nothing, nothing, nothing, nothing) ) -RIGETTI_ARN = "arn:aws:braket:::device/qpu/rigetti/Aspen-M-3" +RIGETTI_ARN = "arn:aws:braket:::device/qpu/rigetti/Ankaa-2" IONQ_ARN = "arn:aws:braket:::device/qpu/ionq/ionQdevice" SV1_ARN = "arn:aws:braket:::device/quantum-simulator/amazon/sv1" IQM_ARN = "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet" From 005d0fcab4fd5c869641de4d48a7c06076d993ca Mon Sep 17 00:00:00 2001 From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:18:16 -0400 Subject: [PATCH 2/3] Fix typo --- src/device.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/device.jl b/src/device.jl index f5ce9cc1..1c23702c 100644 --- a/src/device.jl +++ b/src/device.jl @@ -73,7 +73,7 @@ Base.convert(::Type{String}, d::_Lucy) = "arn:aws:braket:eu-west-2::device/qpu/o struct Garnet <: IQMDevice end Base.convert(::Type{String}, d::Garnet) = "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet" -for (d, d_arn) in zip((:_Aspen8, :_Aspen9, :_Aspen10, :_Aspen11, :_AspenM1, :_AspenM2, :_AspenM3, Ankaa2), +for (d, d_arn) in zip((:_Aspen8, :_Aspen9, :_Aspen10, :_Aspen11, :_AspenM1, :_AspenM2, :_AspenM3, :Ankaa2), ("arn:aws:braket:::device/qpu/rigetti/Aspen-8", "arn:aws:braket:::device/qpu/rigetti/Aspen-9", "arn:aws:braket:::device/qpu/rigetti/Aspen-10", From d8b9b511ae273f28e4269f694dcc05f9dd07d5af Mon Sep 17 00:00:00 2001 From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:24:30 -0400 Subject: [PATCH 3/3] Revert unnecessary change --- test/device.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/device.jl b/test/device.jl index f2c98831..09d64aba 100644 --- a/test/device.jl +++ b/test/device.jl @@ -34,7 +34,7 @@ MOCK_GATE_MODEL_QPU_CAPABILITIES_1 = """{ }""" MOCK_GATE_MODEL_QPU_1() = """{ - "deviceName": "Ankaa-2", + "deviceName": "Aspen-10", "deviceType": "QPU", "providerName": "provider1", "deviceStatus": "OFFLINE",