qiskit qir by default

azure-quantum/azure/quantum/qiskit/backends/backend.py

@@ -36,7 +36,6 @@
 To install run: pip install azure-quantum[qiskit]"
     )
 
-
 class AzureBackendBase(Backend, SessionHost):
 
     # Name of the provider's input parameter which specifies number of shots for a submitted job.
@@ -280,6 +279,8 @@ def _azure_config(self) -> Dict[str, str]:
             "content_type": "qir.v1",
             "input_data_format": "qir.v1",
             "output_data_format": "microsoft.quantum-results.v2",
+            "is_default": True,
+            "is_passthrough": False
         }
 
     def run(
@@ -429,6 +430,37 @@ def _translate_input(
 
         return module.bitcode
 
+    def _estimate_cost_qir(self, circuits, shots, options={}):
+        """Estimate the cost for the given circuit."""
+        config = self.configuration()
+        input_params = self._get_input_params(options, shots=shots)
+
+        if not (isinstance(circuits, list)):
+            circuits = [circuits]
+
+        to_qir_kwargs = input_params.pop(
+            "to_qir_kwargs", config.azure.get("to_qir_kwargs", {"record_output": True})
+        )
+        targetCapability = input_params.pop(
+            "targetCapability",
+            self.options.get("targetCapability", "AdaptiveExecution"),
+        )
+
+        if not input_params.pop("skipTranspile", False):
+            # Set of gates supported by QIR targets.
+            circuits = transpile(
+                circuits, basis_gates=config.basis_gates, optimization_level=0
+            )
+
+
+        (module, _) = self._generate_qir(
+            circuits, targetCapability, **to_qir_kwargs
+        )
+
+        workspace = self.provider().get_workspace()
+        target = workspace.get_targets(self.name())
+        return target.estimate_cost(module, shots=shots)
+
 
 class AzureBackend(AzureBackendBase):
     """Base class for interfacing with a backend in Azure Quantum"""

azure-quantum/azure/quantum/qiskit/backends/ionq.py

@@ -20,7 +20,6 @@
 from qiskit.providers import Options, Provider
 
 from qiskit_ionq.helpers import (
-    ionq_basis_gates,
     GATESET_MAP,
     qiskit_circ_to_ionq_circ,
 )
@@ -46,6 +45,24 @@
     "IonQForteNativeBackend",
 ]
 
+QIR_BASIS_GATES = [
+    "x",
+    "y",
+    "z",
+    "rx",
+    "ry",
+    "rz",
+    "h",
+    "swap",
+    "cx",
+    "cz",
+    "s",
+    "sdg",
+    "t",
+    "tdg",
+    "measure",
+]
+
 _IONQ_SHOTS_INPUT_PARAM_NAME = "shots"
 _DEFAULT_SHOTS_COUNT = 500
 
@@ -68,6 +85,9 @@ def _default_options(cls) -> Options:
             },
             targetCapability="BasicExecution",
             )
+
+    def gateset(self):
+        return self.configuration().gateset
 
     def _azure_config(self) -> Dict[str, str]:
         config = super()._azure_config()
@@ -77,6 +97,10 @@ def _azure_config(self) -> Dict[str, str]:
             }
         )
         return config
