iqm-pulse 9.14.0__py3-none-any.whl → 9.17.0__py3-none-any.whl

iqm/pulse/builder.py

@@ -18,7 +18,6 @@ from __future__ import annotations
 from collections.abc import Iterable
 import copy
 from dataclasses import dataclass, field, replace
-import functools
 import itertools
 import logging
 from types import MethodType
@@ -63,7 +62,7 @@ from iqm.pulse.playlist.instructions import (
     Wait,
 )
 from iqm.pulse.playlist.playlist import Playlist
-from iqm.pulse.playlist.schedule import TOLERANCE, Schedule, Segment
+from iqm.pulse.playlist.schedule import Schedule, Segment
 from iqm.pulse.quantum_ops import QuantumOp, QuantumOpTable, validate_locus_calibration, validate_op_calibration
 from iqm.pulse.scheduler import (
     NONSOLID,
@@ -758,8 +757,8 @@ class ScheduleBuilder:
             if priority_calibration:
                 if op.name in priority_calibration:
                     # first check if full OILCalibrationData structure was given
-                    op_data = priority_calibration.get(op.name)
-                    prio_data = op_data.get(new_impl_name, {}).get(new_locus, {})  # type: ignore
+                    op_data = priority_calibration.get(op.name, {})
+                    prio_data = op_data.get(new_impl_name, {}).get(new_locus, {})
                 else:
                     # if not assume just the data for this locus was given
                     prio_data = priority_calibration
@@ -956,14 +955,8 @@ class ScheduleBuilder:
     def _finish_schedule(self, schedule: Schedule) -> Schedule:
         """Finishes the instruction schedule.
 
-        * filters out zero-duration Blocks and Waits
-        * converts all spacer instructions used during scheduling to Waits
-        * merges consequent Waits
         * removes channels that only have Waits in them
-
-        This should be the final step of the schedule building process, after this the
-        resulting Schedule can no longer be consistently extended with another (since
-        all the spacer instructions are gone).
+        * fuses long-distance Rz corrections to the correct drive pulses
 
         Args:
             schedule: schedule to finish
@@ -973,46 +966,15 @@ class ScheduleBuilder:
 
         """
         has_long_distance_rzs = False
-
-        def segment_pass(inst: Instruction) -> Instruction:
-            """Convert Blocks and Nothings to Waits. Also checks for FluxPulses that have long-distance VirtualZ
-            corrections in order to determine if these need handling (for performance reasons, we want to do this
-            step only on-demand).
-            """
-            nonlocal has_long_distance_rzs
-            if isinstance(inst, NONSOLID) and not isinstance(inst, Wait):
-                return Wait(inst.duration)
-            if isinstance(inst, FluxPulse) and inst.rzs:
-                has_long_distance_rzs = True
-            return inst
-
-        def not_zero_block(inst: Instruction) -> bool:
-            """Zero-duration Block instructions have a legitimate use (in barrier ops),
-            zero-duration Wait instructions are allowed for convenience.
-            Here we filter them out.
-            """
-            return not (inst.duration < TOLERANCE and isinstance(inst, (Block, Wait)))
-
-        def merge_waits(result: list[Instruction], new: Instruction) -> list[Instruction]:
-            """Merge consequent Wait instructions."""
-            if not result:
-                return [new]  # first iteration
-            last = result[-1]
-            if isinstance(last, Wait) and isinstance(new, Wait):
-                result[-1] = Wait(int(last.duration + new.duration))  # replace last with the combined wait
-            else:
-                result.append(new)
-            return result
-
         for channel in schedule.channels():
-            seg = schedule[channel]
-            schedule[channel] = Segment(
-                functools.reduce(merge_waits, map(segment_pass, filter(not_zero_block, seg)), []),
-                duration=seg.duration,
-            )
-        if not has_long_distance_rzs:
-            return schedule.cleanup()
-        return self._fuse_long_distance_virtual_rzs(schedule)
+            if "flux" in channel:
+                for inst in schedule[channel]:
+                    if isinstance(inst, FluxPulse) and inst.rzs:
+                        has_long_distance_rzs = True
+                        break
+            if has_long_distance_rzs:
+                return self._fuse_long_distance_virtual_rzs(schedule)
+        return schedule.cleanup()
 
     def _fuse_long_distance_virtual_rzs(self, schedule: Schedule) -> Schedule:
         """Fuse long-distance (i.e. out-of-gate-locus) VirtualRZ corrections with the next drive pulse
@@ -1036,7 +998,11 @@ class ScheduleBuilder:
                     for drive_channel, rz_angle in rzs.items():
                         drive_sample_counter = 0
                         for drive_inst_idx, drive_inst in enumerate(schedule[drive_channel]):
-                            if not isinstance(drive_inst, Wait) and drive_sample_counter >= sample_counter:
+                            if (
+                                not isinstance(drive_inst, Wait)
+                                and not isinstance(drive_inst, NONSOLID)
+                                and drive_sample_counter >= sample_counter
+                            ):
                                 fuse(
                                     schedule_copy[drive_channel][drive_inst_idx],
                                     drive_inst_idx,
@@ -1116,10 +1082,11 @@ class ScheduleBuilder:
             ):
                 # convert the locus durations to seconds (no probe channels have been used so far)
                 scheduling_in_seconds = True
-                component_durations_seconds = {
-                    component: self._channel_templates["other"].duration_to_seconds(duration)  # type: ignore
-                    for component, duration in component_durations.items()
-                }
+                if self._channel_templates["other"] is not None:
+                    component_durations_seconds = {
+                        component: self._channel_templates["other"].duration_to_seconds(duration)
+                        for component, duration in component_durations.items()
+                    }
 
             child_components = self._get_neighborhood_hard_boundary(child, 0)
             neighborhood_components = self._get_neighborhood_hard_boundary(child, neighborhood)
@@ -1344,38 +1311,58 @@ class ScheduleBuilder:
         }
 
         pl = Playlist()
-        mapped_instructions: dict[int | Instruction, Any] = {}
-        # add the schedules in the playlist
+        mapped_instructions: dict[str, dict[int, Any]] = {}
+
+        def _append_to_schedule(sc_schedule: SC_Schedule, channel_name: str, instr: Instruction) -> None:
+            """Append ``instr`` to ``sc_schedule`` into the channel``channel_name``."""
+            try:
+                # Check if instr can be used as a dictionary key, and use it if possible.
+                # 2 dataclasses can have the same hash if their fields are identical. We must
+                # distinguish between different Waveform classes which may have identical fields,
+                # so we use the instruction itself as a key, so that the class is checked too.
+                instr_id = hash(instr)
+            except TypeError:
+                instr_id = instr.id
+            if instr_id not in mapped_instructions.setdefault(channel_name, {}):
+                mapped = _map_instruction(instr)
+                idx = pl.channel_descriptions[channel_name].add_instruction(mapped)
+                sc_schedule.instructions.setdefault(channel_name, []).append(idx)
+                mapped_instructions[channel_name][instr_id] = idx
+            else:
+                sc_schedule.instructions.setdefault(channel_name, []).append(
+                    mapped_instructions[channel_name][instr_id]
+                )
+
+                # add the schedules in the playlist
+
         # NOTE that there is no implicit right-alignment or equal duration for schedules, unlike in old-style playlists!
         for schedule in schedules:
-            if finish_schedules:
-                schedule = self._finish_schedule(schedule)  # noqa: PLW2901
+            finished_schedule = self._finish_schedule(schedule) if finish_schedules else schedule
             sc_schedule = SC_Schedule()
-            for channel_name, segment in schedule.items():
+            for channel_name, segment in finished_schedule.items():
                 if (channel := channel_descriptions.get(channel_name)) is None:
-                    # ignore virtual channels in the schedule
                     continue
                 pl.add_channel(channel)
+                prev_wait = None
                 for instruction in segment:
-                    try:
-                        # Check if it can be used as a dictionary key, and use it if possible.
-                        # 2 dataclasses can have the same hash if their fields are identical. We must distinguish
-                        # between different Waveform classes which may have identical fields,
-                        # so we use the instruction itself as a key, so that the class is checked too.
-                        instr_id = instruction
-                        is_mapped = instr_id in mapped_instructions
-                    except TypeError:
-                        instr_id = instruction.id
-                        is_mapped = instr_id in mapped_instructions
-                    if is_mapped:
-                        sc_schedule.add_to_segment(channel, mapped_instructions[instr_id])
+                    # convert all NONSOLID instructions into Waits
+                    if finish_schedules and (isinstance(instruction, NONSOLID) or isinstance(instruction, Wait)):
+                        if instruction.duration > 0:
+                            if prev_wait:  # if the previous instruction was a Wait, combine durations
+                                prev_wait = Wait(prev_wait.duration + instruction.duration)
+                            else:
+                                prev_wait = Wait(instruction.duration)
                     else:
-                        mapped = _map_instruction(instruction)
-                        mapped_instructions[instr_id] = mapped
-                        sc_schedule.add_to_segment(channel, mapped)
-
+                        if prev_wait:  # if there's a prev_wait not yet added to schedule, place it before instruction
+                            instructions_to_add = [prev_wait, instruction]
+                            prev_wait = None
+                        else:
+                            instructions_to_add = [instruction]
+                        for instr in instructions_to_add:
+                            _append_to_schedule(sc_schedule, channel_name, instr)
+                if prev_wait:
+                    _append_to_schedule(sc_schedule, channel_name, prev_wait)
             pl.segments.append(sc_schedule)
-
         return pl
 
     def _set_gate_implementation_shortcut(self, op_name: str) -> None:

iqm/pulse/gate_implementation.py

@@ -114,7 +114,7 @@ class GateImplementation(abc.ABC):
 
     def __init__(
         self, parent: QuantumOp, name: str, locus: Locus, calibration_data: OILCalibrationData, builder: ScheduleBuilder
-    ):
+    ) -> None:
         self.parent = parent
         self.name = name
         self.locus = locus
@@ -247,12 +247,12 @@ class GateImplementation(abc.ABC):
                 return value
             if unit == "s":
 
-                def conversion(val):
+                def conversion(val: Any) -> Any:
                     return val / dur if dur > 0 else 0.0
 
             elif unit == "Hz":
 
-                def conversion(val):
+                def conversion(val: Any) -> Any:
                     return val * dur
 
             if isinstance(value, Iterable):
@@ -303,10 +303,7 @@ class GateImplementation(abc.ABC):
         def build_node(path: Iterable[str], dictionary: dict[str, Any]) -> SettingNode:
             node = SettingNode(".".join(path), path=".".join(path))
             for key, value in dictionary.items():
-                if "*" in key:
-                    wildcard_keys = [key.replace("*", q) for q in locus]
-                else:
-                    wildcard_keys = [key]
+                wildcard_keys = [key.replace("*", q) for q in locus] if "*" in key else [key]
 
                 for wkey in wildcard_keys:
                     new_path = (*tuple(path), wkey)
@@ -321,7 +318,7 @@ class GateImplementation(abc.ABC):
                                 value.parameter.model_copy(update={"name": name}), value.value, path=name
                             )
                     else:
-                        raise ValueError(f"{wkey}: value {value} is neither a Parameter, Setting nor a dict.")
+                        raise TypeError(f"{wkey}: value {value} is neither a Parameter, Setting nor a dict.")
             return node
 
         return build_node(path, cls.parameters)
@@ -394,7 +391,7 @@ class CustomIQWaveforms(GateImplementation):
 
     def __init__(
         self, parent: QuantumOp, name: str, locus: Locus, calibration_data: OILCalibrationData, builder: ScheduleBuilder
-    ):
+    ) -> None:
         super().__init__(parent, name, locus, calibration_data, builder)
         if getattr(self, "wave_i", None) is None or getattr(self, "wave_q", None) is None:
             raise ValueError(
@@ -408,7 +405,7 @@ class CustomIQWaveforms(GateImplementation):
         wave_i: type[Waveform] | None = None,
         wave_q: type[Waveform] | None = None,
         dependent_waves: bool | None = None,
-    ):
+    ) -> None:
         """Store the Waveform types used by this subclass, and their parameters.
 
         NOTE: if ``MyGate`` is a subclass of ``CustomIQWaveforms``, with some defined i and q waves, further
@@ -579,7 +576,7 @@ class CompositeGate(GateImplementation):
         locus: Locus,
         calibration_data: OILCalibrationData,
         builder: ScheduleBuilder,
-    ):
+    ) -> None:
         super().__init__(parent, name, locus, calibration_data, builder)
         custom_defaults = {
             op: data.get("default_implementation") for op, data in calibration_data.items() if isinstance(data, dict)
@@ -596,9 +593,8 @@ class CompositeGate(GateImplementation):
             key_is_hashable = True
         except TypeError:
             key_is_hashable = False
-        if key_is_hashable:
-            if box := self.builder.composite_cache.get(self, default_cache_key):
-                return box
+        if key_is_hashable and (box := self.builder.composite_cache.get(self, default_cache_key)):
+            return box
         box = self._call(*args, **kwargs)
         if key_is_hashable:
             self.builder.composite_cache.set(self, default_cache_key, box)
@@ -660,7 +656,7 @@ class CompositeCache:
     data.
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         self._cache: dict[tuple[Any, ...], TimeBox] = {}
 
     def set(

iqm/pulse/gates/cz.py

@@ -383,8 +383,9 @@ class CouplerFluxPulseQubitACStarkPulseGate(GateImplementation):
         """
         _, phase_increment = phase_transformation(0.0, phase_increment)
 
-        wave_i = cls.qubit_drive_wave(phase=phase, **kwargs)  # type: ignore
-        wave_q = cls.qubit_drive_wave(phase=phase - np.pi / 2, **kwargs)  # type: ignore
+        if cls.qubit_drive_wave is not None:
+            wave_i = cls.qubit_drive_wave(phase=phase, **kwargs)
+            wave_q = cls.qubit_drive_wave(phase=phase - np.pi / 2, **kwargs)
         return IQPulse(
             kwargs["n_samples"],
             wave_i=wave_i,

iqm/pulse/gates/measure.py

@@ -431,7 +431,7 @@ class Measure_Constant(Measure_CustomWaveforms, wave_i=Constant, wave_q=Constant
     """
 
 
-class Measure_Constant_Qnd(Measure_CustomWaveforms, wave_i=Constant, wave_q=Constant):
+class Measure_Constant_Qnd(Measure_CustomWaveforms, wave_i=Constant, wave_q=Constant):  # type:ignore[call-arg]
     """Implementation of a single-qubit projective, non quantum demolition, dispersive
     measurements in the Z basis.
 
@@ -824,10 +824,9 @@ class Shelved_Measure_CustomWaveforms(Measure_CustomWaveforms):
     # implementation multiplexing. This is because the method has to return time boxes due to the `prx_12` pulses,
     # instead of `MultiplexedProbeTimeBox`
     # TODO: Enable mixed implementation multiplexing for shelved readout
-    def probe_timebox(
+    def probe_timebox(  # type: ignore[override]
         self, key: str = "", feedback_key: str = "", do_acquisition: bool = True, _skip_override: bool = False
     ) -> TimeBox:
-        # type: ignore[override]
         if _skip_override:
             return super().probe_timebox(key, feedback_key, do_acquisition)
         multiplexed_timeboxes = super().probe_timebox(key, feedback_key)
@@ -847,7 +846,7 @@ class Shelved_Measure_CustomWaveforms(Measure_CustomWaveforms):
         return shelved_measure_box
 
 
-class Shelved_Measure_Constant(Shelved_Measure_CustomWaveforms, wave_i=Constant, wave_q=Constant):
+class Shelved_Measure_Constant(Shelved_Measure_CustomWaveforms, wave_i=Constant, wave_q=Constant):  # type:ignore[call-arg]
     """Implementation of a shelved readout.
 
     A measure gate implemented as a constant waveform is surrounded by two `prx_12` gates.

iqm/pulse/gates/prx.py

@@ -26,6 +26,7 @@ It rotates the qubit state around an axis that lies in the XY plane of the Bloch
 
 from __future__ import annotations
 
+from abc import abstractmethod
 import copy
 from functools import lru_cache
 from typing import TYPE_CHECKING
@@ -85,24 +86,25 @@ def get_unitary_prx(angle: float, phase: float) -> np.ndarray:
     )
 
 
-class PRX_GateImplementation(GateImplementation):
+class PrxGateImplementation(GateImplementation):
     """ABC for different implementations of the PRX gate."""
 
     def __init__(
         self, parent: QuantumOp, name: str, locus: Locus, calibration_data: OILCalibrationData, builder: ScheduleBuilder
-    ):
+    ) -> None:
         super().__init__(parent, name, locus, calibration_data, builder)
         self._cliffords: dict[XYGate, TimeBox] = {}
 
