feat: result instead of exit(1) on trap in recursion #1089
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mattstam
commented
Jul 11, 2024
| @@ -482,7 +477,7 @@ impl<C: SP1ProverComponents> SP1Prover<C> { | |||
| let batched_compress_inputs = | |||
| compress_inputs.chunks(shard_batch_size).collect::<Vec<_>>(); | |||
| reduce_proofs = batched_compress_inputs | |||
| .into_iter() | |||
| .into_par_iter() | |||
There was a problem hiding this comment.
this seems kind of free? Or is there a reason we chose to not do this concurrently? just lmk and I'll remove
There was a problem hiding this comment.
Ah no, good catch. That looks good :)
jtguibas
reviewed
Jul 12, 2024
| @@ -538,11 +533,15 @@ impl<C: SP1ProverComponents> SP1Prover<C> { | |||
| witness_stream.extend(input.write()); | |||
|
|
|||
| runtime.witness_stream = witness_stream.into(); | |||
| runtime.run(); | |||
There was a problem hiding this comment.
more canonical way to do this would be to do runtime.run().map_err(..)?;
jtguibas
reviewed
Jul 12, 2024
| @@ -579,7 +580,11 @@ impl<C: SP1ProverComponents> SP1Prover<C> { | |||
| witness_stream.extend(input.write()); | |||
|
|
|||
| runtime.witness_stream = witness_stream.into(); | |||
| runtime.run(); | |||
|
|
|||
jtguibas
reviewed
Jul 12, 2024
prover/src/lib.rs
Outdated
| runtime.run(); | ||
|
|
||
| if let Err(e) = runtime.run() { | ||
| return Err(SP1RecursionProverError::RuntimeError(e.to_string())); |
jtguibas
reviewed
Jul 12, 2024
| @@ -294,7 +294,7 @@ mod tests { | |||
| let program = basic_program::<F>(); | |||
| let config = SC::new(); | |||
| let mut runtime = Runtime::<F, EF, DiffusionMatrixBabyBear>::new_no_perm(&program); | |||
| runtime.run(); | |||
jtguibas
reviewed
Jul 12, 2024
| @@ -52,7 +52,7 @@ fn main() { | |||
|
|
|||
| let config = SC::new(); | |||
| let mut runtime = Runtime::<F, EF, _>::new(&program, config.perm.clone()); | |||
| runtime.run(); | |||
jtguibas
reviewed
Jul 12, 2024
| @@ -326,7 +326,7 @@ mod tests { | |||
| let program = builder.compile_program(); | |||
|
|
|||
| let mut runtime = Runtime::<F, EF, _>::new(&program, config.perm.clone()); | |||
jtguibas
approved these changes
Jul 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
bubble up
SP1RecursionProverErrorinstead of exit(1)