iqm-pulse 9.16.0__py3-none-any.whl → 9.18.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,
@@ -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,
@@ -1345,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/gates/__init__.py

@@ -48,7 +48,7 @@ from iqm.pulse.gates.default_gates import _quantum_ops_library
 from iqm.pulse.gates.delay import Delay
 from iqm.pulse.gates.flux_multiplexer import FluxMultiplexer_SampleLinear
 from iqm.pulse.gates.measure import Measure_Constant, Measure_Constant_Qnd, Shelved_Measure_Constant
-from iqm.pulse.gates.move import MOVE_CRF_CRF, MOVE_TGSS_CRF
+from iqm.pulse.gates.move import MOVE_CRF_CRF, MOVE_SLEPIAN_CRF, MOVE_TGSS_CRF
 from iqm.pulse.gates.prx import (
     Constant_PRX_with_smooth_rise_fall,
     PRX_DRAGCosineRiseFall,
@@ -105,6 +105,7 @@ _exposed_implementations: dict[str, type[GateImplementation]] = {
         Shelved_Measure_Constant,
         PRX_ModulatedDRAGCosineRiseFall,
         MOVE_CRF_CRF,
+        MOVE_SLEPIAN_CRF,
         MOVE_TGSS_CRF,
         RZ_ACStarkShift_CosineRiseFall,
         RZ_ACStarkShift_smoothConstant,

iqm/pulse/gates/default_gates.py

@@ -35,7 +35,7 @@ from iqm.pulse.gates.cz import (
 from iqm.pulse.gates.delay import Delay
 from iqm.pulse.gates.flux_multiplexer import FluxMultiplexer_SampleLinear
 from iqm.pulse.gates.measure import Measure_Constant, Shelved_Measure_Constant
-from iqm.pulse.gates.move import MOVE_CRF_CRF, MOVE_TGSS_CRF
+from iqm.pulse.gates.move import MOVE_CRF_CRF, MOVE_SLEPIAN_CRF, MOVE_TGSS_CRF
 from iqm.pulse.gates.prx import (
     PRX_DRAGCosineRiseFall,
     PRX_DRAGCosineRiseFallSX,
@@ -89,7 +89,7 @@ _default_implementations = {
         "crf_acstarkcrf": CZ_CRF_ACStarkCRF,
         "slepian_acstarkcrf": CZ_Slepian_ACStarkCRF,
     },
-    "move": {"tgss_crf": MOVE_TGSS_CRF, "crf_crf": MOVE_CRF_CRF},
+    "move": {"tgss_crf": MOVE_TGSS_CRF, "crf_crf": MOVE_CRF_CRF, "slepian_crf": MOVE_SLEPIAN_CRF},
     "cc_prx": {
         "prx_composite": CCPRX_Composite,
         "prx_composite_drag_crf": CCPRX_Composite_DRAGCosineRiseFall,

iqm/pulse/gates/move.py

@@ -44,7 +44,7 @@ from exa.common.data.parameter import Parameter, Setting
 from iqm.pulse.gates.cz import FluxPulseGate
 from iqm.pulse.playlist.instructions import Block, Instruction, VirtualRZ, Wait
 from iqm.pulse.playlist.schedule import Schedule
-from iqm.pulse.playlist.waveforms import CosineRiseFall, TruncatedGaussianSmoothedSquare
+from iqm.pulse.playlist.waveforms import CosineRiseFall, Slepian, TruncatedGaussianSmoothedSquare
 from iqm.pulse.timebox import TimeBox
 from iqm.pulse.utils import normalize_angle
 
@@ -137,6 +137,13 @@ class MOVE_CRF_CRF(MOVE_CustomWaveforms, coupler_wave=CosineRiseFall, qubit_wave
     """Qubit-resonator MOVE gate using the CRF waveform for the coupler and the qubit flux pulse."""
 
 
+class MOVE_SLEPIAN_CRF(MOVE_CustomWaveforms, coupler_wave=Slepian, qubit_wave=CosineRiseFall):
+    # type: ignore[call-arg]
+    """Qubit-resonator MOVE gate using the Slepian waveform for the coupler flux pulse and the
+    CRF waveform for the qubit flux pulse.
+    """
+
+
 class MOVE_TGSS_CRF(MOVE_CustomWaveforms, coupler_wave=TruncatedGaussianSmoothedSquare, qubit_wave=CosineRiseFall):
     # type: ignore[call-arg]
     """Qubit-resonator MOVE gate using the TGSS waveform for the coupler flux pulse and the

{iqm_pulse-9.16.0.dist-info → iqm_pulse-9.18.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulse
-Version: 9.16.0
+Version: 9.18.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.16.0.dist-info → iqm_pulse-9.18.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 iqm/pulse/__init__.py,sha256=FxgHlv3bF8bQCREwOJ1yu_nsrfJq0g0HdovvT1wUnCI,881
 iqm/pulse/base_utils.py,sha256=tLbmnWGmHsjcA8QFCiqvHfgSJJNWS4AVTcD2y4M2ipU,2641
-iqm/pulse/builder.py,sha256=P-lNMmstuL1SPikDxNxJq3fDt_4_0i48TAfG2AqSsig,67288
+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=1sJ6Vy4DcQBswY5WUOkHKbIkMS3NSCEhovxG9QsdkU4,33898
 iqm/pulse/quantum_ops.py,sha256=VxWOV_XD61JjQl0ugKhgY0TSOhg3CRwcrpLvpzIAcIQ,14732
@@ -8,16 +8,16 @@ 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/__init__.py,sha256=5QJglgKW1u2C1Ew1-x7ApAEfoNl97HUTvdkE7dC_6kk,13030
 iqm/pulse/gates/barrier.py,sha256=WhYV70lf4lh4Wa9UZuMk2lp9JbUQIu8lzewRC2P7pNE,2546
 iqm/pulse/gates/conditional.py,sha256=3tW5kVt2M2xaTJxaixTErU5DTe91F0uE9BN9kopBEkQ,6242
 iqm/pulse/gates/cz.py,sha256=HAKdR7puauiOIPikW5proQXf_oWauivrPuX1e632h9k,20162
-iqm/pulse/gates/default_gates.py,sha256=choy57ODXqXvpqY7rFMsZDHqxbDaIosu5Zy70sVbRL8,9516
+iqm/pulse/gates/default_gates.py,sha256=w29BbeA3QGSusyGQX5ST9vFvqpSz2zRRrHF1XzSfKc0,9567
 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=sLr3j7P4C1VAODuUZRWg5tDkPjI0CGFBtQ_mendAHbA,43935
-iqm/pulse/gates/move.py,sha256=yKY-Et4YJV0KmcDwN0yE3oHgDtLL-Xfgy1G_InsJN0U,17182
+iqm/pulse/gates/move.py,sha256=zxlVElaMDxKpdPuvqO3EWhdc8HM6c1VYNUTNsNokiAw,17463
 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=GWOlaHITJojQruu4R8-jIBez0OgFg4olarZkkxIRwRg,9459
@@ -38,8 +38,8 @@ iqm/pulse/playlist/visualisation/templates/static/logo.png,sha256=rbfQZ6_UEaztpY
 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.16.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_pulse-9.16.0.dist-info/METADATA,sha256=e808_Fq7iqLhkClq-wGFLVaf2pjA8DOkuGfYpsrSkeg,14524
-iqm_pulse-9.16.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulse-9.16.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulse-9.16.0.dist-info/RECORD,,
+iqm_pulse-9.18.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_pulse-9.18.0.dist-info/METADATA,sha256=pcJpDrA0hhsKBwlehi500s7fTUSsH7gyJHcr2Ma8Des,14524
+iqm_pulse-9.18.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulse-9.18.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulse-9.18.0.dist-info/RECORD,,