Merge branch 'feat/rayon_parallelism' into matthias/s-box-7

scroll-tech · Jan 24, 2025 · 3f3b410 · 3f3b410
2 parents 8a1690a + 8d2336a
commit 3f3b410
Show file tree

Hide file tree

Showing 45 changed files with 18,230 additions and 10,334 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 *.rtk
 *.ctk
+zok_tests/benchmarks/poseidon_test/poseidon_const.zok
 
 # Generated by Cargo
 # will have compiled files and executables

diff --git a/circ_blocks/Cargo.lock b/circ_blocks/Cargo.lock
diff --git a/circ_blocks/Cargo.toml b/circ_blocks/Cargo.toml
@@ -51,10 +51,7 @@ from-pest = { version = "0.3", optional = true }
 itertools = "0.10"
 petgraph = { version = "0.6", optional = true }
 spartan = { version = "0.8", default-features = false, optional = true }
-spartan_parallel = { path = "../spartan_parallel", default-features = false, features = [
-  "multicore",
-  "profile",
-] }
+spartan_parallel = { path = "../spartan_parallel", default-features = false, features = ["profile"] }
 merlin = { version = "3.0.0" }
 curve25519-dalek = { version = "4", features = ["serde"], optional = true }
 # TODO: kill