iqm-pulse 10.5.0__py3-none-any.whl → 11.1.0__py3-none-any.whl

iqm/pulse/builder.py

@@ -15,6 +15,7 @@
 
 from __future__ import annotations
 
+from collections import defaultdict
 from collections.abc import Iterable
 import copy
 from dataclasses import dataclass, field, replace
@@ -983,7 +984,9 @@ class ScheduleBuilder:
             boxes.append(factory(**op.args))
         return TimeBox.composite(boxes, label=name, scheduling_algorithm=scheduling_algorithm)
 
-    def timeboxes_to_front_padded_playlist(self, boxes: Iterable[TimeBox], *, neighborhood: int = 0) -> Playlist:
+    def timeboxes_to_front_padded_playlist(
+        self, boxes: Iterable[TimeBox], *, neighborhood: int = 0
+    ) -> tuple[Playlist, dict[str, set[str]]]:
         """Temporary helper function, for converting a sequence of TimeBoxes to a Playlist.
 
         Each individual TimeBox in ``boxes`` is resolved into a Schedule, and then
@@ -1002,7 +1005,8 @@ class ScheduleBuilder:
                 blocks only the defined locus components and any other components which have occupied channels.
 
         Returns:
-            playlist that implements ``boxes``
+            playlist that implements ``boxes`` and the mapping from readout labels to the set of used measurement
+            implementations (of the format ``<QuantumOp name>.<impl name>``).
 
         """
         schedules = [self.resolve_timebox(box, neighborhood=neighborhood).cleanup() for box in boxes]
@@ -1046,7 +1050,7 @@ class ScheduleBuilder:
             playlist that implements ``boxes``
 
         """
-        return self.build_playlist(self.timebox_to_schedule(box, neighborhood=neighborhood) for box in boxes)
+        return self.build_playlist(self.timebox_to_schedule(box, neighborhood=neighborhood) for box in boxes)[0]
 
     def timebox_to_schedule(
         self,
@@ -1396,7 +1400,9 @@ class ScheduleBuilder:
             if not schedule[ch]:
                 schedule.append(ch, Block(T))
 
-    def build_playlist(self, schedules: Iterable[Schedule], finish_schedules: bool = True) -> Playlist:
+    def build_playlist(  # noqa: PLR0915
+        self, schedules: Iterable[Schedule], finish_schedules: bool = True
+    ) -> tuple[Playlist, dict[str, set[str]]]:
         """Build a playlist from a number of instruction schedules.
 
         This involves compressing the schedules so that no duplicate information
@@ -1410,7 +1416,8 @@ class ScheduleBuilder:
                 unless some process has already finalised them before calling this function.
 
         Returns:
-            playlist containing the schedules
+            playlist containing the schedules and the mapping from readout labels to the set of used measurement
+            implementations (of the format ``<QuantumOp name>.<impl name>``).
 
         Raises:
             ValueError: if the schedules contain channels with non-uniform sampling rates
@@ -1458,6 +1465,75 @@ class ScheduleBuilder:
 
                 # add the schedules in the playlist
 