+
+    def estimate_cost(self, circuits, shots, options={}):
+        """Estimate the cost for the given circuit."""
+        return self._estimate_cost_qir(circuits, shots, options)
 
     def run(
         self, 
@@ -103,7 +127,7 @@ class IonQSimulatorQirBackend(IonQQirBackendBase):
 
     def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
         """Base class for interfacing with an IonQ QIR Simulator backend"""
-
+        gateset = kwargs.pop("gateset", "qis")
         default_config = BackendConfiguration.from_dict(
             {
                 "backend_name": name,
@@ -112,7 +136,7 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
                 "local": False,
                 "coupling_map": None,
                 "description": "IonQ simulator on Azure Quantum",
-                "basis_gates": ionq_basis_gates,
+                "basis_gates": QIR_BASIS_GATES,
                 "memory": False,
                 "n_qubits": 29,
                 "conditional": False,
@@ -121,6 +145,7 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
                 "open_pulse": False,
                 "gates": [{"name": "TODO", "parameters": [], "qasm_def": "TODO"}],
                 "azure": self._azure_config(),
+                "gateset": gateset
             }
         )
         logger.info("Initializing IonQSimulatorQirBackend")
@@ -135,7 +160,7 @@ class IonQAriaQirBackend(IonQQirBackendBase):
 
     def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
         """Base class for interfacing with an IonQ Aria QPU backend"""
-
+        gateset = kwargs.pop("gateset", "qis")
         default_config = BackendConfiguration.from_dict(
             {
                 "backend_name": name,
@@ -144,7 +169,7 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
                 "local": False,
                 "coupling_map": None,
                 "description": "IonQ Aria QPU on Azure Quantum",
-                "basis_gates": ionq_basis_gates,
+                "basis_gates": QIR_BASIS_GATES,
                 "memory": False,
                 "n_qubits": 23,
                 "conditional": False,
@@ -153,6 +178,7 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
                 "open_pulse": False,
                 "gates": [{"name": "TODO", "parameters": [], "qasm_def": "TODO"}],
                 "azure": self._azure_config(),
+                "gateset": gateset
             }
         )
         logger.info("Initializing IonQAriaQirBackend")
@@ -167,7 +193,7 @@ class IonQForteQirBackend(IonQQirBackendBase):
 
     def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
         """Base class for interfacing with an IonQ Forte QPU backend"""
-
+        gateset = kwargs.pop("gateset", "qis")
         default_config = BackendConfiguration.from_dict(
             {
                 "backend_name": name,
@@ -176,7 +202,7 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
                 "local": False,
                 "coupling_map": None,
                 "description": "IonQ Forte QPU on Azure Quantum",
-                "basis_gates": ionq_basis_gates,
+                "basis_gates": QIR_BASIS_GATES,
                 "memory": False,
                 "n_qubits": 35,
                 "conditional": False,
@@ -185,6 +211,7 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
                 "open_pulse": False,
                 "gates": [{"name": "TODO", "parameters": [], "qasm_def": "TODO"}],
                 "azure": self._azure_config(),
+                "gateset": gateset
             }
         )
         logger.info("Initializing IonQForteQirBackend")
@@ -241,7 +268,8 @@ def _azure_config(self) -> Dict[str, str]:
             "provider_id": "ionq",
             "input_data_format": "ionq.circuit.v1",
             "output_data_format": "ionq.quantum-results.v1",
-            "is_default": True,
+            "is_default": False,
+            "is_passthrough": True
         }
 
     def _prepare_job_metadata(self, circuit, **kwargs):
@@ -309,23 +337,23 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
         )
         super().__init__(configuration=configuration, provider=provider, **kwargs)
 
-
-class IonQSimulatorNativeBackend(IonQSimulatorBackend):
-    def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
-        if "gateset" not in kwargs:
-            kwargs["gateset"] = "native"
-        super().__init__(name, provider, **kwargs)
-
     def _azure_config(self) -> Dict[str, str]:
         config = super()._azure_config()
         config.update(
             {
-                "is_default": False,
+                "is_default": True,
             }
         )
         return config
 
 
+class IonQSimulatorNativeBackend(IonQSimulatorBackend):
+    def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
+        if "gateset" not in kwargs:
+            kwargs["gateset"] = "native"
+        super().__init__(name, provider, **kwargs)
+
+
 class IonQAriaBackend(IonQBackend):
     backend_names = ("ionq.qpu.aria-1", "ionq.qpu.aria-2")
 
@@ -357,6 +385,15 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
             "configuration", default_config
         )
         super().__init__(configuration=configuration, provider=provider, **kwargs)
+
+    def _azure_config(self) -> Dict[str, str]:
+        config = super()._azure_config()
+        config.update(
+            {
+                "is_default": True,
+            }
+        )
+        return config
 
 
 class IonQForteBackend(IonQBackend):
@@ -390,35 +427,26 @@ def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
             "configuration", default_config
         )
         super().__init__(configuration=configuration, provider=provider, **kwargs)
