-
Notifications
You must be signed in to change notification settings - Fork 52
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.
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
Prove #96
Merged
Merged
Prove #96
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
…be explicitly implemented, began explicit implementation for BasicMachine
This does not compile for me: morgan@aristotle:~/code/lita/issue/15/Plonky3$ git log -n 1
commit f1f00480274e16b8e6eaf0e6304d85e445a33d92 (HEAD -> batch_prover, origin/batch_prover)
Merge: e2038ad 3d11432
Author: Hadas <[email protected]>
Date: Fri Jan 12 11:10:29 2024 -0500
merge
morgan@aristotle:~/code/lita/issue/15/Plonky3$ cd ../valida
morgan@aristotle:~/code/lita/issue/15/valida$ git log -n 1
commit 6aae53cd6400a2e22a325b464acf476fd3c171b0 (HEAD -> prove, origin/prove)
Merge: 6bc2cd2 413bb4c
Author: Hadas <[email protected]>
Date: Fri Jan 12 13:21:45 2024 -0500
merge and modularized prover
morgan@aristotle:~/code/lita/issue/15/valida$ cargo build
warning: function cannot return without recursing
--> /home/morgan/code/lita/issue/15/Plonky3/commit/src/adapters/extension_mmcs.rs:37:5
|
37 | fn combine(&self, data:&Vec<Self::ProverData>) -> (Self::Commitment, Self::ProverData){
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recursing
38 | self.combine(data)
| ------------------ recursive call site
|
= help: a `loop` may express intention better if this is on purpose
= note: `#[warn(unconditional_recursion)]` on by default
warning: `p3-commit` (lib) generated 1 warning
Compiling valida-machine v0.1.0 (/home/morgan/code/lita/issue/15/valida/machine)
error[E0432]: unresolved import `p3_uni_stark::ProverData`
--> machine/src/lib.rs:21:59
|
21 | StarkConfig, SymbolicAirBuilder, Commitments, Proof, ProverData
| ^^^^^^^^^^ no `ProverData` in the root
warning: unused imports: `Commitments`, `Proof`
--> machine/src/lib.rs:21:38
|
21 | StarkConfig, SymbolicAirBuilder, Commitments, Proof, ProverData
| ^^^^^^^^^^^ ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `crate::__internal::ConstraintFolder`
--> machine/src/__internal/prove.rs:1:5
|
1 | use crate::__internal::ConstraintFolder;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
warning: unused import: `crate::proof::ChipProof`
--> machine/src/__internal/prove.rs:2:5
|
2 | use crate::proof::ChipProof;
| ^^^^^^^^^^^^^^^^^^^^^^^
warning: unused imports: `Chip`, `Machine`
--> machine/src/__internal/prove.rs:3:13
|
3 | use crate::{Chip, Machine};
| ^^^^ ^^^^^^^
warning: unused import: `p3_air::Air`
--> machine/src/__internal/prove.rs:4:5
|
4 | use p3_air::Air;
| ^^^^^^^^^^^
warning: unused imports: `ProverConstraintFolder`, `StarkConfig`, `SymbolicAirBuilder`, `prove as stark_prove`
--> machine/src/__internal/prove.rs:5:20
|
5 | use p3_uni_stark::{prove as stark_prove,StarkConfig,SymbolicAirBuilder,ProverConstraintFolder};
| ^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^
warning: unused import: `alloc::vec::Vec`
--> machine/src/proof.rs:1:5
|
1 | use alloc::vec::Vec;
| ^^^^^^^^^^^^^^^
warning: unused imports: `Chip`, `Machine`
--> machine/src/proof.rs:3:13
|
3 | use crate::{Chip,Machine};
| ^^^^ ^^^^^^^
For more information about this error, try `rustc --explain E0432`.
warning: `valida-machine` (lib) generated 8 warnings
error: could not compile `valida-machine` (lib) due to previous error; 8 warnings emitted |
morganthomas
approved these changes
Jan 18, 2024
use crate::proof::ChipProof; | ||
use crate::{Chip, Machine}; | ||
use p3_air::Air; | ||
|
||
use p3_uni_stark::{prove as stark_prove,StarkConfig,SymbolicAirBuilder,ProverConstraintFolder}; | ||
/* | ||
pub fn prove<M, A, SC>( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code appears to be commented. Is that on purpose?
morganthomas
approved these changes
Jan 18, 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.
No description provided.