Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/examples/src/xor/gkr_lookups/mle_eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,7 @@ mod tests {
let components = Components {
components: components.iter().map(|&c| c as &dyn Component).collect(),
n_preprocessed_columns: 0,
all_preprocessed_columns: false,
};

let log_sizes = components.column_log_sizes();
Expand Down Expand Up @@ -937,6 +938,7 @@ mod tests {
let components = Components {
components: vec![&mle_coeffs_col_component, &mle_eval_component],
n_preprocessed_columns: 0,
all_preprocessed_columns: false,
};

let log_sizes = components.column_log_sizes();
Expand Down
15 changes: 10 additions & 5 deletions crates/stwo/src/core/air/components.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ use crate::core::ColumnVec;
pub struct Components<'a> {
pub components: Vec<&'a dyn Component>,
pub n_preprocessed_columns: usize,
/// Whether `maks_points` should include all preprocessed columns, regardles of usage.
pub all_preprocessed_columns: bool,
}

impl Components<'_> {
Expand All @@ -36,11 +38,14 @@ impl Components<'_> {
);

let preprocessed_mask_points = &mut mask_points[PREPROCESSED_TRACE_IDX];
*preprocessed_mask_points = vec![vec![]; self.n_preprocessed_columns];

for component in &self.components {
for idx in component.preprocessed_column_indices() {
preprocessed_mask_points[idx] = vec![point];
if self.all_preprocessed_columns {
*preprocessed_mask_points = vec![vec![point]; self.n_preprocessed_columns];
} else {
*preprocessed_mask_points = vec![vec![]; self.n_preprocessed_columns];
for component in &self.components {
for idx in component.preprocessed_column_indices() {
preprocessed_mask_points[idx] = vec![point];
}
}
}

Expand Down
1 change: 1 addition & 0 deletions crates/stwo/src/core/verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ pub fn verify<MC: MerkleChannel>(
let components = Components {
components: components.to_vec(),
n_preprocessed_columns,
all_preprocessed_columns: false,
};
let composition_log_size = components.composition_log_degree_bound();
tracing::info!(
Expand Down
1 change: 1 addition & 0 deletions crates/stwo/src/prover/air/component_prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ impl<B: Backend> ComponentProvers<'_, B> {
.map(|c| *c as &dyn Component)
.collect_vec(),
n_preprocessed_columns: self.n_preprocessed_columns,
all_preprocessed_columns: false,
}
}
pub fn compute_composition_polynomial(
Expand Down