+        label_to_implementation: dict[str, set[str]] = defaultdict(set)
+
+        def _map_instruction(inst: Instruction) -> sc_instructions.Instruction:
+            """TODO only necessary until SC has been updated to use the iqm.pulse Instruction class."""
+            operation: Any
+
+            def _map_acquisition(acq: AcquisitionMethod) -> sc_instructions.AcquisitionMethod:
+                if acq.implementation is not None:
+                    label_to_implementation[acq.label].add(acq.implementation)
+                if isinstance(acq, ThresholdStateDiscrimination):
+                    return sc_instructions.ThresholdStateDiscrimination(
+                        label=acq.label,
+                        delay_samples=acq.delay_samples,
+                        weights=_map_instruction(acq.weights).operation,
+                        threshold=acq.threshold,
+                        feedback_signal_label=acq.feedback_signal_label,
+                    )
+                if isinstance(acq, ComplexIntegration):
+                    return sc_instructions.ComplexIntegration(
+                        label=acq.label,
+                        delay_samples=acq.delay_samples,
+                        weights=_map_instruction(acq.weights).operation,
+                    )
+                if isinstance(acq, TimeTrace):
+                    return sc_instructions.TimeTrace(
+                        label=acq.label, delay_samples=acq.delay_samples, duration_samples=acq.duration_samples
+                    )
+                raise ValueError(f"Unknown AcquisitionMethod {acq}")
+
+            if isinstance(inst, Wait):
+                operation = sc_instructions.Wait()
+            elif isinstance(inst, VirtualRZ):
+                operation = sc_instructions.VirtualRZ(inst.phase_increment)
+            elif isinstance(inst, RealPulse):
+                operation = sc_instructions.RealPulse(
+                    wave=to_canonical(inst.wave),
+                    scale=inst.scale,
+                )
+            elif isinstance(inst, IQPulse):
+                operation = sc_instructions.IQPulse(
+                    wave_i=to_canonical(inst.wave_i),
+                    wave_q=to_canonical(inst.wave_q),
+                    scale_i=inst.scale_i,
+                    scale_q=inst.scale_q,
+                    phase=inst.phase,
+                    modulation_frequency=inst.modulation_frequency,
+                    phase_increment=inst.phase_increment,
+                )
+            elif isinstance(inst, ConditionalInstruction):
+                if len(inst.outcomes) != 2:
+                    raise ValueError("ConditionalInstruction requires exactly two outcomes.")
+                operation = sc_instructions.ConditionalInstruction(
+                    condition=inst.condition,
+                    if_true=_map_instruction(inst.outcomes[1]),
+                    if_false=_map_instruction(inst.outcomes[0]),
+                )
+            elif isinstance(inst, MultiplexedIQPulse):
+                sc_entries = tuple((_map_instruction(p), d) for p, d in inst.entries)
+                operation = sc_instructions.MultiplexedIQPulse(sc_entries)
+            elif isinstance(inst, ReadoutTrigger):
+                sc_acquisitions = tuple(_map_acquisition(a) for a in inst.acquisitions)
+                operation = sc_instructions.ReadoutTrigger(
+                    probe_pulse=_map_instruction(inst.probe_pulse),
+                    acquisitions=sc_acquisitions,
+                )
+            else:
+                raise ValueError(f"{inst} not supported.")
+            return sc_instructions.Instruction(duration_samples=int(inst.duration), operation=operation)
+
         # NOTE that there is no implicit right-alignment or equal duration for schedules, unlike in old-style playlists!
         for schedule in schedules:
             finished_schedule = self._finish_schedule(schedule) if finish_schedules else schedule
@@ -1486,7 +1562,7 @@ class ScheduleBuilder:
                 if prev_wait:
                     _append_to_schedule(sc_schedule, channel_name, prev_wait)
             pl.segments.append(sc_schedule)