-    def _call(self, angle: float, phase: float = 0.0) -> TimeBox:  # type: ignore[override]
-        """Phased x rotation gate.
+    @abstractmethod
+    def _call(self, angle: float, phase: float) -> TimeBox:
+        """Phased X rotation gate.
 
         Args:
-            angle: rotation angle (in radians)
-            phase: phase angle (in radians)
+            angle: Rotation angle in radians.
+            phase: Phase angle in radians.
 
         Returns:
-            boxed instruction schedule implementing the phased x rotation gate
+            Boxed instruction schedule implementing the phased X rotation gate.
 
         """
         raise NotImplementedError
@@ -176,8 +178,8 @@ class PRX_GateImplementation(GateImplementation):
         return SINGLE_COMPONENTS_WITH_DRIVE_LOCUS_MAPPING
 
 
-class PRX_SinglePulse_GateImplementation(SinglePulseGate, PRX_GateImplementation):
-    r"""ABC for PRX gates implemented using a single IQ pulse.
+class PRX_SinglePulse_GateImplementation(SinglePulseGate, PrxGateImplementation):
+    r"""Base class for PRX gates implemented using a single IQ pulse.
 
     This class implements phased x rotation gates on a specific qubit using an :class:`.IQPulse`
     instance, derived from the pulse calibration data provided at construction by
@@ -195,7 +197,7 @@ class PRX_SinglePulse_GateImplementation(SinglePulseGate, PRX_GateImplementation
     duration being zero, the gate implementation will apply a ``Block(0)`` instruction to the qubit's drive channel.
     """
 
