Remove MultiTableProver

book/src/circuit_building.md

@@ -123,13 +123,13 @@ runner.set_public_inputs(&[expected_fib])?;
 
 // Instantiate prover instance
 let config = build_standard_config_koalabear();
-let multi_prover = MultiTableProver::new(config);
+let prover = BatchStarkProver::new(config);
 
 // Generate traces
 let traces = runner.run()?;
 
 // Prove the program
-let proof = multi_prover.prove_all_tables(&traces)?;
+let proof = prover.prove_all_tables(&traces)?;
 ```
 
 ## Key takeaways

circuit-prover/Cargo.toml

@@ -46,7 +46,3 @@ parallel = ["p3-maybe-rayon/parallel"]
 [[example]]
 name = "fibonacci"
 path = "examples/fibonacci.rs"
-
-[[example]]
-name = "mmcs_verify"
-path = "examples/mmcs_verify.rs"

circuit-prover/examples/fibonacci.rs

@@ -1,11 +1,11 @@
 use std::env;
+use std::error::Error;
 
 /// Fibonacci circuit: Compute F(n) and prove correctness
 /// Public input: expected_result (F(n))
 use p3_baby_bear::BabyBear;
 use p3_circuit::CircuitBuilder;
-use p3_circuit_prover::prover::ProverError;
-use p3_circuit_prover::{MultiTableProver, TablePacking, config};
+use p3_circuit_prover::{BatchStarkProver, TablePacking, config};
 use p3_field::PrimeCharacteristicRing;
 use tracing_forest::ForestLayer;
 use tracing_forest::util::LevelFilter;
@@ -26,7 +26,7 @@ fn init_logger() {
         .init();
 }
 
-fn main() -> Result<(), ProverError> {
+fn main() -> Result<(), Box<dyn Error>> {
     init_logger();
 
     let n = env::args()
@@ -64,9 +64,10 @@ fn main() -> Result<(), ProverError> {
     let traces = runner.run()?;
     let config = config::baby_bear().build();
     let table_packing = TablePacking::from_counts(4, 1);
-    let multi_prover = MultiTableProver::new(config).with_table_packing(table_packing);
-    let proof = multi_prover.prove_all_tables(&traces)?;
-    multi_prover.verify_all_tables(&proof)
+    let prover = BatchStarkProver::new(config).with_table_packing(table_packing);
+    let proof = prover.prove_all_tables(&traces)?;
+    prover.verify_all_tables(&proof)?;
+    Ok(())
 }
 
 fn compute_fibonacci_classical(n: usize) -> F {

circuit-prover/src/batch_stark_prover.rs

@@ -16,7 +16,40 @@ use tracing::instrument;
 use crate::air::{AddAir, ConstAir, MulAir, PublicAir, WitnessAir};
 use crate::config::StarkField;
 use crate::field_params::ExtractBinomialW;
-use crate::prover::TablePacking;
+
+// Packing configuration for Add/Mul tables.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct TablePacking {
+    add_lanes: usize,
+    mul_lanes: usize,
+}
+
+impl TablePacking {
+    pub fn new(add_lanes: usize, mul_lanes: usize) -> Self {
+        Self {
+            add_lanes: add_lanes.max(1),
+            mul_lanes: mul_lanes.max(1),
+        }
+    }
+
+    pub fn from_counts(add_lanes: usize, mul_lanes: usize) -> Self {
+        Self::new(add_lanes, mul_lanes)
+    }
+
+    pub const fn add_lanes(self) -> usize {
+        self.add_lanes
+    }
+
+    pub const fn mul_lanes(self) -> usize {
+        self.mul_lanes
+    }
+}
+
+impl Default for TablePacking {
+    fn default() -> Self {
+        Self::new(1, 1)
+    }
+}
 
 #[repr(usize)]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]

circuit-prover/src/config.rs

@@ -193,7 +193,7 @@ where
 ///
 /// ```ignore
 /// let config = config::baby_bear().build();
-/// let prover = MultiTableProver::new(config);
+/// let prover = BatchStarkProver::new(config);
 /// ```
 #[inline]
 pub fn baby_bear()
@@ -228,7 +228,7 @@ pub fn baby_bear_compression() -> impl PseudoCompressionFunction<[BabyBear; 8],
 ///
 /// ```ignore
 /// let config = config::koala_bear().build();
-/// let prover = MultiTableProver::new(config);
+/// let prover = BatchStarkProver::new(config);
 /// ```
 #[inline]
 pub fn koala_bear()
@@ -263,7 +263,7 @@ pub fn koala_bear_compression() -> impl PseudoCompressionFunction<[KoalaBear; 8]
 ///
 /// ```ignore
 /// let config = config::goldilocks().build();
-/// let prover = MultiTableProver::new(config);
+/// let prover = BatchStarkProver::new(config);
 /// ```
 #[inline]
 pub fn goldilocks()

circuit-prover/src/lib.rs

@@ -8,7 +8,7 @@
 //! - `CD`: FRI challenge field degree, independent of `D`.
 //!
 //! - Build a field-specific config via `config::{babybear_config, koalabear_config, goldilocks_config}`.
-//! - Create a `MultiTableProver` from that config.
+//! - Create a `BatchStarkProver` from that config.
 //! - Generate traces from a `p3_circuit::Circuit` runner and prove/verify.
 //!
 //! Example (BabyBear):
@@ -17,7 +17,7 @@
 //! use p3_baby_bear::BabyBear;
 //! use p3_circuit::builder::CircuitBuilder;
 //! use p3_circuit_prover::config::babybear_config::build_standard_config_babybear;
-//! use p3_circuit_prover::MultiTableProver;
+//! use p3_circuit_prover::BatchStarkProver;
 //!
 //! let mut builder = CircuitBuilder::<BabyBear>::new();
 //! let x = builder.add_public_input();
@@ -29,7 +29,7 @@
 //! runner.set_public_inputs(&[BabyBear::from_u64(1), BabyBear::from_u64(2)]).unwrap();
 //! let traces = runner.run().unwrap();
 //! let cfg = build_standard_config_babybear();
-//! let prover = MultiTableProver::new(cfg);
+//! let prover = BatchStarkProver::new(cfg);
 //! let proof = prover.prove_all_tables(&traces).unwrap();
 //! prover.verify_all_tables(&proof).unwrap();
 //! ```
@@ -41,8 +41,6 @@ pub mod air;
 pub mod batch_stark_prover;
 pub mod config;
 pub mod field_params;
-pub mod prover;
 
 // Re-export main API
-pub use batch_stark_prover::{BatchStarkProof, BatchStarkProver};
-pub use prover::{MultiTableProof, MultiTableProver, TablePacking};
+pub use batch_stark_prover::{BatchStarkProof, BatchStarkProver, TablePacking};