Transpiler integration refactor and qiskit v1.2 support

CHANGELOG.rst

@@ -2,6 +2,29 @@
 Changelog
 =========
 
+Version 16.0
+=============
+
+* Fixed Deneb Readout errors to closer resemble reality. Fidelities were reported as errors. `#125 <https://github.com/iqm-finland/iqm-client/pull/125>`_
+* Refactored :meth:`IQMBackend.create_run_request` to improve user experience when using IQM specific run options.
+* Updated the documentation for using additional run options with IQM backends.
+* :meth:`IQMBackendBase.qubit_name_to_index` and :meth:`IQMBackendBase.index_to_qubit_name` now raises an error when using an invalid qubit name or index, rather than returning None.
+* Introduction of `IQMBackendBase.physical_target` and `IQMBackendBase.fake_target` to represent the physical quantum architectures and a Qiskit-compatible version, respectively.        
+* Added support for ``qiskit == 1.2`` and ``qiskit-aer == 1.5``.
+* Moved the circuit serialization logic from :class:`IQMProvider` to :mod:`iqm.qiskit_iqm.qiskit_to_iqm`.
+* Refactoring of the Qiskit transpiler:
+    * The Qiskit transpiler now automatically uses the :class:`IQMOptimizeSingleQubitGates` pass to optimize single-qubit gates if the `optimization_level >= 0`.
+    * You can now use the native Qiskit :meth:`transpile` method to transpile a circuit to the IQM Deneb backend as long as your circuit does not contain any resonators.
+    * There are many new transpiler plugins available that you can use as the `scheduling_method` argument in Qiskit's :meth:`transpile` method. You can find them in following the `Qiskit documentation <https://docs.quantum.ibm.com/guides/transpiler-plugins>`_. 
+    * If your circuit contains resonators, and optionally :class:`MoveGate` operations, you can use the :meth:`transpile_to_IQM` method to transpile your circuit to the IQM Deneb backend.
+    * :meth:`transpile_to_IQM` can now restrict itself to use a restricted set of qubits by specifying the `restrict_to_qubits` argument. You will need to additionally provide a qubit mapping to the :meth:`backend.run` method to ensure that the correct qubits are used.
+    * Bugfix where the :meth:`transpile_to_IQM` did not retain the circuit layout after transpiling.
+* Deprecated features:
+    * :meth:`optimize_single_qubit_gates` has been deprecated in favor of using the new transpiler plugins or :meth:`transpile_to_IQM`. Additionally, this is now incorporated into the Qiskit transpiler as documented above.
+    * In :meth:`IQMBackend.create_run_request`, and as a result in :meth:`IQMBackend.run`, the `max_circuit_duration_over_t2` and `heralding_mode` options have been deprecated in favor of using the `CircuitCompilationOptions` class from :mod:`iqm-client`. 
+    * The :class:`IQMBackend` no longer uses Qiskit's `options` attribute to give run options in favor of using the arguments of the :meth:`IQMBackend.run` method directly.
+
+
 Version 15.5
 ============
 

pyproject.toml

