iqm-pulla 9.0.0__py3-none-any.whl → 9.2.0__py3-none-any.whl

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/utils_qiskit.py

@@ -19,6 +19,7 @@ from collections import Counter
 from collections.abc import Collection, Sequence
 from typing import TYPE_CHECKING
 
+from iqm.iqm_client import Circuit
 from iqm.qiskit_iqm.iqm_backend import IQMBackendBase
 from iqm.qiskit_iqm.iqm_job import IQMJob
 from iqm.qiskit_iqm.qiskit_to_iqm import serialize_instructions
@@ -32,7 +33,7 @@ from iqm.pulla.interface import StationControlResult, TaskStatus
 from iqm.pulse.builder import CircuitOperation
 
 if TYPE_CHECKING:
-    from iqm.iqm_client import Circuit, Instruction
+    from iqm.iqm_client import Instruction
     from iqm.qiskit_iqm.iqm_backend import DynamicQuantumArchitecture
     from iqm.qiskit_iqm.iqm_provider import IQMBackend
 
@@ -137,7 +138,10 @@ def qiskit_to_pulla(
         else {m.logical_name: m.physical_name for m in run_request.qubit_mapping}
     )
 
-    circuits = [_circuit_to_dataclass(c) for c in run_request.circuits]
+    # We can be certain run_request contains only Circuit objects, because we created it
+    # right in this method with qiskit.QuantumCircuit objects
+    run_request_iqm_circuits: list[Circuit] = [c for c in run_request.circuits if isinstance(c, (Circuit))]
+    circuits = [_circuit_to_dataclass(c) for c in run_request_iqm_circuits]
     return circuits, compiler
 
 

{iqm_pulla-9.0.0.dist-info → iqm_pulla-9.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 9.0.0
+Version: 9.2.0
 Summary: Client library for pulse-level access to an IQM quantum computer
 Author-email: IQM Finland Oy <developers@meetiqm.com>
 License: Apache License
@@ -239,8 +239,8 @@ 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 <11,>=10 ; extra == 'qiskit'
-Requires-Dist: iqm-client <30,>=29 ; extra == 'qiskit'
 Requires-Dist: iqm-client[qiskit] <30,>=29 ; extra == 'qiskit'
+Requires-Dist: iqm-client <30,>=29 ; extra == 'qiskit'
 
 IQM Pulla
 #########

{iqm_pulla-9.0.0.dist-info → iqm_pulla-9.2.0.dist-info}/RECORD

@@ -18,11 +18,11 @@ iqm/pulla/quantum_architecture.py,sha256=mJH9e9fdkblg6LrgN7qd-Ui3Igawf-hGd2Z7Zcl
 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_qiskit.py,sha256=SyL9zz9xZ3mEi8t5uJVLxe3ipgNf4REZURMJQRr2E-E,10108
-iqm_pulla-9.0.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
-iqm_pulla-9.0.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
-iqm_pulla-9.0.0.dist-info/METADATA,sha256=wsZmPqqyjRETlQueBlE2PwvYWFORj1q65YEgjpGk77c,17695
-iqm_pulla-9.0.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulla-9.0.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulla-9.0.0.dist-info/RECORD,,
+iqm/pulla/utils_qir.py,sha256=c4LiKdUnHZSQsI4fzc2wp59-qIH1s2sTyfBEf0MTxkk,11495
+iqm/pulla/utils_qiskit.py,sha256=RBrAf_KbxlL8DI078mtN8nK1pdfAbd4yk7DJSZVEFSs,10397
+iqm_pulla-9.2.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
+iqm_pulla-9.2.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
+iqm_pulla-9.2.0.dist-info/METADATA,sha256=H-mXVSGK33mzcRzM-y15wgG4udI1mSU8rGssI8koGxk,17695
+iqm_pulla-9.2.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulla-9.2.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulla-9.2.0.dist-info/RECORD,,