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

Roll Back recent merge #100

Closed
wants to merge 15 commits into from
Closed

Roll Back recent merge #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c42c63b
start of manual implementation of Machine trait for BasicMachine
hadasz Dec 17, 2023
669aace
implemented chip proof function, generalized Machine trait so it can …
hadasz Dec 17, 2023
f509c9a
removed sumcheck
hadasz Dec 17, 2023
014c195
prove in machine implementation for basic machine
hadasz Dec 20, 2023
9abe475
prover done except for accessing commitments to put in proof object
hadasz Jan 8, 2024
6bc2cd2
prover for basic machine
hadasz Jan 10, 2024
6aae53c
merge and modularized prover
hadasz Jan 12, 2024
563419f
lint
hadasz Jan 17, 2024
c223409
Merge branch 'main' into prove
hadasz Jan 17, 2024
9bfe764
Renames + ordering fixes
dlubarov Jan 17, 2024
e2262b1
smoke test for prover
hadasz Jan 17, 2024
009d801
clippy
hadasz Jan 17, 2024
23ecec1
fmt
hadasz Jan 17, 2024
9e911a1
merge conflicts
hadasz Jan 18, 2024
50f0505
Merge pull request #96 from lita-xyz/prove
morganthomas Jan 18, 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
2 changes: 1 addition & 1 deletion alu_u32/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ p3-baby-bear = { path = "../../Plonky3/baby-bear" }
p3-field = { path = "../../Plonky3/field" }
p3-matrix = { path = "../../Plonky3/matrix" }
p3-maybe-rayon = { path = "../../Plonky3/maybe-rayon" }

p3-uni-stark = { path = "../../Plonky3/uni-stark" }
valida-bus = { path = "../bus" }
valida-derive = { path = "../derive" }
valida-machine = { path = "../machine" }
Expand Down
2 changes: 1 addition & 1 deletion alu_u32/src/add/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use p3_air::VirtualPairCol;
use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;
use valida_machine::config::StarkConfig;
use p3_uni_stark::StarkConfig;
use valida_util::pad_to_power_of_two;

pub mod columns;
Expand Down
2 changes: 1 addition & 1 deletion alu_u32/src/bitwise/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use p3_air::VirtualPairCol;
use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;
use valida_machine::config::StarkConfig;
use p3_uni_stark::StarkConfig;
use valida_util::pad_to_power_of_two;

pub mod columns;
Expand Down
4 changes: 2 additions & 2 deletions alu_u32/src/div/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ use p3_air::VirtualPairCol;
use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;
use valida_machine::config::StarkConfig;
use valida_util::pad_to_power_of_two;

use valida_util::pad_to_power_of_two;
use p3_uni_stark::StarkConfig;
pub mod columns;
pub mod stark;

Expand Down
4 changes: 2 additions & 2 deletions alu_u32/src/lt/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ use p3_air::VirtualPairCol;
use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;
use valida_machine::config::StarkConfig;
use valida_util::pad_to_power_of_two;

use valida_util::pad_to_power_of_two;
use p3_uni_stark::StarkConfig;
pub mod columns;
pub mod stark;

Expand Down
2 changes: 1 addition & 1 deletion alu_u32/src/mul/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use core::borrow::BorrowMut;
use p3_air::VirtualPairCol;
use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use valida_machine::config::StarkConfig;
use p3_uni_stark::StarkConfig;

pub mod columns;
pub mod stark;
Expand Down
2 changes: 1 addition & 1 deletion alu_u32/src/shift/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use p3_air::VirtualPairCol;
use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;
use valida_machine::config::StarkConfig;
use p3_uni_stark::StarkConfig;
use valida_util::pad_to_power_of_two;

pub mod columns;
Expand Down
3 changes: 2 additions & 1 deletion alu_u32/src/sub/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ use p3_air::VirtualPairCol;
use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;
use valida_machine::config::StarkConfig;
use p3_uni_stark::StarkConfig;

use valida_util::pad_to_power_of_two;

pub mod columns;
Expand Down
11 changes: 9 additions & 2 deletions basic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@ p3-baby-bear = { path = "../../Plonky3/baby-bear" }
p3-field = { path = "../../Plonky3/field" }
p3-maybe-rayon = { path = "../../Plonky3/maybe-rayon" }
p3-util = { path = "../../Plonky3/util" }

p3-goldilocks = {path = "../../Plonky3/goldilocks" }
p3-uni-stark = {path = "../../Plonky3/uni-stark" }
p3-commit = { path = "../../Plonky3/commit" }
p3-air = { path = "../../Plonky3/air" }
p3-matrix = { path = "../../Plonky3/matrix" }
[dev-dependencies]

p3-challenger = { path = "../../Plonky3/challenger" }
p3-commit = { path = "../../Plonky3/commit" }

p3-dft = { path = "../../Plonky3/dft" }
p3-field = { path = "../../Plonky3/field" }
p3-fri = { path = "../../Plonky3/fri" }
Expand All @@ -40,4 +45,6 @@ p3-mds = { path = "../../Plonky3/mds" }
p3-merkle-tree = { path = "../../Plonky3/merkle-tree" }
p3-poseidon = { path = "../../Plonky3/poseidon" }
p3-symmetric = { path = "../../Plonky3/symmetric" }


rand = "0.8.5"
Loading
Loading