[DAGCircuit Oxidation] Port DAGCircuit to Rust

Cargo.toml

@@ -16,14 +16,18 @@ license = "Apache-2.0"
 [workspace.dependencies]
 bytemuck = "1.16"
 indexmap.version = "2.3.0"
-hashbrown.version = "0.14.0"
+hashbrown.version = "0.14.5"
 num-bigint = "0.4"
 num-complex = "0.4"
 ndarray = "^0.15.6"
 numpy = "0.21.0"
 smallvec = "1.13"
 thiserror = "1.0"
+rustworkx-core = "0.15"
+approx = "0.5"
+itertools = "0.13.0"
 ahash = "0.8.11"
+rayon = "1.10"
 
 # Most of the crates don't need the feature `extension-module`, since only `qiskit-pyext` builds an
 # actual C extension (the feature disables linking in `libpython`, which is forbidden in Python

crates/accelerate/Cargo.toml

@@ -10,18 +10,18 @@ name = "qiskit_accelerate"
 doctest = false
 
 [dependencies]
-rayon = "1.10"
+rayon.workspace = true
 numpy.workspace = true
 rand = "0.8"
 rand_pcg = "0.3"
 rand_distr = "0.4.3"
 ahash.workspace = true
 num-traits = "0.2"
 num-complex.workspace = true
+rustworkx-core.workspace = true
 num-bigint.workspace = true
-rustworkx-core = "0.15"
 faer = "0.19.1"
-itertools = "0.13.0"
+itertools.workspace = true
 qiskit-circuit.workspace = true
 thiserror.workspace = true
 
@@ -38,7 +38,7 @@ workspace = true
 features = ["rayon", "approx-0_5"]
 
 [dependencies.approx]
-version = "0.5"
+workspace = true
 features = ["num-complex"]
 
 [dependencies.hashbrown]

crates/accelerate/src/convert_2q_block_matrix.rs

@@ -27,15 +27,15 @@ use qiskit_circuit::circuit_instruction::CircuitInstruction;
 use qiskit_circuit::dag_node::DAGOpNode;
 use qiskit_circuit::gate_matrix::ONE_QUBIT_IDENTITY;
 use qiskit_circuit::imports::QI_OPERATOR;
