feature: add new IonQ Aria-2 target + unit-tests (#507)

* feature: add IonQ Aria-2 target * chore: updated test-recordings * chore: retriggering microsoft.visualization-pr check since it's stuck
microsoft · Sep 12, 2023 · e32c5a4 · e32c5a4
1 parent 1672bb9
commit e32c5a4
Show file tree

Hide file tree

Showing 84 changed files with 14,018 additions and 42,992 deletions.
diff --git a/azure-quantum/azure/quantum/qiskit/backends/ionq.py b/azure-quantum/azure/quantum/qiskit/backends/ionq.py
@@ -128,7 +128,7 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
 
 
 class IonQAriaQirBackend(IonQQirBackendBase):
-    backend_names = ("ionq.qpu.aria-1",)
+    backend_names = ("ionq.qpu.aria-1", "ionq.qpu.aria-2")
 
     def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
         """Base class for interfacing with an IonQ Aria QPU backend"""
@@ -316,7 +316,7 @@ def _azure_config(self) -> Dict[str, str]:
 
 
 class IonQAriaBackend(IonQBackend):
-    backend_names = ("ionq.qpu.aria-1",)
+    backend_names = ("ionq.qpu.aria-1", "ionq.qpu.aria-2")
 
     def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
         """Base class for interfacing with an IonQ Aria QPU backend"""

diff --git a/azure-quantum/azure/quantum/target/ionq.py b/azure-quantum/azure/quantum/target/ionq.py
@@ -12,19 +12,22 @@
 COST_1QUBIT_GATE_MAP = {
     "ionq.simulator" : 0.0,
     "ionq.qpu" : 0.00003,
-    "ionq.qpu.aria-1" : 0.0002205
+    "ionq.qpu.aria-1" : 0.0002205,
+    "ionq.qpu.aria-2" : 0.0002205
 }
 
 COST_2QUBIT_GATE_MAP = {
     "ionq.simulator" : 0.0,
     "ionq.qpu" : 0.0003,
-    "ionq.qpu.aria-1" : 0.00098
+    "ionq.qpu.aria-1" : 0.00098,
+    "ionq.qpu.aria-2" : 0.00098
 }
 
 MIN_PRICE_MAP = {
     "ionq.simulator" : 0.0,
     "ionq.qpu" : 1.0,
-    "ionq.qpu.aria-1" : 97.5
+    "ionq.qpu.aria-1" : 97.5,
+    "ionq.qpu.aria-2" : 97.5
 }
 
 def int_to_bitstring(k: int, num_qubits: int, measured_qubit_ids: List[int]):
@@ -39,7 +42,8 @@ class IonQ(Target):
     target_names = (
         "ionq.qpu",
         "ionq.simulator",
-        "ionq.qpu.aria-1"
+        "ionq.qpu.aria-1",
+        "ionq.qpu.aria-2"
     )
 
     def __init__(
@@ -132,7 +136,7 @@ def estimate_cost(
 
         For the most current pricing details, see
         https://docs.microsoft.com/azure/quantum/provider-ionq#pricing
-        Or find your workspace and view pricing options in the "Provider" tab
+        or find your workspace and view pricing options in the "Provider" tab
         of your workspace: https://aka.ms/aq/myworkspaces
 
         :param circuit: Quantum circuit in IonQ JSON format (for examples,

diff --git a/azure-quantum/tests/unit/recordings/test_configuration_quantinuum_backends.yaml b/azure-quantum/tests/unit/recordings/test_configuration_quantinuum_backends.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_estimator_batching_job.yaml b/azure-quantum/tests/unit/recordings/test_estimator_batching_job.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_estimator_failing_job.yaml b/azure-quantum/tests/unit/recordings/test_estimator_failing_job.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_estimator_non_batching_job.yaml b/azure-quantum/tests/unit/recordings/test_estimator_non_batching_job.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_estimator_profiling_job.yaml b/azure-quantum/tests/unit/recordings/test_estimator_profiling_job.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_estimator_qiskit_job.yaml b/azure-quantum/tests/unit/recordings/test_estimator_qiskit_job.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_ionq.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_ionq.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_ionq_100_shots.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_ionq_100_shots.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_ionq_cost_estimate.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_ionq_cost_estimate.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_quantinuum.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_quantinuum.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_quantinuum_h2_1e.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_quantinuum_h2_1e.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_quantinuum_h2_1sc.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_quantinuum_h2_1sc.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_rigetti_default_input_params.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_rigetti_default_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_rigetti_dict_input_params.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_rigetti_dict_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_rigetti_typed_input_params.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_rigetti_typed_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_parametrized_quil.yaml b/azure-quantum/tests/unit/recordings/test_parametrized_quil.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_plugins_cirq_get_targets.yaml b/azure-quantum/tests/unit/recordings/test_plugins_cirq_get_targets.yaml
@@ -53,95 +53,76 @@ interactions:
     uri: https://eastus.quantum.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup/providers/Microsoft.Quantum/workspaces/myworkspace/providerStatus?api-version=2022-09-12-preview&test-sequence-id=1
   response:
     body:
-      string: '{"value": [{"id": "Microsoft", "currentAvailability": "Degraded", "targets":
-        [{"id": "microsoft.paralleltempering-parameterfree.cpu", "currentAvailability":
-        "Unavailable", "averageQueueTime": 0, "statusPage": null}, {"id": "microsoft.paralleltempering.cpu",
-        "currentAvailability": "Unavailable", "averageQueueTime": 0, "statusPage":
-        null}, {"id": "microsoft.simulatedannealing-parameterfree.cpu", "currentAvailability":
-        "Unavailable", "averageQueueTime": 0, "statusPage": null}, {"id": "microsoft.simulatedannealing.cpu",
-        "currentAvailability": "Unavailable", "averageQueueTime": 0, "statusPage":
-        null}, {"id": "microsoft.tabu-parameterfree.cpu", "currentAvailability": "Unavailable",
-        "averageQueueTime": 0, "statusPage": null}, {"id": "microsoft.tabu.cpu", "currentAvailability":
-        "Unavailable", "averageQueueTime": 0, "statusPage": null}, {"id": "microsoft.qmc.cpu",
-        "currentAvailability": "Unavailable", "averageQueueTime": 0, "statusPage":
-        null}, {"id": "microsoft.populationannealing.cpu", "currentAvailability":
-        "Unavailable", "averageQueueTime": 0, "statusPage": null}, {"id": "microsoft.populationannealing-parameterfree.cpu",
-        "currentAvailability": "Unavailable", "averageQueueTime": 0, "statusPage":
-        null}, {"id": "microsoft.substochasticmontecarlo.cpu", "currentAvailability":
-        "Unavailable", "averageQueueTime": 0, "statusPage": null}, {"id": "microsoft.substochasticmontecarlo-parameterfree.cpu",
-        "currentAvailability": "Unavailable", "averageQueueTime": 0, "statusPage":
-        null}, {"id": "microsoft.populationannealing-parameterfree.cpu", "currentAvailability":
-        "Unavailable", "averageQueueTime": 0, "statusPage": null}]}, {"id": "ionq",
-        "currentAvailability": "Degraded", "targets": [{"id": "ionq.qpu", "currentAvailability":
-        "Available", "averageQueueTime": 791, "statusPage": "https://status.ionq.co"},
-        {"id": "ionq.qpu.aria-1", "currentAvailability": "Unavailable", "averageQueueTime":
-        192312, "statusPage": "https://status.ionq.co"}, {"id": "ionq.simulator",
-        "currentAvailability": "Available", "averageQueueTime": 23, "statusPage":
-        "https://status.ionq.co"}]}, {"id": "quantinuum", "currentAvailability": "Degraded",
-        "targets": [{"id": "quantinuum.qpu.h1-1", "currentAvailability": "Degraded",
-        "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+      string: '{"value": [{"id": "ionq", "currentAvailability": "Degraded", "targets":
+        [{"id": "ionq.qpu", "currentAvailability": "Available", "averageQueueTime":
+        0, "statusPage": "https://status.ionq.co"}, {"id": "ionq.qpu.aria-1", "currentAvailability":
+        "Unavailable", "averageQueueTime": 755678, "statusPage": "https://status.ionq.co"},
+        {"id": "ionq.qpu.aria-2", "currentAvailability": "Available", "averageQueueTime":
+        77908, "statusPage": "https://status.ionq.co"}, {"id": "ionq.simulator", "currentAvailability":
+        "Available", "averageQueueTime": 991, "statusPage": "https://status.ionq.co"}]},
+        {"id": "microsoft-qc", "currentAvailability": "Available", "targets": [{"id":
+        "microsoft.estimator", "currentAvailability": "Available", "averageQueueTime":
+        0, "statusPage": null}]}, {"id": "pasqal", "currentAvailability": "Available",
+        "targets": [{"id": "pasqal.sim.emu_free", "currentAvailability": "Available",
+        "averageQueueTime": 0, "statusPage": "https://pasqal.com"}, {"id": "pasqal.sim.emu_tn",
+        "currentAvailability": "Available", "averageQueueTime": 0, "statusPage": "https://pasqal.com"},
+        {"id": "pasqal.qpu.fresnel", "currentAvailability": "Available", "averageQueueTime":
+        0, "statusPage": "https://pasqal.com"}]}, {"id": "quantinuum", "currentAvailability":
+        "Degraded", "targets": [{"id": "quantinuum.qpu.h1-1", "currentAvailability":
+        "Unavailable", "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
         {"id": "quantinuum.sim.h1-1sc", "currentAvailability": "Available", "averageQueueTime":
-        14, "statusPage": "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.qpu.h1-2",
-        "currentAvailability": "Degraded", "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
-        {"id": "quantinuum.sim.h1-2sc", "currentAvailability": "Available", "averageQueueTime":
-        0, "statusPage": "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-1e",
-        "currentAvailability": "Available", "averageQueueTime": 89468, "statusPage":
-        "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-2e",
-        "currentAvailability": "Available", "averageQueueTime": 1046, "statusPage":
-        "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.qpu.h2-1", "currentAvailability":
-        "Available", "averageQueueTime": 68997, "statusPage": "https://www.quantinuum.com/hardware/h2"},
-        {"id": "quantinuum.sim.h2-1sc", "currentAvailability": "Available", "averageQueueTime":
-        1, "statusPage": "https://www.quantinuum.com/hardware/h2"}, {"id": "quantinuum.sim.h2-1e",
-        "currentAvailability": "Available", "averageQueueTime": 76098, "statusPage":
-        "https://www.quantinuum.com/hardware/h2"}, {"id": "quantinuum.sim.h1-1sc-preview",
-        "currentAvailability": "Available", "averageQueueTime": 14, "statusPage":
-        "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-2sc-preview",
+        0, "statusPage": "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.qpu.h1-2",
+        "currentAvailability": "Unavailable", "averageQueueTime": 0, "statusPage":
+        "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-2sc",
+        "currentAvailability": "Available", "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        {"id": "quantinuum.sim.h1-1e", "currentAvailability": "Available", "averageQueueTime":
+        6, "statusPage": "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-2e",
+        "currentAvailability": "Available", "averageQueueTime": 6, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        {"id": "quantinuum.qpu.h2-1", "currentAvailability": "Unavailable", "averageQueueTime":
+        0, "statusPage": "https://www.quantinuum.com/hardware/h2"}, {"id": "quantinuum.sim.h2-1sc",
+        "currentAvailability": "Available", "averageQueueTime": 7, "statusPage": "https://www.quantinuum.com/hardware/h2"},
+        {"id": "quantinuum.sim.h2-1e", "currentAvailability": "Available", "averageQueueTime":
+        0, "statusPage": "https://www.quantinuum.com/hardware/h2"}, {"id": "quantinuum.sim.h1-1sc-preview",
         "currentAvailability": "Available", "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        {"id": "quantinuum.sim.h1-2sc-preview", "currentAvailability": "Available",
+        "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
         {"id": "quantinuum.sim.h1-1e-preview", "currentAvailability": "Available",
-        "averageQueueTime": 89468, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        "averageQueueTime": 6, "statusPage": "https://www.quantinuum.com/hardware/h1"},
         {"id": "quantinuum.sim.h1-2e-preview", "currentAvailability": "Available",
-        "averageQueueTime": 1046, "statusPage": "https://www.quantinuum.com/hardware/h1"},
-        {"id": "quantinuum.qpu.h1-1-preview", "currentAvailability": "Degraded", "averageQueueTime":
-        0, "statusPage": "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.qpu.h1-2-preview",
-        "currentAvailability": "Degraded", "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"}]},
+        "averageQueueTime": 6, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        {"id": "quantinuum.qpu.h1-1-preview", "currentAvailability": "Unavailable",
+        "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        {"id": "quantinuum.qpu.h1-2-preview", "currentAvailability": "Unavailable",
+        "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"}]},
         {"id": "rigetti", "currentAvailability": "Degraded", "targets": [{"id": "rigetti.sim.qvm",
         "currentAvailability": "Available", "averageQueueTime": 5, "statusPage": "https://rigetti.statuspage.io/"},
         {"id": "rigetti.qpu.aspen-m-2", "currentAvailability": "Unavailable", "averageQueueTime":
         0, "statusPage": null}, {"id": "rigetti.qpu.aspen-m-3", "currentAvailability":
         "Available", "averageQueueTime": 5, "statusPage": "https://rigetti.statuspage.io/"}]},
-        {"id": "1qbit", "currentAvailability": "Unavailable", "targets": [{"id": "1qbit.tabu",
-        "currentAvailability": "Unavailable", "averageQueueTime": 0, "statusPage":
-        null}, {"id": "1qbit.pathrelinking", "currentAvailability": "Unavailable",
-        "averageQueueTime": 0, "statusPage": null}, {"id": "1qbit.pticm", "currentAvailability":
-        "Unavailable", "averageQueueTime": 0, "statusPage": null}]}, {"id": "toshiba",
-        "currentAvailability": "Available", "targets": [{"id": "toshiba.sbm.ising",
-        "currentAvailability": "Available", "averageQueueTime": 4, "statusPage": "https://aq-sbm.net/v1/service_monitor/index.html"}]},
-        {"id": "microsoft-qc", "currentAvailability": "Available", "targets": [{"id":
-        "microsoft.estimator", "currentAvailability": "Available", "averageQueueTime":
-        0, "statusPage": null}]}, {"id": "qci", "currentAvailability": "Degraded",
-        "targets": [{"id": "qci.simulator", "currentAvailability": "Available", "averageQueueTime":
-        1, "statusPage": "https://quantumcircuits.com"}, {"id": "qci.machine1", "currentAvailability":
-        "Unavailable", "averageQueueTime": 1, "statusPage": "https://quantumcircuits.com"},
-        {"id": "qci.simulator.noisy", "currentAvailability": "Available", "averageQueueTime":
-        0, "statusPage": "https://quantumcircuits.com"}]}, {"id": "Microsoft.Test",
-        "currentAvailability": "Available", "targets": [{"id": "echo-rigetti", "currentAvailability":
-        "Available", "averageQueueTime": 1, "statusPage": ""}, {"id": "echo-quantinuum",
+        {"id": "qci", "currentAvailability": "Degraded", "targets": [{"id": "qci.simulator",
+        "currentAvailability": "Available", "averageQueueTime": 1, "statusPage": "https://quantumcircuits.com"},
+        {"id": "qci.machine1", "currentAvailability": "Unavailable", "averageQueueTime":
+        1, "statusPage": "https://quantumcircuits.com"}, {"id": "qci.simulator.noisy",
+        "currentAvailability": "Available", "averageQueueTime": 0, "statusPage": "https://quantumcircuits.com"}]},
+        {"id": "Microsoft.Test", "currentAvailability": "Available", "targets": [{"id":
+        "echo-rigetti", "currentAvailability": "Available", "averageQueueTime": 1,
+        "statusPage": ""}, {"id": "echo-quantinuum", "currentAvailability": "Available",
+        "averageQueueTime": 1, "statusPage": ""}, {"id": "echo-qci", "currentAvailability":
+        "Available", "averageQueueTime": 1, "statusPage": ""}, {"id": "echo-ionq",
         "currentAvailability": "Available", "averageQueueTime": 1, "statusPage": ""},
-        {"id": "echo-qci", "currentAvailability": "Available", "averageQueueTime":
-        1, "statusPage": ""}, {"id": "echo-ionq", "currentAvailability": "Available",
-        "averageQueueTime": 1, "statusPage": ""}, {"id": "sparse-sim-rigetti", "currentAvailability":
-        "Available", "averageQueueTime": 1, "statusPage": ""}, {"id": "sparse-sim-quantinuum",
+        {"id": "sparse-sim-rigetti", "currentAvailability": "Available", "averageQueueTime":
+        1, "statusPage": ""}, {"id": "sparse-sim-quantinuum", "currentAvailability":
+        "Available", "averageQueueTime": 1, "statusPage": ""}, {"id": "sparse-sim-qci",
         "currentAvailability": "Available", "averageQueueTime": 1, "statusPage": ""},
-        {"id": "sparse-sim-qci", "currentAvailability": "Available", "averageQueueTime":
-        1, "statusPage": ""}, {"id": "sparse-sim-ionq", "currentAvailability": "Available",
-        "averageQueueTime": 1, "statusPage": ""}, {"id": "echo-output", "currentAvailability":
-        "Available", "averageQueueTime": 1, "statusPage": ""}]}], "nextLink": null,
-        "access_token": "fake_token"}'
+        {"id": "sparse-sim-ionq", "currentAvailability": "Available", "averageQueueTime":
+        1, "statusPage": ""}, {"id": "echo-output", "currentAvailability": "Available",
+        "averageQueueTime": 1, "statusPage": ""}]}], "nextLink": null, "access_token":
+        "fake_token"}'
     headers:
       connection:
       - keep-alive
       content-length:
-      - '7170'
+      - '5501'
       content-type:
       - application/json; charset=utf-8
       transfer-encoding: