Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@ wrapper-prover = { version = "=0.155.8", path = "crates/wrapper-prover", package

# These dependencies should be shared by all the crates.
# zksync-crypto repository
boojum = "=0.32.9"
fflonk-cpu = { package = "fflonk", version = "=0.32.9" }
franklin-crypto = "=0.32.9"
rescue_poseidon = "=0.32.9"
snark_wrapper = "=0.32.9"
boojum = "=0.32.10"
franklin-crypto = "=0.32.10"
rescue_poseidon = "=0.32.10"
snark_wrapper = "=0.32.10"
fflonk-cpu = { package = "fflonk", version = "=0.32.10" }


# zksync-protocol repository
circuit_definitions = { version = "=0.153.8" }
zkevm_test_harness = { version = "=0.153.8" }
circuit_definitions = "=0.153.9"
zkevm_test_harness = "=0.153.9"

[profile.release]
debug = "line-tables-only"
1 change: 0 additions & 1 deletion crates/boojum-cuda/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ criterion = "0.5"
criterion-macro = "0.4"
itertools = "0.13"
rand = "0.8"
rand_04 = { package = "rand", version = "0.4" }
rayon = "1.10"
serial_test = "3.1"

Expand Down
4 changes: 2 additions & 2 deletions crates/boojum-cuda/src/poseidon2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -538,10 +538,10 @@ mod tests {
use crate::ops_simple::set_to_zero;
use crate::tests_helpers::RandomIterator;
use boojum::cs::implementations::pow::PoWRunner;
use boojum::pairing::rand::Rand;
use era_cudart::memory::{memory_copy_async, DeviceAllocation};
use itertools::Itertools;
use rand::{thread_rng, Rng};
use rand_04::Rand;
use std::cmp;
use std::fmt::Debug;

Expand Down Expand Up @@ -843,7 +843,7 @@ mod tests {
}

fn random_digest_element() -> Self::DigestElementType {
BN::rand(&mut rand_04::thread_rng())
BN::rand(&mut boojum::pairing::rand::thread_rng())
}
}

Expand Down
1 change: 0 additions & 1 deletion crates/fflonk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ exclude = ["/data"]
fflonk-cpu = {workspace = true, optional = true}
circuit_definitions.workspace = true
gpu-ffi.workspace = true
rand = "0.4"
derivative = "2.2"
byteorder = "1"
bincode = "1.3"
Expand Down
3 changes: 0 additions & 3 deletions crates/gpu-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ crossbeam = "0.8"
era_cudart_sys.workspace = true
cmake = "0.1"

[dev-dependencies]
rand = "0.4"

[lib]
doctest = false

1 change: 0 additions & 1 deletion crates/gpu-prover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ franklin-crypto = { workspace = true, optional = true }
gpu-ffi.workspace = true

crossbeam = "0.8"
rand = "0.4"
num_cpus = "1"
itertools = "0.10"
cfg-if = "1"
Expand Down
12 changes: 6 additions & 6 deletions crates/gpu-prover/src/memory_manager/tests.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::*;
use bellman::{pairing::CurveAffine, plonk::fft::cooley_tukey_ntt::bitreverse};
use franklin_crypto::bellman::CurveProjective;
use rand::thread_rng;
use franklin_crypto::rand::thread_rng;
type TestConfigs = A100_40GB_2GPU_Test_Configs; // G5_5GB_Testing_Configs;

fn init_manager() -> DeviceMemoryManager<Fr, TestConfigs> {
Expand Down Expand Up @@ -263,7 +263,7 @@ fn test_manager_add_constant() {
let mut a = AsyncVec::<Fr>::allocate_new(degree);
generate_scalars_to_buf(&worker, a.get_values_mut().unwrap());

use rand::Rng;
use franklin_crypto::rand::Rng;
let constant: Fr = thread_rng().gen();

manager
Expand Down Expand Up @@ -296,7 +296,7 @@ fn test_manager_sub_constant() {
let mut a = AsyncVec::<Fr>::allocate_new(degree);
generate_scalars_to_buf(&worker, a.get_values_mut().unwrap());

use rand::Rng;
use franklin_crypto::rand::Rng;
let constant: Fr = thread_rng().gen();

manager
Expand Down Expand Up @@ -329,7 +329,7 @@ fn test_manager_mul_constant() {
let mut a = AsyncVec::<Fr>::allocate_new(degree);
generate_scalars_to_buf(&worker, a.get_values_mut().unwrap());

use rand::Rng;
use franklin_crypto::rand::Rng;
let constant: Fr = thread_rng().gen();

manager
Expand Down Expand Up @@ -493,7 +493,7 @@ fn test_manager_add_assign_scaled() {
let mut b = AsyncVec::<Fr>::allocate_new(degree);
generate_scalars_to_buf(&worker, b.get_values_mut().unwrap());

use rand::Rng;
use franklin_crypto::rand::Rng;
let constant: Fr = thread_rng().gen();

manager
Expand Down Expand Up @@ -540,7 +540,7 @@ fn test_manager_sub_assign_scaled() {
let mut b = AsyncVec::<Fr>::allocate_new(degree);
generate_scalars_to_buf(&worker, b.get_values_mut().unwrap());

use rand::Rng;
use franklin_crypto::rand::Rng;
let constant: Fr = thread_rng().gen();

manager
Expand Down
2 changes: 1 addition & 1 deletion crates/gpu-prover/src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::*;
use bellman::pairing::{CurveAffine, GenericCurveProjective};
use core::ops::Range;
use rand::{thread_rng, Rng};
use franklin_crypto::rand::{thread_rng, Rng};

pub(crate) fn generate_scalars_to_buf<F: PrimeField>(worker: &Worker, buf: &mut [F]) {
assert!(buf.len().is_power_of_two());
Expand Down