-
-
-class IonQAriaNativeBackend(IonQAriaBackend):
-    def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
-        if "gateset" not in kwargs:
-            kwargs["gateset"] = "native"
-        super().__init__(name, provider, **kwargs)
-
+
     def _azure_config(self) -> Dict[str, str]:
         config = super()._azure_config()
         config.update(
             {
-                "is_default": False,
+                "is_default": True,
             }
         )
         return config
 
 
-class IonQForteNativeBackend(IonQForteBackend):
+class IonQAriaNativeBackend(IonQAriaBackend):
     def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
         if "gateset" not in kwargs:
             kwargs["gateset"] = "native"
         super().__init__(name, provider, **kwargs)
 
-    def _azure_config(self) -> Dict[str, str]:
-        config = super()._azure_config()
-        config.update(
-            {
-                "is_default": False,
-            }
-        )
-        return config
+
+class IonQForteNativeBackend(IonQForteBackend):
+    def __init__(self, name: str, provider: "AzureQuantumProvider", **kwargs):
+        if "gateset" not in kwargs:
+            kwargs["gateset"] = "native"
+        super().__init__(name, provider, **kwargs)

azure-quantum/azure/quantum/qiskit/backends/quantinuum.py

@@ -97,6 +97,10 @@ def _azure_config(self) -> Dict[str, str]:
 
     def _get_n_qubits(self, name):
         return _get_n_qubits(name)
+
+    def estimate_cost(self, circuits, shots, options={}):
+        """Estimate the cost for the given circuit."""
+        return self._estimate_cost_qir(circuits, shots, options)
 
 
 class QuantinuumSyntaxCheckerQirBackend(QuantinuumQirBackendBase):
@@ -236,7 +240,8 @@ def _azure_config(self) -> Dict[str, str]:
             "provider_id": self._provider_id,
             "input_data_format": "honeywell.openqasm.v1",
             "output_data_format": "honeywell.quantum-results.v1",
-            "is_default": True,
+            "is_default": False,
+            "is_passthrough": True
         }
 
     def _translate_input(self, circuit):

azure-quantum/azure/quantum/qiskit/job.py

@@ -312,6 +312,26 @@ def _get_entry_point_names(self):
             entry_point_names.append(entry_point["entryPoint"])
         return entry_point_names if len(entry_point_names) > 0 else ["main"]
 
+    def _get_headers(self):
+        headers = self._azure_job.details.metadata
+        if (not isinstance(headers, list)):
+            headers = [headers]
+
+        # This function will attempt to parse the header into a JSON object, and if the header is not a JSON object, we return the header itself
+        def tryParseJSON(header):
+            try:
+                json_object = json.loads(header)
+            except ValueError as e:
+                return header
+            return json_object
+
+        for header in headers:
+            del header['qiskit'] # we throw out the qiskit header as it is implied
+            for key in header.keys():
+                header[key] = tryParseJSON(header[key])
+        return headers
+
+
     def _format_microsoft_v2_results(self) -> List[Dict[str, Any]]:
         success = self._azure_job.details.status == "Succeeded"
 
@@ -326,10 +346,15 @@ def _format_microsoft_v2_results(self) -> List[Dict[str, Any]]:
         entry_point_names = self._get_entry_point_names()
 
         results = self._translate_microsoft_v2_results()
-        
+
         if len(results) != len(entry_point_names):
-            raise ValueError("The number of experiment results does not match the number of experiment names")
+            raise ValueError("The number of experiment results does not match the number of entry point names")
+
+        headers = self._get_headers()
 
+        if len(results) != len(headers):
+            raise ValueError("The number of experiment results does not match the number of headers")
+
         status = self.status()
 
         return [{
@@ -338,7 +363,5 @@ def _format_microsoft_v2_results(self) -> List[Dict[str, Any]]:
             "shots": total_count,
             "name": name,
             "status": status,
-            "header": {
-                "name": name
-            }
-        } for name, (total_count, result) in zip(entry_point_names, results)]
+            "header": header 
+        } for name, (total_count, result), header in zip(entry_point_names, results, headers)]