Fix bugs

Author: Liu Keyu

src/mqt/predictor/rl/actions.py

@@ -495,6 +495,7 @@ def get_openqasm_gates() -> list[str]:
         PassType.MAPPING,
         stochastic=True,
         transpile_pass=lambda device: [
+            TrivialLayout(coupling_map=CouplingMap(device.build_coupling_map())),
             SafeAIRouting(coupling_map=device.build_coupling_map(), optimization_level=3, layout_mode="optimize"),
         ],
     )
@@ -649,22 +650,22 @@ def get_openqasm_gates() -> list[str]:
     )
 )
 
-# register_action(
-#     DeviceDependentAction(
-#         "BQSKitSynthesis",
-#         CompilationOrigin.BQSKIT,
-#         PassType.SYNTHESIS,
-#         transpile_pass=lambda device: lambda bqskit_circuit: bqskit_compile(
-#             bqskit_circuit,
-#             model=MachineModel(bqskit_circuit.num_qudits, gate_set=get_bqskit_native_gates(device)),
-#             optimization_level=1 if os.getenv("GITHUB_ACTIONS") == "true" else 2,
-#             synthesis_epsilon=1e-1 if os.getenv("GITHUB_ACTIONS") == "true" else 1e-8,
-#             max_synthesis_size=2 if os.getenv("GITHUB_ACTIONS") == "true" else 3,
-#             seed=10,
-#             num_workers=1 if os.getenv("GITHUB_ACTIONS") == "true" else -1,
-#         ),
-#     )
-# )
+register_action(
+    DeviceDependentAction(
+        "BQSKitSynthesis",
+        CompilationOrigin.BQSKIT,
+        PassType.SYNTHESIS,
+        transpile_pass=lambda device: lambda bqskit_circuit: bqskit_compile(
+            bqskit_circuit,
+            model=MachineModel(bqskit_circuit.num_qudits, gate_set=get_bqskit_native_gates(device)),
+            optimization_level=1 if os.getenv("GITHUB_ACTIONS") == "true" else 2,
+            synthesis_epsilon=1e-1 if os.getenv("GITHUB_ACTIONS") == "true" else 1e-8,
+            max_synthesis_size=2 if os.getenv("GITHUB_ACTIONS") == "true" else 3,
+            seed=10,
+            num_workers=1 if os.getenv("GITHUB_ACTIONS") == "true" else -1,
+        ),
+    )
+)
 
 register_action(
     DeviceIndependentAction(

src/mqt/predictor/rl/helper.py

@@ -78,20 +78,16 @@ def best_of_n_passmanager(
         msg = f"Expected list of passes, got {type(all_passes)}"
         raise TypeError(msg)
 
-    if len(all_passes) == 1:
-        layouted_qc = qc
-        layout_props = {}
-        routing_pass = all_passes
-    else:
-        layout_passes = all_passes[:-1]
-        routing_pass = all_passes[-1:]
+    layout_passes = all_passes[:-1]
+    routing_pass = all_passes[-1:]
 
-        layout_pm = PassManager(layout_passes)
-        try:
-            layouted_qc = layout_pm.run(qc)
-            layout_props = dict(layout_pm.property_set)
-        except Exception:
-            return qc, {}
+    # Run layout once
+    layout_pm = PassManager(layout_passes)
+    try:
+        layouted_qc = layout_pm.run(qc)
+        layout_props = dict(layout_pm.property_set)
+    except Exception:
+        return qc, {}
 
     # Run routing multiple times and optimize for the given metric
     for i in range(max_iteration[1]):