Merge branch 'python-lint' into polish-qasm

Author: ciaranra

python/pecos-rslib/src/pecos_rslib/rssparse_sim.py

@@ -25,7 +25,7 @@
 from pecos_rslib._pecos_rslib import SparseSim as RustSparseSim
 
 if TYPE_CHECKING:
-    from pecos.type_defs import SimulatorGateParams
+    from pecos.typing import SimulatorGateParams
 
 
 class SparseSimRs:

python/pecos-rslib/src/pecos_rslib/rsstate_vec.py

@@ -25,7 +25,7 @@
 from pecos_rslib._pecos_rslib import RsStateVec as RustStateVec
 
 if TYPE_CHECKING:
-    from pecos.type_defs import SimulatorGateParams
+    from pecos.typing import SimulatorGateParams
 
 
 class StateVecRs:

python/quantum-pecos/src/pecos/circuits/qc2phir.py

@@ -276,14 +276,14 @@ def ops_buffer_append(
                 }
                 del metadata["export"]
 
-            elif metadata.get("cop_type") in ["Idle", "idle"]:
+            elif metadata.get("cop_type") in {"Idle", "idle"}:
                 del metadata["cop_type"]
                 op = {
                     "mop": "Idle",
                     "args": find_qid2qsym(qubits),
                 }
 
