fix: refactor assert funcs

src/qibo/transpiler/placer.py

@@ -9,7 +9,7 @@
 from qibo.transpiler._exceptions import PlacementError
 from qibo.transpiler.abstract import Placer, Router
 from qibo.transpiler.router import _find_connected_qubit
-from qibo.transpiler.utils import assert_placement
+from qibo.transpiler.utils import assert_placement, assert_qubit_match
 
 
 def _find_gates_qubits_pairs(circuit: Circuit):
@@ -66,7 +66,7 @@ def __call__(self, circuit: Circuit):
             circuit (:class:`qibo.models.circuit.Circuit`): The original Qibo circuit to transform.
                 Only single qubit gates and two qubits gates are supported by the router.
         """
-
+        assert_qubit_match(circuit, self.connectivity)
         middle_qubit_idx = circuit.wire_names.index(self.middle_qubit)
         wire_names = circuit.wire_names.copy()
 
@@ -109,6 +109,7 @@ def __call__(self, circuit: Circuit = None):
         Args:
             circuit (:class:`qibo.models.circuit.Circuit`): circuit to be transpiled.
         """
+        assert_qubit_match(circuit, self.connectivity)
         return
 
 
@@ -131,6 +132,7 @@ def __call__(self, circuit: Circuit):
         Args:
             circuit (:class:`qibo.models.circuit.Circuit`): circuit to be transpiled.
         """
+        assert_qubit_match(circuit, self.connectivity)
         if isinstance(self.initial_map, dict):
             circuit.wire_names = sorted(self.initial_map, key=self.initial_map.get)
         elif isinstance(self.initial_map, list):
@@ -162,6 +164,7 @@ def __call__(self, circuit: Circuit):
         Args:
             circuit (:class:`qibo.models.circuit.Circuit`): circuit to be transpiled.
         """
