Add rayon

Author: darth-cy

circ_blocks/Cargo.toml

@@ -52,7 +52,6 @@ itertools = "0.10"
 petgraph = { version = "0.6", optional = true }
 spartan = { version = "0.8", default-features = false, optional = true }
 spartan_parallel = { path = "../spartan_parallel", default-features = false, features = [
-  "multicore",
   "profile",
 ] }
 merlin = { version = "3.0.0" }

spartan_parallel/Cargo.toml

@@ -20,7 +20,7 @@ rand = { version = "0.8", features = ["getrandom"], default-features = false }
 digest = { version = "0.10", default-features = false }
 sha3 = { version = "0.10", default-features = false }
 byteorder = { version = "1", default-features = false }
-rayon = { version = "1", optional = true }
+rayon = { version = "1" }
 serde = { version = "1", features = ["derive"], default-features = false }
 bincode = { version = "1", default-features = false }
 subtle = { version = "2", features = ["i128"], default-features = false }
@@ -53,7 +53,6 @@ std = [
   "itertools/use_std",
   "flate2/rust_backend",
 ]
-multicore = ["rayon"]
 profile = ["colored"]
 
 [[example]]

spartan_parallel/src/sparse_mlpoly.rs

@@ -14,8 +14,9 @@ use super::timer::Timer;
 use super::transcript::{AppendToTranscript, ProofTranscript};
 use core::cmp::Ordering;
 use merlin::Transcript;
+use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct SparseMatEntry<S: SpartanExtensionField> {
@@ -415,20 +416,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.A_list[p_inst].M.len())
-      .map(|i| {
+      .into_par_iter()
+      .for_each(|i| {
         let row = inst.A_list[p_inst].M[i].row;
         let col = inst.A_list[p_inst].M[i].col;
-        let val = &inst.A_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.A_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