iqm-pulla 11.14.1__py3-none-any.whl → 11.16.2__py3-none-any.whl

iqm/cpc/compiler/dd.py

@@ -19,7 +19,11 @@ import math
 
 from iqm.cpc.compiler.errors import ClientError
 from iqm.cpc.interface.compiler import DDStrategy, PRXSequence
-from iqm.pulla.utils import InstructionLocation, locate_instructions, replace_instruction_in_place
+from iqm.pulla.utils import (
+    InstructionLocation,
+    locate_instructions,
+    replace_instruction_in_place,
+)
 from iqm.pulse.builder import ScheduleBuilder
 from iqm.pulse.gate_implementation import GateImplementation
 from iqm.pulse.playlist.instructions import Instruction, Wait
@@ -193,10 +197,11 @@ def _find_wait_instructions_on_channels(
 
     for wait in all_waits:
         # Check if leading and/or trailing instruction should be excluded
-        if skip_leading_wait and wait.index == 0:
+        if skip_leading_wait and wait.index == 1:
             continue
-        last_index = len(schedule[wait.channel_name]) - 1
-        if skip_trailing_wait and wait.index == last_index:
+        if skip_trailing_wait and wait.index == len(schedule[wait.channel_name]) - 3:  # third last index
+            continue
+        if skip_trailing_wait and wait.index == len(schedule[wait.channel_name]) - 1:  # last index
             continue
         filtered_waits.append(wait)
 
@@ -490,7 +495,7 @@ def insert_dd_sequences(
     dd_sequences: list[tuple[int, PRXSequence, str]] = [
         (
             ratio,
-            _gate_pattern_to_prx_sequence(pattern) if isinstance(pattern, str) else pattern,
+            (_gate_pattern_to_prx_sequence(pattern) if isinstance(pattern, str) else pattern),
             alignment,
         )
         for ratio, pattern, alignment in dd_sequences_sorted

iqm/cpc/compiler/station_settings.py

@@ -176,6 +176,17 @@ _per_qubit = (
         "controllers.{}.drive.awg.center_frequency",
         required=False,
     ),  # ZI SHFSG
+    Map(
+        Parameter("", "Local oscillator power for drive mixer", "dBm"),
+        "controllers.{}.drive.local_oscillator.power",
+        required=False,
+    ),  # ZI HDAWG
+    # NOTE: For SHFSG, the unit of the output_range setting is in fact "dBm"
+    Map(
+        Parameter("", "Drive AWG output range", "V"),
+        "controllers.{}.drive.awg.output_range",
+        required=False,
+    ),  # HDAWG, SHFSG
     Map(Parameter("", "Trigger delay for drive AWG", "s"), "controllers.{}.drive.awg.trigger_delay", required=False),
 )
 
@@ -191,6 +202,11 @@ _per_flux_pulsed_qubit = {
         "controllers.{}.flux.awg.precompensation.amplitudes",
         required=False,
     ),
+    Map(
+        Parameter("", "Flux AWG output range", "V"),
+        "controllers.{}.flux.awg.output_range",
+        required=False,
+    ),  # HDAWG, Oceanus
     Map(Parameter("", "Trigger delay for flux AWG", "s"), "controllers.{}.flux.awg.trigger_delay", required=False),
 }
 
@@ -207,6 +223,11 @@ _per_coupler = (
         "controllers.{}.flux.awg.precompensation.amplitudes",
         required=False,
     ),
+    Map(
+        Parameter("", "Flux AWG output range", "V"),
+        "controllers.{}.flux.awg.output_range",
+        required=False,
+    ),  # HDAWG, Oceanus
     Map(Parameter("", "Trigger delay for flux AWG", "s"), "controllers.{}.flux.awg.trigger_delay", required=False),
 )
 
