Skip to content

Commit

Permalink
Merge branch 'oxidize-dag' into oxidize-dag-layers
Browse files Browse the repository at this point in the history
  • Loading branch information
raynelfss committed Jul 18, 2024
2 parents 9068f55 + c1ba596 commit 5f175cc
Show file tree
Hide file tree
Showing 15 changed files with 2,240 additions and 456 deletions.
6 changes: 4 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ndarray = "^0.15.6"
numpy = "0.21.0"
smallvec = "1.13"
thiserror = "1.0"
rustworkx-core = "0.15"

# 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
Expand Down
2 changes: 1 addition & 1 deletion crates/accelerate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ahash = "0.8.11"
num-traits = "0.2"
num-complex.workspace = true
num-bigint = "0.4"
rustworkx-core = { git = "https://github.com/Qiskit/rustworkx.git" }
rustworkx-core.workspace = true
faer = "0.19.1"
itertools = "0.13.0"
qiskit-circuit.workspace = true
Expand Down
3 changes: 2 additions & 1 deletion crates/circuit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ name = "qiskit_circuit"
doctest = false

[dependencies]
rayon = "1.10"
ahash = "0.8.11"
rustworkx-core = { git = "https://github.com/Qiskit/rustworkx.git" }
rustworkx-core.workspace = true
num-complex.workspace = true
ndarray.workspace = true
numpy.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/circuit/src/bit_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use hashbrown::HashMap;
use pyo3::exceptions::{PyKeyError, PyRuntimeError, PyValueError};
use pyo3::prelude::*;
use pyo3::types::PyList;
use std::fmt::{Debug, Display};
use std::fmt::Debug;
use std::hash::{Hash, Hasher};
use std::mem::swap;

Expand Down
1 change: 0 additions & 1 deletion crates/circuit/src/circuit_instruction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ use crate::interner::Index;
use crate::operations::{
Operation, OperationType, Param, PyGate, PyInstruction, PyOperation, StandardGate,
};
use crate::{Clbit, Qubit};

/// These are extra mutable attributes for a circuit instruction's state. In general we don't
/// typically deal with this in rust space and the majority of the time they're not used in Python
Expand Down
Loading

0 comments on commit 5f175cc

Please sign in to comment.