-            elif metadata.get("cop_type") in ["Transport", "transport"]:
+            elif metadata.get("cop_type") in {"Transport", "transport"}:
                 del metadata["cop_type"]
                 op = {
                     "mop": "Transport",

python/quantum-pecos/src/pecos/circuits/quantum_circuit.py

@@ -15,6 +15,7 @@
 
 from __future__ import annotations
 
+import copy
 import json
 from collections import defaultdict
 from collections.abc import MutableSequence
@@ -26,13 +27,13 @@
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from pecos.type_defs import JSONDict, JSONValue
+    from pecos.typing import JSONDict, JSONValue
 
 # Type aliases
 Location = int | tuple[int, ...]
 LocationSet = set[Location] | list[Location] | tuple[Location, ...]
 GateDict = dict[str, LocationSet]
-CircuitSetup = None | int | list[GateDict]
+CircuitSetup = int | list[GateDict] | None
 
 
 class QuantumCircuit(MutableSequence):
@@ -353,7 +354,7 @@ def __copy__(self) -> QuantumCircuit:
 
     def copy(self) -> QuantumCircuit:
         """Create a shallow copy of the circuit."""
-        return self.__copy__()
+        return copy.copy(self)
 
     def __iter__(self) -> Iterator[tuple[str, LocationSet, JSONDict]]:
         """Iterate over all gates in the circuit."""

python/quantum-pecos/src/pecos/classical_interpreters/phir_classical_interpreter.py

@@ -105,7 +105,7 @@ def init(
             PHIRModel.model_validate(self.program)
 
         if isinstance(self.program, dict):
-            if self.program["format"] not in ["PHIR/JSON", "PHIR"]:
+            if self.program["format"] not in {"PHIR/JSON", "PHIR"}:
                 msg = f"Unsupported PHIR format: {self.program['format']}"
                 raise ValueError(msg)
             if version2tuple(self.program["version"]) >= (0, 2, 0):
@@ -203,7 +203,7 @@ def execute(self, seq: Sequence) -> Generator[list, Any, None]:
             if isinstance(op, pt.opt.QOp):
                 op_buffer.append(op)
 
-                if op.name in ["measure Z", "Measure", "Measure +Z"]:
+                if op.name in {"measure Z", "Measure", "Measure +Z"}:
                     yield op_buffer
                     op_buffer.clear()
 
@@ -266,7 +266,7 @@ def get_bit(self, cvar: str, idx: int) -> int:
     def eval_expr(
         self,
         expr: int | str | list | pt.opt.COp,
-    ) -> None | int | integer:
+    ) -> int | integer | None:
         """Evaluates integer expressions."""
         match expr:
             case int():
@@ -442,5 +442,5 @@ def result_bits(
                 i: int
                 if filter_private and m.startswith("__"):
                     continue
-                send_meas[(m, i)] = self.get_bit(m, i)
+                send_meas[m, i] = self.get_bit(m, i)
         return send_meas

python/quantum-pecos/src/pecos/decoders/mwpm2d/mwpm2d.py

@@ -140,7 +140,7 @@ def decode(
             matching.update(dict(matching_edges))
 
             nodes_paired = set()
-            ## for n1 in real_graph.nodes():
+            # for n1 in real_graph.nodes():
             real_syn = set(real_graph.nodes())
             for n1 in syndromes & real_syn:
                 n2 = matching[n1]

python/quantum-pecos/src/pecos/decoders/mwpm2d/precomputing.py

@@ -221,13 +221,13 @@ def surface4444_identity(instr: LogicalInstructionProtocol) -> dict[str, Any]:
             virt_node = "v" + str(vi)
 
             # X virtual nodes (sides left and right)
-            if side_label in ["left", "right"]:  # 1 for i = 1 and 3 => left and right
+            if side_label in {"left", "right"}:  # 1 for i = 1 and 3 => left and right
                 syn_list = d2edge_x.setdefault(data, [])
                 syn_list.append(virt_node)
                 virt_x.add(virt_node)
 
             # Z virtual nodes (sides top and bottom)
-            elif side_label in ["top", "bottom"]:  # 0 for i = 0 and 2 => top and bottom
+            elif side_label in {"top", "bottom"}:  # 0 for i = 0 and 2 => top and bottom
                 syn_list = d2edge_z.setdefault(data, [])
                 syn_list.append(virt_node)
                 virt_z.add(virt_node)
@@ -255,7 +255,7 @@ def surface4444_identity(instr: LogicalInstructionProtocol) -> dict[str, Any]:
                 raise Exception(msg)
 
             edges[tuple(edge)] = data
-            edges[(edge[1], edge[0])] = data
+            edges[edge[1], edge[0]] = data
             temp_graph.add_edge(edge[0], edge[1])
 
     # Create distance graph
@@ -288,7 +288,7 @@ def surface4444_identity(instr: LogicalInstructionProtocol) -> dict[str, Any]:
                     data_path = []
                     s1 = syn_path[0]
                     for s2 in syn_path[1:]:
-                        data = edge2d[(s1, s2)]
+                        data = edge2d[s1, s2]
                         data_path.append(data)
                         s1 = s2
 
@@ -323,7 +323,7 @@ def surface4444_identity(instr: LogicalInstructionProtocol) -> dict[str, Any]:
             data_path = []
             s1 = syn_path[0]
             for s2 in syn_path[1:]:
-                data = edge2d[(s1, s2)]
+                data = edge2d[s1, s2]
                 data_path.append(data)
                 s1 = s2
 
@@ -510,7 +510,7 @@ def surface4444medial_identity(instr: LogicalInstructionProtocol) -> dict[str, A
                 raise Exception(msg)
 
             edges[tuple(edge)] = data
-            edges[(edge[1], edge[0])] = data
+            edges[edge[1], edge[0]] = data
             temp_graph.add_edge(edge[0], edge[1])
 
     # Create distance graph
@@ -543,7 +543,7 @@ def surface4444medial_identity(instr: LogicalInstructionProtocol) -> dict[str, A
                     data_path = []
                     s1 = syn_path[0]
                     for s2 in syn_path[1:]:
-                        data = edge2d[(s1, s2)]
+                        data = edge2d[s1, s2]
                         data_path.append(data)
                         s1 = s2
 
@@ -578,7 +578,7 @@ def surface4444medial_identity(instr: LogicalInstructionProtocol) -> dict[str, A
             data_path = []
             s1 = syn_path[0]
             for s2 in syn_path[1:]:
-                data = edge2d[(s1, s2)]
+                data = edge2d[s1, s2]
                 data_path.append(data)
                 s1 = s2
 

python/quantum-pecos/src/pecos/engines/cvm/binarray.py

@@ -17,6 +17,14 @@
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
 
+"""Binary array implementation for the PECOS classical virtual machine.
+
+This module provides the BinArray class for efficient binary array operations
+within the classical virtual machine (CVM) framework. It supports various
+binary representations and operations needed for classical computations
+in quantum error correction simulations.
+"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

python/quantum-pecos/src/pecos/engines/cvm/classical.py

@@ -377,20 +377,20 @@ def eval_condition(
 
         # Map of operators to their evaluation functions
         ops = {
-            "==": lambda a, b: bool(a.__eq__(b)),
-            "!=": lambda a, b: bool(a.__ne__(b)),
-            "^": lambda a, b: bool(a.__xor__(b).__int__()),
-            "|": lambda a, b: bool(a.__or__(b).__int__()),
-            "&": lambda a, b: bool(a.__and__(b).__int__()),
-            "<": lambda a, b: a.__lt__(b),
-            ">": lambda a, b: a.__gt__(b),
-            "<=": lambda a, b: a.__le__(b),
-            ">=": lambda a, b: a.__ge__(b),
-            ">>": lambda a, b: a.__rshift__(b),
-            "<<": lambda a, b: a.__lshift__(b),
-            "~": lambda a, _: a.__invert__(),
-            "*": lambda a, b: a.__mul__(b),
-            "/": lambda a, b: a.__floordiv__(b),
+            "==": lambda a, b: bool(a == b),
+            "!=": lambda a, b: bool(a != b),
+            "^": lambda a, b: bool(int(a ^ b)),
+            "|": lambda a, b: bool(int(a | b)),
+            "&": lambda a, b: bool(int(a & b)),
+            "<": lambda a, b: a < b,
+            ">": lambda a, b: a > b,
+            "<=": lambda a, b: a <= b,
+            ">=": lambda a, b: a >= b,
+            ">>": lambda a, b: a >> b,
+            "<<": lambda a, b: a << b,
+            "~": lambda a, _: ~a,
+            "*": lambda a, b: a * b,
+            "/": lambda a, b: a // b,
         }
 
         if op in ops:

python/quantum-pecos/src/pecos/engines/cvm/sim_func.py

@@ -172,7 +172,7 @@ def sim_exec(
     func: str,
     runner: Runner,
     *args: Any,  # noqa: ANN401 - Dynamic dispatch requires Any
-) -> None | int | dict[str, Any]:
+) -> int | dict[str, Any] | None:
     """Execute a simulation function by name.
 
     Dispatches to the appropriate simulation function based on the function name,