Support frames using signals

qiskit/assembler/assemble_circuits.py

@@ -35,6 +35,7 @@
     QobjHeader,
 )
 from qiskit.tools.parallel import parallel_map
+from qiskit.pulse.transforms.frames import requires_frame_mapping
 
 
 PulseLibrary = Dict[str, List[complex]]
@@ -192,6 +193,12 @@ def _assemble_pulse_gates(
     pulse_library = {}
     for gate, cals in circuit.calibrations.items():
         for (qubits, params), schedule in cals.items():
+
+            # This will require the backend to map frames once timings are known in order to
+            # compute the phase advances.
+            if requires_frame_mapping(schedule):
+                raise QiskitError("Calibrations with frames are not yet supported.")
+
             qobj_instructions, _ = _assemble_schedule(
                 schedule,
                 converters.InstructionToQobjConverter(PulseQobjInstruction),
@@ -358,6 +365,10 @@ def assemble_circuits(
             if m_los:
                 qobj_config_dict["meas_lo_freq"] = [freq / 1e9 for freq in m_los]
 
+        # Needed so that the backend can map the frames.
+        if "frames_config" in qobj_config_dict:
+            qobj_config_dict["frames_config"] = qobj_config_dict["frames_config"].to_dict()
+
         qobj_config = QasmQobjConfig(**qobj_config_dict)
 
     qubit_sizes = []

qiskit/assembler/assemble_schedules.py

@@ -100,7 +100,11 @@ def _assemble_experiments(
     )
     instruction_converter = instruction_converter(qobj.PulseQobjInstruction, **run_config.to_dict())
 
-    formatted_schedules = [transforms.target_qobj_transform(sched) for sched in schedules]
+    frames_config = getattr(run_config, "frames_config", None)
+    formatted_schedules = [
+        transforms.target_qobj_transform(sched, frames_config=frames_config) for sched in schedules
+    ]
+
     compressed_schedules = transforms.compress_pulses(formatted_schedules)
 
     user_pulselib = {}
@@ -179,7 +183,9 @@ def _assemble_instructions(
         A list of converted instructions, the user pulse library dictionary (from pulse name to
         pulse samples), and the maximum number of readout memory slots used by this Schedule.
     """
-    sched = transforms.target_qobj_transform(sched)
+    sched = transforms.target_qobj_transform(
+        sched, frames_config=getattr(run_config, "frames_config", None)
+    )
 
     max_memory_slot = 0
     qobj_instructions = []
@@ -328,4 +334,6 @@ def _assemble_config(
         if m_los:
             qobj_config["meas_lo_freq"] = [freq / 1e9 for freq in m_los]
 
+    qobj_config.pop("frames_config", None)
+
     return qobj.PulseQobjConfig(**qobj_config)

qiskit/compiler/assembler.py

@@ -27,6 +27,7 @@
 from qiskit.pulse import LoConfig, Instruction
 from qiskit.pulse import Schedule, ScheduleBlock
 from qiskit.pulse.channels import PulseChannel
+from qiskit.pulse.frame import FramesConfiguration
 from qiskit.qobj import QobjHeader, Qobj
 from qiskit.qobj.utils import MeasLevel, MeasReturnType
 from qiskit.validation.jsonschema import SchemaValidationError
@@ -75,6 +76,7 @@ def assemble(
     parameter_binds: Optional[List[Dict[Parameter, float]]] = None,
     parametric_pulses: Optional[List[str]] = None,
     init_qubits: bool = True,
+    frames_config: FramesConfiguration = None,
     **run_config: Dict,
 ) -> Qobj:
     """Assemble a list of circuits or pulse schedules into a ``Qobj``.
@@ -140,7 +142,9 @@ def assemble(
 
             ['gaussian', 'constant']
         init_qubits: Whether to reset the qubits to the ground state for each shot.
-                     Default: ``True``.
+            Default: ``True``.
+        frames_config: An instance of FramesConfiguration defining how the frames are configured
+            for the backend.
         **run_config: Extra arguments used to configure the run (e.g., for Aer configurable
             backends). Refer to the backend documentation for details on these
             arguments.
@@ -169,6 +173,7 @@ def assemble(
         qubit_lo_range,
         meas_lo_range,
         schedule_los,
+        frames_config,
         **run_config,
     )
 
@@ -236,6 +241,7 @@ def _parse_common_args(
     qubit_lo_range,
     meas_lo_range,
     schedule_los,
+    frames_config,
     **run_config,
 ):
     """Resolve the various types of args allowed to the assemble() function through
@@ -341,6 +347,21 @@ def _parse_common_args(
         for lo_config in schedule_los
     ]
 
+    frames_config_ = FramesConfiguration()
+    if backend:
+        frames_config_ = getattr(backend.defaults(), "frames", FramesConfiguration())
+
+    if frames_config is None:
+        frames_config = frames_config_
+    else:
+        for frame, config in frames_config_.items():
+            # Do not override the frames provided by the user.
+            if frame not in frames_config:
+                frames_config[frame] = config
+
+    if backend:
+        frames_config.sample_duration = backend_config.dt
+
     # create run configuration and populate
     run_config_dict = dict(
         shots=shots,
@@ -355,6 +376,7 @@ def _parse_common_args(
         meas_lo_range=meas_lo_range,
         schedule_los=schedule_los,
         n_qubits=n_qubits,
+        frames_config=frames_config,
         **run_config,
     )
 
@@ -404,6 +426,7 @@ def _parse_pulse_args(
     memory_slot_size,
     rep_time,
     parametric_pulses,
+    frames_config,
     **run_config,
 ):
     """Build a pulse RunConfig replacing unset arguments with defaults derived from the `backend`.
@@ -428,6 +451,7 @@ def _parse_pulse_args(
             )
 
     meas_map = meas_map or getattr(backend_config, "meas_map", None)
+
     dynamic_reprate_enabled = getattr(backend_config, "dynamic_reprate_enabled", False)
 
     rep_time = rep_time or getattr(backend_config, "rep_times", None)
@@ -452,6 +476,7 @@ def _parse_pulse_args(
         memory_slot_size=memory_slot_size,
         rep_time=rep_time,
         parametric_pulses=parametric_pulses,
+        frames_config=frames_config,
         **run_config,
     )
     run_config = RunConfig(**{k: v for k, v in run_config_dict.items() if v is not None})

qiskit/providers/models/pulsedefaults.py

@@ -16,9 +16,11 @@
 from typing import Any, Dict, List
 
 from qiskit.pulse.instruction_schedule_map import InstructionScheduleMap
+from qiskit.pulse.channels import DriveChannel, MeasureChannel
 from qiskit.pulse.schedule import Schedule
 from qiskit.qobj import PulseLibraryItem, PulseQobjInstruction
 from qiskit.qobj.converters import QobjToInstructionConverter
+from qiskit.pulse.frame import Frame, FramesConfiguration
 
 
 class MeasurementKernel:
@@ -213,6 +215,7 @@ def __init__(
             self.discriminator = discriminator
 
         self._data.update(kwargs)
+        self._frames_config = None
 
     def __getattr__(self, name):
         try:
@@ -277,6 +280,33 @@ def from_dict(cls, data):
             in_data["discriminator"] = Discriminator.from_dict(in_data.pop("discriminator"))
         return cls(**in_data)
 
+    @property
+    def frames(self) -> FramesConfiguration:
+        """Get the frames supported by the backend.
+
+        Returns:
+            frames: A list of dicts, each dict defines a frame, its frequency, and its purpose.
+        """
+        if self._frames_config is None:
+            frames = {}
+            for qubit, freq in enumerate(self.qubit_freq_est):
+                frames[Frame(DriveChannel.prefix, qubit)] = {
+                    "frequency": freq,
+                    "purpose": f"Frame of qubit {qubit}",
+                    "has_physical_channel": True,
+                }
+
+            for meas, freq in enumerate(self.meas_freq_est):
+                frames[Frame(MeasureChannel.prefix, meas)] = {
+                    "frequency": freq,
+                    "purpose": f"Frame of meas {meas}",
+                    "has_physical_channel": True,
+                }
+
+            self._frames_config = FramesConfiguration.from_dict(frames)
+
+        return self._frames_config
+
     def __str__(self):
         qubit_freqs = [freq / 1e9 for freq in self.qubit_freq_est]
         meas_freqs = [freq / 1e9 for freq in self.meas_freq_est]

qiskit/pulse/__init__.py

@@ -470,3 +470,5 @@
 )
 from qiskit.pulse.library.samplers.decorators import functional_pulse
 from qiskit.pulse.schedule import Schedule, ScheduleBlock
+from qiskit.pulse.library.signal import Signal
+from qiskit.pulse.frame import Frame