Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
EkamSinghPandher committed Nov 14, 2024
1 parent 1df33d1 commit 6cd25da
Show file tree
Hide file tree
Showing 11 changed files with 208 additions and 210 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["field", "maybe_rayon", "plonky2", "starky", "util", "gen", "u32", "e
resolver = "2"

[workspace.dependencies]
cryptography_cuda = { git = "ssh://[email protected]/okx/zeknox.git", rev = "ce33382971cf6fb16ef5a0edc7e347bcc73b6602" }
zeknox = { git = "ssh://[email protected]/okx/zeknox.git", rev = "04c1ac8c9ed44c0c1d885f8029045dd9969b2f55" }
ahash = { version = "0.8.7", default-features = false, features = [
"compile-time-rng",
] } # NOTE: Be sure to keep this version the same as the dependency in `hashbrown`.
Expand Down
6 changes: 3 additions & 3 deletions ecdsa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ categories.workspace = true

[features]
parallel = ["plonky2_maybe_rayon/parallel", "plonky2/parallel"]
cuda = ["cryptography_cuda/cuda", "plonky2/cuda"]
no_cuda = ["cryptography_cuda/no_cuda", "plonky2/no_cuda"]
cuda = ["zeknox/cuda", "plonky2/cuda"]
no_cuda = ["zeknox/no_cuda", "plonky2/no_cuda"]

[dependencies]
anyhow = { version = "1.0.40" }
Expand All @@ -22,7 +22,7 @@ num = { version = "0.4.0" }
plonky2 = { path = "../plonky2" }
plonky2_u32 = { path = "../u32" }
serde = { version = "1.0", features = ["derive"] }
cryptography_cuda = { workspace = true, optional = true }
zeknox = { workspace = true, optional = true }

[dev-dependencies]
rand = { version = "0.8.4", features = ["getrandom"] }
Expand Down
6 changes: 3 additions & 3 deletions ecgfp5/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ itertools = "0.10"
serde = "1"
rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }
hex = "0.4.3"
cryptography_cuda = { workspace = true, optional = true }
zeknox = { workspace = true, optional = true }

[dev-dependencies]
rand = { version = "0.8.5", features = ["min_const_gen"] }
Expand All @@ -48,5 +48,5 @@ name = "schnorr"
harness = false

[features]
cuda = ["cryptography_cuda/cuda", "plonky2/cuda"]
no_cuda = ["cryptography_cuda/no_cuda", "plonky2/no_cuda"]
cuda = ["zeknox/cuda", "plonky2/cuda"]
no_cuda = ["zeknox/no_cuda", "plonky2/no_cuda"]
6 changes: 3 additions & 3 deletions field/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rand = { workspace = true, features = ["getrandom"] }
serde = { workspace = true, features = ["alloc"] }
static_assertions = { workspace = true }
unroll = { workspace = true }
cryptography_cuda = { workspace = true, optional = true }
zeknox = { workspace = true, optional = true }

[dev-dependencies]
rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }
Expand All @@ -37,9 +37,9 @@ quote = "1"

[features]
default = []
cuda = ["cryptography_cuda/cuda"]
cuda = ["zeknox/cuda"]
precompile = []
no_cuda = ["cryptography_cuda/no_cuda"]
no_cuda = ["zeknox/no_cuda"]

# Display math equations properly in documentation
[package.metadata.docs.rs]
Expand Down
6 changes: 3 additions & 3 deletions plonky2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ gate_testing = []
parallel = ["hashbrown/rayon", "plonky2_maybe_rayon/parallel"]
std = ["anyhow/std", "rand/std", "itertools/use_std"]
timing = ["std", "dep:web-time"]
cuda = ["cryptography_cuda/cuda"]
no_cuda = ["cryptography_cuda/no_cuda"]
cuda = ["zeknox/cuda"]
no_cuda = ["zeknox/no_cuda"]
batch = []
cuda_timing = []
papi = []
Expand All @@ -44,7 +44,7 @@ papi-bindings = { version = "0.5.2" }
plonky2_field = { version = "0.2.2", path = "../field", default-features = false }
plonky2_maybe_rayon = { version = "0.2.0", path = "../maybe_rayon", default-features = false }
plonky2_util = { version = "0.2.0", path = "../util", default-features = false }
cryptography_cuda = { workspace = true, optional = true }
zeknox = { workspace = true, optional = true }
dyn-clone = "1.0.17"

[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion plonky2/benches/lde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ mod allocator;

use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
#[cfg(feature = "cuda")]
use cryptography_cuda::init_cuda_degree_rs;
use zeknox::init_cuda_degree_rs;
use plonky2::field::extension::Extendable;
use plonky2::field::goldilocks_field::GoldilocksField;
use plonky2::field::polynomial::PolynomialCoeffs;
Expand Down
Loading

0 comments on commit 6cd25da

Please sign in to comment.