Merge branch 'feat/hyrbid-engine-rs' into rng-refactor

Author: ciaranra

.github/workflows/python-release.yml

@@ -1,7 +1,7 @@
 name: Python Artifacts
 
 env:
-  TRIGGER_ON_PR_PUSH: false  # Set to true to enable triggers on PR pushes
+  TRIGGER_ON_PR_PUSH: true  # Set to true to enable triggers on PR pushes
   PYTHON_VERSION: '3.10'
 
 on:

.github/workflows/python-test.yml

@@ -1,4 +1,11 @@
 name: Python test / linting
+
+env:
+  TRIGGER_ON_PR_PUSH: true  # Set to true to enable triggers on PR pushes
+  RUSTFLAGS: -C debuginfo=0
+  RUST_BACKTRACE: 1
+  PYTHONUTF8: 1
+
 on:
   push:
     branches: [ "master", "development" ]
@@ -21,11 +28,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  RUSTFLAGS: -C debuginfo=0
-  RUST_BACKTRACE: 1
-  PYTHONUTF8: 1
-
 defaults:
   run:
     shell: bash

.github/workflows/rust-test.yml

@@ -1,8 +1,7 @@
 name: Rust test / linting
 
 env:
-  TRIGGER_ON_PR_PUSH: false  # Set to true to enable triggers on PR pushes
-
+  TRIGGER_ON_PR_PUSH: true  # Set to true to enable triggers on PR pushes
   RUSTFLAGS: -C debuginfo=0
   RUST_BACKTRACE: 1
 

Cargo.lock

@@ -24,6 +24,7 @@ categories = ["science", "simulation"]
 rand = "0.9"
 rand_chacha = "0.9"
 pyo3 = { version = "0.24", features = ["extension-module"] }
+pyo3-build-config = { version = "0.24", features = ["resolve-config"] }
 rayon = "1"
 clap = { version = "4", features = ["derive"] }
 log = "0.4"

Cargo.toml

@@ -74,11 +74,7 @@ lint: fmt clippy
 
 .PHONY: rstest
 rstest:  ## Run Rust tests
-ifeq ($(OS),Windows_NT)
-	cargo test --workspace --exclude pecos-rslib --doc false
-else
-	cargo test
-endif
+	cargo test --workspace
 
 .PHONY: pytest
 pytest:  ## Run tests on the Python package (not including optional dependencies). ASSUMES: previous build command

Makefile

@@ -902,31 +902,33 @@ impl GeneralNoiseModel {
         for &qubit in &gate.qubits {
             if has_leakage {
                 add_original_gate = false;
+            }
 
-                // If qubit has leaked and spontaneous emission has occurred... seep the qubit
-                if self.rng.occurs(self.p1_emission_ratio) {
-                    if let Some(gates) = self.seep(qubit) {
-                        noise.extend(gates);
-                    }
-                }
-            } else if self.rng.occurs(self.p1) {
+            if self.rng.occurs(self.p1) {
                 // Spontaneous emission
                 if self.rng.occurs(self.p1_emission_ratio) {
-                    add_original_gate = false;
+                    // If qubit has leaked and spontaneous emission has occurred... seep the qubit
+                    if has_leakage {
+                        if let Some(gates) = self.seep(qubit) {
+                            noise.extend(gates);
+                        }
+                    } else {
+                        add_original_gate = false;
 
                     let result = self.p1_emission_model.sample_gates(&mut self.rng, qubit);
 
-                    if result.has_leakage() {
-                        // Handle leakage
-                        if let Some(gate) = self.leak(qubit) {
+                        if result.has_leakage() {
+                            // Handle leakage
+                            if let Some(gate) = self.leak(qubit) {
+                                noise.push(gate);
+                            }
+                        } else if let Some(gate) = result.gate {
+                            // Handle Pauli gate
                             noise.push(gate);
+                            trace!("Applied Pauli error to qubit {}", qubit);
                         }
-                    } else if let Some(gate) = result.gate {
-                        // Handle Pauli gate
-                        noise.push(gate);
-                        trace!("Applied Pauli error to qubit {}", qubit);
                     }
-                } else {
+                } else if !has_leakage {
                     // Pauli noise
                     let result = self.p1_pauli_model.sample_gates(&mut self.rng, qubit);
                     if let Some(gate) = result.gate {

build.sh

@@ -23,9 +23,12 @@ pub use pecos_engines::{
 // Re-exporting specific implementations that aren't at the crate root
 pub use pecos_engines::engines::{
     classical::{ProgramType, detect_program_type, get_program_path, setup_engine},
-    quantum::{StateVecEngine, new_quantum_engine_arbitrary_qgate},
+    quantum::{SparseStabEngine, StateVecEngine, new_quantum_engine_arbitrary_qgate},
 };
 
+// Re-exporting byte_message functions
+pub use pecos_engines::byte_message::dump_batch;
+
 // re-exporting pecos-qsim
 pub use pecos_qsim::{
     ArbitraryRotationGateable, CliffordGateable, QuantumSimulator, SparseStab, StateVec,

crates/pecos-engines/src/engines/noise/general.rs

@@ -15,12 +15,19 @@ publish = false
 [lib]
 name = "pecos_rslib"
 crate-type = ["cdylib", "rlib"]
+# Skip doc tests as they won't work properly in this setup
+doctest = false
+# Skip unit tests as well - all testing should be done through Python
+test = false
 
 [dependencies]
-pyo3 = { workspace=true, features = ["extension-module", "abi3-py37"] }
+pyo3 = { workspace=true, features = ["extension-module", "abi3-py310", "generate-import-lib"] }
 pecos = { workspace = true }
-pecos-engines = { workspace = true }
+# Removing pecos-engines dependency, using pecos prelude instead
 parking_lot = { workspace = true}
 
 [lints]
 workspace = true
+
+[build-dependencies]
+pyo3-build-config = { workspace = true }