iqm-pulla 8.3.0__py3-none-any.whl → 9.1.0__py3-none-any.whl

iqm/cpc/compiler/compiler.py

@@ -49,7 +49,7 @@ from iqm.pulla.utils import (
 )
 from iqm.pulse.builder import ScheduleBuilder
 from iqm.pulse.gate_implementation import GateImplementation, Locus
-from iqm.pulse.gates import register_implementation
+from iqm.pulse.gates import register_implementation, register_operation
 
 # from iqm.pulse.gates.move import apply_move_gate_phase_corrections, validate_move_instructions
 from iqm.pulse.quantum_ops import QuantumOp
@@ -323,38 +323,36 @@ class Compiler:
         self,
         op_name: str,
         impl_name: str,
-        implementation: type[GateImplementation],
+        impl_class: type[GateImplementation],
         *,
         set_as_default: bool = False,
         overwrite: bool = False,
-        quantum_op_specs: QuantumOp | dict | None = None,
+        quantum_op: QuantumOp | None = None,
     ) -> None:
-        """Adds a new implementation of a quantum operation (gate).
+        """Adds a new implementation for a quantum operation (gate).
 
         Refreshes the compiler after adding a new implementation.
 
         Args:
-            op_name: The gate name for which to register a new implementation.
-            impl_name: The "human-readable" name with which the new gate implementation will be found e.g. in settings.
-            implementation: The python class of the new gate implementation to be added.
-            set_as_default: Whether to set the new implementation as the default implementation for the gate.
-            overwrite: If True, allows replacing any existing implementation of the same name.
-            quantum_op_specs: The quantum operation this gate represents. If a QuantumOp is given, it is used as is.
+            op_name: The name of the quantum operation for which to register a new implementation.
+            impl_name: The "human-readable" name with which the new implementation will be found e.g. in settings.
+            impl_class: The class of the new implementation to be added.
+            set_as_default: Whether to set the new implementation as the default implementation for the operation.
+            overwrite: If True, replaces any existing implementation of the same name for the operation.
+            quantum_op: The quantum operation this gate represents. If a QuantumOp is given, it is used as is.
                 If None is given and the same gate has been registered before, the previously registered properties are
-                used.
-                Otherwise, the given dict values are given to the constructor of
-                :class:`~iqm.pulse.quantum_ops.QuantumOp`.
-                For any missing constructor values, some defaults suitable for a 1-QB gate are used.
+                used. Existing operations cannot be replaced or modified.
 
         """
+        if quantum_op is not None:
+            register_operation(self.builder.op_table, quantum_op)
         register_implementation(
             operations=self.builder.op_table,
-            gate_name=op_name,
+            op_name=op_name,
             impl_name=impl_name,
-            impl_class=implementation,
+            impl_class=impl_class,
             set_as_default=set_as_default,
             overwrite=overwrite,
-            quantum_op_specs=quantum_op_specs,
         )
         self._refresh()
 

iqm/pulla/utils.py

@@ -86,7 +86,7 @@ def iqm_circuit_to_gate_implementation(circuit: CPC_Circuit, qubit_mapping: dict
         # TODO This method does not heed GateImplementation.locus, and will always apply the
         # gate on fixed qubits. It just pastes ``circuit`` contents, with the qubits mapped using
         # the likewise fixed mapping, into a TimeBox.
-        registered_gates = list({instr.name for instr in circuit.instructions})
+        registered_gates = tuple({instr.name for instr in circuit.instructions})
 
         def __call__(self):
             boxes = []

iqm/pulla/utils_qir.py

@@ -34,10 +34,11 @@ from pyqir import (
     required_num_results,
     result_id,
 )
+from qiskit import QuantumCircuit
+from qiskit.providers import BackendV2
 
 from iqm.cpc.compiler.compiler import Compiler
 from iqm.cpc.interface.compiler import Circuit as CPC_Circuit
-from iqm.pulla.pulla import Pulla
 from iqm.pulse.builder import CircuitOperation
 
 qir_logger = logging.getLogger(__name__)
@@ -147,19 +148,20 @@ def _parse_double(value: str) -> float:
 
 
 def qir_to_pulla(  # noqa: PLR0915, PLR0912
-    pulla: Pulla, qir: str | bytes, qubit_mapping: dict[int, str] | None = None
+    compiler: Compiler, qir: str | bytes, qubit_mapping: dict[str, str] | None = None
 ) -> tuple[list[CPC_Circuit], Compiler]:
     """Convert a QIR module to a CPC circuit.
 
     Args:
-        pulla: The Pulla instance to get compiler from.
+        compiler: compiler to use
         qir: The QIR source or bitcode to convert to a circuit.
         qubit_mapping: A dictionary mapping QIR qubit indexes to physical qubit names,
                        None will assume opaque pointers match physical names.
 
     Returns:
         str: The QIR program name,
