chore: change MAX generic to instance field

chips/src/range/air.rs

@@ -5,18 +5,18 @@ use p3_matrix::dense::RowMajorMatrix;
 use super::columns::NUM_RANGE_COLS;
 use super::RangeCheckerChip;
 
-impl<F: Field, const MAX: u32> BaseAir<F> for RangeCheckerChip<MAX> {
+impl<F: Field> BaseAir<F> for RangeCheckerChip {
     fn width(&self) -> usize {
         NUM_RANGE_COLS
     }
 
     fn preprocessed_trace(&self) -> Option<RowMajorMatrix<F>> {
-        let column = (0..MAX).map(F::from_canonical_u32).collect();
+        let column = (0..self.range_max).map(F::from_canonical_u32).collect();
         Some(RowMajorMatrix::new_col(column))
     }
 }
 
-impl<AB, const MAX: u32> Air<AB> for RangeCheckerChip<MAX>
+impl<AB> Air<AB> for RangeCheckerChip
 where
     AB: AirBuilder,
 {

chips/src/range/chip.rs

@@ -7,7 +7,7 @@ use super::{
     RangeCheckerChip,
 };
 
-impl<F: PrimeField32, const MAX: u32> Chip<F> for RangeCheckerChip<MAX> {
+impl<F: PrimeField32> Chip<F> for RangeCheckerChip {
     fn receives(&self) -> Vec<Interaction<F>> {
         vec![Interaction {
             fields: vec![VirtualPairCol::single_preprocessed(

chips/src/range/mod.rs

@@ -8,19 +8,24 @@ pub mod columns;
 pub mod trace;
 
 #[derive(Default)]
-pub struct RangeCheckerChip<const MAX: u32> {
+pub struct RangeCheckerChip {
     /// The index for the Range Checker bus.
     bus_index: usize,
+    range_max: u32,
     pub count: Vec<Arc<AtomicU32>>,
 }
 
-impl<const MAX: u32> RangeCheckerChip<MAX> {
-    pub fn new(bus_index: usize) -> Self {
+impl RangeCheckerChip {
+    pub fn new(bus_index: usize, range_max: u32) -> Self {
         let mut count = vec![];
-        for _ in 0..MAX {
+        for _ in 0..range_max {
             count.push(Arc::new(AtomicU32::new(0)));
         }
-        Self { bus_index, count }
+        Self {
+            bus_index,
+            range_max,
+            count,
+        }
     }
 
     pub fn bus_index(&self) -> usize {

chips/src/range/trace.rs

@@ -8,9 +8,9 @@ use super::{
     RangeCheckerChip,
 };
 
-impl<const MAX: u32> RangeCheckerChip<MAX> {
+impl RangeCheckerChip {
     pub fn generate_trace<F: PrimeField32>(&self) -> RowMajorMatrix<F> {
-        let mut rows = vec![[F::zero(); NUM_RANGE_COLS]; MAX as usize];
+        let mut rows = vec![[F::zero(); NUM_RANGE_COLS]; self.range_max as usize];
         for (n, row) in rows.iter_mut().enumerate() {
             let cols: &mut RangeCols<F> = unsafe { transmute(row) };
 

chips/src/range_gate/air.rs

@@ -8,13 +8,13 @@ use super::columns::RangeGateCols;
 use super::columns::NUM_RANGE_GATE_COLS;
 use super::RangeCheckerGateChip;
 
-impl<F: Field, const MAX: u32> BaseAir<F> for RangeCheckerGateChip<MAX> {
+impl<F: Field> BaseAir<F> for RangeCheckerGateChip {
     fn width(&self) -> usize {
         NUM_RANGE_GATE_COLS
     }
 }
 
-impl<AB, const MAX: u32> Air<AB> for RangeCheckerGateChip<MAX>
+impl<AB> Air<AB> for RangeCheckerGateChip
 where
     AB: AirBuilder,
 {

chips/src/range_gate/chip.rs

@@ -4,7 +4,7 @@ use p3_field::PrimeField64;
 
 use super::{columns::RANGE_GATE_COL_MAP, RangeCheckerGateChip};
 
-impl<F: PrimeField64, const MAX: u32> Chip<F> for RangeCheckerGateChip<MAX> {
+impl<F: PrimeField64> Chip<F> for RangeCheckerGateChip {
     fn receives(&self) -> Vec<Interaction<F>> {
         vec![Interaction {
             fields: vec![VirtualPairCol::single_main(RANGE_GATE_COL_MAP.counter)],

chips/src/range_gate/mod.rs

@@ -10,19 +10,24 @@ pub mod trace;
 /// column. The counter column is generated using a gate, as opposed to
 /// the other RangeCheckerChip.
 #[derive(Default)]
-pub struct RangeCheckerGateChip<const MAX: u32> {
+pub struct RangeCheckerGateChip {
     /// The index for the Range Checker bus.
     bus_index: usize,
+    _range_max: u32,
     pub count: Vec<Arc<AtomicU32>>,
 }
 
-impl<const MAX: u32> RangeCheckerGateChip<MAX> {
-    pub fn new(bus_index: usize) -> Self {
+impl RangeCheckerGateChip {
+    pub fn new(bus_index: usize, range_max: u32) -> Self {
         let mut count = vec![];
-        for _ in 0..MAX {
+        for _ in 0..range_max {
             count.push(Arc::new(AtomicU32::new(0)));
         }
-        Self { bus_index, count }
+        Self {
+            bus_index,
+            _range_max: range_max,
+            count,
+        }
     }
 
     pub fn bus_index(&self) -> usize {

chips/src/range_gate/trace.rs

@@ -3,7 +3,7 @@ use p3_matrix::dense::RowMajorMatrix;
 
 use super::{columns::NUM_RANGE_GATE_COLS, RangeCheckerGateChip};
 
-impl<const MAX: u32> RangeCheckerGateChip<MAX> {
+impl RangeCheckerGateChip {
     pub fn generate_trace<F: PrimeField64>(&self) -> RowMajorMatrix<F> {
         let rows = self
             .count

chips/tests/integration_test.rs

@@ -35,7 +35,7 @@ fn test_list_range_checker() {
     const LIST_LEN: usize = 1 << LOG_TRACE_DEGREE_LIST;
 
     // Creating a RangeCheckerChip
-    let range_checker = Arc::new(RangeCheckerChip::<MAX>::new(bus_index));
+    let range_checker = Arc::new(RangeCheckerChip::new(bus_index, MAX));
 
     // Generating random lists
     let num_lists = 10;
@@ -50,8 +50,8 @@ fn test_list_range_checker() {
     // define a bunch of ListChips
     let lists = lists_vals
         .iter()
-        .map(|vals| ListChip::new(bus_index, vals.to_vec(), Arc::clone(&range_checker)))
-        .collect::<Vec<ListChip<MAX>>>();
+        .map(|vals| ListChip::new(bus_index, MAX, vals.to_vec(), Arc::clone(&range_checker)))
+        .collect::<Vec<ListChip>>();
 
     let lists_traces = lists
         .par_iter()
@@ -329,7 +329,7 @@ fn test_range_gate_chip() {
     const LOG_LIST_LEN: usize = 6;
     const LIST_LEN: usize = 1 << LOG_LIST_LEN;
 
-    let range_checker = RangeCheckerGateChip::<MAX>::new(bus_index);
+    let range_checker = RangeCheckerGateChip::new(bus_index, MAX);
 
     // Generating random lists
     let num_lists = 10;
@@ -387,7 +387,7 @@ fn negative_test_range_gate_chip() {
     const N: usize = 3;
     const MAX: u32 = 1 << N;
 
-    let range_checker = RangeCheckerGateChip::<MAX>::new(bus_index);
+    let range_checker = RangeCheckerGateChip::new(bus_index, MAX);
 
     // generating a trace with a counter starting from 1
     // instead of 0 to test the AIR constraints in range_checker

chips/tests/list/air.rs

@@ -4,13 +4,13 @@ use p3_field::Field;
 use super::columns::NUM_LIST_COLS;
 use super::ListChip;
 
-impl<F: Field, const MAX: u32> BaseAir<F> for ListChip<MAX> {
+impl<F: Field> BaseAir<F> for ListChip {
     fn width(&self) -> usize {
         NUM_LIST_COLS
     }
 }
 
-impl<AB, const MAX: u32> Air<AB> for ListChip<MAX>
+impl<AB> Air<AB> for ListChip
 where
     AB: AirBuilder,
 {

chips/tests/list/chip.rs

@@ -4,7 +4,7 @@ use p3_field::PrimeField32;
 
 use super::{columns::LIST_COL_MAP, ListChip};
 
-impl<F: PrimeField32, const MAX: u32> Chip<F> for ListChip<MAX> {
+impl<F: PrimeField32> Chip<F> for ListChip {
     fn sends(&self) -> Vec<Interaction<F>> {
         vec![Interaction {
             fields: vec![VirtualPairCol::single_main(LIST_COL_MAP.val)],

chips/tests/list/mod.rs

@@ -8,22 +8,25 @@ pub mod columns;
 pub mod trace;
 
 #[derive(Default)]
-pub struct ListChip<const MAX: u32> {
+pub struct ListChip {
     /// The index for the Range Checker bus.
     bus_index: usize,
+    _range_max: u32,
     pub vals: Vec<u32>,
 
-    range_checker: Arc<RangeCheckerChip<MAX>>,
+    range_checker: Arc<RangeCheckerChip>,
 }
 
-impl<const MAX: u32> ListChip<MAX> {
+impl ListChip {
     pub fn new(
         bus_index: usize,
+        range_max: u32,
         vals: Vec<u32>,
-        range_checker: Arc<RangeCheckerChip<MAX>>,
+        range_checker: Arc<RangeCheckerChip>,
     ) -> Self {
         Self {
             bus_index,
+            _range_max: range_max,
             vals,
             range_checker,
         }

chips/tests/list/trace.rs

@@ -3,7 +3,7 @@ use p3_matrix::dense::RowMajorMatrix;
 
 use super::{columns::NUM_LIST_COLS, ListChip};
 
-impl<const MAX: u32> ListChip<MAX> {
+impl ListChip {
     pub fn generate_trace<F: PrimeField32>(&self) -> RowMajorMatrix<F> {
         let mut rows = vec![];
         for val in self.vals.iter() {