Schedule with backend v2

qiskit/compiler/scheduler.py

@@ -22,8 +22,9 @@
 from qiskit.circuit.quantumcircuit import QuantumCircuit
 from qiskit.exceptions import QiskitError
 from qiskit.pulse import InstructionScheduleMap, Schedule
-from qiskit.providers.backend import Backend
-from qiskit.scheduler import ScheduleConfig
+from qiskit.providers.backend import Backend, BackendV1, BackendV2
+from qiskit.providers.backend_compat import convert_to_target
+from qiskit.transpiler import Target
 from qiskit.scheduler.schedule_circuit import schedule_circuit
 from qiskit.tools.parallel import parallel_map
 
@@ -42,6 +43,7 @@ def schedule(
     meas_map: Optional[List[List[int]]] = None,
     dt: Optional[float] = None,
     method: Optional[Union[str, List[str]]] = None,
+    target: Optional[Target] = None,
 ) -> Union[Schedule, List[Schedule]]:
     """
     Schedule a circuit to a pulse ``Schedule``, using the backend, according to any specified
@@ -58,6 +60,9 @@ def schedule(
             which contain time information, dt is required. If not provided, it will be
             obtained from the backend configuration
         method: Optionally specify a particular scheduling method
+        target: The optional :class:`~.Target` representing the target backend. If ``None``,
+                defaults to the ``backend``\'s ``target``, constructed from convert_to_target,
+                or prepared from ``meas_map`` and ``inst_map``
 
     Returns:
         A pulse ``Schedule`` that implements the input circuit
@@ -67,36 +72,36 @@ def schedule(
     """
     arg_circuits_list = isinstance(circuits, list)
     start_time = time()
-    if backend and getattr(backend, "version", 0) > 1:
-        if inst_map is None:
-            inst_map = backend.instruction_schedule_map
-        if meas_map is None:
-            meas_map = backend.meas_map
-        if dt is None:
-            dt = backend.dt
-    else:
-        if inst_map is None:
-            if backend is None:
-                raise QiskitError(
-                    "Must supply either a backend or InstructionScheduleMap for scheduling passes."
-                )
-            defaults = backend.defaults()
+    if target is None:
+        if isinstance(backend, BackendV2):
+            target = backend.target
+            if inst_map:
+                target.update_from_instruction_schedule_map(inst_map=inst_map)
+        elif isinstance(backend, BackendV1):
+            defaults = backend.defaults() if hasattr(backend, "defaults") else None
             if defaults is None:
                 raise QiskitError(
                     "The backend defaults are unavailable. The backend may not support pulse."
                 )
-            inst_map = defaults.instruction_schedule_map
-        if meas_map is None:
-            if backend is None:
+            if backend.configuration() is not None:
+                target = convert_to_target(
+                    configuration=backend.configuration(),
+                    properties=backend.properties(),
+                    defaults=defaults,
+                )
+                if inst_map:
+                    target.update_from_instruction_schedule_map(inst_map=inst_map)
+            else:
+                raise QiskitError("Must specify backend that has a configuration.")
+        else:
+            if meas_map and inst_map:
+                target = Target(concurrent_measurements=meas_map, dt=dt)
+                target.update_from_instruction_schedule_map(inst_map=inst_map)
+            else:
                 raise QiskitError(
-                    "Must supply either a backend or a meas_map for scheduling passes."
+                    "Must specify either target, backend, "
+                    "or both meas_map and inst_map for scheduling passes."
                 )
-            meas_map = backend.configuration().meas_map
-        if dt is None:
-            if backend is not None:
-                dt = backend.configuration().dt
-
-    schedule_config = ScheduleConfig(inst_map=inst_map, meas_map=meas_map, dt=dt)
     circuits = circuits if isinstance(circuits, list) else [circuits]
     schedules = parallel_map(schedule_circuit, circuits, (schedule_config, method, backend))
     end_time = time()

qiskit/compiler/sequencer.py

@@ -17,9 +17,10 @@
 
 from qiskit.circuit.quantumcircuit import QuantumCircuit
 from qiskit.exceptions import QiskitError
-from qiskit.providers.backend import Backend
+from qiskit.providers.backend import Backend, BackendV1, BackendV2
+from qiskit.providers.backend_compat import convert_to_target
 from qiskit.pulse import InstructionScheduleMap, Schedule
-from qiskit.scheduler import ScheduleConfig
+from qiskit.transpiler import Target
 from qiskit.scheduler.sequence import sequence as _sequence
 
 
