Fix bugs

Fix bugs

Fix bugs

Fix bugs

Author: Liu Keyu

src/mqt/predictor/rl/actions.py

@@ -50,7 +50,6 @@
 from qiskit.transpiler import CouplingMap
 from qiskit.transpiler.passes import (
     ApplyLayout,
-    BasicSwap,
     BasisTranslator,
     Collect2qBlocks,
     CollectCliffords,
@@ -125,6 +124,7 @@ class Action:
     pass_type: PassType
     transpile_pass: (
         list[qiskit_BasePass | tket_BasePass]
+        | Callable[..., list[Any]]
         | Callable[..., list[qiskit_BasePass | tket_BasePass]]
         | Callable[
             ...,
@@ -144,7 +144,8 @@ class DeviceDependentAction(Action):
     """Action that represents a device-specific compilation pass that can be applied to a specific device."""
 
     transpile_pass: (
-        Callable[..., list[qiskit_BasePass | tket_BasePass]]
+        Callable[..., list[Any]]
+        | Callable[..., list[qiskit_BasePass | tket_BasePass]]
         | Callable[
             ...,
             Callable[..., tuple[Any, ...] | Circuit],
@@ -466,7 +467,7 @@ def get_openqasm_gates() -> list[str]:
 
 register_action(
     DeviceDependentAction(
-        "SabreLayout+BasicSwap",
+        "SabreLayout+AIRouting",
         CompilationOrigin.QISKIT,
         PassType.MAPPING,
         stochastic=True,
@@ -482,26 +483,19 @@ def get_openqasm_gates() -> list[str]:
             FullAncillaAllocation(coupling_map=CouplingMap(device.build_coupling_map())),
             EnlargeWithAncilla(),
             ApplyLayout(),
-            BasicSwap(coupling_map=CouplingMap(device.build_coupling_map())),
+            SafeAIRouting(coupling_map=device.build_coupling_map(), optimization_level=3, layout_mode="improve"),
         ],
     )
 )
 
 register_action(
     DeviceDependentAction(
-        "SabreLayout+AIRouting",
+        "AIRouting",
         CompilationOrigin.QISKIT,
         PassType.MAPPING,
         stochastic=True,
-        transpile_pass=lambda device, max_iteration=(20, 20): [
-            SabreLayout(
-                coupling_map=CouplingMap(device.build_coupling_map()),
-                skip_routing=True,
-                layout_trials=max_iteration[0],
-                swap_trials=max_iteration[1],
-                max_iterations=4,
-                seed=None,
-            ),
+        transpile_pass=lambda device: [
+            TrivialLayout(coupling_map=CouplingMap(device.build_coupling_map())),
             FullAncillaAllocation(coupling_map=CouplingMap(device.build_coupling_map())),
             EnlargeWithAncilla(),
             ApplyLayout(),
@@ -532,20 +526,6 @@ def get_openqasm_gates() -> list[str]:
     )
 )
 
-register_action(
-    DeviceDependentAction(
-        name="DenseLayout+BasicSwap",
-        origin=CompilationOrigin.QISKIT,
-        pass_type=PassType.MAPPING,
-        transpile_pass=lambda device: [
-            DenseLayout(coupling_map=CouplingMap(device.build_coupling_map())),
-            FullAncillaAllocation(coupling_map=CouplingMap(device.build_coupling_map())),
-            EnlargeWithAncilla(),
-            ApplyLayout(),
-            BasicSwap(coupling_map=CouplingMap(device.build_coupling_map())),
-        ],
-    )
-)
 
 register_action(
     DeviceDependentAction(
@@ -579,45 +559,11 @@ def get_openqasm_gates() -> list[str]:
             FullAncillaAllocation(coupling_map=CouplingMap(device.build_coupling_map())),
             EnlargeWithAncilla(),
             ApplyLayout(),
-            SafeAIRouting(coupling_map=device.build_coupling_map(), optimization_level=3, layout_mode="optimize"),
+            SafeAIRouting(coupling_map=device.build_coupling_map(), optimization_level=3, layout_mode="improve"),
         ],
     )
 )
 
-register_action(
-    DeviceDependentAction(
-        name="VF2Layout+BasicSwap",
-        origin=CompilationOrigin.QISKIT,
-        pass_type=PassType.MAPPING,
-        transpile_pass=lambda device: [
-            VF2Layout(
-                coupling_map=CouplingMap(device.build_coupling_map()),
-                target=device,
-            ),
-            ConditionalController(
-                [
-                    FullAncillaAllocation(coupling_map=CouplingMap(device.build_coupling_map())),
-                    EnlargeWithAncilla(),
-                    ApplyLayout(),
-                ],
-                condition=lambda property_set: property_set["VF2Layout_stop_reason"]
-                == VF2LayoutStopReason.SOLUTION_FOUND,
-            ),
-            ConditionalController(
-                [
-                    TrivialLayout(coupling_map=CouplingMap(device.build_coupling_map())),
-                    FullAncillaAllocation(coupling_map=CouplingMap(device.build_coupling_map())),
-                    EnlargeWithAncilla(),
-                    ApplyLayout(),
-                ],
-                # Run if VF2Layout did not find a solution
-                condition=lambda property_set: property_set["VF2Layout_stop_reason"]
-                != VF2LayoutStopReason.SOLUTION_FOUND,
-            ),
-            BasicSwap(coupling_map=CouplingMap(device.build_coupling_map())),
-        ],
-    )
-)
 
 register_action(
     DeviceDependentAction(
@@ -691,7 +637,7 @@ def get_openqasm_gates() -> list[str]:
                 condition=lambda property_set: property_set["VF2Layout_stop_reason"]
                 != VF2LayoutStopReason.SOLUTION_FOUND,
             ),
-            SafeAIRouting(coupling_map=device.build_coupling_map(), optimization_level=3, layout_mode="optimize"),
+            SafeAIRouting(coupling_map=device.build_coupling_map(), optimization_level=3, layout_mode="improve"),
         ],
     )
 )

src/mqt/predictor/rl/predictorenv.py

@@ -188,6 +188,7 @@ def step(self, action: int) -> tuple[dict[str, Any], float, bool, bool, dict[Any
             RuntimeError: If no valid actions are left.
         """
         self.used_actions.append(str(self.action_set[action].name))
+        logger.info(f"Applying: {self.action_set[action].name!s}")
         altered_qc = self.apply_action(action)
         if not altered_qc:
             return (
@@ -377,9 +378,9 @@ def metric_fn(circ: QuantumCircuit) -> float:
                 pm = PassManager(transpile_pass)
                 altered_qc = pm.run(self.state)
                 pm_property_set = dict(pm.property_set) if hasattr(pm, "property_set") else {}
-                if action_index in (self.actions_mapping_indices + self.actions_final_optimization_indices):
-                    pm_property_set = dict(pm.property_set)
-                    altered_qc = self._handle_qiskit_layout_postprocessing(action, pm_property_set, altered_qc)
+        if action_index in (self.actions_mapping_indices + self.actions_final_optimization_indices):
+            pm_property_set = dict(pm.property_set)
+            altered_qc = self._handle_qiskit_layout_postprocessing(action, pm_property_set, altered_qc)
 
         return altered_qc
 
@@ -466,7 +467,7 @@ def _apply_bqskit_action(self, action: Action, action_index: int) -> QuantumCirc
 
     def determine_valid_actions_for_state(self) -> list[int]:
         """Determines and returns the valid actions for the current state."""
-        check_nat_gates = GatesInBasis(target=self.device)
+        check_nat_gates = GatesInBasis(basis_gates=self.device.operation_names)
         check_nat_gates(self.state)
         only_nat_gates = check_nat_gates.property_set["all_gates_in_basis"]
 
@@ -477,7 +478,7 @@ def determine_valid_actions_for_state(self) -> list[int]:
         if not only_nat_gates:  # not native gates yet
             return self.actions_synthesis_indices + self.actions_opt_indices
 
-        if mapped and self.layout is not None:  # The circuit is correctly mapped.
+        if mapped and self.layout is not None:  # The circuit is correctly mapped
             return [self.action_terminate_index, *self.actions_opt_indices, *self.actions_final_optimization_indices]
         # The circuit is not mapped yet
         # Or the circuit was mapped but some optimization actions change its structure and the circuit is again unmapped

tests/compilation/test_predictor_rl.py

@@ -37,7 +37,7 @@ def test_predictor_env_reset_from_string() -> None:
     device = get_device("ibm_eagle_127")
     predictor = Predictor(figure_of_merit="expected_fidelity", device=device)
     qasm_path = Path("test.qasm")
-    qc = get_benchmark("dj", BenchmarkLevel.ALG, 3)
+    qc = get_benchmark("dj", BenchmarkLevel.INDEP, 3)
     with qasm_path.open("w", encoding="utf-8") as f:
         dump(qc, f)
     assert predictor.env.reset(qc=qasm_path)[0] == create_feature_dict(qc)
@@ -69,7 +69,7 @@ def test_qcompile_with_newly_trained_models() -> None:
     """
     figure_of_merit = "expected_fidelity"
     device = get_device("ibm_falcon_127")
-    qc = get_benchmark("ghz", BenchmarkLevel.ALG, 3)
+    qc = get_benchmark("ghz", BenchmarkLevel.INDEP, 3)
     predictor = Predictor(figure_of_merit=figure_of_merit, device=device)
 
     model_name = "model_" + figure_of_merit + "_" + device.description
@@ -95,7 +95,7 @@ def test_qcompile_with_newly_trained_models() -> None:
 
 def test_qcompile_with_false_input() -> None:
     """Test the qcompile function with false input."""
-    qc = get_benchmark("dj", BenchmarkLevel.ALG, 5)
+    qc = get_benchmark("dj", BenchmarkLevel.INDEP, 5)
     with pytest.raises(ValueError, match=re.escape("figure_of_merit must not be None if predictor_singleton is None.")):
         rl_compile(qc, device=get_device("quantinuum_h2_56"), figure_of_merit=None)
     with pytest.raises(ValueError, match=re.escape("device must not be None if predictor_singleton is None.")):