+        assert_qubit_match(circuit, self.connectivity)
         gates_qubits_pairs = _find_gates_qubits_pairs(circuit)
         if len(gates_qubits_pairs) < 3:
             raise_error(
@@ -220,6 +223,7 @@ def __call__(self, circuit):
         Args:
             circuit (:class:`qibo.models.circuit.Circuit`): Circuit to be transpiled.
         """
+        assert_qubit_match(circuit, self.connectivity)
         _, local_state = _check_backend_and_local_state(self.seed, backend=None)
         gates_qubits_pairs = _find_gates_qubits_pairs(circuit)
         nodes = self.connectivity.number_of_nodes()
@@ -305,6 +309,7 @@ def __call__(self, circuit: Circuit):
         Args:
             circuit (:class:`qibo.models.circuit.Circuit`): circuit to be transpiled.
         """
+        assert_qubit_match(circuit, self.connectivity)
         self.routing_algorithm.connectivity = self.connectivity
         new_circuit = self._assemble_circuit(circuit)
         self._routing_step(new_circuit)

src/qibo/transpiler/router.py

@@ -11,6 +11,7 @@
 from qibo.transpiler._exceptions import ConnectivityError
 from qibo.transpiler.abstract import Router
 from qibo.transpiler.blocks import Block, CircuitBlocks
+from qibo.transpiler.utils import assert_qubit_match
 
 
 class StarConnectivityRouter(Router):
@@ -48,7 +49,7 @@ def __call__(self, circuit: Circuit):
             circuit (:class:`qibo.models.circuit.Circuit`): The original Qibo circuit to transform.
                 Only single qubit gates and two qubits gates are supported by the router.
         """
-
+        assert_qubit_match(circuit, self.connectivity)
         middle_qubit_idx = circuit.wire_names.index(self.middle_qubit)
         nqubits = circuit.nqubits
         new = Circuit(nqubits=nqubits, wire_names=circuit.wire_names)
@@ -334,6 +335,7 @@ def __call__(self, circuit: Circuit):
             (:class:`qibo.models.circuit.Circuit`, dict): circut mapped to hardware topology,
                 and final physical-to-logical qubit mapping.
         """
+        assert_qubit_match(circuit, self.connectivity)
         self._preprocessing(circuit=circuit)
         while self._dag.number_of_nodes() != 0:
             execute_block_list = self._check_execution()
@@ -624,6 +626,7 @@ def __call__(self, circuit: Circuit):
         Returns:
             (:class:`qibo.models.circuit.Circuit`, dict): routed circuit and final layout.
         """
+        assert_qubit_match(circuit, self.connectivity)
         self._preprocessing(circuit=circuit)
         longest_path = np.max(self._dist_matrix)
 

src/qibo/transpiler/utils.py

@@ -18,6 +18,20 @@
 from qibo.transpiler.unroller import NativeGates
 
 
+def assert_qubit_match(circuit: Circuit, connectivity: nx.Graph):
+    """Check if the number of qubits in the circuit matches the connectivity graph.
+
+    Args:
+        circuit (:class:`qibo.models.circuit.Circuit`): Circuit model to check.
+        connectivity (:class:`networkx.Graph`): Chip connectivity.
+    """
+    if circuit.nqubits != len(connectivity.nodes):
+        raise_error(
+            TranspilerPipelineError,
+            "Number of qubits in the circuit does not match the connectivity graph.",
+        )
+
+
 def assert_transpiling(
     original_circuit: Circuit,
     transpiled_circuit: Circuit,

tests/test_transpiler_pipeline.py

@@ -85,38 +85,6 @@ def test_pipeline_default(ngates, names, star_connectivity):
     )
 
 
-def test_assert_circuit_equivalence_equal():
-    circ1 = Circuit(2)
-    circ2 = Circuit(2)
-    circ1.add(gates.X(0))
-    circ1.add(gates.CZ(0, 1))
-    circ2.add(gates.X(0))
-    circ2.add(gates.CZ(0, 1))
-    final_map = {0: 0, 1: 1}
-    assert_circuit_equivalence(circ1, circ2, final_map=final_map)
-
-
-def test_assert_circuit_equivalence_swap():
-    circ1 = Circuit(2)
-    circ2 = Circuit(2)
-    circ1.add(gates.X(0))
-    circ2.add(gates.SWAP(0, 1))
-    circ2.add(gates.X(1))
-    final_map = {0: 1, 1: 0}
-    assert_circuit_equivalence(circ1, circ2, final_map=final_map)
-
-
-def test_assert_circuit_equivalence_false():
-    circ1 = Circuit(2)
-    circ2 = Circuit(2)
-    circ1.add(gates.X(0))
-    circ2.add(gates.SWAP(0, 1))
-    circ2.add(gates.X(1))
-    final_map = {0: 0, 1: 1}
-    with pytest.raises(TranspilerPipelineError):
-        assert_circuit_equivalence(circ1, circ2, final_map=final_map)
-
-
 def test_int_qubit_names_default(star_connectivity):
     names = [1244, 1532, 2315, 6563, 8901]
     circ = Circuit(5, wire_names=names)

tests/test_transpiler_placer.py

@@ -3,7 +3,7 @@
 
 from qibo import gates
 from qibo.models import Circuit
-from qibo.transpiler._exceptions import PlacementError
+from qibo.transpiler._exceptions import PlacementError, TranspilerPipelineError
 from qibo.transpiler.pipeline import restrict_connectivity_qubits
 from qibo.transpiler.placer import (
     Custom,
@@ -15,7 +15,7 @@
     _find_gates_qubits_pairs,
 )
 from qibo.transpiler.router import ShortestPaths
-from qibo.transpiler.utils import assert_mapping_consistency, assert_placement
+from qibo.transpiler.utils import assert_placement
 
 
 def star_circuit(names=["q0", "q1", "q2", "q3", "q4"]):
@@ -25,56 +25,6 @@ def star_circuit(names=["q0", "q1", "q2", "q3", "q4"]):
     return circuit
 
 
-def test_assert_placement_true(star_connectivity):
-    circuit = Circuit(5)
-    assert_placement(circuit, connectivity=star_connectivity())
-
-
-@pytest.mark.parametrize(
-    "qubits, names", [(5, ["A", "B", "C", "D", "F"]), (3, ["A", "B", "C"])]
-)
-def test_assert_placement_false(qubits, names, star_connectivity):
-    connectivity = star_connectivity()
-    circuit = Circuit(qubits, wire_names=names)
-    with pytest.raises(PlacementError):
-        assert_placement(circuit, connectivity)
-
-
-@pytest.mark.parametrize("qubits", [10, 1])
-def test_assert_placement_error(qubits, star_connectivity):
-    connectivity = star_connectivity()
-    circuit = Circuit(qubits)
-    with pytest.raises(PlacementError):
-        assert_placement(circuit, connectivity)
-
-
-@pytest.mark.parametrize("names", [["A", "B", "C", "D", "E"], [0, 1, 2, 3, 4]])
-def test_mapping_consistency(names, star_connectivity):
-    assert_mapping_consistency(names, star_connectivity(names))
-
-
-def test_mapping_consistency_error(star_connectivity):
-    with pytest.raises(PlacementError):
-        assert_mapping_consistency(["A", "B", "C", "D", "F"], star_connectivity())
-
-
-@pytest.mark.parametrize("names", [["A", "B", "C", "D", "E"], [0, 1, 2, 3, 4]])
-def test_mapping_consistency_restricted(names, star_connectivity):
-    connectivity = star_connectivity(names)
-    on_qubit = [names[0], names[2]]
-    restricted_connectivity = restrict_connectivity_qubits(connectivity, on_qubit)
-    assert_mapping_consistency(on_qubit, restricted_connectivity)
-
-
-@pytest.mark.parametrize("names", [["A", "B", "C", "D", "E"], [0, 1, 2, 3, 4]])
-def test_mapping_consistency_restricted_error(names, star_connectivity):
-    connectivity = star_connectivity(names)
-    on_qubit = [names[0], names[2]]
-    restricted_connectivity = restrict_connectivity_qubits(connectivity, on_qubit)
-    with pytest.raises(PlacementError):
-        assert_mapping_consistency([names[3], names[4]], restricted_connectivity)
-
-
 def test_gates_qubits_pairs():
     circuit = Circuit(5)
     circuit.add(gates.CNOT(0, 1))
@@ -152,7 +102,7 @@ def test_custom_error_circuit(star_connectivity):
     custom_layout = [4, 3, 2, 1, 0]
     connectivity = star_connectivity(names=custom_layout)
     placer = Custom(connectivity=connectivity, initial_map=custom_layout)
-    with pytest.raises(ValueError):
+    with pytest.raises(TranspilerPipelineError):
         placer(circuit)
 
 

tests/test_transpiler_router.py

@@ -93,25 +93,6 @@ def matched_circuit(names):
     return circuit
 
 
-def test_assert_connectivity(star_connectivity):
-    names = ["A", "B", "C", "D", "E"]
-    assert_connectivity(star_connectivity(names), matched_circuit(names))
-
-
-def test_assert_connectivity_false(star_connectivity):
-    circuit = Circuit(5)
-    circuit.add(gates.CZ(0, 1))
-    with pytest.raises(ConnectivityError):
-        assert_connectivity(star_connectivity(), circuit)
-
-
-def test_assert_connectivity_3q(star_connectivity):
-    circuit = Circuit(5)
-    circuit.add(gates.TOFFOLI(0, 1, 2))
-    with pytest.raises(ConnectivityError):
-        assert_connectivity(star_connectivity(), circuit)
-
-
 def test_bell_state_3q():
     circuit = Circuit(3)
     circuit.add(gates.H(0))
@@ -407,7 +388,7 @@ def test_sabre_matched(names, star_connectivity):
     connectivity = star_connectivity(names=names)
     circuit = matched_circuit(names)
     original_circuit = circuit.copy()
-    placer = Trivial()
+    placer = Trivial(connectivity=connectivity)
     router = Sabre(connectivity=connectivity)
 
     placer(circuit)
@@ -428,7 +409,7 @@ def test_sabre_simple(seed, star_connectivity):
     circ = Circuit(5)
     circ.add(gates.CZ(0, 1))
     original_circuit = circ.copy()
-    placer = Trivial()
+    placer = Trivial(connectivity=connectivity)
     router = Sabre(connectivity=connectivity, seed=seed)
 
     placer(circ)
@@ -506,10 +487,11 @@ def test_sabre_random_circuits_grid(
 
 
 def test_sabre_memory_map(star_connectivity):
-    placer = Trivial()
+    connectivity = star_connectivity()
+    placer = Trivial(connectivity=connectivity)
     layout_circ = Circuit(5)
     placer(layout_circ)
-    router = Sabre(connectivity=star_connectivity())
+    router = Sabre(connectivity=connectivity)
     router._preprocessing(circuit=star_circuit())
     router._memory_map = [[1, 0, 2, 3, 4]]
     value = router._compute_cost((0, 1))
@@ -554,7 +536,7 @@ def test_restrict_qubits(router_algorithm, star_connectivity):
 
 
 def test_star_error_multi_qubit(star_connectivity):
-    circuit = Circuit(3)
+    circuit = Circuit(5)
     circuit.add(gates.TOFFOLI(0, 1, 2))
     connectivity = star_connectivity(middle_qubit_idx=2)
     transpiler = StarConnectivityRouter(connectivity)

tests/test_transpiler_unitary_decompositions.py

@@ -3,7 +3,6 @@
 from scipy.linalg import expm
 
 from qibo import Circuit, gates, matrices
-from qibo.config import PRECISION_TOL
 from qibo.quantum_info.linalg_operations import partial_trace
 from qibo.quantum_info.metrics import purity
 from qibo.quantum_info.random_ensembles import random_unitary

tests/test_transpiler_unroller.py

@@ -39,36 +39,6 @@ def test_translate_gate_error_2q():
         translate_gate(gates.CZ(0, 1), natives)
 
 
-def test_assert_decomposition():
-    circuit = Circuit(2)
-    circuit.add(gates.CZ(0, 1))
-    circuit.add(gates.Z(0))
-    circuit.add(gates.M(1))
-    assert_decomposition(circuit, native_gates=NativeGates.default())
-
-
-def test_assert_decomposition_fail_1q():
-    circuit = Circuit(1)
-    circuit.add(gates.X(0))
-    with pytest.raises(DecompositionError):
-        assert_decomposition(circuit, native_gates=NativeGates.default())
-
-
-@pytest.mark.parametrize("gate", [gates.CNOT(0, 1), gates.iSWAP(0, 1)])
-def test_assert_decomposition_fail_2q(gate):
-    circuit = Circuit(2)
-    circuit.add(gate)
-    with pytest.raises(DecompositionError):
-        assert_decomposition(circuit, native_gates=NativeGates.default())
-
-
-def test_assert_decomposition_fail_3q():
-    circuit = Circuit(3)
-    circuit.add(gates.TOFFOLI(0, 1, 2))
-    with pytest.raises(DecompositionError):
-        assert_decomposition(circuit, native_gates=NativeGates.default())
-
-
 @pytest.mark.parametrize(
     "natives_2q",
     [NativeGates.CZ, NativeGates.iSWAP, NativeGates.CZ | NativeGates.iSWAP],