Update dev2

* Adding Rust state-vector sim

* Adding Angle Type

Author: ciaranra

Cargo.lock

@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+    "python/pecos-rslib/rust",
     "crates/pecos*",
     "crates/benchmarks",
 ]
@@ -20,27 +21,44 @@ keywords = ["scientific", "quantum", "QEC"]
 categories = ["science", "simulation"]
 
 [workspace.dependencies]
+rand = "0.9"
+rand_chacha = "0.9"
+rand_xoshiro = "0.7"
+uuid = { version = "1", features = ["v4"] }
 pyo3 = "0.23"
-rand = "0.8"
-rand_chacha = "0.3"
-rand_xoshiro = "0.6"
+pyo3-build-config = { version = "0.24", features = ["resolve-config"] }
+log = "0.4"
+env_logger = "0.11"
+memmap2 = "0.9"
+serde = { version = "1", features = ["derive"] }
+os_pipe = "1"
+lazy_static = "1"
+parking_lot = "0.12"
+serde_json = "1"
+num-complex = "0.4"
+num-traits = "0.2"
+criterion = "0.5"
 
 pecos-core = { version = "0.1.1", path = "crates/pecos-core" }
 pecos-qsim = { version = "0.1.1", path = "crates/pecos-qsim" }
 pecos-qec = { version = "0.1.1", path = "crates/pecos-qec" }
 pecos = { version = "0.1.1", path = "crates/pecos" }
-pecos-python = { version = "0.1.1", path = "crates/pecos-python" }
+pecos-rslib = { version = "0.1.1", path = "python/pecos-rslib/rust"}
 
 [profile.release]
 codegen-units = 1
 lto = "fat"
 
 [workspace.lints.clippy]
 # For more details see: https://doc.rust-lang.org/clippy/lints.html
-suspicious = "warn"
-complexity = "warn"
-perf = "warn"
-style = "warn"
-pedantic = "warn"
+suspicious = { level = "warn", priority = -1 }
+complexity = { level = "warn", priority = -1 }
+perf = { level = "warn", priority = -1 }
+style = { level = "warn", priority = -1 }
+pedantic = { level = "warn", priority = -1 }
 # restriction = "warn"
-cargo = "warn"
+cargo = { level = "warn", priority = -1 }
+multiple-crate-versions = "allow" # TODO: remove when possible
+
+[workspace.metadata.commands]
+test-py = ["./scripts/setup-env.sh", "cargo", "test", "-p", "pecos-python"]

Cargo.toml

@@ -24,24 +24,24 @@ installreqs: ## Install Python project requirements to root .venv
 # ---------------------------------
 .PHONY: build
 build: installreqs ## Compile and install for development
-	cd python/pecos-rslib/ && uv run maturin develop --uv
-	cd python/quantum-pecos && uv pip install -e .[all]
+	@unset CONDA_PREFIX && cd python/pecos-rslib/ && uv run maturin develop --uv
+	@unset CONDA_PREFIX && cd python/quantum-pecos && uv pip install -e .[all]
 
 .PHONY: build-basic
 build-basic: installreqs ## Compile and install for development but do not include install extras
-	cd python/pecos-rslib/ && uv run maturin develop --uv
-	cd python/quantum-pecos && uv pip install -e .
+	@unset CONDA_PREFIX && cd python/pecos-rslib/ && uv run maturin develop --uv
+	@unset CONDA_PREFIX && cd python/quantum-pecos && uv pip install -e .
 
 .PHONY: build-release
 build-release: installreqs ## Build a faster version of binaries
-	cd python/pecos-rslib/ && uv run maturin develop --uv --release
-	cd python/quantum-pecos && uv pip install -e .[all]
+	@unset CONDA_PREFIX && cd python/pecos-rslib/ && uv run maturin develop --uv --release
+	@unset CONDA_PREFIX && cd python/quantum-pecos && uv pip install -e .[all]
 
 .PHONY: build-native
 build-native: installreqs ## Build a faster version of binaries with native CPU optimization
-	cd python/pecos-rslib/ && RUSTFLAGS='-C target-cpu=native' \
+	@unset CONDA_PREFIX && cd python/pecos-rslib/ && RUSTFLAGS='-C target-cpu=native' \
 	&& uv run maturin develop --uv --release
-	cd python/quantum-pecos && uv pip install -e .[all]
+	@unset CONDA_PREFIX && cd python/quantum-pecos && uv pip install -e .[all]
 
 # Documentation
 # -------------