@@ -218,12 +239,42 @@ _per_probe_line = (
     Map(Parameter("", "TWPA bias voltage_2", "V"), "controllers.{}.twpa.voltage_2", required=False),
     Map(Parameter("", "Frequency of the LO driving the TWPA", "Hz"), "controllers.{}.twpa.frequency", required=False),
     Map(Parameter("", "Power of the LO driving the TWPA", "dBm"), "controllers.{}.twpa.power", required=False),
+    Map(
+        Parameter("", "Local oscillator frequency for the readout", "Hz"),
+        "controllers.{}.readout.local_oscillator.frequency",
+        required=False,
+    ),  # UHFQA
+    Map(
+        Parameter("", "Local oscillator power for the readout", "dBm"),
+        "controllers.{}.readout.local_oscillator.power",
+        required=False,
+    ),  # UHFQA
     # Center frequency must be within the AWG IF bandwidth from every <qubit>.readout.frequency
     Map(
         Parameter("", "Probe line center frequency", "Hz"),
         "controllers.{}.readout.center_frequency",
         required=True,
     ),
+    Map(
+        Parameter("", "Readout output range", "dBm"),
+        "controllers.{}.readout.output_range",
+        required=False,
+    ),  # UHFQA, SHFQA
+    Map(
+        Parameter("", "Readout input range", "dBm"),
+        "controllers.{}.readout.input_range",
+        required=False,
+    ),  # UHFQA, SHFQA
+    Map(
+        Parameter("", "Readout attenuation out", "dB"),
+        "controllers.{}.readout.attenuation_out",
+        required=False,
+    ),  # Athene
+    Map(
+        Parameter("", "Readout attenuation in", "dB"),
+        "controllers.{}.readout.attenuation_in",
+        required=False,
+    ),  # Athene
     Map(
         Parameter("", "Trigger delay for readout instrument", "s"),
         "controllers.{}.readout.trigger_delay",

iqm/pulla/utils.py

@@ -18,6 +18,7 @@ from collections import namedtuple
 from collections.abc import Hashable, Iterable, Iterator, Sequence, Set
 from dataclasses import replace
 from itertools import chain
+import logging
 from typing import Any, TypeAlias
 
 import numpy as np
@@ -47,6 +48,8 @@ from iqm.pulse.timebox import TimeBox
 from iqm.station_control.client.qon import locus_str_to_locus
 from iqm.station_control.interface.models.observation import ObservationBase
 
+logger = logging.getLogger(__name__)
+
 _CircuitMeasurementResultsNew: TypeAlias = dict[str, np.ndarray]
 """Measurement results from a single circuit/schedule. For each measurement operation in the circuit,
 maps the measurement key to an array of results, where the first dimension correspond to shots,
@@ -54,6 +57,10 @@ and the second dimension to the qubits measured in the measurement operation."""
 # TODO should replace CircuitMeasurementResults in the API
 
 
+class PostSelectionError(Exception):
+    """Error in performing post selection via heralded results"""
+
+
 def circuit_operations_to_cpc(circ_ops: tuple[CircuitOperation], name: str | None = None) -> CPC_Circuit:
     """Convert a list of CircuitOperations to an IQM CPC Circuit.
 
@@ -174,11 +181,18 @@ def convert_sweep_spot_to_arrays(
         Converted measurement results for each circuit in the batch.
 
     """
+
+    def _fix_typing(arr: np.ndarray) -> np.ndarray:
+        """Cast thresholded (int) results into np.uint8"""
+        if np.iscomplex(arr).any():
+            return arr
+        return arr.astype(np.uint8)
+
     num_triggers_for_label, labels_for_circuit = _get_trigger_indexing_for(readout_mappings)
     first_key = next(iter(results))
     num_shots = len(results[first_key]) // num_triggers_for_label[first_key]  # num shots equal for all labels
     results = {
-        label: measurements.reshape((num_shots, num_triggers_for_label[label]))
+        label: _fix_typing(measurements.reshape((num_shots, num_triggers_for_label[label])))
         for label, measurements in results.items()
     }
     for circuit_idx, readout_mapping in enumerate(readout_mappings):
@@ -238,6 +252,9 @@ def convert_sweep_spot_to_arrays_with_heralding_mode_zero(
             the heralding measurement, , with the heralding measurement data removed.
 
     """
+    for data in results.values():
+        if np.iscomplex(data).any():
+            raise PostSelectionError("Complex readout results are not supported in post-selection.")
     num_triggers_for_label, labels_for_circuit = _get_trigger_indexing_for(readout_mappings)
     first_key = next(iter(results.keys()))
     num_shots = len(results[first_key]) // num_triggers_for_label[first_key]  # num shots equal for all labels
@@ -298,14 +315,19 @@ def map_sweep_results_to_logical_qubits(
 
     # circuit execution uses just one soft sweep spot
     results = {k: v[0] for k, v in sweep_results.items()}
-    if heralding_mode == HeraldingMode.NONE:
-        circuit_results_iter = convert_sweep_spot_to_arrays(results, readout_mappings)
-    else:
-        circuit_results_iter = convert_sweep_spot_to_arrays_with_heralding_mode_zero(results, readout_mappings)
-
-    # TODO 99% of the time in this function is spent in the tolist() converting the arrays to ints.
-    # For large datasets, it is several seconds.
-    # To rectify this, we should change CircuitMeasurementResultsBatch of the public API.
+    if heralding_mode != HeraldingMode.NONE:
+        try:
+            # TODO 99% of the time in this function is spent in the tolist() converting the arrays to ints.
+            # For large datasets, it is several seconds.
+            # To rectify this, we should change CircuitMeasurementResultsBatch of the public API.
+            circuit_results_iter = convert_sweep_spot_to_arrays_with_heralding_mode_zero(results, readout_mappings)
+            return [{mk: array.tolist() for mk, array in circuit_res.items()} for circuit_res in circuit_results_iter]
+        except PostSelectionError:
+            logger.warning(
+                "Cannot perform post-selection based on herald measurement results in complex readout mode. "
+                "Returning all results."
+            )
+    circuit_results_iter = convert_sweep_spot_to_arrays(results, readout_mappings)
     return [{mk: array.tolist() for mk, array in circuit_res.items()} for circuit_res in circuit_results_iter]
 
 

{iqm_pulla-11.14.1.dist-info → iqm_pulla-11.16.2.dist-info}/METADATA

@@ -1,22 +1,22 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 11.14.1
+Version: 11.16.2
 Summary: Client library for pulse-level access to an IQM quantum computer
 Author-email: IQM Finland Oy <developers@meetiqm.com>
 License: Apache License
                                    Version 2.0, January 2004
                                 http://www.apache.org/licenses/
-
+        
            TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
+        
            1. Definitions.
-
+        
               "License" shall mean the terms and conditions for use, reproduction,
               and distribution as defined by Sections 1 through 9 of this document.
-
+        
               "Licensor" shall mean the copyright owner or entity authorized by
               the copyright owner that is granting the License.
-
+        
               "Legal Entity" shall mean the union of the acting entity and all
               other entities that control, are controlled by, or are under common
               control with that entity. For the purposes of this definition,
@@ -24,24 +24,24 @@ License: Apache License
               direction or management of such entity, whether by contract or
               otherwise, or (ii) ownership of fifty percent (50%) or more of the
               outstanding shares, or (iii) beneficial ownership of such entity.
-
+        
               "You" (or "Your") shall mean an individual or Legal Entity
               exercising permissions granted by this License.
-
+        
               "Source" form shall mean the preferred form for making modifications,
               including but not limited to software source code, documentation
               source, and configuration files.
-
+        
               "Object" form shall mean any form resulting from mechanical
               transformation or translation of a Source form, including but
               not limited to compiled object code, generated documentation,
               and conversions to other media types.
-
+        
               "Work" shall mean the work of authorship, whether in Source or
               Object form, made available under the License, as indicated by a
               copyright notice that is included in or attached to the work
               (an example is provided in the Appendix below).
-
+        
               "Derivative Works" shall mean any work, whether in Source or Object
               form, that is based on (or derived from) the Work and for which the
               editorial revisions, annotations, elaborations, or other modifications
@@ -49,7 +49,7 @@ License: Apache License
               of this License, Derivative Works shall not include works that remain
               separable from, or merely link (or bind by name) to the interfaces of,
               the Work and Derivative Works thereof.
-
+        
               "Contribution" shall mean any work of authorship, including
               the original version of the Work and any modifications or additions
               to that Work or Derivative Works thereof, that is intentionally
@@ -63,18 +63,18 @@ License: Apache License
               Licensor for the purpose of discussing and improving the Work, but
               excluding communication that is conspicuously marked or otherwise
               designated in writing by the copyright owner as "Not a Contribution."
-
+        
               "Contributor" shall mean Licensor and any individual or Legal Entity
               on behalf of whom a Contribution has been received by Licensor and
               subsequently incorporated within the Work.
-
+        
            2. Grant of Copyright License. Subject to the terms and conditions of
               this License, each Contributor hereby grants to You a perpetual,
               worldwide, non-exclusive, no-charge, royalty-free, irrevocable
               copyright license to reproduce, prepare Derivative Works of,
               publicly display, publicly perform, sublicense, and distribute the
               Work and such Derivative Works in Source or Object form.
-
+        
            3. Grant of Patent License. Subject to the terms and conditions of
               this License, each Contributor hereby grants to You a perpetual,
               worldwide, non-exclusive, no-charge, royalty-free, irrevocable
@@ -90,24 +90,24 @@ License: Apache License
               or contributory patent infringement, then any patent licenses
               granted to You under this License for that Work shall terminate
               as of the date such litigation is filed.
-
+        
            4. Redistribution. You may reproduce and distribute copies of the
               Work or Derivative Works thereof in any medium, with or without
               modifications, and in Source or Object form, provided that You
               meet the following conditions:
-
+        
               (a) You must give any other recipients of the Work or
                   Derivative Works a copy of this License; and
-
+        
               (b) You must cause any modified files to carry prominent notices
                   stating that You changed the files; and
-
+        
               (c) You must retain, in the Source form of any Derivative Works
                   that You distribute, all copyright, patent, trademark, and
                   attribution notices from the Source form of the Work,
                   excluding those notices that do not pertain to any part of
                   the Derivative Works; and
-
+        
               (d) If the Work includes a "NOTICE" text file as part of its
                   distribution, then any Derivative Works that You distribute must
                   include a readable copy of the attribution notices contained
@@ -124,14 +124,14 @@ License: Apache License
                   or as an addendum to the NOTICE text from the Work, provided
                   that such additional attribution notices cannot be construed
                   as modifying the License.
-
+        
               You may add Your own copyright statement to Your modifications and
               may provide additional or different license terms and conditions
               for use, reproduction, or distribution of Your modifications, or
               for any such Derivative Works as a whole, provided Your use,
               reproduction, and distribution of the Work otherwise complies with
               the conditions stated in this License.
-
+        
            5. Submission of Contributions. Unless You explicitly state otherwise,
               any Contribution intentionally submitted for inclusion in the Work
               by You to the Licensor shall be under the terms and conditions of
@@ -139,12 +139,12 @@ License: Apache License
               Notwithstanding the above, nothing herein shall supersede or modify
               the terms of any separate license agreement you may have executed
               with Licensor regarding such Contributions.
-
+        
            6. Trademarks. This License does not grant permission to use the trade
               names, trademarks, service marks, or product names of the Licensor,
               except as required for reasonable and customary use in describing the
               origin of the Work and reproducing the content of the NOTICE file.
-
+        
            7. Disclaimer of Warranty. Unless required by applicable law or
               agreed to in writing, Licensor provides the Work (and each
               Contributor provides its Contributions) on an "AS IS" BASIS,
@@ -154,7 +154,7 @@ License: Apache License
               PARTICULAR PURPOSE. You are solely responsible for determining the
               appropriateness of using or redistributing the Work and assume any
               risks associated with Your exercise of permissions under this License.
-
+        
            8. Limitation of Liability. In no event and under no legal theory,
               whether in tort (including negligence), contract, or otherwise,
               unless required by applicable law (such as deliberate and grossly
@@ -166,7 +166,7 @@ License: Apache License
               work stoppage, computer failure or malfunction, or any and all
               other commercial damages or losses), even if such Contributor
               has been advised of the possibility of such damages.
-
+        
            9. Accepting Warranty or Additional Liability. While redistributing
               the Work or Derivative Works thereof, You may choose to offer,
               and charge a fee for, acceptance of support, warranty, indemnity,
@@ -177,11 +177,11 @@ License: Apache License
               defend, and hold each Contributor harmless for any liability
               incurred by, or claims asserted against, such Contributor by reason
               of your accepting any such warranty or additional liability.
-
+        
            END OF TERMS AND CONDITIONS
-
+        
            APPENDIX: How to apply the Apache License to your work.
-
+        
               To apply the Apache License to your work, attach the following
               boilerplate notice, with the fields enclosed by brackets "[]"
               replaced with your own identifying information. (Don't include
@@ -190,21 +190,21 @@ License: Apache License
               file or class name and description of purpose be included on the
               same "printed page" as the copyright notice for easier
               identification within third-party archives.
-
+        
            Copyright 2025 IQM
-
+        
            Licensed under the Apache License, Version 2.0 (the "License");
            you may not use this file except in compliance with the License.
            You may obtain a copy of the License at
-
+        
                http://www.apache.org/licenses/LICENSE-2.0
-
+        
            Unless required by applicable law or agreed to in writing, software
            distributed under the License is distributed on an "AS IS" BASIS,
            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
            See the License for the specific language governing permissions and
            limitations under the License.
-
+        
 Project-URL: Documentation, https://iqm-finland.github.io/docs/iqm-pulla/
 Project-URL: Homepage, https://pypi.org/project/iqm-pulla/
 Classifier: Development Status :: 4 - Beta
@@ -239,8 +239,8 @@ Provides-Extra: qiskit
 Requires-Dist: iqm-exa-common <28,>=27 ; extra == 'qiskit'
 Requires-Dist: iqm-station-control-client <12,>=11 ; extra == 'qiskit'
 Requires-Dist: iqm-pulse <13,>=12 ; extra == 'qiskit'
-Requires-Dist: iqm-client[qiskit] <33,>=32 ; extra == 'qiskit'
 Requires-Dist: iqm-client <33,>=32 ; extra == 'qiskit'
+Requires-Dist: iqm-client[qiskit] <33,>=32 ; extra == 'qiskit'
 
 IQM Pulla
 #########

{iqm_pulla-11.14.1.dist-info → iqm_pulla-11.16.2.dist-info}/RECORD

@@ -1,14 +1,11 @@
-.DS_Store,sha256=JTD1E_E-4_5-zyGGkIiQdxhnWEwJ8wOBf7tB-DglpU4,6148
-iqm_pulla-11.14.1-py3-none-any.whl,sha256=upckuS0jJNoqlNyP2_zQ1ziEg540l1ig1HPVc-0XU-s,542
-iqm/.DS_Store,sha256=mF7utOUe3tB57CEdODAuWMsUUKZNsQkhjrBn55A0bpk,6148
 iqm/cpc/__init__.py,sha256=mml8qMgjIQcfcfumrYu2lIfl30ZPSwaN3adn8CdRd3w,1079
 iqm/cpc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/cpc/compiler/__init__.py,sha256=ieYyHzb2IyevDm5swU--rPMsh5GdUtLrw8773Cd0ens,678
 iqm/cpc/compiler/compiler.py,sha256=NRmy_G4gECUWT1916iNLsI0NMAt2Nh5ZZXtiNzAw9R8,22398
-iqm/cpc/compiler/dd.py,sha256=j4onTod24RPxRwwsM3EMBBgX4hDO0k_nW9R762AocXo,21674
+iqm/cpc/compiler/dd.py,sha256=Kf5fIZtLHT74oiVpF1vtVNN0mbrjc2KPwVJL0sSSMzE,21802
 iqm/cpc/compiler/errors.py,sha256=tz-8g1QtDvCAPmAjjCYK3FoULrazkpSTmXIvyqukaT4,1949
 iqm/cpc/compiler/standard_stages.py,sha256=wW_pvSwrth9PdTLeTunCKNhz33xPXxJ0f9K8918O1pw,34776
-iqm/cpc/compiler/station_settings.py,sha256=l4cJYcNtMar_BoChJaUbmVfpXv7liTCeLWpSv7fAipg,16903
+iqm/cpc/compiler/station_settings.py,sha256=KUq_ZswTYE4AsS6LaKXRwlPbP0jsZ0j7pH2qQv0ifrc,18621
 iqm/cpc/interface/__init__.py,sha256=mvhNx1I9K5Sg40CwPntWj35M3Bni__23PWEw_qYaXtQ,611
 iqm/cpc/interface/compiler.py,sha256=zxUyalyiBIQA9EUK_fDGNq0SZ5OwfxQdB6Xk5BDDMVk,9797
 iqm/pulla/__init__.py,sha256=fj5Qh8R9K-z6q5g9-CySBZsG8d33nU7hCHrqIIB8_-0,901
@@ -17,14 +14,14 @@ iqm/pulla/interface.py,sha256=XZ_uOWyxlZBmil5-Z02R6rZ1dsR5t43xr6oL01DAows,3614
 iqm/pulla/pulla.py,sha256=kgcyoMe9a9VvD9Y7HLvFdaQaax8vJkP_OVRd7sftvjo,16166
 iqm/pulla/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/pulla/quantum_architecture.py,sha256=jj9zqK9CcODedR69p8zLSj3qDfzIxI_f9rb8s07GKaM,6377
-iqm/pulla/utils.py,sha256=eKXEotu5xSyus4nCAc_rqPs1u3e5jdlEXxFKqrfBT_g,27720
+iqm/pulla/utils.py,sha256=gRl_IbNk_Kom9iZryHX6CjxNRIlCppBl3-ot7_766Fw,28644
 iqm/pulla/utils_cirq.py,sha256=VtdO356D2RAh2lSVdaPm3ClJ9-nvC4jzhR9hP5QSQhI,793
 iqm/pulla/utils_dd.py,sha256=SxYAuRBgvYELKjeXpFbP4mM0xCCivDk7WUHw7oEXfMo,1695
 iqm/pulla/utils_qir.py,sha256=uNEiqBczv7rX8tAqcg7TX-si0P-ZdDcPTMOVfi5eb28,11567
 iqm/pulla/utils_qiskit.py,sha256=pbb2fEJAdxqd6hW9_Qgvpvy0P2H81zTJ1QLahe4Tx6U,9482
-iqm_pulla-11.14.1.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
-iqm_pulla-11.14.1.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
-iqm_pulla-11.14.1.dist-info/METADATA,sha256=LkKzcVCjyKS5IDOXvCzQX2gLVqWrIkn02dA2L2XvYWs,17437
-iqm_pulla-11.14.1.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulla-11.14.1.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulla-11.14.1.dist-info/RECORD,,
+iqm_pulla-11.16.2.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
+iqm_pulla-11.16.2.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
+iqm_pulla-11.16.2.dist-info/METADATA,sha256=ND1mpT5jESt3Iwlf4YjgmWIdmskHOFN5O6DQluDZdnk,17701
+iqm_pulla-11.16.2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulla-11.16.2.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulla-11.16.2.dist-info/RECORD,,