merged with dev

okx · Apr 15, 2024 · b2f5103 · b2f5103
2 parents 94ff49a + 8fa96c5
commit b2f5103
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/depends/cryptography_cuda b/depends/cryptography_cuda
diff --git a/field/Cargo.toml b/field/Cargo.toml
@@ -23,7 +23,7 @@ rand = { workspace = true, features = ["getrandom"] }
 serde = { workspace = true, features = ["alloc"] }
 static_assertions = { workspace = true }
 unroll = { workspace = true }
-cryptography_cuda = { path = "../depends/cryptography_cuda", optional = true}
+cryptography_cuda ={git="ssh://[email protected]/okx/cryptography_cuda.git", rev="d44b861cf241d27688525e7a8f082199a2abcbfa", optional=true, features=["no_cuda"]}
 
 [dev-dependencies]
 rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }

diff --git a/plonky2/Cargo.toml b/plonky2/Cargo.toml
@@ -12,7 +12,7 @@ keywords.workspace = true
 categories.workspace = true
 
 [features]
-default = ["gate_testing", "parallel", "rand_chacha", "std"]
+default = ["gate_testing", "parallel", "rand_chacha", "std", "no_cuda"]
 gate_testing = []
 parallel = ["hashbrown/rayon", "plonky2_maybe_rayon/parallel"]
 std = ["anyhow/std", "rand/std", "itertools/use_std"]
@@ -42,7 +42,7 @@ once_cell = { version = "1.18.0" }
 plonky2_field = { version = "0.2.0", 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 ={ path = "../depends/cryptography_cuda", optional = true}
+cryptography_cuda ={git="ssh://[email protected]/okx/cryptography_cuda.git", rev="d44b861cf241d27688525e7a8f082199a2abcbfa", optional=true, features=["no_cuda"]}
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 getrandom = { version = "0.2", default-features = false, features = ["js"] }

diff --git a/plonky2/src/fri/oracle.rs b/plonky2/src/fri/oracle.rs
@@ -346,7 +346,7 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
 
         // If blinding, salt with two random elements to each leaf vector.
         let salt_size = if blinding { SALT_SIZE } else { 0 };
-        println!("salt_size: {:?}", salt_size);
+        // println!("salt_size: {:?}", salt_size);
 
         #[cfg(all(feature = "cuda", feature = "batch"))]
         let num_gpus: usize = std::env::var("NUM_OF_GPUS")
@@ -356,8 +356,8 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
         // let num_gpus: usize = 1;
         #[cfg(all(feature = "cuda", feature = "batch"))]
         println!("get num of gpus: {:?}", num_gpus);
-        let total_num_of_fft = polynomials.len();
-        println!("total_num_of_fft: {:?}", total_num_of_fft);
+        let _total_num_of_fft = polynomials.len();
+        // println!("total_num_of_fft: {:?}", total_num_of_fft);
         #[cfg(all(feature = "cuda", feature = "batch"))]
         let per_device_batch = total_num_of_fft.div_ceil(num_gpus);
 

diff --git a/plonky2/src/util/timing.rs b/plonky2/src/util/timing.rs
@@ -154,7 +154,7 @@ impl TimingTree {
 
     #[cfg(not(feature = "timing"))]
     pub fn print(&self) {
-        log!(
+        log::log!(
             self.0,
             "TimingTree is not supported without the 'timing' feature enabled"
         );