-    def _call(self, angle: float, phase: float = 0.0) -> TimeBox:  # type: ignore[override]
+    def _call(self, angle: float, phase: float = 0.0) -> TimeBox:
         scale, new_phase = _normalize_params(angle, phase)
         pulse = self.pulse.copy(
             scale_i=scale * self.pulse.scale_i,
@@ -216,7 +218,7 @@ class PRX_SinglePulse_GateImplementation(SinglePulseGate, PRX_GateImplementation
 
 
 class PRX_CustomWaveforms(PRX_SinglePulse_GateImplementation, CustomIQWaveforms):
-    """ABC for PRX gates implemented using a single IQ pulse and hot-swappable waveforms."""
+    """Base class for PRX gates implemented using a single IQ pulse and hot-swappable waveforms."""
 
     root_parameters: dict[str, Parameter | Setting] = {
         "duration": Parameter("", "pi pulse duration", "s"),
@@ -251,14 +253,14 @@ class PRX_CustomWaveforms(PRX_SinglePulse_GateImplementation, CustomIQWaveforms)
         )
 
 
-class PRX_DRAGGaussian(PRX_CustomWaveforms, wave_i=TruncatedGaussian, wave_q=TruncatedGaussianD):  # type: ignore
+class PRX_DRAGGaussian(PRX_CustomWaveforms, wave_i=TruncatedGaussian, wave_q=TruncatedGaussianD):  # type:ignore[call-arg]
     """PRX gate, DRAG / TruncatedGaussian IQ pulse implementation.
 
     See :class:`.PRX_CustomWaveforms`.
     """
 
 
-class PRX_DRAGCosineRiseFall(PRX_CustomWaveforms, wave_i=CosineRiseFall, wave_q=CosineRiseFallD):  # type: ignore
+class PRX_DRAGCosineRiseFall(PRX_CustomWaveforms, wave_i=CosineRiseFall, wave_q=CosineRiseFallD):  # type:ignore[call-arg]
     """PRX gate, DRAG / CosineRiseFall IQ pulse implementation.
 
     See :class:`.PRX_CustomWaveforms`.
@@ -273,7 +275,7 @@ class PRX_DRAGCosineRiseFall(PRX_CustomWaveforms, wave_i=CosineRiseFall, wave_q=
 
 
 class PRX_CustomWaveformsSX(PRX_SinglePulse_GateImplementation, CustomIQWaveforms):
-    r"""ABC for PRX gates implemented using SX gate, hot-swappable waveforms and phase manipulation.
+    r"""Base class for PRX gates implemented using SX gate, hot-swappable waveforms and phase manipulation.
 
     The schedule used to implement the PRX gate depends on the arguments:
         1. If the rotation angle :math:`\theta = \pi/2`, the timebox will consist of just the SX IQ pulse, with phase.
@@ -373,15 +375,14 @@ class PRX_CustomWaveformsSX(PRX_SinglePulse_GateImplementation, CustomIQWaveform
         )
 
 
-class PRX_DRAGGaussianSX(PRX_CustomWaveformsSX, wave_i=TruncatedGaussian, wave_q=TruncatedGaussianD):
-    # type: ignore
+class PRX_DRAGGaussianSX(PRX_CustomWaveformsSX, wave_i=TruncatedGaussian, wave_q=TruncatedGaussianD):  # type:ignore[call-arg]
     """PRX gate, DRAG / Gaussian IQ pulse with VZ implementation.
 
     See :class:`.PRX_CustomWaveformsVZ`.
     """
 
 
-class PRX_DRAGCosineRiseFallSX(PRX_CustomWaveformsSX, wave_i=CosineRiseFall, wave_q=CosineRiseFallD):  # type: ignore
+class PRX_DRAGCosineRiseFallSX(PRX_CustomWaveformsSX, wave_i=CosineRiseFall, wave_q=CosineRiseFallD):  # type:ignore[call-arg]
     """PRX gate, DRAG / CosineRiseFall IQ pulse with VZ implementation.
 
     See :class:`.PRX_CustomWaveformsVZ`.
@@ -395,32 +396,28 @@ class PRX_DRAGCosineRiseFallSX(PRX_CustomWaveformsSX, wave_i=CosineRiseFall, wav
         return super()._get_pulse(**kwargs)
 
 
-class PRX_FastDragSX(PRX_CustomWaveformsSX, wave_i=FastDragI, wave_q=FastDragQ):
-    # type: ignore
+class PRX_FastDragSX(PRX_CustomWaveformsSX, wave_i=FastDragI, wave_q=FastDragQ):  # type:ignore[call-arg]
     """PRX gate, FAST DRAG IQ pulse with VZ-based SX-implementation.
 
     See :class:`.PRX_CustomWaveformsSX`.
     """
 
 
-class PRX_FastDrag(PRX_CustomWaveforms, wave_i=FastDragI, wave_q=FastDragQ):
-    # type: ignore
+class PRX_FastDrag(PRX_CustomWaveforms, wave_i=FastDragI, wave_q=FastDragQ):  # type:ignore[call-arg]
     """PRX gate, FAST DRAG IQ pulse based on amplitude scaling.
 
     See :class:`.PRX_CustomWaveforms`.
     """
 
 
-class PRX_HdDragSX(PRX_CustomWaveformsSX, wave_i=HdDragI, wave_q=HdDragQ):
-    # type: ignore
+class PRX_HdDragSX(PRX_CustomWaveformsSX, wave_i=HdDragI, wave_q=HdDragQ):  # type:ignore[call-arg]
     """PRX gate, HD DRAG IQ pulse with VZ-based SX-implementation.
 
     See :class:`.PRX_CustomWaveformsSX`.
     """
 
 
-class PRX_HdDrag(PRX_CustomWaveforms, wave_i=HdDragI, wave_q=HdDragQ):
-    # type: ignore
+class PRX_HdDrag(PRX_CustomWaveforms, wave_i=HdDragI, wave_q=HdDragQ):  # type:ignore[call-arg]
     """PRX gate, HD DRAG IQ pulse based on amplitude scaling
 
     See :class:`.PRX_CustomWaveforms`.
@@ -447,8 +444,8 @@ def _normalize_params(angle: float, phase: float) -> tuple[float, float]:
     return angle / half_turn, normalize_angle(phase)
 
 
-class ABC_Constant_smooth(PRX_GateImplementation):
-    r"""ABC class for creating gates with an arbitrarily long Constant pulses with smooth rise and fall.
+class ABC_Constant_smooth(PrxGateImplementation):
+    r"""Base class for creating gates with an arbitrarily long Constant pulses with smooth rise and fall.
     This pulse creates a :'Segment' consisting of three instructions : [rise_waveform, main_waveform, fall_waveform].
     This class is created so that one can use middle waveform as a constant, thus enabling to use arbitrarily
     long pulses, not limited by the awg memory.
@@ -617,8 +614,8 @@ class Constant_PRX_with_smooth_rise_fall(
     """
 
 
-class PRX_ModulatedCustomWaveForms(PRX_CustomWaveforms):  # type: ignore
-    r"""ABC for PRX gates with modulated frequency, hot-swappable waveforms.
+class PRX_ModulatedCustomWaveForms(PRX_CustomWaveforms):
+    r"""Base class for PRX gates with modulated frequency, hot-swappable waveforms.
 
     The class takes baseband I and Q waveform as input, and modulates them with frequency in the root_parameters.
     The final pulse shape after modulation is:
@@ -660,7 +657,7 @@ class PRX_ModulatedCustomWaveForms(PRX_CustomWaveforms):  # type: ignore
         )
 
 
-class PRX_ModulatedDRAGCosineRiseFall(PRX_ModulatedCustomWaveForms, wave_i=CosineRiseFall, wave_q=CosineRiseFallD):
+class PRX_ModulatedDRAGCosineRiseFall(PRX_ModulatedCustomWaveForms, wave_i=CosineRiseFall, wave_q=CosineRiseFallD):  # type:ignore[call-arg]
     """Modulated PRX pulse with cosine rise fall waveform"""
 
     excluded_parameters = ["rise_time"]

iqm/pulse/gates/rz.py

@@ -218,8 +218,8 @@ class RZ_ACStarkShift(GateImplementation):
         """
         _, phase_increment = phase_transformation(0, phase_increment)
 
-        wave_i = cls.ac_stark_waveform(n_samples=n_samples, phase=phase, **kwargs)  # type: ignore
-        wave_q = cls.ac_stark_waveform(n_samples=n_samples, phase=phase - np.pi / 2, **kwargs)  # type: ignore
+        wave_i = cls.ac_stark_waveform(n_samples=n_samples, phase=phase, **kwargs)
+        wave_q = cls.ac_stark_waveform(n_samples=n_samples, phase=phase - np.pi / 2, **kwargs)
         return IQPulse(
             n_samples,
             wave_i=wave_i,
@@ -236,9 +236,9 @@ class RZ_ACStarkShift_CosineRiseFall(RZ_ACStarkShift, ac_stark_waveform=Modulate
 
 class RZ_ACStarkShift_smoothConstant(
     Constant_PRX_with_smooth_rise_fall,
-    rise_waveform=CosineRise,
-    main_waveform=Constant,
-    fall_waveform=CosineFall,
+    rise_waveform=CosineRise,  # type:ignore[call-arg]
+    main_waveform=Constant,  # type:ignore[call-arg]
+    fall_waveform=CosineFall,  # type:ignore[call-arg]
 ):
     """Constant AC stark pulse with cosine rise and fall padding.
     Implemented as a 3-instruction Schedule.

iqm/pulse/playlist/hd_drag.py

@@ -114,11 +114,11 @@ def solve_hd_drag_coefficients_from_suppressed_frequencies(
 
     """
     # The beta coefficients can be solved from a matrix equation A*beta = b according to Eq. (B5). Let's build A
-    suppressed_freq_arr = np.asarray(suppressed_freq_arr)
-    n_coefs = len(suppressed_freq_arr) + 1
+    suppressed_freqs = np.asarray(suppressed_freq_arr)
+    n_coefs = len(suppressed_freqs) + 1
     a_mat = np.zeros((n_coefs, n_coefs))
     a_mat[0, 0] = 1
-    a_mat[1:, :] = (-1) ** np.arange(n_coefs)[None] * (pulse_duration * suppressed_freq_arr[:, None]) ** (
+    a_mat[1:, :] = (-1) ** np.arange(n_coefs)[None] * (pulse_duration * suppressed_freqs[:, None]) ** (
         2 * np.arange(n_coefs)[None]
     )
     b_arr = np.zeros((n_coefs,))

iqm/pulse/playlist/visualisation/base.py

@@ -22,6 +22,7 @@ import html
 import io
 import json
 from pathlib import Path
+from typing import Any
 
 from iqm.models.playlist.waveforms import Waveform
 from jinja2 import Environment, FileSystemLoader
@@ -30,6 +31,29 @@ import numpy as np
 from iqm.pulse.playlist.playlist import Playlist
 
 
+def _numpy_to_builtin_types(data: list[tuple[str, Any]]):
+    """Convert selected ``numpy`` types to Python's built-in types.
+
+    This helper function is to be used for converting dataclasses into
+    dictionaries with ``asdict``.
+
+    For example, ``Playlist`` dataclasses can get converted to dictionaries to
+    be rendered as HTML/JavaScript in "playlist inspector". If such classes
+    were to contain ``numpy`` types they could not be handled by JavaScript.
+    """
+    converted_data = {}
+
+    for key, value in data:
+        if isinstance(value, np.float64):
+            converted_data[key] = float(value)
+        elif isinstance(value, np.ndarray):
+            converted_data[key] = value.tolist()
+        else:
+            converted_data[key] = value
+
+    return converted_data
+
+
 def _get_waveform(wave: Waveform, scale: float, wave_q: Waveform | None = None, scale_q: float | None = None) -> str:
     import matplotlib.pyplot as plt
 
@@ -74,7 +98,7 @@ def _playlist_as_a_dict(playlist: Playlist, segment_indices: Sequence[int]) -> d
                 instruction = channel_desc.instruction_table[instruction_idx]
                 instruction_dict = {}
                 instruction_dict["name"] = instruction.operation.__class__.__name__
-                params = asdict(instruction.operation)
+                params = asdict(instruction.operation, dict_factory=_numpy_to_builtin_types)
                 if instruction.operation.__class__.__name__ == "RealPulse":
                     instruction_dict["wave_img_idx"] = instruction_idx
                     if str(instruction_idx) not in waveform_dict[channel]:

iqm/pulse/playlist/visualisation/templates/playlist_inspection.jinja2

@@ -119,7 +119,7 @@
         var fullscreen_state = false;
 
         // The schedules to render
-        var schedules = {{jsonobj.playlists | replace("array", "Array")}}
+        var schedules = {{jsonobj.playlists}}
         var waveforms = {{jsonobj.waveforms}}
         var segment_indices = {{segment_indices}}
 

iqm/pulse/scheduler.py

@@ -266,8 +266,8 @@ def extend_schedule_new(  # noqa: PLR0915
             _ = channels[ch].duration_to_int_samples(duration, message=f"{ch}: {iA} + {iB}: overlap duration")
 
         if isinstance(iA, Nothing) and isinstance(iB, Nothing):
-            return Nothing(duration=duration)  # type: ignore
-        return Block(duration=duration)  # type: ignore
+            return Nothing(duration=duration)
+        return Block(duration=duration)
 
     def find_start_time() -> float:
         """Find the earliest possible start time for schedule B."""
@@ -297,7 +297,7 @@ def extend_schedule_new(  # noqa: PLR0915
         if distance >= -TOL:
             if distance > TOL:
                 # gap, add a Nothing between A and B
-                segment_A._instructions.append(Nothing(duration=distance))  # type: ignore
+                segment_A._instructions.append(Nothing(duration=distance))
             # add B
             segment_A._instructions.extend(pointer_B.tail())
         else:

{iqm_pulse-9.14.0.dist-info → iqm_pulse-9.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulse
-Version: 9.14.0
+Version: 9.17.0
 Summary: A Python-based project for providing interface and implementations for control pulses.
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License: Apache License

{iqm_pulse-9.14.0.dist-info → iqm_pulse-9.17.0.dist-info}/RECORD

@@ -1,45 +1,45 @@
 iqm/pulse/__init__.py,sha256=FxgHlv3bF8bQCREwOJ1yu_nsrfJq0g0HdovvT1wUnCI,881
 iqm/pulse/base_utils.py,sha256=tLbmnWGmHsjcA8QFCiqvHfgSJJNWS4AVTcD2y4M2ipU,2641
-iqm/pulse/builder.py,sha256=qy00Qwm-m5p-F3_8dqlG3kgN6846fsJAfhWZw9XSQ5A,67235
+iqm/pulse/builder.py,sha256=34y0-5CF4Izo4s7BsVYXOVePuf5SomxZiMdM7Je59PY,66940
 iqm/pulse/circuit_operations.py,sha256=LhOcgSXVYUr6-JzI38uy3r14Bnra9Yu-Zlubg2l_MUA,22665
-iqm/pulse/gate_implementation.py,sha256=ThLgwXKM-cnoDpg7r3qm7l8_PhgsCcb-4eeuvggPc_w,33923
+iqm/pulse/gate_implementation.py,sha256=1sJ6Vy4DcQBswY5WUOkHKbIkMS3NSCEhovxG9QsdkU4,33898
 iqm/pulse/quantum_ops.py,sha256=VxWOV_XD61JjQl0ugKhgY0TSOhg3CRwcrpLvpzIAcIQ,14732
-iqm/pulse/scheduler.py,sha256=jBi68_Y1RVNe3aDmP4wmudDs5vXCHZm-UXl3IpgNDDM,22738
+iqm/pulse/scheduler.py,sha256=Y5WL8TwAEzoSnboie8scv9skC5YBmdXKAJ4KTnYn0xU,22690
 iqm/pulse/timebox.py,sha256=w3R6VafBXx_cGWrcvI_6x1e6JII_9v1vxQoRSGIjtXE,16591
 iqm/pulse/utils.py,sha256=HyTkMD0er_rZnvDZWM1WscOFxaxGMyRAW_Aw36b0Hdc,7998
 iqm/pulse/validation.py,sha256=-tZWrW201t4nbTQWeZ8M9DixzoN8B0Q63IP57BfDAz0,10733
 iqm/pulse/gates/__init__.py,sha256=UI6kx0MrXw4Fqz8OFkVo8rZirNbSfT1dlWpnnG8ELwQ,12986
 iqm/pulse/gates/barrier.py,sha256=WhYV70lf4lh4Wa9UZuMk2lp9JbUQIu8lzewRC2P7pNE,2546
 iqm/pulse/gates/conditional.py,sha256=3tW5kVt2M2xaTJxaixTErU5DTe91F0uE9BN9kopBEkQ,6242
-iqm/pulse/gates/cz.py,sha256=QgV-mn2aPDbfNplwEi18Lll4Zle-IELpn43IPM6Q_w8,20141
+iqm/pulse/gates/cz.py,sha256=HAKdR7puauiOIPikW5proQXf_oWauivrPuX1e632h9k,20162
 iqm/pulse/gates/default_gates.py,sha256=choy57ODXqXvpqY7rFMsZDHqxbDaIosu5Zy70sVbRL8,9516
 iqm/pulse/gates/delay.py,sha256=nST9dY2JFp_mpKhiSfsYa5yL4hFKcNJSAyCzXjhauQg,3767
 iqm/pulse/gates/enums.py,sha256=ATwb6vZYpfgQ1gQyFPW53JyIKrdAP3FPHm6jV-t9OAk,2532
 iqm/pulse/gates/flux_multiplexer.py,sha256=5psam8_3z796z2nL-A2RKzDGTRDE-7GJ4F0aYCgaPUY,9691
-iqm/pulse/gates/measure.py,sha256=jUofgAZENB9pNXuChD4wzxvRYJ_LlfOnn12-M-N3hJw,43892
+iqm/pulse/gates/measure.py,sha256=sLr3j7P4C1VAODuUZRWg5tDkPjI0CGFBtQ_mendAHbA,43935
 iqm/pulse/gates/move.py,sha256=yKY-Et4YJV0KmcDwN0yE3oHgDtLL-Xfgy1G_InsJN0U,17182
-iqm/pulse/gates/prx.py,sha256=SaJHcVu-NURUBTF5LtmTwwK1qcCtXA89NA5VwJXBM1o,24504
+iqm/pulse/gates/prx.py,sha256=yd87JbHU1y40EOzgA1m4m-y8BX6XkHij_uw7o0t-B1s,24596
 iqm/pulse/gates/reset.py,sha256=vYbzaA0pg3r5Oh6Edpu6NPlYoq1M7_tEWnf-7SHig4o,7589
-iqm/pulse/gates/rz.py,sha256=6iQudKjEhze0DkGDY1GZIJ7IW1QqxL7Fy74lTrJ4o8s,9416
+iqm/pulse/gates/rz.py,sha256=GWOlaHITJojQruu4R8-jIBez0OgFg4olarZkkxIRwRg,9459
 iqm/pulse/gates/sx.py,sha256=V8e94LHRLkXLjSSeuKxZQbhwgGDAWdQxsfhbYi4gtp8,1673
 iqm/pulse/gates/u.py,sha256=2kmbTYprrkVP4EbwGXNZcT5lzInjjOAvq8vk0lw57YY,5256
 iqm/pulse/playlist/__init__.py,sha256=XW-7Po_vCzhkk1Js06K8P-5srPpBuPHkqpc1yhL_Zx4,997
 iqm/pulse/playlist/channel.py,sha256=RAkGyjTU66MiF-ccf06FFZAXpUykWEltbfNXw4xJpYc,17164
 iqm/pulse/playlist/fast_drag.py,sha256=80Knv0Q9IaGiVdc0TrHlxNi1zJtTUZvWIVO38reYcA0,19600
-iqm/pulse/playlist/hd_drag.py,sha256=Tju5Vy0B1nC3O4HDPfWtdlQzdKob-1RSNaxn12zVL4c,13571
+iqm/pulse/playlist/hd_drag.py,sha256=JYRy3aPu0LD9y0H3UncOiWI39eV9-TARvgLonNUsaO0,13562
 iqm/pulse/playlist/instructions.py,sha256=K4c8TwC9FBbD_kdPD2OpjG1OZsDJALlwJon4SD9etk8,9845
 iqm/pulse/playlist/playlist.py,sha256=7MIX4iRfh2Nit8AnpNyqv5A5ZmK7JR-v201DXVL6kUk,685
 iqm/pulse/playlist/schedule.py,sha256=VYrVyPlB04Rm8iOYBXu2uOpsLBqczJRx3L2VU53CxVU,17989
 iqm/pulse/playlist/waveforms.py,sha256=Xa7P3V0rRIn7sQIoLKqXaWwtAbyQWjdVGW6bKOGNcOQ,17898
 iqm/pulse/playlist/visualisation/__init__.py,sha256=wCNfJHIR_bqG3ZBlgm55v90Rih7VCpfctoIMfwRMgjk,567
-iqm/pulse/playlist/visualisation/base.py,sha256=owECDA8rgWtNWncu7_QLAyEm7K2GrXaE1e1VfPEYkNg,7882
-iqm/pulse/playlist/visualisation/templates/playlist_inspection.jinja2,sha256=DrGHv4LLPZ2jyirin0CrGBRkpbs3oZVCeMLQrdfwUcI,11539
+iqm/pulse/playlist/visualisation/base.py,sha256=5RkwfZw-5bMVsZSTx6gbw1DAEz2B9HA5kuAKuzUQoME,8734
+iqm/pulse/playlist/visualisation/templates/playlist_inspection.jinja2,sha256=4XPmpISH5LLOf3YjmK3OKfvkAWj4TlzD2K4ClFTvZhI,11511
 iqm/pulse/playlist/visualisation/templates/static/logo.png,sha256=rbfQZ6_UEaztpY2uoYBuVypEwQVQTFB61oHzDzNRFJ0,94565
 iqm/pulse/playlist/visualisation/templates/static/moment.min.js,sha256=4iQZ6BVL4qNKlQ27TExEhBN1HFPvAvAMbFavKKosSWQ,53324
 iqm/pulse/playlist/visualisation/templates/static/vis-timeline-graph2d.min.css,sha256=svzNasPg1yR5gvEaRei2jg-n4Pc3sVyMUWeS6xRAh6U,19837
 iqm/pulse/playlist/visualisation/templates/static/vis-timeline-graph2d.min.js,sha256=OqCqCyA6JnxPz3PGXq_P_9VuSqWptgNt5Ev3T-xjefQ,570288
-iqm_pulse-9.14.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_pulse-9.14.0.dist-info/METADATA,sha256=TqnEuz_4eFndGLja-YbC8wNkP-nZNk2O_PQvbItwuZc,14524
-iqm_pulse-9.14.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulse-9.14.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulse-9.14.0.dist-info/RECORD,,
+iqm_pulse-9.17.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_pulse-9.17.0.dist-info/METADATA,sha256=1PDOhj5fzQhuYt0aZaxhzyKBGHBVlOQXCNghiRUJMZw,14524
+iqm_pulse-9.17.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulse-9.17.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulse-9.17.0.dist-info/RECORD,,