Merge pull request #1090 from qiboteam/fix_natives_0.2

Propagate #1077 to 0.2

Author: Edoardo-Pedicillo

src/qibocal/auto/transpile.py

@@ -4,7 +4,9 @@
 from qibo.backends import Backend
 from qibo.transpiler.pipeline import Passes
 from qibo.transpiler.unroller import NativeGates, Unroller
+from qibolab import PulseSequence
 from qibolab._core.compilers import Compiler
+from qibolab._core.native import NativeContainer
 
 from qibocal.auto.operation import QubitId
 
@@ -109,29 +111,35 @@ def execute_transpiled_circuit(
     )
 
 
-def natives(platform):
+def natives(platform) -> dict[str, NativeContainer]:
     """
-    Return the list of native gates defined in the `platform`.
-    This function assumes the native gates to be the same for each
+    Return the dict of native gates name with the associated native container
+    defined in the `platform`. This function assumes the native gates to be the same for each
     qubit and pair.
     """
     pair = next(iter(platform.pairs))
     qubit = next(iter(platform.qubits))
-    two_qubit_natives = list(platform.natives.two_qubit[pair].model_fields)
-    single_qubit_natives = list(platform.natives.single_qubit[qubit].model_fields)
+    two_qubit_natives_container = platform.natives.two_qubit[pair]
+    single_qubit_natives_container = platform.natives.single_qubit[qubit]
+    single_qubit_natives = list(single_qubit_natives_container.model_fields)
+    two_qubit_natives = list(two_qubit_natives_container.model_fields)
     # Solve Qibo-Qibolab mismatch
     single_qubit_natives.append("RZ")
     single_qubit_natives.append("Z")
     single_qubit_natives.remove("RX12")
     single_qubit_natives.remove("RX90")
     single_qubit_natives.remove("CP")
-    new_single_natives = [REPLACEMENTS.get(i, i) for i in single_qubit_natives]
-    return new_single_natives + two_qubit_natives
+    single_qubit_natives = [REPLACEMENTS.get(x, x) for x in single_qubit_natives]
+    return {i: platform.natives.single_qubit[qubit] for i in single_qubit_natives} | {
+        i: platform.natives.two_qubit[pair] for i in two_qubit_natives
+    }
 
 
-def create_rule(native):
-    def rule(gate, native):
-        return native.ensure(gate.__class__.__name__).create_sequence()
+def create_rule(name, natives):
+    """Create rule for gate name given container natives."""
+
+    def rule(gate: gates.Gate, natives: NativeContainer) -> PulseSequence:
+        return natives.ensure(name).create_sequence()
 
     return rule
 
@@ -142,10 +150,10 @@ def set_compiler(backend, natives_):
     """
     compiler = backend.compiler
     rules = {}
-    for native in natives_:
-        gate = getattr(gates, native)
+    for name, natives_container in natives_.items():
+        gate = getattr(gates, name)
         if gate not in compiler.rules:
-            rules[gate] = create_rule(native)
+            rules[gate] = create_rule(name, natives_container)
         else:
             rules[gate] = compiler.rules[gate]
     rules[gates.I] = compiler.rules[gates.I]

tests/test_transpile.py

@@ -10,6 +10,21 @@
 )
 
 
+def test_natives():
+    backend = construct_backend("qibolab", platform="dummy")
+    transpiler = dummy_transpiler(backend)
+    assert gates.iSWAP in backend.compiler.rules
+
+    circuit = Circuit(2)
+    circuit.add(gates.iSWAP(0, 1))
+    qubit_map = [1, 2]
+    transpiled_circuit, _ = execute_transpiled_circuit(
+        circuit, qubit_map, backend, transpiler=transpiler
+    )
+    sequence, _ = backend.compiler.compile(transpiled_circuit, backend.platform)
+    assert len(sequence) == 4  # dummy compiles iSWAP in 4 pulses
+
+
 def test_padd_circuit():
     small_circuit = Circuit(2)
     small_circuit.add(gates.X(0))