@@ -20,8 +20,8 @@ classifiers = [
 requires-python = ">=3.9, <3.12"
 dependencies = [
     "numpy",
-    "qiskit >= 0.45, < 1.2",
-    "qiskit-aer >= 0.13.1, < 0.15",
+    "qiskit >= 0.45, < 1.3",
+    "qiskit-aer >= 0.13.1, < 0.16",
     "iqm-client >= 20.0, < 21.0"
 ]
 
@@ -158,3 +158,21 @@ ignore-imports = true
 
 [tool.pylint.string]
 check-quote-consistency = true
+
+# Expose the different custom transpiler passes to the Qiskit transpiler using their plugin system.
+[project.entry-points."qiskit.transpiler.scheduling"] 
+move_routing = "iqm.qiskit_iqm:MoveGateRoutingPlugin"
+move_routing_keep = "iqm.qiskit_iqm:MoveGateRoutingKeepExistingMovesPlugin"
+move_routing_remove = "iqm.qiskit_iqm:MoveGateRoutingRemoveExistingMovesPlugin"
+move_routing_trust = "iqm.qiskit_iqm:MoveGateRoutingTrustExistingMovesPlugin"
+only_move_routing = "iqm.qiskit_iqm:MoveGateRoutingOnlyPlugin"
+only_move_routing_keep = "iqm.qiskit_iqm:MoveGateRoutingOnlyKeepExistingMovesPlugin"
+only_move_routing_remove = "iqm.qiskit_iqm:MoveGateRoutingOnlyRemoveExistingMovesPlugin"
+only_move_routing_trust = "iqm.qiskit_iqm:MoveGateRoutingOnlyTrustExistingMovesPlugin"
+move_routing_exact_global_phase = "iqm.qiskit_iqm:MoveGateRoutingWithExactRzPlugin"
+move_routing_Rz_optimization_ignores_barriers = "iqm.qiskit_iqm:MoveGateRoutingWithRzOptimizationIgnoreBarriersPlugin"
+only_Rz_optimization = "iqm.qiskit_iqm:OnlyRzOptimizationPlugin"
+only_Rz_optimization_exact_global_phase = "iqm.qiskit_iqm:OnlyRzOptimizationExactPlugin"
+only_Rz_optimization_ignore_barriers = "iqm.qiskit_iqm:OnlyRzOptimizationIgnoreBarriersPlugin"
+iqm_default_scheduling = "iqm.qiskit_iqm:IQMDefaultSchedulingPlugin"
+

src/iqm/qiskit_iqm/__init__.py

@@ -26,6 +26,7 @@
 from iqm.qiskit_iqm.iqm_provider import IQMBackend, IQMProvider, __version__
 from iqm.qiskit_iqm.iqm_transpilation import IQMOptimizeSingleQubitGates, optimize_single_qubit_gates
 from iqm.qiskit_iqm.move_gate import MoveGate
+from iqm.qiskit_iqm.transpiler_plugins import *
 
 if qiskit_version < "1.0.0":
     warn(

src/iqm/qiskit_iqm/fake_backends/fake_deneb.py

@@ -105,12 +105,12 @@ def IQMFakeDeneb() -> IQMFakeBackend:
         two_qubit_gate_durations={"cz": 120.0, "move": 96.0},
         readout_errors={
             "COMP_R": {"0": 0.0, "1": 0.0},
-            "QB1": {"0": 0.977, "1": 0.977},
-            "QB2": {"0": 0.977, "1": 0.977},
-            "QB3": {"0": 0.977, "1": 0.977},
-            "QB4": {"0": 0.977, "1": 0.977},
-            "QB5": {"0": 0.977, "1": 0.977},
-            "QB6": {"0": 0.977, "1": 0.977},
+            "QB1": {"0": 0.02, "1": 0.02},
+            "QB2": {"0": 0.02, "1": 0.02},
+            "QB3": {"0": 0.02, "1": 0.02},
+            "QB4": {"0": 0.02, "1": 0.02},
+            "QB5": {"0": 0.02, "1": 0.02},
+            "QB6": {"0": 0.02, "1": 0.02},
         },
         name="sample-chip",
     )

src/iqm/qiskit_iqm/fake_backends/iqm_fake_backend.py

@@ -23,14 +23,19 @@
 
 from qiskit import QuantumCircuit
 from qiskit.providers import JobV1, Options
-from qiskit.transpiler import TransformationPass
 from qiskit_aer import AerSimulator
 from qiskit_aer.noise import NoiseModel
 from qiskit_aer.noise.errors import depolarizing_error, thermal_relaxation_error
 
 from iqm.iqm_client import DynamicQuantumArchitecture, QuantumArchitectureSpecification
 from iqm.qiskit_iqm.iqm_backend import IQM_TO_QISKIT_GATE_NAME, IQMBackendBase
-from iqm.qiskit_iqm.iqm_circuit import IQMCircuit
+from iqm.qiskit_iqm.iqm_circuit_validation import validate_circuit
+from iqm.qiskit_iqm.iqm_transpilation import IQMReplaceGateWithUnitaryPass
+from iqm.qiskit_iqm.move_gate import MOVE_GATE_UNITARY
+
+GATE_TO_UNITARY = {
+    "move": MOVE_GATE_UNITARY,
+}
 
 
 # pylint: disable=too-many-instance-attributes
@@ -281,9 +286,7 @@ def _default_options(cls) -> Options:
     def max_circuits(self) -> Optional[int]:
         return None
 
-    def run(
-        self, run_input: Union[QuantumCircuit, list[QuantumCircuit], IQMCircuit, list[IQMCircuit]], **options
-    ) -> JobV1:
+    def run(self, run_input: Union[QuantumCircuit, list[QuantumCircuit]], **options) -> JobV1:
         """
         Run `run_input` on the fake backend using a simulator.
 
@@ -302,64 +305,22 @@ def run(
         Raises:
             ValueError: If empty list of circuits is provided.
         """
-        circuits_aux = [run_input] if isinstance(run_input, (QuantumCircuit, IQMCircuit)) else run_input
+        circuits_aux = [run_input] if isinstance(run_input, (QuantumCircuit)) else run_input
 
         if len(circuits_aux) == 0:
             raise ValueError("Empty list of circuits submitted for execution.")
 
-        this = self
-
-        class check_move_validity(TransformationPass):
-            """Checks that the placement of move gates is valid in the circuit."""
-
-            def run(self, dag):
-                qubits_involved_in_last_move = None  # Store which qubit was last used for MOVE IN
-                for node in dag.op_nodes():
-                    if node.op.name not in this.noise_model.basis_gates + ["id", "barrier", "measure"]:
-                        raise ValueError("Operation '" + node.op.name + "' is not supported by the backend.")
-                    if qubits_involved_in_last_move is not None:
-                        # Verify that no single qubit gate is performed on the qubit between MOVE IN and MOVE OUT
-                        if (
-                            node.op.name not in ["move", "barrier", "measure"]
-                            and len(node.qargs) == 1
-                            and node.qargs[0] == qubits_involved_in_last_move[0]
-                        ):
-                            raise ValueError(
-                                f"Operations to qubits {node.qargs[0]} while their states are moved to a resonator."
-                            )
-                    if node.op.name == "move":
-                        if qubits_involved_in_last_move is None:
-                            # MOVE IN was performed
-                            qubits_involved_in_last_move = node.qargs
-                        elif qubits_involved_in_last_move != node.qargs:
-                            raise ValueError(
-                                f"Cannot apply MOVE on {node.qargs[0]} because COMP_R already holds the state of "
-                                + f"{qubits_involved_in_last_move[0]}."
-                            )
-                        else:
-                            # MOVE OUT was performed
-                            qubits_involved_in_last_move = None
-
-                if qubits_involved_in_last_move is not None:
-                    raise ValueError(
-                        "The following resonators are still holding qubit states at the end of the circuit: "
-                        + f"{qubits_involved_in_last_move[0]}."
-                    )
-
-                return dag
-
         circuits = []
 
         for circ in circuits_aux:
             circ_to_add = circ
 
-            if "move" in self.noise_model.basis_gates:
-                check_move_validity()(circ)
+            validate_circuit(circ_to_add, self)
 
             for iqm_gate in [
                 g for g in self.noise_model.basis_gates if g not in list(IQM_TO_QISKIT_GATE_NAME.values())
             ]:
-                circ_to_add = circ.decompose(gates_to_decompose=iqm_gate)
+                circ_to_add = IQMReplaceGateWithUnitaryPass(iqm_gate, GATE_TO_UNITARY[iqm_gate])(circ_to_add)
             circuits.append(circ_to_add)
 
         shots = options.get("shots", self.options.shots)