Merge remote-tracking branch 'origin/main' into mc-ntt-refactor

matter-labs · Nov 16, 2023 · b621435 · b621435
2 parents 4849b70 + 6731d9a
commit b621435
Show file tree

Hide file tree

Showing 97 changed files with 139 additions and 4,147 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,3 +1,53 @@
-[workspace]
-members = ["boojum-cuda", "criterion-cuda", "cudart", "cudart-sys"]
-resolver = "2"
+[package]
+name = "boojum-cuda"
+version = "0.1.0"
+edition = "2021"
+build = "build/main.rs"
+license = "MIT OR Apache-2.0"
+
+[build-dependencies]
+boojum = { git = "https://github.com/matter-labs/era-boojum.git", branch = "main" }
+cudart-sys = { git = "https://github.com/matter-labs/era-cuda.git", branch = "main", package = "cudart-sys" }
+cmake = "^0"
+itertools = "^0"
+
+[dependencies]
+boojum = { git = "https://github.com/matter-labs/era-boojum.git", branch = "main" }
+cudart = { git = "https://github.com/matter-labs/era-cuda.git", branch = "main", package = "cudart" }
+cudart-sys = { git = "https://github.com/matter-labs/era-cuda.git", branch = "main", package = "cudart-sys" }
+itertools = "^0"
+lazy_static = "^1"
+
+[dev-dependencies]
+blake2 = "^0"
+criterion = "^0"
+criterion-cuda = { git = "https://github.com/matter-labs/era-cuda.git", branch = "main", package = "criterion-cuda" }
+criterion-macro = "^0"
+itertools = "^0"
+rand = "^0"
+rayon = "^1"
+serial_test = "^2"
+
+[[bench]]
+name = "blake2s"
+harness = false
+
+[[bench]]
+name = "gates"
+harness = false
+
+[[bench]]
+name = "goldilocks"
+harness = false
+
+[[bench]]
+name = "ntt"
+harness = false
+
+[[bench]]
+name = "ops_complex"
+harness = false
+
+[[bench]]
+name = "poseidon"
+harness = false
diff --git a/boojum-cuda/benches/blake2s.rs → benches/blake2s.rs b/boojum-cuda/benches/blake2s.rs → benches/blake2s.rs
diff --git a/boojum-cuda/benches/gates.rs → benches/gates.rs b/boojum-cuda/benches/gates.rs → benches/gates.rs
diff --git a/boojum-cuda/benches/goldilocks.rs → benches/goldilocks.rs b/boojum-cuda/benches/goldilocks.rs → benches/goldilocks.rs
diff --git a/boojum-cuda/benches/ntt.rs → benches/ntt.rs b/boojum-cuda/benches/ntt.rs → benches/ntt.rs
diff --git a/boojum-cuda/benches/ops_complex.rs → benches/ops_complex.rs b/boojum-cuda/benches/ops_complex.rs → benches/ops_complex.rs
diff --git a/boojum-cuda/benches/poseidon.rs → benches/poseidon.rs b/boojum-cuda/benches/poseidon.rs → benches/poseidon.rs
diff --git a/boojum-cuda/Cargo.toml b/boojum-cuda/Cargo.toml
diff --git a/boojum-cuda/build/gates.rs → build/gates.rs b/boojum-cuda/build/gates.rs → build/gates.rs
diff --git a/boojum-cuda/build/main.rs → build/main.rs b/boojum-cuda/build/main.rs → build/main.rs
diff --git a/boojum-cuda/build/poseidon_constants.rs → build/poseidon_constants.rs b/boojum-cuda/build/poseidon_constants.rs → build/poseidon_constants.rs
diff --git a/boojum-cuda/build/template.rs → build/template.rs b/boojum-cuda/build/template.rs → build/template.rs
diff --git a/criterion-cuda/Cargo.toml b/criterion-cuda/Cargo.toml
diff --git a/criterion-cuda/src/lib.rs b/criterion-cuda/src/lib.rs
diff --git a/cudart-sys/Cargo.toml b/cudart-sys/Cargo.toml