File tree Expand file tree Collapse file tree 4 files changed +7
-2
lines changed Expand file tree Collapse file tree 4 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -377,7 +377,11 @@ impl PartitionOptions {
377
377
378
378
/// Returns the size of each partition used when committing to the main and auxiliary traces as
379
379
/// well as the constraint evaluation trace.
380
+ /// The returned size is given in terms of number of columns in the field `E`.
380
381
pub fn partition_size < E : FieldElement > ( & self , num_columns : usize ) -> usize {
382
+ if self . num_partitions == 1 && self . min_partition_size == 1 {
383
+ return num_columns;
384
+ }
381
385
let base_elements_per_partition = cmp:: max (
382
386
( num_columns * E :: EXTENSION_DEGREE ) . div_ceil ( self . num_partitions as usize ) ,
383
387
self . min_partition_size as usize ,
Original file line number Diff line number Diff line change @@ -219,6 +219,7 @@ pub trait Prover {
219
219
/// Builds and returns the auxiliary trace.
220
220
#[ allow( unused_variables) ]
221
221
#[ maybe_async]
222
+ #[ instrument( skip_all) ]
222
223
fn build_aux_trace < E > (
223
224
& self ,
224
225
main_trace : & Self :: Trace ,
Original file line number Diff line number Diff line change @@ -188,7 +188,7 @@ impl<E: FieldElement> RowMatrix<E> {
188
188
// allocate vector to store row hashes
189
189
let mut row_hashes = unsafe { uninit_vector :: < H :: Digest > ( self . num_rows ( ) ) } ;
190
190
191
- if partition_size == self . num_cols ( ) * E :: EXTENSION_DEGREE {
191
+ if partition_size == self . num_cols ( ) {
192
192
// iterate though matrix rows, hashing each row
193
193
batch_iter_mut ! (
194
194
& mut row_hashes,
Original file line number Diff line number Diff line change @@ -442,7 +442,7 @@ where
442
442
E : FieldElement ,
443
443
H : ElementHasher < BaseField = E :: BaseField > ,
444
444
{
445
- if partition_size == row. len ( ) * E :: EXTENSION_DEGREE {
445
+ if partition_size == row. len ( ) {
446
446
H :: hash_elements ( row)
447
447
} else {
448
448
let mut buffer = vec ! [ H :: Digest :: default ( ) ; partition_size] ;
You can’t perform that action at this time.
0 commit comments