Support IBMBackend.run()

qiskit_ibm_runtime/qiskit_runtime_service.py

@@ -34,6 +34,7 @@
 from qiskit_ibm_provider.utils.backend_decoder import configuration_from_server_data
 from qiskit_ibm_runtime import ibm_backend
 
+from .utils.utils import validate_job_tags
 from .accounts import AccountManager, Account, ChannelType
 from .api.clients import AuthClient, VersionClient
 from .api.clients.runtime import RuntimeClient
@@ -1344,6 +1345,8 @@ def jobs(
                     "The 'instance' keyword is only supported for ``ibm_quantum`` runtime."
                 )
             hub, group, project = from_instance_format(instance)
+        if job_tags:
+            validate_job_tags(job_tags)
 
         job_responses = []  # type: List[Dict[str, Any]]
         current_page_limit = limit or 20

qiskit_ibm_runtime/runtime_job.py

@@ -27,9 +27,10 @@
 from qiskit.providers.job import JobV1 as Job
 
 # pylint: disable=unused-import,cyclic-import
-from qiskit_ibm_provider.utils import validate_job_tags, utc_to_local
+from qiskit_ibm_provider.utils import utc_to_local
 from qiskit_ibm_runtime import qiskit_runtime_service
 
+from .utils.utils import validate_job_tags
 from .constants import API_TO_JOB_ERROR_MESSAGE, API_TO_JOB_STATUS, DEFAULT_DECODERS
 from .exceptions import (
     IBMApiError,
@@ -40,12 +41,10 @@
     RuntimeJobMaxTimeoutError,
 )
 from .program.result_decoder import ResultDecoder
-from .utils import RuntimeDecoder
 from .api.clients import RuntimeClient, RuntimeWebsocketClient, WebsocketClientCloseCode
 from .exceptions import IBMError
 from .api.exceptions import RequestsApiError
 from .api.client_parameters import ClientParameters
-from .utils.utils import CallableStr
 
 logger = logging.getLogger(__name__)
 
@@ -419,7 +418,7 @@ def update_tags(self, new_tags: List[str]) -> List[str]:
                 with the server or updating the job tags.
         """
         tags_to_update = set(new_tags)
-        validate_job_tags(new_tags, RuntimeInvalidStateError)
+        validate_job_tags(new_tags)
 
         response = self._api_client.update_tags(job_id=self.job_id(), tags=list(tags_to_update))
 
@@ -575,7 +574,8 @@ def _stream_results(
                     traceback.format_exc(),
                 )
 
-    def _empty_result_queue(self, result_queue: queue.Queue) -> None:
+    @staticmethod
+    def _empty_result_queue(result_queue: queue.Queue) -> None:
         """Empty the result queue.
 
         Args:

qiskit_ibm_runtime/runtime_options.py

@@ -103,4 +103,4 @@ def validate(self, channel: str) -> None:
             )
 
         if self.job_tags:
-            validate_job_tags(self.job_tags, IBMInputValueError)
+            validate_job_tags(self.job_tags)

qiskit_ibm_runtime/transpiler/__init__.py

@@ -0,0 +1,31 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2022.
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+
+"""
+====================================================================
+IBM Backend Transpiler Tools (:mod:`qiskit_ibm_provider.transpiler`)
+====================================================================
+
+A collection of transpiler tools for working with IBM Quantum's
+next-generation backends that support advanced "dynamic circuit"
+capabilities. Ie., circuits with support for classical
+compute and control-flow/feedback based off of measurement results.
+
+Transpiler Passes
+==================
+
+.. autosummary::
+    :toctree: ../stubs/
+
+    passes
+
+"""

qiskit_ibm_runtime/transpiler/passes/__init__.py

@@ -0,0 +1,36 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2022.
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+
+"""
+================================================================
+Transpiler Passes (:mod:`qiskit_ibm_provider.transpiler.passes`)
+================================================================
+
+.. currentmodule:: qiskit_ibm_provider.transpiler.passes
+
+A collection of transpiler passes for IBM backends.
+
+.. autosummary::
+   :toctree: ../stubs/
+
+   basis
+   scheduling
+
+
+"""
+
+from .basis import ConvertIdToDelay
+
+# circuit scheduling
+from .scheduling import ASAPScheduleAnalysis
+from .scheduling import PadDynamicalDecoupling
+from .scheduling import PadDelay

qiskit_ibm_runtime/transpiler/passes/basis/__init__.py

@@ -0,0 +1,23 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2022.
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+
+"""
+==========================================================
+Basis (:mod:`qiskit_ibm_provider.transpiler.passes.basis`)
+==========================================================
+
+.. currentmodule:: qiskit_ibm_provider.transpiler.passes.basis
+
+Passes to layout circuits to IBM backend's instruction sets.
+"""
+
+from .convert_id_to_delay import ConvertIdToDelay

qiskit_ibm_runtime/transpiler/passes/basis/convert_id_to_delay.py

@@ -0,0 +1,87 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2022.
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+
+"""Pass to convert Id gate operations to a delay instruction."""
+
+from typing import Dict
+
+from qiskit.converters import dag_to_circuit, circuit_to_dag
+
+from qiskit.circuit import ControlFlowOp
+from qiskit.circuit import Delay
+from qiskit.circuit.library import IGate
+from qiskit.dagcircuit import DAGCircuit
+from qiskit.transpiler.basepasses import TransformationPass
+from qiskit.transpiler.instruction_durations import InstructionDurations
+
+
+class ConvertIdToDelay(TransformationPass):
+    """Convert :class:`qiskit.circuit.library.standard_gates.IGate` to
+    a delay of the corresponding length.
+    """
+
+    def __init__(self, durations: InstructionDurations, gate: str = "sx"):
+        """Convert :class:`qiskit.circuit.library.IGate` to a
+        Convert :class:`qiskit.circuit.Delay`.
+
+        Args:
+            duration: Duration of the delay to replace the identity gate with.
+            gate: Single qubit gate to extract duration from.
+        """
+        self.durations = durations
+        self.gate = gate
+        self._cached_durations: Dict[int, int] = {}
+
+        super().__init__()
+
+    def run(self, dag: DAGCircuit) -> DAGCircuit:
+        self._run_inner(dag)
+        return dag
+
+    def _run_inner(self, dag: DAGCircuit) -> bool:
+        """Run the pass on one :class:`.DAGCircuit`, mutating it.  Returns ``True`` if the circuit
+        was modified and ``False`` if not."""
+        modified = False
+        qubit_index_map = {bit: index for index, bit in enumerate(dag.qubits)}
+        for node in dag.op_nodes():
+            if isinstance(node.op, ControlFlowOp):
+                modified_blocks = False
+                new_dags = []
+                for block in node.op.blocks:
+                    new_dag = circuit_to_dag(block)
+                    modified_blocks |= self._run_inner(new_dag)
+                    new_dags.append(new_dag)
+                if not modified_blocks:
+                    continue
+                dag.substitute_node(
+                    node,
+                    node.op.replace_blocks(dag_to_circuit(block) for block in new_dags),
+                    inplace=True,
+                )
+            elif isinstance(node.op, IGate):
+                delay_op = Delay(self._get_duration(qubit_index_map[node.qargs[0]]))
+                dag.substitute_node(node, delay_op, inplace=True)
+
+                modified = True
+
+        return modified
+
+    def _get_duration(self, qubit: int) -> int:
+        """Get the duration of a gate in dt."""
+        duration = self._cached_durations.get(qubit, None)
+        if duration:
+            return duration
+
+        duration = self.durations.get(self.gate, qubit)
+        self._cached_durations[qubit] = duration
+
+        return duration