Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(witness_vector_generator): Make it possible to run multiple wvg instances in one binary #2493

Merged
merged 2 commits into from
Jul 26, 2024
Merged

feat(witness_vector_generator): Make it possible to run multiple wvg instances in one binary #2493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
373d957
feat(witness_vector_generator): Make it possible to run multiple wvg …
popzxc Jul 25, 2024
012e06f
Merge branch 'main' into popzxc-many-wvgs
popzxc Jul 26, 2024
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
45 changes: 29 additions & 16 deletions prover/crates/bin/witness_vector_generator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ struct Cli {
pub(crate) config_path: Option<std::path::PathBuf>,
#[arg(long)]
pub(crate) secrets_path: Option<std::path::PathBuf>,
/// Number of WVG jobs to run in parallel.
/// Default value is 1.
#[arg(long, default_value_t = 1)]
pub(crate) threads: usize,
}

#[tokio::main]
Expand Down Expand Up @@ -106,17 +110,6 @@ async fn main() -> anyhow::Result<()> {

let protocol_version = PROVER_PROTOCOL_SEMANTIC_VERSION;

let witness_vector_generator = WitnessVectorGenerator::new(
object_store,
pool,
circuit_ids_for_round_to_be_proven.clone(),
zone.clone(),
config,
protocol_version,
prover_config.max_attempts,
Some(prover_config.setup_data_path.clone()),
);

let (stop_sender, stop_receiver) = watch::channel(false);

let (stop_signal_sender, stop_signal_receiver) = oneshot::channel();
Expand All @@ -128,12 +121,32 @@ async fn main() -> anyhow::Result<()> {
})
.expect("Error setting Ctrl+C handler");

tracing::info!("Starting witness vector generation for group: {} with circuits: {:?} in zone: {} with protocol_version: {:?}", specialized_group_id, circuit_ids_for_round_to_be_proven, zone, protocol_version);
tracing::info!(
"Starting {} witness vector generation jobs for group: {} with circuits: {:?} in zone: {} with protocol_version: {:?}",
opt.threads,
specialized_group_id,
circuit_ids_for_round_to_be_proven,
zone,
protocol_version
);

let tasks = vec![
tokio::spawn(exporter_config.run(stop_receiver.clone())),
tokio::spawn(witness_vector_generator.run(stop_receiver, opt.n_iterations)),
];
let mut tasks = vec![tokio::spawn(exporter_config.run(stop_receiver.clone()))];

for _ in 0..opt.threads {
let witness_vector_generator = WitnessVectorGenerator::new(
object_store.clone(),
pool.clone(),
circuit_ids_for_round_to_be_proven.clone(),
zone.clone(),
config.clone(),
protocol_version,
prover_config.max_attempts,
Some(prover_config.setup_data_path.clone()),
);
tasks.push(tokio::spawn(
witness_vector_generator.run(stop_receiver.clone(), opt.n_iterations),
));
}

let mut tasks = ManagedTasks::new(tasks);
tokio::select! {
Expand Down
Loading