@@ -79,14 +79,15 @@ rstest:  ## Run Rust tests
 .PHONY: pytest
 pytest:  ## Run tests on the Python package (not including optional dependencies). ASSUMES: previous build command
 	uv run pytest ./python/tests/ -m "not optional_dependency"
+	uv run pytest ./python/pecos-rslib/tests/
 
 .PHONY: pytest-dep
 pytest-dep: ## Run tests on the Python package only for optional dependencies. ASSUMES: previous build command
 	uv run pytest ./python/tests/ -m optional_dependency
 
 .PHONY: pytest-all
-pytest-all:  ## Run all tests on the Python package ASSUMES: previous build command
-	uv run pytest ./python/tests/
+pytest-all:  pytest ## Run all tests on the Python package ASSUMES: previous build command
+	uv run pytest ./python/tests/ -m "optional_dependency"
 
 # .PHONY: pytest-doc
 # pydoctest:  ## Run doctests with pytest. ASSUMES: A build command was ran previously. ASSUMES: previous build command
@@ -103,13 +104,13 @@ test: rstest pytest-all ## Run all tests. ASSUMES: previous build command
 clean:  ## Clean up caches and build artifacts
 	@rm -rf *.egg-info
 	@rm -rf dist
-	@rm -rf **/build/
+	@find . -type d -name "build" -exec rm -rf {} +
 	@rm -rf python/docs/_build
-	@rm -rf **/.pytest_cache/
-	@rm -rf **/.ipynb_checkpoints
+	@find . -type d -name ".pytest_cache" -exec rm -rf {} +
+	@find . -type d -name ".ipynb_checkpoints" -exec rm -rf {} +
 	@rm -rf .ruff_cache/
-	@rm -rf **/.hypothesis/
-	@rm -rf **/junit/
+	@find . -type d -name ".hypothesis" -exec rm -rf {} +
+	@find . -type d -name "junit" -exec rm -rf {} +
 	@cargo clean
 
 .PHONY: pip-install-uv

Makefile

@@ -11,11 +11,8 @@ categories.workspace = true
 publish = false
 
 [dev-dependencies]
-criterion = "0.5"
+criterion = { workspace = true }
 pecos = { workspace = true }
-pecos-core = { workspace = true }
-pecos-qsim = { workspace = true }
-pecos-qec = { workspace = true }
 
 [[bench]]
 name = "benchmarks"

crates/benchmarks/Cargo.toml

@@ -11,7 +11,7 @@
 // the License.
 
 use criterion::{black_box, measurement::Measurement, BenchmarkGroup, Criterion};
-use pecos_core::IndexableElement;
+use pecos::prelude::*;
 
 pub fn benchmarks<M: Measurement>(c: &mut Criterion<M>) {
     let mut group = c.benchmark_group("Element Operations");
@@ -30,7 +30,7 @@ fn bench_conversion<E: IndexableElement + From<u16>, M: Measurement>(
         b.iter(|| {
             let mut sum = 0_usize;
             for i in 0..1000_u16 {
-                sum += E::from(i).to_usize();
+                sum += E::from(i).to_index();
             }
             black_box(sum)
         });
@@ -50,7 +50,7 @@ fn bench_memory_access<E: IndexableElement + From<u16>, M: Measurement>(
         b.iter(|| {
             let mut sum = E::from(0_u16);
             for &item in &vec {
-                sum = E::from((sum.to_usize() + item.to_usize()) as u16);
+                sum = E::from((sum.to_index() + item.to_index()) as u16);
             }
             black_box(sum)
         });

crates/benchmarks/benches/modules/element_ops.rs

@@ -11,7 +11,7 @@
 // the License.
 
 use criterion::{black_box, measurement::Measurement, BenchmarkGroup, Criterion};
-use pecos_core::{IndexableElement, Set, VecSet};
+use pecos::prelude::*;
 
 pub fn benchmarks<M: Measurement>(c: &mut Criterion<M>) {
     let mut group = c.benchmark_group("Set Operations");

crates/benchmarks/benches/modules/set_ops.rs

@@ -14,6 +14,9 @@ description = "Provides core definitions and functions for PECOS simulations."
 rand = { workspace = true }
 rand_chacha = { workspace = true }
 rand_xoshiro = { workspace = true }
+num-traits = { workspace = true }
+num-complex = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 
 [lints]
 workspace = true