Skip to content

Commit

Permalink
fix/program-size3: fix merge conflict (#619)
Browse files Browse the repository at this point in the history
Fix an invisible merge conflict between #611 and #608.

Co-authored-by: Aurélien Nicolas <[email protected]>
  • Loading branch information
naure and Aurélien Nicolas authored Nov 21, 2024
1 parent c548dc8 commit 12ed922
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ceno_zkvm/src/tables/program.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ impl<E: ExtensionField> TableCircuit<E> for ProgramTableCircuit<E> {
let pc_base = program.base_address;
assert!(num_instructions <= config.program_size);

let mut fixed = RowMajorMatrix::<E::BaseField>::new(PROGRAM_SIZE, num_fixed);
let mut fixed = RowMajorMatrix::<E::BaseField>::new(config.program_size, num_fixed);

fixed
.par_iter_mut()
Expand Down Expand Up @@ -195,7 +195,7 @@ impl<E: ExtensionField> TableCircuit<E> for ProgramTableCircuit<E> {
prog_mlt[i] = *mlt;
}

let mut witness = RowMajorMatrix::<E::BaseField>::new(PROGRAM_SIZE, num_witin);
let mut witness = RowMajorMatrix::<E::BaseField>::new(config.program_size, num_witin);
witness
.par_iter_mut()
.with_min_len(MIN_PAR_SIZE)
Expand Down

0 comments on commit 12ed922

Please sign in to comment.