⏪ unrelated changes

Author: flowerthrower

src/mqt/predictor/reward.py

@@ -23,6 +23,7 @@
 
 if TYPE_CHECKING:
     from qiskit import QuantumCircuit
+from qiskit.circuit import QuantumRegister, Qubit
     from qiskit.transpiler import Target
     from sklearn.ensemble import RandomForestRegressor
 
@@ -61,22 +62,44 @@ def expected_fidelity(qc: QuantumCircuit, device: Target, precision: int = 10) -
 
         if gate_type != "barrier":
             assert len(qargs) in [1, 2]
-            first_qubit_idx = qc.find_bit(qargs[0]).index
+            first_qubit_idx = calc_qubit_index(qargs, qc.qregs, 0)
 
             if len(qargs) == 1:
                 specific_fidelity = 1 - device[gate_type][first_qubit_idx,].error
             else:
-                second_qubit_idx = qc.find_bit(qargs[1]).index
-                try:
+                second_qubit_idx = calc_qubit_index(qargs, qc.qregs, 1)
                     specific_fidelity = 1 - device[gate_type][first_qubit_idx, second_qubit_idx].error
-                except KeyError:
-                    msg = f"Error rate for gate {gate_type} on qubits {first_qubit_idx} and {second_qubit_idx} not found in device properties."
-                    raise KeyError(msg) from None
+                
             res *= specific_fidelity
 
     return float(np.round(res, precision).item())
 
 
+def calc_qubit_index(qargs: list[Qubit], qregs: list[QuantumRegister], index: int) -> int:
+    """Calculates the global qubit index for a given quantum circuit and qubit index.
+
+    Arguments:
+        qargs: The qubits of the quantum circuit.
+        qregs: The quantum registers of the quantum circuit.
+        index: The index of the qubit in the qargs list.
+
+    Returns:
+        The global qubit index of the given qubit in the quantum circuit.
+
+    Raises:
+        ValueError: If the qubit index is not found in the quantum registers.
+    """
+    offset = 0
+    for reg in qregs:
+        if qargs[index] not in reg:
+            offset += reg.size
+        else:
+            qubit_index: int = offset + reg.index(qargs[index])
+            return qubit_index
+    error_msg = f"Global qubit index for local qubit {index} index not found."
+    raise ValueError(error_msg)
+
+
 def estimated_success_probability(qc: QuantumCircuit, device: Target, precision: int = 10) -> float:
     """Calculates the estimated success probability of a given quantum circuit on a given device.
 
@@ -102,7 +125,7 @@ def estimated_success_probability(qc: QuantumCircuit, device: Target, precision:
         if gate_type == "barrier" or gate_type == "id":
             continue
         assert len(qargs) in (1, 2)
-        first_qubit_idx = qc.find_bit(qargs[0]).index
+        first_qubit_idx = calc_qubit_index(qargs, qc.qregs, 0)
         active_qubits.add(first_qubit_idx)
 
         if len(qargs) == 1:  # single-qubit gate
@@ -117,7 +140,7 @@ def estimated_success_probability(qc: QuantumCircuit, device: Target, precision:
             ))
             exec_time_per_qubit[first_qubit_idx] += duration
         else:  # multi-qubit gate
-            second_qubit_idx = qc.find_bit(qargs[1]).index
+            second_qubit_idx = calc_qubit_index(qargs, qc.qregs, 1)
             active_qubits.add(second_qubit_idx)
             duration = device[gate_type][first_qubit_idx, second_qubit_idx].duration
             op_times.append((gate_type, [first_qubit_idx, second_qubit_idx], duration, "s"))
@@ -168,7 +191,7 @@ def estimated_success_probability(qc: QuantumCircuit, device: Target, precision:
             continue
 
         assert len(qargs) in (1, 2)
-        first_qubit_idx = scheduled_circ.find_bit(qargs[0]).index
+        first_qubit_idx = calc_qubit_index(qargs, qc.qregs, 0)
 
         if len(qargs) == 1:
             if gate_type == "measure":
@@ -190,7 +213,7 @@ def estimated_success_probability(qc: QuantumCircuit, device: Target, precision:
                 continue
             res *= 1 - device[gate_type][first_qubit_idx,].error
         else:
-            second_qubit_idx = scheduled_circ.find_bit(qargs[1]).index
+            second_qubit_idx = calc_qubit_index(qargs, qc.qregs, 1)
             res *= 1 - device[gate_type][first_qubit_idx, second_qubit_idx].error
 
     if qiskit_version >= "2.0.0":

src/mqt/predictor/rl/actions.py

@@ -11,6 +11,7 @@
 from __future__ import annotations
 
 import os
+import sys
 from collections import defaultdict
 from dataclasses import dataclass
 from enum import Enum
@@ -89,8 +90,7 @@
     from qiskit.passmanager.base_tasks import Task
 
     TaskList = list[Task | TketBasePass | PreProcessTKETRoutingAfterQiskitLayout]
-    from qiskit.passmanager import PropertySet
-
+    
 
 class CompilationOrigin(str, Enum):
     """Enumeration of the origin of the compilation action."""
@@ -146,7 +146,7 @@ class DeviceDependentAction(Action):
             Callable[..., tuple[Any, ...] | Circuit],
         ]
     )
-    do_while: Callable[[PropertySet], bool] | None = None
+    do_while: Callable[[dict[str, Circuit]], bool] | None = None
 
 
 # Registry of actions
@@ -332,7 +332,7 @@ def remove_action(name: str) -> None:
             circuit,
             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=3,
+            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,
         ),
@@ -431,7 +431,7 @@ def remove_action(name: str) -> None:
                 with_mapping=True,
                 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=3,
+                max_synthesis_size=2 if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux" else 3,
                 seed=10,
                 num_workers=1 if os.getenv("GITHUB_ACTIONS") == "true" else -1,
             )
@@ -461,7 +461,7 @@ def remove_action(name: str) -> None:
                 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=3,
+                max_synthesis_size=2 if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux" else 3,
                 seed=10,
                 num_workers=1 if os.getenv("GITHUB_ACTIONS") == "true" else -1,
             )

src/mqt/predictor/rl/predictor.py

@@ -97,11 +97,11 @@ def train_model(
             verbose: The verbosity level. Defaults to 2.
             test: Whether to train the model for testing purposes. Defaults to False.
         """
-        set_random_seed(0)  # for reproducibility
-        if test:
-            n_steps = 512
+                if test:
+set_random_seed(0)  # for reproducibility
+            n_steps = 10
             n_epochs = 1
-            batch_size = 16
+            batch_size = 10
             progress_bar = False
         else:
             # default PPO values