Merge remote-tracking branch 'origin/HEAD'

Author: TomWambsgans

crates/lean_vm/src/tables/dot_product/exec.rs

@@ -63,10 +63,7 @@ pub(super) fn exec_dot_product_ee(
 ) -> Result<(), RunnerError> {
     assert!(size > 0);
 
-    let (slice_0, slice_1, dot_product_result) = if ptr_arg_1.to_usize() == ONE_VEC_PTR {
-        if size != 1 {
-            unimplemented!("weird use case");
-        }
+    let (slice_0, slice_1, dot_product_result) = if ptr_arg_1.to_usize() == ONE_VEC_PTR && size == 1 {
         if ptr_res.to_usize() == ZERO_VEC_PTR {
             memory.set_ef_element(ptr_arg_0.to_usize(), EF::ZERO)?;
             (vec![EF::ZERO], vec![EF::ONE], EF::ZERO)

crates/rec_aggregation/recursion.py

@@ -391,7 +391,7 @@ def continue_recursion_ordered(second_table, third_table, fs, offset, retrieved_
                     inner_sum,
                     dot_product_ret(
                         evals_down_ef,
-                        batching_scalar_powers + n_down_columns_f,
+                        batching_scalar_powers + n_down_columns_f * DIM,
                         n_down_columns_ef,
                         EE,
                     ),
@@ -413,7 +413,7 @@ def continue_recursion_ordered(second_table, third_table, fs, offset, retrieved_
                     batched_col_down_sc_eval,
                     dot_product_ret(
                         evals_ef_on_down_columns,
-                        batching_scalar_powers + n_down_columns_f,
+                        batching_scalar_powers + n_down_columns_f * DIM,
                         n_down_columns_ef,
                         EE,
                     ),

crates/rec_aggregation/src/recursion.rs

@@ -22,8 +22,11 @@ def main():
         null_ptr = ZERO_VEC_PTR  # pointer to zero vector
         poseidon_of_zero = POSEIDON_OF_ZERO
         poseidon16(null_ptr, null_ptr, poseidon_of_zero)
-        dot_product(null_ptr, null_ptr, null_ptr, 2, BE)
-        dot_product(null_ptr, null_ptr, null_ptr, 2, EE)
+        a = Array(DIM)
+        b = Array(DIM)
+        after_null_ptr = 16
+        dot_product(after_null_ptr, after_null_ptr, a, 3, BE)
+        dot_product(after_null_ptr, after_null_ptr, b, 2, EE)
         x: Mut = 0
         n = 10
         for j in range(0, n):

crates/rec_aggregation/utils.py

@@ -612,7 +612,7 @@ def next_mle(x, y, n):
 def dot_product_with_the_base_vectors(slice):
     # slice: pointer to DIM extension field elements
     # cf constants.rs: by convention, [10000] [01000] [00100] [00010] [00001] is harcoded in memory, starting at ONE_VEC_PTR
-    return dot_product_ret(slice, ONE_VEC_PTR, 1, EE)
+    return dot_product_ret(slice, ONE_VEC_PTR, DIM, EE)
 
 
 def _verify_log2_small(n, partial_sums_24, log2: Const):