-        return pl
+        return pl, label_to_implementation
 
     def _set_gate_implementation_shortcut(self, op_name: str) -> None:
         """Create shortcut for `self.get_implementation(<op_name>, ...)` as `self.<op_name>(...)`.
@@ -1522,67 +1598,3 @@ class ScheduleBuilder:
                 f"a class attribute ``ScheduleBuilder.{op_name}``."
             )
             self._logger.warning(warning_msg)
-
-
-def _map_instruction(inst: Instruction) -> sc_instructions.Instruction:
-    """TODO only necessary until SC has been updated to use the iqm.pulse Instruction class."""
-    operation: Any
-
-    def _map_acquisition(acq: AcquisitionMethod) -> sc_instructions.AcquisitionMethod:
-        if isinstance(acq, ThresholdStateDiscrimination):
-            return sc_instructions.ThresholdStateDiscrimination(
-                label=acq.label,
-                delay_samples=acq.delay_samples,
-                weights=_map_instruction(acq.weights).operation,
-                threshold=acq.threshold,
-                feedback_signal_label=acq.feedback_signal_label,
-            )
-        if isinstance(acq, ComplexIntegration):
-            return sc_instructions.ComplexIntegration(
-                label=acq.label, delay_samples=acq.delay_samples, weights=_map_instruction(acq.weights).operation
-            )
-        if isinstance(acq, TimeTrace):
-            return sc_instructions.TimeTrace(
-                label=acq.label, delay_samples=acq.delay_samples, duration_samples=acq.duration_samples
-            )
-        raise ValueError(f"Unknown AcquisitionMethod {acq}")
-
-    if isinstance(inst, Wait):
-        operation = sc_instructions.Wait()
-    elif isinstance(inst, VirtualRZ):
-        operation = sc_instructions.VirtualRZ(inst.phase_increment)
-    elif isinstance(inst, RealPulse):
-        operation = sc_instructions.RealPulse(
-            wave=to_canonical(inst.wave),
-            scale=inst.scale,
-        )
-    elif isinstance(inst, IQPulse):
-        operation = sc_instructions.IQPulse(
-            wave_i=to_canonical(inst.wave_i),
-            wave_q=to_canonical(inst.wave_q),
-            scale_i=inst.scale_i,
-            scale_q=inst.scale_q,
-            phase=inst.phase,
-            modulation_frequency=inst.modulation_frequency,
-            phase_increment=inst.phase_increment,
-        )
-    elif isinstance(inst, ConditionalInstruction):
-        if len(inst.outcomes) != 2:
-            raise ValueError("ConditionalInstruction requires exactly two outcomes.")
-        operation = sc_instructions.ConditionalInstruction(
-            condition=inst.condition,
-            if_true=_map_instruction(inst.outcomes[1]),
-            if_false=_map_instruction(inst.outcomes[0]),
-        )
-    elif isinstance(inst, MultiplexedIQPulse):
-        sc_entries = tuple((_map_instruction(p), d) for p, d in inst.entries)
-        operation = sc_instructions.MultiplexedIQPulse(sc_entries)
-    elif isinstance(inst, ReadoutTrigger):
-        sc_acquisitions = tuple(_map_acquisition(a) for a in inst.acquisitions)
-        operation = sc_instructions.ReadoutTrigger(
-            probe_pulse=_map_instruction(inst.probe_pulse),
-            acquisitions=sc_acquisitions,
-        )
-    else:
-        raise ValueError(f"{inst} not supported.")
-    return sc_instructions.Instruction(duration_samples=int(inst.duration), operation=operation)

iqm/pulse/gates/default_gates.py

@@ -68,7 +68,9 @@ _implementation_library: dict[str, dict[str, type[GateImplementation]]] = {
     "delay": {"wait": Delay},
     "measure": {
         "constant": Measure_Constant,
-        "constant_qnd": Measure_Constant,
+    },
+    "measure_fidelity": {
+        "constant": Measure_Constant,
         "shelved_constant": Shelved_Measure_Constant,
     },
     "prx": {
@@ -134,6 +136,13 @@ _quantum_ops_library = {
             implementations=_implementation_library["measure"],
             factorizable=True,
         ),
+        QuantumOp(
+            "measure_fidelity",
+            0,
+            ("key",),
+            implementations=_implementation_library["measure_fidelity"],
+            factorizable=True,
+        ),
         QuantumOp(
             "prx",
             1,

iqm/pulse/gates/measure.py

@@ -199,9 +199,13 @@ class Measure_CustomWaveforms(CustomIQWaveforms):
 
         acquisition_type = root_params.get("acquisition_type", self.root_parameters["acquisition_type"].value)  # type: ignore[union-attr]
         acquisition_label = "TO_BE_REPLACED"
+        op_and_implementation = f"{self.parent.name}.{self.name}"
         if acquisition_type == "complex":
             acquisition_method = ComplexIntegration(
-                label=acquisition_label, delay_samples=root_params["acquisition_delay"], weights=weights
+                label=acquisition_label,
+                delay_samples=root_params["acquisition_delay"],
+                weights=weights,
+                implementation=op_and_implementation,
             )
         elif acquisition_type == "threshold":
             acquisition_method = ThresholdStateDiscrimination(
@@ -209,6 +213,7 @@ class Measure_CustomWaveforms(CustomIQWaveforms):
                 delay_samples=root_params["acquisition_delay"],
                 weights=weights,
                 threshold=root_params["integration_threshold"],
+                implementation=op_and_implementation,
             )
         else:
             raise ValueError(f"Unknown acquisition type {acquisition_type}")
@@ -407,6 +412,7 @@ class Measure_CustomWaveforms(CustomIQWaveforms):
                     label=f"{probe_name}__{label_key}",
                     delay_samples=delay_samples,
                     duration_samples=duration_samples,
+                    implementation=f"{self.parent.name}.{self.name}",
                 )
                 trigger_with_trace = replace(readout_trigger, acquisitions=readout_trigger.acquisitions + (time_trace,))
                 segment._instructions[0] = trigger_with_trace
@@ -520,7 +526,10 @@ class ProbePulse_CustomWaveforms(CustomIQWaveforms):
         acquisition_delay = round(self._probe_line.duration_to_samples(root_params["acquisition_delay"]))
         time_trace_label = "TO_BE_REPLACED"
         time_trace_acquisition = TimeTrace(
-            label=time_trace_label, delay_samples=acquisition_delay, duration_samples=integration_length
+            label=time_trace_label,
+            delay_samples=acquisition_delay,
+            duration_samples=integration_length,
+            implementation=f"{self.parent.name}.{self.name}",
         )
 
         # TODO: due to device limitations, we need to integrate always, even though it does not make much sense here
@@ -536,7 +545,10 @@ class ProbePulse_CustomWaveforms(CustomIQWaveforms):
         )
         integration_label = "dummy__integration"
         integration_acquisition = ComplexIntegration(
-            label=integration_label, delay_samples=acquisition_delay, weights=weights
+            label=integration_label,
+            delay_samples=acquisition_delay,
+            weights=weights,
+            implementation=f"{self.parent.name}.{self.name}",
         )
         return probe_pulse, (integration_acquisition, time_trace_acquisition)
 

iqm/pulse/gates/reset.py

@@ -62,15 +62,9 @@ class Reset_Conditional(CompositeGate):
             for q in self.locus
             if "drive" in self.builder.component_channels[q] and q in self.builder.chip_topology.component_to_probe_line
         )
-        # try to get a qnd measurement, otherwise use default one
-        try:  # TODO: should the QND measurement be its own QuantumOp instead?
-            probe_timebox = self.build("measure", resettable, impl_name="constant_qnd").probe_timebox(  # type: ignore[attr-defined]
-                RESET_MEASUREMENT_KEY, feedback_key=RESET_FEEDBACK_KEY
-            )
-        except (ValueError, KeyError):
-            probe_timebox = self.build("measure", resettable).probe_timebox(  # type: ignore[attr-defined]
-                RESET_MEASUREMENT_KEY, feedback_key=RESET_FEEDBACK_KEY
-            )
+        probe_timebox = self.build("measure", resettable).probe_timebox(  # type: ignore[attr-defined]
+            RESET_MEASUREMENT_KEY, feedback_key=RESET_FEEDBACK_KEY
+        )
         virtual_channels = set()
         probes = set()
         resets = []

iqm/pulse/playlist/instructions.py

@@ -210,6 +210,10 @@ class AcquisitionMethod:
     """Identifier for the returned data, like ``QB1__readout.time_trace``."""
     delay_samples: int
     """Delay from beginning of probe pulse to beginning of acquisition window, in samples."""
+    implementation: str | None
+    """Measure operation and implementation that created this AcquisitionMethod, in the format
+    ``<operation name>.<implementation name>``. If the acquisition is not originated from a
+    gate implementation, this should be ``None``."""
 
 
 @dataclass(frozen=True)

{iqm_pulse-10.5.0.dist-info → iqm_pulse-11.1.0.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 iqm/pulse/__init__.py,sha256=FxgHlv3bF8bQCREwOJ1yu_nsrfJq0g0HdovvT1wUnCI,881
 iqm/pulse/base_utils.py,sha256=ll3k8wbVxjHi6XcVo3PEWIjHx5QjG1C-yH218zTG8jU,2657
-iqm/pulse/builder.py,sha256=HonGGWI8PAUXhiD-QuvUXXDjF7E72G7H9s4WL3RKU4c,73526
+iqm/pulse/builder.py,sha256=MhBAw2NHTDGR79ARGGF44EkGDxaXlp6KHoNnPEQuyEY,74712
 iqm/pulse/circuit_operations.py,sha256=V568uC2LJBs6BlDbioQCh9iCBYhgkTiAbto9VSbmTgQ,22499
 iqm/pulse/gate_implementation.py,sha256=yyj2d1aDL0K_qouo0qLHnZ49_1qHsJEShKW14398t8Q,39546
 iqm/pulse/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,14 +13,14 @@ iqm/pulse/gates/__init__.py,sha256=l07iD52FiKKQyVFwswRapZMqEE0XfILSc4aZ5sXGJo4,8
 iqm/pulse/gates/barrier.py,sha256=WhYV70lf4lh4Wa9UZuMk2lp9JbUQIu8lzewRC2P7pNE,2546
 iqm/pulse/gates/conditional.py,sha256=NE-1GYlFcfaCmRuhqGEIhtoJmBArhyY5KhVnO4y4zng,6289
 iqm/pulse/gates/cz.py,sha256=72KO8OINZRVOye4g4quHAEzwNplOlIZE0hU1IjE8Gfk,33366
-iqm/pulse/gates/default_gates.py,sha256=TcJjg07ThQVDgH-MMZTacaykBZM82k2cLUXE3gG-LGE,7413
+iqm/pulse/gates/default_gates.py,sha256=G76Nz2XAuwH2i5KIrzSp4pTBSbe9vcAjfT12PfPYMYA,7645
 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=sk84ItEvkx7Z0pCHt8MCCczBe7_BHNvqS4_oeNghZw8,9757
-iqm/pulse/gates/measure.py,sha256=5yG5dQeDljZewrPdy6vwejz5m3KU-9SlXQco9oAyssw,44488
+iqm/pulse/gates/measure.py,sha256=yBDGM3dmE8fzSloMbMJj7eD2KOPyC93cmUTR_pfobGM,44939
 iqm/pulse/gates/move.py,sha256=siy9SBIFohknYV6zEJuUZv03cDEOiS53p9jFYm-5WAA,17470
 iqm/pulse/gates/prx.py,sha256=gWT4vEL6BZvRNOkwlxSg_V8nq7baFgh2K-V8q3bqLjI,25203
-iqm/pulse/gates/reset.py,sha256=idsknRq_z2JKIq4zXc4LvdE2czE5-KgGTdLPmYVyWIg,7480
+iqm/pulse/gates/reset.py,sha256=JzUurqhncTQ3Ti9tJyQHSybSXZsGslV0K-Dz5GRliPI,7066
 iqm/pulse/gates/rz.py,sha256=7XPS7moiiaqZ5rWx8_U_yyADFexofkQOj4QK3NeUCgg,9700
 iqm/pulse/gates/sx.py,sha256=3s7lo5ib2HZh-kzZd95-JqL41LxCX5GA4QZ0h7u3WCQ,1736
 iqm/pulse/gates/u.py,sha256=EUX84XkawqLhwRaJ1MxSKB33VpC8XDsFu875uHNo0WI,5403
@@ -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=oBvzwddpiK6nNWAbBJkk5lwTM-y6UCP3OPe-H57ml0o,9978
+iqm/pulse/playlist/instructions.py,sha256=z9umJqFLTsSd26EuzW-X5raWVHGpSLds9s4m8tDAV-E,10249
 iqm/pulse/playlist/playlist.py,sha256=7MIX4iRfh2Nit8AnpNyqv5A5ZmK7JR-v201DXVL6kUk,685
 iqm/pulse/playlist/schedule.py,sha256=ToaHKgDxNxLUQalI2TAMMld-EH5Im9rZNktQkXhOyBk,18037
 iqm/pulse/playlist/waveforms.py,sha256=eYFmWAbaJkZtYc2IsejgyR_DqbeKXJy4tMqAcA18BeY,22577
@@ -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-10.5.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_pulse-10.5.0.dist-info/METADATA,sha256=OX4WSttR9H1QqVOJZKY17yG5x-7EkPZCal6L8z9s-gA,14551
-iqm_pulse-10.5.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulse-10.5.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulse-10.5.0.dist-info/RECORD,,
+iqm_pulse-11.1.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_pulse-11.1.0.dist-info/METADATA,sha256=kEcGLtU-Lxe7qpYcX0EPV_B0eKs4wKWiFzv4JXIaQKU,14551
+iqm_pulse-11.1.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulse-11.1.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulse-11.1.0.dist-info/RECORD,,