@@ -29,6 +30,7 @@ def sequence(
     inst_map: Optional[InstructionScheduleMap] = None,
     meas_map: Optional[List[List[int]]] = None,
     dt: Optional[float] = None,
+    target: Optional[Target] = None,
 ) -> Union[Schedule, List[Schedule]]:
     """
     Schedule a scheduled circuit to a pulse ``Schedule``, using the backend.
@@ -43,27 +45,42 @@ def sequence(
         dt: The output sample rate of backend control electronics. For scheduled circuits
             which contain time information, dt is required. If not provided, it will be
             obtained from the backend configuration
+        target: The optional :class:`~.Target` representing the target backend. If ``None``,
+                defaults to the ``backend``\'s ``target``, constructed from convert_to_target,
+                or prepared from ``meas_map`` and ``inst_map``
+
 
     Returns:
         A pulse ``Schedule`` that implements the input circuit
 
     Raises:
         QiskitError: If ``inst_map`` and ``meas_map`` are not passed and ``backend`` is not passed
     """
-    if inst_map is None:
-        if backend is None:
-            raise QiskitError("Must supply either a backend or inst_map for sequencing.")
-        inst_map = backend.defaults().instruction_schedule_map
-    if meas_map is None:
-        if backend is None:
-            raise QiskitError("Must supply either a backend or a meas_map for sequencing.")
-        meas_map = backend.configuration().meas_map
-    if dt is None:
-        if backend is None:
-            raise QiskitError("Must supply either a backend or a dt for sequencing.")
-        dt = backend.configuration().dt
-
-    schedule_config = ScheduleConfig(inst_map=inst_map, meas_map=meas_map, dt=dt)
+    if target is None:
+        if isinstance(backend, BackendV2):
+            target = backend.target
+            if inst_map:
+                target.update_from_instruction_schedule_map(inst_map=inst_map)
+        elif isinstance(backend, BackendV1):
+            if backend.configuration() is not None:
+                target = convert_to_target(
+                    configuration=backend.configuration(),
+                    properties=backend.properties(),
+                    defaults=backend.defaults() if hasattr(backend, "defaults") else None,
+                )
+                if inst_map:
+                    target.update_from_instruction_schedule_map(inst_map=inst_map)
+            else:
+                raise QiskitError("Must specify backend that has a configuration.")
+        else:
+            if meas_map and inst_map:
+                target = Target(concurrent_measurements=meas_map, dt=dt)
+                target.update_from_instruction_schedule_map(inst_map=inst_map)
+            else:
+                raise QiskitError(
+                    "Must specify either target, backend, "
+                    "or both meas_map and inst_map for scheduling passes."
+                )
     circuits = scheduled_circuits if isinstance(scheduled_circuits, list) else [scheduled_circuits]
-    schedules = [_sequence(circuit, schedule_config) for circuit in circuits]
+    schedules = [_sequence(circuit, target=target) for circuit in circuits]
     return schedules[0] if len(schedules) == 1 else schedules

qiskit/providers/fake_provider/fake_openpulse_2q.py

@@ -301,6 +301,30 @@ def __init__(self):
                         Nduv(date=mock_time, name="gate_length", unit="ns", value=0.0),
                     ],
                 ),
+                Gate(
+                    gate="u1",
+                    qubits=[1],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=0.0),
+                    ],
+                ),
+                Gate(
+                    gate="u2",
+                    qubits=[0],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=2 * dt),
+                    ],
+                ),
+                Gate(
+                    gate="u2",
+                    qubits=[1],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=2 * dt),
+                    ],
+                ),
                 Gate(
                     gate="u3",
                     qubits=[0],
@@ -314,7 +338,7 @@ def __init__(self):
                     qubits=[1],
                     parameters=[
                         Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
-                        Nduv(date=mock_time, name="gate_length", unit="ns", value=4 * dt),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=2 * dt),
                     ],
                 ),
                 Gate(

qiskit/providers/fake_provider/fake_openpulse_3q.py

@@ -13,6 +13,7 @@
 """
 Fake backend supporting OpenPulse.
 """
+import datetime
 
 from qiskit.providers.models import (
     GateConfig,
@@ -21,6 +22,7 @@
     Command,
     UchannelLO,
 )
+from qiskit.providers.models.backendproperties import Nduv, Gate, BackendProperties
 from qiskit.qobj import PulseQobjInstruction
 
 from .fake_backend import FakeBackend
@@ -326,7 +328,105 @@ def __init__(self):
                 ],
             }
         )
