Replace some deprecated qiskit functions (#576)

* Replace some depracated qiskit fuctions
microsoft · Feb 27, 2024 · 8b8569b · 8b8569b
1 parent db9bc9d
commit 8b8569b
Show file tree

Hide file tree

Showing 110 changed files with 21,452 additions and 15,789 deletions.
diff --git a/azure-quantum/azure/quantum/qiskit/backends/backend.py b/azure-quantum/azure/quantum/qiskit/backends/backend.py
@@ -129,6 +129,7 @@ def _get_input_params(self, options: Dict[str, Any], shots: int = None) -> Dict[
         if self._can_send_shots_input_param():
             options_shots = options.pop(self.__class__._SHOTS_PARAM_NAME, None)
 
+            final_shots = None
             # First we check for the explicitly specified 'shots' parameter, then for a provider-specific
             # field in options, then for a backend's default value. 
 
@@ -142,7 +143,7 @@ def _get_input_params(self, options: Dict[str, Any], shots: int = None) -> Dict[
 
             elif shots is not None:
                 final_shots = shots
-            else:
+            elif options_shots is not None:
                 warnings.warn(
                     f"Parameter '{self.__class__._SHOTS_PARAM_NAME}' is subject to change in future versions. "
                     "Please, use 'shots' parameter instead."

diff --git a/azure-quantum/azure/quantum/qiskit/backends/quantinuum.py b/azure-quantum/azure/quantum/qiskit/backends/quantinuum.py
@@ -14,6 +14,7 @@
 from qiskit.providers.models import BackendConfiguration
 from qiskit.providers import Options
 from qiskit.providers import Provider
+from qiskit.qasm2 import dumps
 
 import logging
 
@@ -243,7 +244,7 @@ def _azure_config(self) -> Dict[str, str]:
 
     def _translate_input(self, circuit):
         """Translates the input values to the format expected by the AzureBackend."""
-        return circuit.qasm()
+        return dumps(circuit)
 
     def estimate_cost(
         self, circuit: QuantumCircuit, shots: int = None, count: int = None
@@ -267,7 +268,7 @@ def estimate_cost(
         if shots is None:
             raise ValueError("Missing input argument 'shots'.")
 
-        input_data = circuit.qasm()
+        input_data = dumps(circuit)
         workspace = self.provider().get_workspace()
         target = workspace.get_targets(self.name())
         return target.estimate_cost(input_data, shots=shots)

diff --git a/azure-quantum/requirements-qiskit.txt b/azure-quantum/requirements-qiskit.txt
@@ -1,5 +1,5 @@
 qiskit-ionq>=0.3.3,<1.0
 qiskit-qir>=0.4,<0.5
-qiskit-terra>=0.45,<0.46
+qiskit-terra>=0.46,<0.47
 Markdown>=3.4.1,<4.0
 python-markdown-math>=0.8.0,<1.0
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_dft_failure_algorithm_produces_output.yaml b/azure-quantum/tests/unit/recordings/test_dft_failure_algorithm_produces_output.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_dft_failure_invalid_input.yaml b/azure-quantum/tests/unit/recordings/test_dft_failure_invalid_input.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_dft_success.yaml b/azure-quantum/tests/unit/recordings/test_dft_success.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_estimator_warn_on_passed_shots.yaml b/azure-quantum/tests/unit/recordings/test_estimator_warn_on_passed_shots.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/...antum/tests/unit/recordings/test_job_submit_ionq_100_shots_with_deprecated_num_shots.yaml b/...antum/tests/unit/recordings/test_job_submit_ionq_100_shots_with_deprecated_num_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/.../tests/unit/recordings/test_job_submit_ionq_with_conflicting_shots_from_input_params.yaml b/.../tests/unit/recordings/test_job_submit_ionq_with_conflicting_shots_from_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_ionq_with_shots_and_num_shots.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_ionq_with_shots_and_num_shots.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_ionq_with_shots_from_input_params.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_ionq_with_shots_from_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_default_input_params.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_default_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_dict_input_params.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_dict_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_typed_input_params.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_typed_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_with_count_from_input_param.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_with_count_from_input_param.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_with_shots_and_count.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_with_shots_and_count.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_with_shots_param.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_pasqal_with_shots_param.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/...ordings/test_job_submit_quantinuum_with_conflictin_shots_and_count_from_input_params.yaml b/...ordings/test_job_submit_quantinuum_with_conflictin_shots_and_count_from_input_params.yaml
diff --git a/...uantum/tests/unit/recordings/test_job_submit_quantinuum_with_count_from_input_params.yaml b/...uantum/tests/unit/recordings/test_job_submit_quantinuum_with_count_from_input_params.yaml
diff --git a/...e-quantum/tests/unit/recordings/test_job_submit_quantinuum_with_deprecated_num_shots.yaml b/...e-quantum/tests/unit/recordings/test_job_submit_quantinuum_with_deprecated_num_shots.yaml
diff --git a/...tests/unit/recordings/test_job_submit_quantinuum_with_shots_and_deprecated_num_shots.yaml b/...tests/unit/recordings/test_job_submit_quantinuum_with_shots_and_deprecated_num_shots.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/...e-quantum/tests/unit/recordings/test_job_submit_rigetti_dict_input_params_with_shots.yaml b/...e-quantum/tests/unit/recordings/test_job_submit_rigetti_dict_input_params_with_shots.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/...-quantum/tests/unit/recordings/test_job_submit_rigetti_typed_input_params_with_shots.yaml b/...-quantum/tests/unit/recordings/test_job_submit_rigetti_typed_input_params_with_shots.yaml
diff --git a/...ecordings/test_job_submit_rigetti_with_conflicting_shots_and_count_from_input_params.yaml b/...ecordings/test_job_submit_rigetti_with_conflicting_shots_and_count_from_input_params.yaml
diff --git a/azure-quantum/tests/unit/recordings/test_job_submit_rigetti_with_count.yaml b/azure-quantum/tests/unit/recordings/test_job_submit_rigetti_with_count.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
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/x-www-form-urlencoded
       User-Agent:
-      - azsdk-python-identity/1.15.0 Python/3.9.18 (Windows-10-10.0.22621-SP0)
+      - azsdk-python-identity/1.15.0 Python/3.9.18 (Windows-10-10.0.22631-SP0)
       x-client-current-telemetry:
       - 4|730,2|
       x-client-os:
@@ -46,21 +46,21 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - testapp-azure-quantum-cirq azsdk-python-quantum/0.0.1 Python/3.9.18 (Windows-10-10.0.22621-SP0)
+      - testapp-azure-quantum-cirq azsdk-python-quantum/0.0.1 Python/3.9.18 (Windows-10-10.0.22631-SP0)
     method: GET
     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-elements", "currentAvailability": "Available",
         "targets": [{"id": "microsoft.dft", "currentAvailability": "Available", "averageQueueTime":
         0, "statusPage": null}]}, {"id": "ionq", "currentAvailability": "Degraded",
-        "targets": [{"id": "ionq.qpu", "currentAvailability": "Available", "averageQueueTime":
-        381072, "statusPage": "https://status.ionq.co"}, {"id": "ionq.qpu.aria-1",
-        "currentAvailability": "Available", "averageQueueTime": 1467020, "statusPage":
+        "targets": [{"id": "ionq.qpu", "currentAvailability": "Unavailable", "averageQueueTime":
+        6374471, "statusPage": "https://status.ionq.co"}, {"id": "ionq.qpu.aria-1",
+        "currentAvailability": "Available", "averageQueueTime": 5662524, "statusPage":
         "https://status.ionq.co"}, {"id": "ionq.qpu.aria-2", "currentAvailability":
-        "Unavailable", "averageQueueTime": 1591912, "statusPage": "https://status.ionq.co"},
+        "Available", "averageQueueTime": 8697847, "statusPage": "https://status.ionq.co"},
         {"id": "ionq.simulator", "currentAvailability": "Available", "averageQueueTime":
-        31, "statusPage": "https://status.ionq.co"}]}, {"id": "microsoft-qc", "currentAvailability":
+        10, "statusPage": "https://status.ionq.co"}]}, {"id": "microsoft-qc", "currentAvailability":
         "Available", "targets": [{"id": "microsoft.estimator", "currentAvailability":
         "Available", "averageQueueTime": 0, "statusPage": null}]}, {"id": "pasqal",
         "currentAvailability": "Degraded", "targets": [{"id": "pasqal.sim.emu-tn",
@@ -69,62 +69,61 @@ interactions:
         0, "statusPage": "https://pasqal.com"}]}, {"id": "rigetti", "currentAvailability":
         "Available", "targets": [{"id": "rigetti.sim.qvm", "currentAvailability":
         "Available", "averageQueueTime": 5, "statusPage": "https://rigetti.statuspage.io/"},
-        {"id": "rigetti.qpu.aspen-m-3", "currentAvailability": "Available", "averageQueueTime":
-        5, "statusPage": "https://rigetti.statuspage.io/"}, {"id": "rigetti.qpu.ankaa-9q-1",
-        "currentAvailability": "Available", "averageQueueTime": 5, "statusPage": "https://rigetti.statuspage.io/"},
-        {"id": "rigetti.qpu.ankaa-2", "currentAvailability": "Available", "averageQueueTime":
-        5, "statusPage": "https://rigetti.statuspage.io/"}]}, {"id": "Microsoft.Test",
-        "currentAvailability": "Available", "targets": [{"id": "echo-rigetti", "currentAvailability":
-        "Available", "averageQueueTime": 1, "statusPage": ""}, {"id": "echo-quantinuum",
+        {"id": "rigetti.qpu.ankaa-9q-1", "currentAvailability": "Available", "averageQueueTime":
+        5, "statusPage": "https://rigetti.statuspage.io/"}, {"id": "rigetti.qpu.ankaa-2",
+        "currentAvailability": "Available", "averageQueueTime": 5, "statusPage": "https://rigetti.statuspage.io/"}]},
+        {"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": ""}]}, {"id": "qci", "currentAvailability":
+        {"id": "sparse-sim-ionq", "currentAvailability": "Available", "averageQueueTime":
+        1, "statusPage": ""}, {"id": "echo-output", "currentAvailability": "Available",
+        "averageQueueTime": 1, "statusPage": ""}]}, {"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": "quantinuum", "currentAvailability": "Degraded", "targets": [{"id":
-        "quantinuum.qpu.h1-1", "currentAvailability": "Available", "averageQueueTime":
-        99720, "statusPage": "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-1sc",
-        "currentAvailability": "Available", "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        "quantinuum.qpu.h1-1", "currentAvailability": "Unavailable", "averageQueueTime":
+        0, "statusPage": "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-1sc",
+        "currentAvailability": "Available", "averageQueueTime": 7, "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": "Unavailable", "averageQueueTime": 0, "statusPage":
         "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-1e",
-        "currentAvailability": "Available", "averageQueueTime": 4174, "statusPage":
+        "currentAvailability": "Available", "averageQueueTime": 151, "statusPage":
         "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.sim.h1-2e",
         "currentAvailability": "Unavailable", "averageQueueTime": 0, "statusPage":
         "https://www.quantinuum.com/hardware/h1"}, {"id": "quantinuum.qpu.h2-1", "currentAvailability":
-        "Available", "averageQueueTime": 23280, "statusPage": "https://www.quantinuum.com/hardware/h2"},
+        "Degraded", "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h2"},
         {"id": "quantinuum.sim.h2-1sc", "currentAvailability": "Available", "averageQueueTime":
-        13, "statusPage": "https://www.quantinuum.com/hardware/h2"}, {"id": "quantinuum.sim.h2-1e",
-        "currentAvailability": "Available", "averageQueueTime": 949, "statusPage":
-        "https://www.quantinuum.com/hardware/h2"}, {"id": "quantinuum.sim.h1-1sc-preview",
-        "currentAvailability": "Available", "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        6, "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": 7, "statusPage": "https://www.quantinuum.com/hardware/h1"},
         {"id": "quantinuum.sim.h1-2sc-preview", "currentAvailability": "Unavailable",
         "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"},
         {"id": "quantinuum.sim.h1-1e-preview", "currentAvailability": "Available",
-        "averageQueueTime": 4174, "statusPage": "https://www.quantinuum.com/hardware/h1"},
-        {"id": "quantinuum.sim.h1-2e-preview", "currentAvailability": "Unavailable",
+        "averageQueueTime": 151, "statusPage": "https://www.quantinuum.com/hardware/h1"},
+        {"id": "quantinuum.sim.h1-2e-preview", "currentAvailability": "Available",
+        "averageQueueTime": 0, "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-1-preview", "currentAvailability": "Available",
-        "averageQueueTime": 99720, "statusPage": "https://www.quantinuum.com/hardware/h1"},
         {"id": "quantinuum.qpu.h1-2-preview", "currentAvailability": "Unavailable",
         "averageQueueTime": 0, "statusPage": "https://www.quantinuum.com/hardware/h1"}]}],
         "nextLink": null, "access_token": "fake_token"}'
     headers:
       connection:
       - keep-alive
       content-length:
-      - '5752'
+      - '5597'
       content-type:
       - application/json; charset=utf-8
       transfer-encoding: