Skip to content

Commit f191d3b

Browse files
committed
redirect each process's output
1 parent 4e5cedc commit f191d3b

7 files changed

Lines changed: 23 additions & 5 deletions

File tree

expander_compiler/src/zkcuda/proving_system/expander_no_oversubscribe/server_fn.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ where
3030
verifier_setup: &mut ExpanderVerifierSetup<GetFieldConfig<ZC>, GetPCS<ZC>>,
3131
mpi_win: &mut Option<SharedMemoryWINWrapper>,
3232
) {
33+
eprintln!("Entering setup_request_handler for ExpanderNoOverSubscribe");
3334
match ZC::BATCH_PCS {
3435
true => ExpanderPCSDefered::<ZC::GKRConfig>::setup_request_handler(
3536
global_mpi_config,
@@ -48,6 +49,7 @@ where
4849
mpi_win,
4950
),
5051
}
52+
eprintln!("Exiting setup_request_handler for ExpanderNoOverSubscribe");
5153
}
5254

5355
fn prove_request_handler(

expander_compiler/src/zkcuda/proving_system/expander_parallelized/cmd_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn start_server<C: GKREngine>(
1616

1717
let batch_pcs_option = if batch_pcs { "--batch-pcs" } else { "" };
1818
let cmd_str = format!(
19-
"mpiexec -n {max_parallel_count} {overscribe} {binary} --field-type {field_name} --poly-commit {pcs_name} --port-number {port_number} {batch_pcs_option} --fiat-shamir-hash {fiat_shamir_hash}"
19+
"mpiexec -n {max_parallel_count} --output-filename worker_log {overscribe} {binary} --field-type {field_name} --poly-commit {pcs_name} --port-number {port_number} {batch_pcs_option} --fiat-shamir-hash {fiat_shamir_hash}",
2020
);
2121
exec_command(&cmd_str, false);
2222
}

expander_compiler/src/zkcuda/proving_system/expander_parallelized/prove_impl.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ where
134134
T: Transcript,
135135
ECCConfig: Config<FieldConfig = F>,
136136
{
137+
eprintln!("Entering prove_kernel_gkr");
137138
let local_mpi_config = generate_local_mpi_config(mpi_config, parallel_count);
138139

139140
local_mpi_config.as_ref()?;
@@ -162,6 +163,7 @@ where
162163
&local_mpi_config,
163164
);
164165

166+
eprintln!("Exiting prove_kernel_gkr");
165167
Some((transcript, challenge))
166168
}
167169

expander_compiler/src/zkcuda/proving_system/expander_parallelized/server_fns.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ pub fn read_circuit<C, ECCConfig>(
148148
C: GKREngine,
149149
ECCConfig: Config<FieldConfig = C::FieldConfig>,
150150
{
151+
eprintln!("Entering read_circuit");
151152
let (cg, win) = if global_mpi_config.is_root() {
152153
let computation_graph_bytes =
153154
std::fs::read(setup_file).expect("Failed to read computation graph from file");
@@ -162,4 +163,5 @@ pub fn read_circuit<C, ECCConfig>(
162163

163164
*computation_graph = cg;
164165
mpi_win.replace(SharedMemoryWINWrapper { win });
166+
eprintln!("Exiting read_circuit");
165167
}

expander_compiler/src/zkcuda/proving_system/expander_pcs_defered/prove_impl.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ where
3737
C: GKREngine,
3838
ECCConfig: Config<FieldConfig = C::FieldConfig>,
3939
{
40+
eprintln!("Entering max_len_setup_commit_impl");
4041
assert_eq!(prover_setup.p_keys.len(), 1);
4142
let len_to_commit = prover_setup.p_keys.keys().next().cloned().unwrap();
4243

@@ -47,6 +48,7 @@ where
4748
local_commit_impl::<C, ECCConfig>(prover_setup.p_keys.get(&len_to_commit).unwrap(), vals);
4849

4950
commitment.vals_len = actual_len; // Store the actual length in the commitment
51+
eprintln!("Exiting max_len_setup_commit_impl");
5052
(commitment, state)
5153
}
5254

@@ -106,6 +108,7 @@ where
106108
C: GKREngine,
107109
ECCConfig: Config<FieldConfig = C::FieldConfig>,
108110
{
111+
eprintln!("Entering mpi_prove_with_pcs_defered");
109112
let commit_timer = Timer::new("Commit to all input", global_mpi_config.is_root());
110113
let (commitments, _states) = if global_mpi_config.is_root() {
111114
let (commitments, states) = values
@@ -144,6 +147,7 @@ where
144147
);
145148

146149
if global_mpi_config.is_root() {
150+
eprintln!("Entering pcs claim extraction");
147151
let (mut transcript, challenge) = gkr_end_state.unwrap();
148152
assert!(challenge.challenge_y().is_none());
149153
let challenge = challenge.challenge_x();
@@ -157,7 +161,7 @@ where
157161

158162
vals_ref.extend(local_vals_ref);
159163
challenges.extend(local_challenges);
160-
164+
eprintln!("Exiting pcs claim extraction");
161165
Some(ExpanderProof {
162166
data: vec![transcript.finalize_and_get_proof()],
163167
})
@@ -168,22 +172,26 @@ where
168172
.collect::<Vec<_>>();
169173
prove_timer.stop();
170174

171-
if global_mpi_config.is_root() {
175+
let ret = if global_mpi_config.is_root() {
176+
eprintln!("Entering pcs batch opening");
172177
let mut proofs = proofs.into_iter().map(|p| p.unwrap()).collect::<Vec<_>>();
173178

174179
let pcs_opening_timer = Timer::new("Batch PCS Opening for all kernels", true);
175180
let pcs_batch_opening =
176181
open_defered_pcs::<C, ECCConfig>(prover_setup, &vals_ref, &challenges);
177182
pcs_opening_timer.stop();
178-
179183
proofs.push(pcs_batch_opening);
184+
eprintln!("Exiting pcs batch opening");
180185
Some(CombinedProof {
181186
commitments: commitments.unwrap(),
182187
proofs,
183188
})
184189
} else {
185190
None
186-
}
191+
};
192+
193+
eprintln!("Exiting mpi_prove_with_pcs_defered");
194+
ret
187195
}
188196

189197
pub fn extract_pcs_claims<'a, C: GKREngine>(

expander_compiler/src/zkcuda/proving_system/expander_pcs_defered/server_fns.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ where
3131
verifier_setup: &mut ExpanderVerifierSetup<C::FieldConfig, C::PCSConfig>,
3232
mpi_win: &mut Option<SharedMemoryWINWrapper>,
3333
) {
34+
eprintln!("Entering setup_request_handler for ExpanderPCSDefered");
3435
let setup_file = if global_mpi_config.is_root() {
3536
let setup_file = setup_file.expect("Setup file path must be provided");
3637
broadcast_string(global_mpi_config, Some(setup_file))
@@ -44,6 +45,7 @@ where
4445
(*prover_setup, *verifier_setup) =
4546
pcs_setup_max_length_only::<C, ECCConfig>(computation_graph);
4647
}
48+
eprintln!("Exiting setup_request_handler for ExpanderPCSDefered");
4749
}
4850

4951
fn prove_request_handler(

expander_compiler/src/zkcuda/proving_system/expander_pcs_defered/setup_impl.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ where
2323
C: GKREngine,
2424
ECCConfig: Config<FieldConfig = C::FieldConfig>,
2525
{
26+
eprintln!("Entering pcs_setup_max_length_only");
2627
let mut p_keys = HashMap::new();
2728
let mut v_keys = HashMap::new();
2829
let max_commitment_len = computation_graph
@@ -40,6 +41,7 @@ where
4041
p_keys.insert(max_commitment_len, p_key);
4142
v_keys.insert(max_commitment_len, v_key);
4243

44+
eprintln!("Exiting pcs_setup_max_length_only");
4345
(
4446
ExpanderProverSetup { p_keys },
4547
ExpanderVerifierSetup { v_keys },

0 commit comments

Comments
 (0)