Merge pull request #1419 from qiboteam/router_sabre

SABRE + CircuitMap Optimization
qiboteam · Sep 16, 2024 · 1b6eb8a · 1b6eb8a
2 parents 434989e + 24ecc7a
commit 1b6eb8a
Show file tree

Hide file tree

Showing 3 changed files with 312 additions and 206 deletions.
diff --git a/src/qibo/transpiler/placer.py b/src/qibo/transpiler/placer.py
@@ -54,7 +54,7 @@ def assert_mapping_consistency(layout: dict, connectivity: nx.Graph = None):
     ref_keys = (
         ["q" + str(i) for i in nodes] if isinstance(physical_qubits[0], str) else nodes
     )
-    if physical_qubits != ref_keys:
+    if sorted(physical_qubits) != sorted(ref_keys):
         raise_error(
             PlacementError,
             "Some physical qubits in the layout may be missing or duplicated.",
@@ -411,7 +411,6 @@ def __init__(
     ):
         self.connectivity = connectivity
         self.routing_algorithm = routing_algorithm
-        self.routing_algorithm.connectivity = connectivity
         self.depth = depth
 
     def __call__(self, circuit: Circuit):
@@ -425,6 +424,7 @@ def __call__(self, circuit: Circuit):
         """
         initial_placer = Trivial(self.connectivity)
         initial_placement = initial_placer(circuit=circuit)
+        self.routing_algorithm.connectivity = self.connectivity
         new_circuit = self._assemble_circuit(circuit)
         final_placement = self._routing_step(initial_placement, new_circuit)