Skip to content

Commit b081bc6

Browse files
committed
fix weid bug on columns_up_and_down
1 parent 671fb07 commit b081bc6

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

crates/air/src/utils.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use multilinear_toolkit::prelude::*;
22
use p3_field::Field;
3+
use tracing::instrument;
34

45
pub(crate) fn matrix_up_lde<F: Field>(point: &[F]) -> F {
56
/*
@@ -129,11 +130,17 @@ fn next_mle<F: Field>(point: &[F]) -> F {
129130
.sum()
130131
}
131132

133+
#[instrument(skip_all, fields(len = columns.len(), col_len = columns[0].len()))]
132134
pub(crate) fn columns_up_and_down<F: Field>(columns: &[&[F]]) -> Vec<Vec<F>> {
133-
columns
134-
.par_iter()
135-
.map(|c| column_up(c))
136-
.chain(columns.par_iter().map(|c| column_down(c)))
135+
(0..columns.len() * 2)
136+
.into_par_iter()
137+
.map(|i| {
138+
if i < columns.len() {
139+
column_up(columns[i])
140+
} else {
141+
column_down(columns[i - columns.len()])
142+
}
143+
})
137144
.collect()
138145
}
139146

crates/rec_aggregation/src/recursion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ fn run_recursion_benchmark() -> RecursionBenchStats {
180180
// #[rustfmt::skip] // debug
181181
// std::fs::write("public_input.txt", build_public_memory(&public_input).chunks_exact(8).enumerate().map(|(i, chunk)| { format!("{} - {}: {}\n", i, i * 8, chunk.iter().map(|x| x.to_string()).collect::<Vec<_>>().join(", ")) }).collect::<String>(),).unwrap();
182182

183-
// utils::init_tracing();
183+
utils::init_tracing();
184184
let (bytecode, function_locations) = compile_program(&program_str);
185185
let time = Instant::now();
186186
let (proof_data, proof_size) = prove_execution(

crates/rec_aggregation/src/xmss_aggregate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ pub fn bench_xmss(n: usize, log_lifetime: usize) -> Duration {
308308

309309
#[test]
310310
fn test_xmss_aggregate() {
311-
//utils::init_tracing();
311+
utils::init_tracing();
312312
use p3_field::Field;
313313
let n_public_keys: usize = std::env::var("NUM_XMSS_AGGREGATED")
314314
.unwrap_or("100".to_string())

0 commit comments

Comments
 (0)