-use qiskit_circuit::operations::{Operation, OperationRef};
+use qiskit_circuit::operations::Operation;
 
 use crate::QiskitError;
 
 fn get_matrix_from_inst<'py>(
     py: Python<'py>,
     inst: &'py CircuitInstruction,
 ) -> PyResult<Array2<Complex64>> {
-    if let Some(mat) = inst.op().matrix(&inst.params) {
+    if let Some(mat) = inst.operation.matrix(&inst.params) {
         Ok(mat)
     } else if inst.operation.try_standard_gate().is_some() {
         Err(QiskitError::new_err(
@@ -124,29 +124,7 @@ pub fn change_basis(matrix: ArrayView2<Complex64>) -> Array2<Complex64> {
     trans_matrix
 }
 
-#[pyfunction]
-pub fn collect_2q_blocks_filter(node: &Bound<PyAny>) -> Option<bool> {
-    let Ok(node) = node.downcast::<DAGOpNode>() else {
-        return None;
-    };
-    let node = node.borrow();
-    match node.instruction.op() {
-        gate @ (OperationRef::Standard(_) | OperationRef::Gate(_)) => Some(
-            gate.num_qubits() <= 2
-                && node
-                    .instruction
-                    .extra_attrs
-                    .as_ref()
-                    .and_then(|attrs| attrs.condition.as_ref())
-                    .is_none()
-                && !node.is_parameterized(),
-        ),
-        _ => Some(false),
-    }
-}
-
 pub fn convert_2q_block_matrix(m: &Bound<PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(blocks_to_matrix))?;
-    m.add_wrapped(wrap_pyfunction!(collect_2q_blocks_filter))?;
     Ok(())
 }

crates/accelerate/src/euler_one_qubit_decomposer.rs

@@ -743,7 +743,7 @@ pub fn compute_error_list(
         .iter()
         .map(|node| {
             (
-                node.instruction.op().name().to_string(),
+                node.instruction.operation.name().to_string(),
                 smallvec![], // Params not needed in this path
             )
         })
@@ -988,10 +988,11 @@ pub fn optimize_1q_gates_decomposition(
                 .iter()
                 .map(|node| {
                     if let Some(err_map) = error_map {
-                        error *= compute_error_term(node.instruction.op().name(), err_map, qubit)
+                        error *=
+                            compute_error_term(node.instruction.operation.name(), err_map, qubit)
                     }
                     node.instruction
-                        .op()
+                        .operation
                         .matrix(&node.instruction.params)
                         .expect("No matrix defined for operation")
                 })
@@ -1043,22 +1044,6 @@ fn matmul_1q(operator: &mut [[Complex64; 2]; 2], other: Array2<Complex64>) {
     ];
 }
 
-#[pyfunction]
-pub fn collect_1q_runs_filter(node: &Bound<PyAny>) -> bool {
-    let Ok(node) = node.downcast::<DAGOpNode>() else {
-        return false;
-    };
-    let node = node.borrow();
-    let op = node.instruction.op();
-    op.num_qubits() == 1
-        && op.num_clbits() == 0
-        && op.matrix(&node.instruction.params).is_some()
-        && match &node.instruction.extra_attrs {
-            None => true,
-            Some(attrs) => attrs.condition.is_none(),
-        }
-}
-
 pub fn euler_one_qubit_decomposer(m: &Bound<PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(params_zyz))?;
     m.add_wrapped(wrap_pyfunction!(params_xyx))?;
@@ -1072,7 +1057,6 @@ pub fn euler_one_qubit_decomposer(m: &Bound<PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(compute_error_one_qubit_sequence))?;
     m.add_wrapped(wrap_pyfunction!(compute_error_list))?;
     m.add_wrapped(wrap_pyfunction!(optimize_1q_gates_decomposition))?;
-    m.add_wrapped(wrap_pyfunction!(collect_1q_runs_filter))?;
     m.add_class::<OneQubitGateSequence>()?;
     m.add_class::<OneQubitGateErrorMap>()?;
     m.add_class::<EulerBasis>()?;

crates/circuit/Cargo.toml

@@ -10,17 +10,29 @@ name = "qiskit_circuit"
 doctest = false
 
 [dependencies]
+rayon.workspace = true
+ahash.workspace = true
+rustworkx-core.workspace = true
 bytemuck.workspace = true
-hashbrown.workspace = true
 num-complex.workspace = true
 ndarray.workspace = true
 numpy.workspace = true
 thiserror.workspace = true
+approx.workspace = true
+itertools.workspace = true
 
 [dependencies.pyo3]
 workspace = true
 features = ["hashbrown", "indexmap", "num-complex", "num-bigint", "smallvec"]
 
+[dependencies.hashbrown]
+workspace = true
+features = ["rayon"]
+
+[dependencies.indexmap]
+workspace = true
+features = ["rayon"]
+
 [dependencies.smallvec]
 workspace = true
 features = ["union"]

crates/circuit/src/bit_data.rs

@@ -17,6 +17,7 @@ use pyo3::prelude::*;
 use pyo3::types::PyList;
 use std::fmt::Debug;
 use std::hash::{Hash, Hasher};
+use std::mem::swap;
 
 /// Private wrapper for Python-side Bit instances that implements
 /// [Hash] and [Eq], allowing them to be used in Rust hash-based
@@ -81,17 +82,6 @@ pub struct BitData<T> {
     cached: Py<PyList>,
 }
 
-pub struct BitNotFoundError<'py>(pub(crate) Bound<'py, PyAny>);
-
-impl<'py> From<BitNotFoundError<'py>> for PyErr {
-    fn from(error: BitNotFoundError) -> Self {
-        PyKeyError::new_err(format!(
-            "Bit {:?} has not been added to this circuit.",
-            error.0
-        ))
-    }
-}
-
 impl<T> BitData<T>
 where
     T: From<BitType> + Copy,
@@ -139,14 +129,19 @@ where
     pub fn map_bits<'py>(
         &self,
         bits: impl IntoIterator<Item = Bound<'py, PyAny>>,
-    ) -> Result<impl Iterator<Item = T>, BitNotFoundError<'py>> {
+    ) -> PyResult<impl Iterator<Item = T>> {
         let v: Result<Vec<_>, _> = bits
             .into_iter()
             .map(|b| {
                 self.indices
                     .get(&BitAsKey::new(&b))
                     .copied()
-                    .ok_or_else(|| BitNotFoundError(b))
+                    .ok_or_else(|| {
+                        PyKeyError::new_err(format!(
+                            "Bit {:?} has not been added to this circuit.",
+                            b
+                        ))
+                    })
             })
             .collect();
         v.map(|x| x.into_iter())
@@ -168,7 +163,7 @@ where
     }
 
     /// Adds a new Python bit.
-    pub fn add(&mut self, py: Python, bit: &Bound<PyAny>, strict: bool) -> PyResult<()> {
+    pub fn add(&mut self, py: Python, bit: &Bound<PyAny>, strict: bool) -> PyResult<T> {
         if self.bits.len() != self.cached.bind(bit.py()).len() {
             return Err(PyRuntimeError::new_err(
             format!("This circuit's {} list has become out of sync with the circuit data. Did something modify it?", self.description)
@@ -193,6 +188,29 @@ where
                 bit
             )));
         }
+        Ok(idx.into())
+    }
+
+    pub fn remove_indices<I>(&mut self, py: Python, indices: I) -> PyResult<()>
+    where
+        I: IntoIterator<Item = T>,
+    {
+        let mut indices_sorted: Vec<usize> = indices
+            .into_iter()
+            .map(|i| <BitType as From<T>>::from(i) as usize)
+            .collect();
+        indices_sorted.sort();
+
+        for index in indices_sorted.into_iter().rev() {
+            self.cached.bind(py).del_item(index)?;
+            let bit = self.bits.remove(index);
+            self.indices.remove(&BitAsKey::new(bit.bind(py)));
+        }
+        // Update indices.
+        for (i, bit) in self.bits.iter().enumerate() {
+            self.indices
+                .insert(BitAsKey::new(bit.bind(py)), (i as BitType).into());
+        }
         Ok(())
     }
 
@@ -203,3 +221,37 @@ where
         self.bits.clear();
     }
 }
+
+pub struct Iter<'a, T> {
+    _data: &'a BitData<T>,
+    index: usize,
+}
+
+impl<'a, T> Iterator for Iter<'a, T>
+where
+    T: From<BitType>,
+{
+    type Item = T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let mut index = self.index + 1;
+        swap(&mut self.index, &mut index);
+        let index: Option<BitType> = index.try_into().ok();
+        index.map(|i| From::from(i))
+    }
+}
+
+impl<'a, T> IntoIterator for &'a BitData<T>
+where
+    T: From<BitType>,
+{
+    type Item = T;
+    type IntoIter = Iter<'a, T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        Iter {
+            _data: self,
+            index: 0,
+        }
+    }
+}