iqm-pulse 12.7.3__py3-none-any.whl → 12.7.4__py3-none-any.whl

iqm/pulse/builder.py

@@ -1455,7 +1455,7 @@ class ScheduleBuilder:
             if not schedule[ch]:
                 schedule.append(ch, Block(T))
 
-    def build_playlist(  # noqa: PLR0915
+    def build_playlist(  # noqa: PLR0915, PLR0912
         self, schedules: Sequence[Schedule], finish_schedules: bool = True
     ) -> tuple[Playlist, ReadoutMetrics]:
         """Build a playlist from a number of instruction schedules.
@@ -1595,26 +1595,56 @@ class ScheduleBuilder:
                     continue
                 pl.add_channel(channel)
                 prev_wait = None
+                prev_vz = None
                 for instruction in segment:
                     if isinstance(instruction, ReadoutTrigger):
                         readout_metrics.extend(instruction, seg_idx)
+
+                    if not finish_schedules:
+                        _append_to_schedule(sc_schedule, channel_name, instruction)
+                        continue
+
+                    # convert 0-angle virtual rotation instructions to Wait
+                    is_wait = isinstance(instruction, (NONSOLID, Wait)) or (
+                        isinstance(instruction, VirtualRZ) and instruction.phase_increment == 0.0
+                    )
+
                     # convert all NONSOLID instructions into Waits
-                    if finish_schedules and (isinstance(instruction, NONSOLID) or isinstance(instruction, Wait)):
+                    if is_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:
-                        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
+                        continue
+
+                    if isinstance(instruction, VirtualRZ):
+                        if prev_vz:  # merge successive VirtualRZ instructions
+                            prev_vz = VirtualRZ(
+                                duration=prev_vz.duration + instruction.duration,
+                                phase_increment=prev_vz.phase_increment + instruction.phase_increment,
+                            )
                         else:
-                            instructions_to_add = [instruction]
-                        for instr in instructions_to_add:
-                            _append_to_schedule(sc_schedule, channel_name, instr)
+                            prev_vz = VirtualRZ(instruction.duration, instruction.phase_increment)
+                        continue
+
+                    # handle instructions that are neither Wait nor VirtualRZ
+                    if prev_wait:  # flush accumulated Wait instructions
+                        _append_to_schedule(sc_schedule, channel_name, prev_wait)
+                        prev_wait = None
+                    if prev_vz:  # flush accumulated VirtualRZ instructions
+                        _append_to_schedule(sc_schedule, channel_name, prev_vz)
+                        prev_vz = None
+                    # finally, add instruction
+                    _append_to_schedule(sc_schedule, channel_name, instruction)
+                    continue
+
+                # if segment ends with VirtualRZ or Wait, flush to schedule
                 if prev_wait:
                     _append_to_schedule(sc_schedule, channel_name, prev_wait)
+                if prev_vz:
+                    _append_to_schedule(sc_schedule, channel_name, prev_vz)
+
             pl.segments.append(sc_schedule)
         return pl, readout_metrics
 

iqm/pulse/playlist/instructions.py

@@ -35,9 +35,21 @@ class Instruction:
     """Time duration of the instruction. In samples at the channel sample rate."""
 
     def __post_init__(self):
-        """Add a unique id for caching purposes, which can be used if the instruction is not hashable."""
+        """Add a unique id for caching purposes, which can be used if the instruction is not hashable.
+
+        Rounds ``phase`` and ``phase_increment`` to a fixed precision.
+        """
         object.__setattr__(self, "id", random.getrandbits(64))
 
+        # HACK round phases to 8th decimal place to prevent essentially identical instructions bloating
+        # the ZI command table, caused by phase differences beyond machine precision.
+        # Phase precision for ZI is in the order of 10**-5 radians (19-bit resolution).
+        # In the future this should be done on the station-control side for all instruments that benefit from it.
+        if hasattr(self, "phase_increment"):
+            object.__setattr__(self, "phase_increment", round(self.phase_increment, 8))
+        if hasattr(self, "phase"):
+            object.__setattr__(self, "phase", round(self.phase, 8))
+
     def validate(self) -> None:
         """Validate the instruction attributes.
 
@@ -291,7 +303,7 @@ class ReadoutMetrics:
     """Map each time trace label (of the format ``"<component>__<readout key>"``) to its number of time trace samples.
     """
     implementations: dict[str, set[str]] = field(default_factory=dict)
-    """Map each integration or time trace readout label to its implementations (of the format 
+    """Map each integration or time trace readout label to its implementations (of the format
     ``"<measure gate name>.<implementation name>"``)."""
 
     def extend(self, trigger: ReadoutTrigger, seg_idx: int) -> None:

{iqm_pulse-12.7.3.dist-info → iqm_pulse-12.7.4.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 iqm/pulse/__init__.py,sha256=aQhtfbLQgr_1IvbZLH1MCuf0aFomokeu7DSjxuDWZC4,978
 iqm/pulse/base_utils.py,sha256=ll3k8wbVxjHi6XcVo3PEWIjHx5QjG1C-yH218zTG8jU,2657
-iqm/pulse/builder.py,sha256=TByM0GSq13eim2vL3I1uBMU7otzheHAIzsVYxyZXSUc,78179
+iqm/pulse/builder.py,sha256=KkO4s5tLNIHNxPFuJywcXIx628Sy45cVrKxa625Vknc,79482
 iqm/pulse/circuit_operations.py,sha256=P83gevhGcaY4DaopGKO3CHN_CnWAPfEu-MHoLkqhu5Y,24847
 iqm/pulse/gate_implementation.py,sha256=LuQuzv45X1iAOAe2UGegu--oFdrudVPCAwvXGgt7sAE,39857
 iqm/pulse/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,7 +28,7 @@ iqm/pulse/playlist/__init__.py,sha256=XW-7Po_vCzhkk1Js06K8P-5srPpBuPHkqpc1yhL_Zx
 iqm/pulse/playlist/channel.py,sha256=RKFaLfdL436LOw-sNvcNVhNEQrQDoCWJsN8k2p479OQ,17180
 iqm/pulse/playlist/fast_drag.py,sha256=80Knv0Q9IaGiVdc0TrHlxNi1zJtTUZvWIVO38reYcA0,19600
 iqm/pulse/playlist/hd_drag.py,sha256=JYRy3aPu0LD9y0H3UncOiWI39eV9-TARvgLonNUsaO0,13562
-iqm/pulse/playlist/instructions.py,sha256=uCZX5uKO5XV8fnQQO-_GwMXKcRFsHCu7hdL3YQwBI_4,15559
+iqm/pulse/playlist/instructions.py,sha256=2cnRTPhDDLUPjpObjH3Ih2nlOn08EuqjN2vTcvDjTR4,16268
 iqm/pulse/playlist/playlist.py,sha256=7MIX4iRfh2Nit8AnpNyqv5A5ZmK7JR-v201DXVL6kUk,685
 iqm/pulse/playlist/schedule.py,sha256=ToaHKgDxNxLUQalI2TAMMld-EH5Im9rZNktQkXhOyBk,18037
 iqm/pulse/playlist/waveforms.py,sha256=w5Kgpo7VJwsaCUUKOu3rf5pNmN7Jw2jVLTn3hH-k0R4,23973
@@ -39,8 +39,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-12.7.3.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_pulse-12.7.3.dist-info/METADATA,sha256=gaQFokYQ0AN460elDwo9_D319pHqiM5Rx2BHRDaVaTM,14492
-iqm_pulse-12.7.3.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulse-12.7.3.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulse-12.7.3.dist-info/RECORD,,
+iqm_pulse-12.7.4.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_pulse-12.7.4.dist-info/METADATA,sha256=gY3XGD8X-_km4x4-kuR9-SulZQVjFM49SB7gYioMrV0,14492
+iqm_pulse-12.7.4.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulse-12.7.4.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulse-12.7.4.dist-info/RECORD,,