Merge pull request #99 from valida-xyz/finish_prover

Finishing the prover
valida-xyz · Jan 23, 2024 · ad0d444 · ad0d444
2 parents 3019431 + f23f0c4
commit ad0d444
Show file tree

Hide file tree

Showing 34 changed files with 1,328 additions and 489 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,9 +18,8 @@ jobs:
       - name: Checkout Plonky3
         uses: actions/checkout@v4
         with:
-          repository: lita-xyz/Plonky3
+          repository: Plonky3/Plonky3
           path: Plonky3
-          ref: batch_prover
 
       - name: Checkout Valida
         uses: actions/checkout@v4
@@ -49,9 +48,8 @@ jobs:
       - name: Checkout Plonky3
         uses: actions/checkout@v4
         with:
-          repository: lita-xyz/Plonky3
+          repository: Plonky3/Plonky3
           path: Plonky3
-          ref: batch_prover
 
       - name: Checkout Valida
         uses: actions/checkout@v4

diff --git a/alu_u32/src/add/mod.rs b/alu_u32/src/add/mod.rs
@@ -13,8 +13,8 @@ use valida_range::MachineWithRangeChip;
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use p3_maybe_rayon::*;
-use p3_uni_stark::StarkConfig;
+use p3_maybe_rayon::prelude::*;
+use valida_machine::config::StarkConfig;
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;

diff --git a/alu_u32/src/bitwise/mod.rs b/alu_u32/src/bitwise/mod.rs
@@ -12,8 +12,8 @@ use valida_opcodes::{AND32, OR32, XOR32};
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use p3_maybe_rayon::*;
-use p3_uni_stark::StarkConfig;
+use p3_maybe_rayon::prelude::*;
+use valida_machine::config::StarkConfig;
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;

diff --git a/alu_u32/src/div/mod.rs b/alu_u32/src/div/mod.rs
@@ -6,18 +6,18 @@ use columns::{Div32Cols, DIV_COL_MAP, NUM_DIV_COLS};
 use core::mem::transmute;
 use valida_bus::MachineWithGeneralBus;
 use valida_cpu::MachineWithCpuChip;
+use valida_machine::config::StarkConfig;
 use valida_machine::core::SDiv;
 use valida_machine::{instructions, Chip, Instruction, Interaction, Operands, Word};
 use valida_opcodes::{DIV32, SDIV32};
 use valida_range::MachineWithRangeChip;
+use valida_util::pad_to_power_of_two;
 
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use p3_maybe_rayon::*;
+use p3_maybe_rayon::prelude::*;
 
-use p3_uni_stark::StarkConfig;
-use valida_util::pad_to_power_of_two;
 pub mod columns;
 pub mod stark;
 

diff --git a/alu_u32/src/lt/mod.rs b/alu_u32/src/lt/mod.rs
@@ -15,9 +15,9 @@ use valida_opcodes::LT32;
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use p3_maybe_rayon::*;
+use p3_maybe_rayon::prelude::*;
 
-use p3_uni_stark::StarkConfig;
+use valida_machine::config::StarkConfig;
 use valida_util::pad_to_power_of_two;
 pub mod columns;
 pub mod stark;

diff --git a/alu_u32/src/mul/mod.rs b/alu_u32/src/mul/mod.rs
@@ -13,7 +13,7 @@ use core::borrow::BorrowMut;
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use p3_uni_stark::StarkConfig;
+use valida_machine::config::StarkConfig;
 
 pub mod columns;
 pub mod stark;

diff --git a/alu_u32/src/shift/mod.rs b/alu_u32/src/shift/mod.rs
@@ -14,8 +14,8 @@ use valida_opcodes::{DIV32, MUL32, SDIV32, SHL32, SHR32, SRA32};
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use p3_maybe_rayon::*;
-use p3_uni_stark::StarkConfig;
+use p3_maybe_rayon::prelude::*;
+use valida_machine::config::StarkConfig;
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;

diff --git a/alu_u32/src/sub/mod.rs b/alu_u32/src/sub/mod.rs
@@ -13,9 +13,8 @@ use valida_range::MachineWithRangeChip;
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use p3_maybe_rayon::*;
-use p3_uni_stark::StarkConfig;
-
+use p3_maybe_rayon::prelude::*;
+use valida_machine::config::StarkConfig;
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;