Method consistency

Author: darth-cy

spartan_parallel/src/sparse_mlpoly.rs

@@ -444,20 +444,19 @@ impl<S: SpartanExtensionField> SparseMatPolynomial<S> {
     p: usize,
     q: usize,
   ) -> Vec<S> {
+    let res = Arc::new(Mutex::new(vec![S::field_zero(); num_rows]));
+
     (0..inst.B_list[p_inst].M.len())
-      .map(|i| {
+      .into_par_iter()
+      .for_each(|i| {
         let row = inst.B_list[p_inst].M[i].row;
         let col = inst.B_list[p_inst].M[i].col;
-        let val = &inst.B_list[p_inst].M[i].val;
-        (
-          row,
-          *val * z_mat[p][q][col / max_num_cols][col % max_num_cols],
-        )
-      })
-      .fold(vec![S::field_zero(); num_rows], |mut Mz, (r, v)| {
-        Mz[r] = Mz[r] + v;
-        Mz
-      })
+        let val = inst.B_list[p_inst].M[i].val;
+        let mut Mz = res.lock().unwrap();
+        Mz[row] += val * z_mat[p][q][col / max_num_cols][col % max_num_cols]
+      });
+    let vec = res.lock().unwrap();
+    vec.clone()
   }
 
   // Z is consisted of vector segments
@@ -473,20 +472,19 @@ impl<S: SpartanExtensionField> SparseMatPolynomial<S> {
     p: usize,
     q: usize,
   ) -> Vec<S> {
+    let res = Arc::new(Mutex::new(vec![S::field_zero(); num_rows]));
+
     (0..inst.C_list[p_inst].M.len())
-      .map(|i| {
+      .into_par_iter()
+      .for_each(|i| {
         let row = inst.C_list[p_inst].M[i].row;
         let col = inst.C_list[p_inst].M[i].col;
-        let val = &inst.C_list[p_inst].M[i].val;
-        (
-          row,
-          *val * z_mat[p][q][col / max_num_cols][col % max_num_cols],
-        )
-      })
-      .fold(vec![S::field_zero(); num_rows], |mut Mz, (r, v)| {
-        Mz[r] = Mz[r] + v;
-        Mz
-      })
+        let val = inst.C_list[p_inst].M[i].val;
+        let mut Mz = res.lock().unwrap();
+        Mz[row] += val * z_mat[p][q][col / max_num_cols][col % max_num_cols]
+      });
+    let vec = res.lock().unwrap();
+    vec.clone()
   }
 
   pub fn compute_eval_table_sparse(&self, rx: &[S], num_rows: usize, num_cols: usize) -> Vec<S> {