+        mock_time = datetime.datetime.now()
+        dt = 1.3333
+        self._properties = BackendProperties(
+            backend_name="fake_openpulse_3q",
+            backend_version="0.0.0",
+            last_update_date=mock_time,
+            qubits=[
+                [
+                    Nduv(date=mock_time, name="T1", unit="µs", value=71.9500421005539),
+                    Nduv(date=mock_time, name="T2", unit="µs", value=69.4240447362455),
+                    Nduv(date=mock_time, name="frequency", unit="MHz", value=4919.96800692),
+                    Nduv(date=mock_time, name="readout_error", unit="", value=0.02),
+                ],
+                [
+                    Nduv(date=mock_time, name="T1", unit="µs", value=81.9500421005539),
+                    Nduv(date=mock_time, name="T2", unit="µs", value=75.5598482446578),
+                    Nduv(date=mock_time, name="frequency", unit="GHz", value=5.01996800692),
+                    Nduv(date=mock_time, name="readout_error", unit="", value=0.02),
+                ],
+                [
+                    Nduv(date=mock_time, name="T1", unit="µs", value=81.9500421005539),
+                    Nduv(date=mock_time, name="T2", unit="µs", value=75.5598482446578),
+                    Nduv(date=mock_time, name="frequency", unit="GHz", value=5.01996800692),
+                    Nduv(date=mock_time, name="readout_error", unit="", value=0.02),
+                ],
+            ],
+            gates=[
+                Gate(
+                    gate="u1",
+                    qubits=[0],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=0.0),
+                    ],
+                ),
+                Gate(
+                    gate="u1",
+                    qubits=[1],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=0.0),
+                    ],
+                ),
+                Gate(
+                    gate="u1",
+                    qubits=[2],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=0.0),
+                    ],
+                ),
+                Gate(
+                    gate="u3",
+                    qubits=[0],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=2 * dt),
+                    ],
+                ),
+                Gate(
+                    gate="u3",
+                    qubits=[1],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=2 * dt),
+                    ],
+                ),
+                Gate(
+                    gate="u3",
+                    qubits=[2],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=0.06),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=2 * dt),
+                    ],
+                ),
+                Gate(
+                    gate="cx",
+                    qubits=[0, 1],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=1.0),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=22 * dt),
+                    ],
+                ),
+                Gate(
+                    gate="cx",
+                    qubits=[1, 2],
+                    parameters=[
+                        Nduv(date=mock_time, name="gate_error", unit="", value=1.0),
+                        Nduv(date=mock_time, name="gate_length", unit="ns", value=22 * dt),
+                    ],
+                ),
+            ],
+            general=[],
+        )
         super().__init__(configuration)
 
     def defaults(self):  # pylint: disable=missing-function-docstring
         return self._defaults
+
+    def properties(self):
+        """Return the measured characteristics of the backend."""
+        return self._properties

qiskit/pulse/builder.py

@@ -103,7 +103,7 @@
    d2 = pulse.DriveChannel(2)
 
    with pulse.build(backend) as bell_prep:
-       pulse.u2(0, math.pi, 0)
+       pulse.u3(1.57, 0, math.pi, 0)
        pulse.cx(0, 1)
 
    with pulse.build(backend) as decoupled_bell_prep_and_measure:

qiskit/pulse/macros.py

@@ -28,6 +28,7 @@
 def measure(
     qubits: List[int],
     backend=None,
+    target: Optional[Target] = None,
     inst_map: Optional[InstructionScheduleMap] = None,
     meas_map: Optional[Union[List[List[int]], Dict[int, List[int]]]] = None,
     qubit_mem_slots: Optional[Dict[int, int]] = None,
@@ -51,6 +52,7 @@ def measure(
         qubits: List of qubits to be measured.
         backend (Union[Backend, BaseBackend]): A backend instance, which contains
             hardware-specific data required for scheduling.
+        target: The :class:`~.Target` representing the target backend.
         inst_map: Mapping of circuit operations to pulse schedules. If None, defaults to the
                   ``instruction_schedule_map`` of ``backend``.
         meas_map: List of sets of qubits that must be measured together. If None, defaults to
@@ -63,12 +65,13 @@ def measure(
     """
 
     # backend is V2.
-    if isinstance(backend, BackendV2):
+    if isinstance(backend, BackendV2) or target:
+        meas_map = meas_map or getattr(backend, "meas_map", None)
 
         return _measure_v2(
             qubits=qubits,
-            target=backend.target,
-            meas_map=meas_map or backend.meas_map,
+            target=target or backend.target,
+            meas_map=meas_map or target.concurrent_measurements,
             qubit_mem_slots=qubit_mem_slots or dict(zip(qubits, range(len(qubits)))),
             measure_name=measure_name,
         )

qiskit/scheduler/config.py

@@ -15,7 +15,6 @@
 from typing import List
 
 from qiskit.pulse.instruction_schedule_map import InstructionScheduleMap
-from qiskit.pulse.utils import format_meas_map
 
 
 class ScheduleConfig:
@@ -31,5 +30,5 @@ def __init__(self, inst_map: InstructionScheduleMap, meas_map: List[List[int]],
             dt: Sample duration.
         """
         self.inst_map = inst_map
-        self.meas_map = format_meas_map(meas_map)
+        self.meas_map = meas_map
         self.dt = dt