-        tuple[CircuitOperation, ...]: The circuit operations extracted from the QIR code.
+        tuple[list[Circuit], Compiler]:
+            Circuits extracted from the QIR module and the compiler with updated component_mapping
 
     Raises:
         ValueError: If the QIR program has more than one basic block.
@@ -240,14 +242,11 @@ def qir_to_pulla(  # noqa: PLR0915, PLR0912
     circuits = [CPC_Circuit(name=name, instructions=circuit_instructions)]
     qir_logger.debug("Converted circuit: %s", circuits)
 
-    # Create a compiler containing all the required station information
-    compiler = pulla.get_standard_compiler()
-
     if qubit_mapping:
         # QIR programs reference to qubits as opaque pointer indexes,
         # however, for example qiskit is using logical names for qubits,
         # so we need to map these indexes to physical qubit names
-        compiler.component_mapping = {f"{i}": qubit_mapping[i] for i in range(_required_num_qubits)}
+        compiler.component_mapping = {f"{i}": qubit_mapping[str(i)] for i in range(_required_num_qubits)}
     else:
         # QIR programs reference to qubits as opaque pointer indexes,
         # we expect these indexes to match physical qubit names,
@@ -256,3 +255,33 @@ def qir_to_pulla(  # noqa: PLR0915, PLR0912
         compiler.component_mapping = {f"{i}": f"QB{i + 1}" for i in range(_required_num_qubits)}
 
     return circuits, compiler
+
+
+def generate_qiskit_qir_qubit_mapping(qiskit_circuit: QuantumCircuit, qiskit_backend: BackendV2) -> dict[str, str]:
+    """qiskit-qir has a bug, which causes qubit pointers to not be generated correctly
+    according to the final_layout. So we replicate this logic here and generate a new mapping.
+    Then we assign qiskit-qir index to the qiskit logic qubit idx.
+
+    Args:
+        qiskit_circuit: Qiskit circuit to generate the mapping for.
+        qiskit_backend: Qiskit backend object to be used for qubit name generation.
+
+    Returns:
+        A dictionary mapping Qiskit qubit indices to QIR qubit pointers.
+
+    """
+    # For simplicity, reverse the mapping
+    layout_reverse_mapping = {bit: idx for idx, bit in qiskit_circuit.layout.final_layout.get_physical_bits().items()}
+    qiskit_qir_mapping: dict[int, int] = {}
+
+    # Replicate qiskit-qir logic for defining qubit pointer indices
+    for register in qiskit_circuit.qregs:
+        qiskit_qir_mapping.update(
+            {layout_reverse_mapping[bit]: n + len(qiskit_qir_mapping) for n, bit in enumerate(register)}
+        )
+
+    # In the generated QIR qubit pointers will use qiskit-qir qubit labels,
+    # but we already know how to map them to IQM physical qubits, through qiskit logical qubit indices.
+    return {
+        str(qiskit_qir_mapping[i]): str(qiskit_backend.index_to_qubit_name(i)) for i in range(qiskit_circuit.num_qubits)
+    }

{iqm_pulla-8.3.0.dist-info → iqm_pulla-9.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 8.3.0
+Version: 9.1.0
 Summary: Client library for pulse-level access to an IQM quantum computer
 Author-email: IQM Finland Oy <developers@meetiqm.com>
 License: Apache License
@@ -218,29 +218,29 @@ License-File: LICENSE.txt
 License-File: AUTHORS.rst
 Requires-Dist: iqm-exa-common <27,>=26
 Requires-Dist: iqm-station-control-client <10,>=9
-Requires-Dist: iqm-pulse <10,>=9
+Requires-Dist: iqm-pulse <11,>=10
 Requires-Dist: iqm-data-definitions <3.0,>=2.13
 Requires-Dist: pylatexenc ==2.10
 Requires-Dist: pydantic <3.0,>=2.10.4
 Provides-Extra: notebook
 Requires-Dist: iqm-exa-common <27,>=26 ; extra == 'notebook'
 Requires-Dist: iqm-station-control-client <10,>=9 ; extra == 'notebook'
-Requires-Dist: iqm-pulse <10,>=9 ; extra == 'notebook'
+Requires-Dist: iqm-pulse <11,>=10 ; extra == 'notebook'
 Requires-Dist: notebook <7,>=6.4.11 ; extra == 'notebook'
 Requires-Dist: matplotlib <4,>=3.6.3 ; extra == 'notebook'
 Requires-Dist: nbclient ~=0.5.10 ; extra == 'notebook'
 Provides-Extra: qir
 Requires-Dist: iqm-exa-common <27,>=26 ; extra == 'qir'
 Requires-Dist: iqm-station-control-client <10,>=9 ; extra == 'qir'
-Requires-Dist: iqm-pulse <10,>=9 ; extra == 'qir'
+Requires-Dist: iqm-pulse <11,>=10 ; extra == 'qir'
 Requires-Dist: iqm-pyqir ==0.12.0 ; extra == 'qir'
 Requires-Dist: iqm-qiskit-qir ==0.8.0 ; extra == 'qir'
 Provides-Extra: qiskit
 Requires-Dist: iqm-exa-common <27,>=26 ; extra == 'qiskit'
 Requires-Dist: iqm-station-control-client <10,>=9 ; extra == 'qiskit'
-Requires-Dist: iqm-pulse <10,>=9 ; extra == 'qiskit'
-Requires-Dist: iqm-client[qiskit] <30,>=29 ; extra == 'qiskit'
+Requires-Dist: iqm-pulse <11,>=10 ; extra == 'qiskit'
 Requires-Dist: iqm-client <30,>=29 ; extra == 'qiskit'
+Requires-Dist: iqm-client[qiskit] <30,>=29 ; extra == 'qiskit'
 
 IQM Pulla
 #########

{iqm_pulla-8.3.0.dist-info → iqm_pulla-9.1.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ iqm/cpc/__init__.py,sha256=qw_SFgwld1YOYYyBE-NSticm60xx5aCAw5LJJzjou8Y,1745
 iqm/cpc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/cpc/compiler/__init__.py,sha256=ieYyHzb2IyevDm5swU--rPMsh5GdUtLrw8773Cd0ens,678
 iqm/cpc/compiler/circuit_compilation_request_handler.py,sha256=Es3VoO1kOG2XHcJ5ntmT6-aMo7GiCUYkMJGILrUjkfg,4409
-iqm/cpc/compiler/compiler.py,sha256=9h1BrkGsO5VcyOCuXZd2dowHj-9fgK1Zemy5IH2YbaM,20512
+iqm/cpc/compiler/compiler.py,sha256=KsxRrpfPawZYqg3gvTYch58GXlSW8mr3p-11hejbZ_0,20383
 iqm/cpc/compiler/dd.py,sha256=j4onTod24RPxRwwsM3EMBBgX4hDO0k_nW9R762AocXo,21674
 iqm/cpc/compiler/errors.py,sha256=tz-8g1QtDvCAPmAjjCYK3FoULrazkpSTmXIvyqukaT4,1949
 iqm/cpc/compiler/standard_stages.py,sha256=W3CizQJDpxyz_4iHsQ-dxv7DxGxL_MMwOlIiiBjO6KY,33858
@@ -15,14 +15,14 @@ iqm/pulla/interface.py,sha256=yymQo4REHYcUOWgPxPYq9IixS9bBZ27LXLQgJhzET58,5400
 iqm/pulla/pulla.py,sha256=IpW6VLbpx7Qroy47sbybmNmv4jVr2fyd_zx-sdKMklA,14109
 iqm/pulla/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/pulla/quantum_architecture.py,sha256=mJH9e9fdkblg6LrgN7qd-Ui3Igawf-hGd2Z7ZclQg04,6260
-iqm/pulla/utils.py,sha256=IgppjgxeqfupDRpKXQiTvqWVoGxqbYQ9I7Sx6Cgs1Ac,24731
+iqm/pulla/utils.py,sha256=TTAOFhNW59VFAjnu6ZicmHXvp-GI_f66oh6IC1zFQKE,24732
 iqm/pulla/utils_cirq.py,sha256=8SBy6w7cr4AmnCgKwh7dBWwBGfGKxnoEMv9-1yfKs0A,777
 iqm/pulla/utils_dd.py,sha256=SxYAuRBgvYELKjeXpFbP4mM0xCCivDk7WUHw7oEXfMo,1695
-iqm/pulla/utils_qir.py,sha256=VjhUFYm71LAdcx8OUgSaKwMg_zaFQfSEIuKDP0L_8fw,10123
+iqm/pulla/utils_qir.py,sha256=c4LiKdUnHZSQsI4fzc2wp59-qIH1s2sTyfBEf0MTxkk,11495
 iqm/pulla/utils_qiskit.py,sha256=SyL9zz9xZ3mEi8t5uJVLxe3ipgNf4REZURMJQRr2E-E,10108
-iqm_pulla-8.3.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
-iqm_pulla-8.3.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
-iqm_pulla-8.3.0.dist-info/METADATA,sha256=8X4mbIS6tfjN53dK1p7T8VFLVj6zcUmEijlbyxipX2w,17691
-iqm_pulla-8.3.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulla-8.3.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulla-8.3.0.dist-info/RECORD,,
+iqm_pulla-9.1.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
+iqm_pulla-9.1.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
+iqm_pulla-9.1.0.dist-info/METADATA,sha256=9sARQGBwq1vzFWWvzDTHgOFN7ek76ZXgF95q1K_FP2M,17695
+iqm_pulla-9.1.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulla-9.1.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulla-9.1.0.dist-info/RECORD,,