feat: using p3-maybe-rayon for whir crate

Author: Sahilgill24

Cargo.lock

@@ -18,6 +18,7 @@ clap.workspace = true
 ff_ext = { path = "../ff_ext" }
 multilinear_extensions = { path = "../multilinear_extensions" }
 p3.workspace = true
+p3-maybe-rayon.workspace = true
 rand = "0.8"
 rand_chacha = "0.3"
 rayon = { workspace = true, optional = true }
@@ -42,6 +43,6 @@ nightly-features = [
   "transcript/nightly-features",
   "witness/nightly-features",
 ]
-parallel = ["dep:rayon"]
+parallel = ["p3-maybe-rayon/parallel","dep:rayon"]
 print-trace = ["tracing/log"]
 rayon = ["dep:rayon"]

crates/whir/Cargo.toml

@@ -5,8 +5,8 @@ use p3::{
         Dimensions,
         dense::{DenseMatrix, RowMajorMatrix},
     },
+    maybe_rayon::prelude::*,
 };
-use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use transcript::Transcript;
 

crates/whir/src/crypto/mod.rs

@@ -9,13 +9,13 @@ mod wavelet;
 
 use self::matrix::MatrixMut;
 
+#[cfg(feature = "parallel")]
+use p3::maybe_rayon::prelude::*;
 use p3::{
     dft::{Radix2DitParallel, TwoAdicSubgroupDft},
     field::TwoAdicField,
     matrix::Matrix,
 };
-#[cfg(feature = "parallel")]
-use rayon::prelude::*;
 use tracing::instrument;
 use witness::{InstancePaddingStrategy, RowMajorMatrix};
 

crates/whir/src/ntt/mod.rs

@@ -3,8 +3,10 @@ use crate::ntt::matrix_skip::MatrixMutSkip;
 use super::{super::utils::is_power_of_two, MatrixMut, utils::workload_size};
 use std::mem::swap;
 
-use p3::matrix::{Matrix, dense::RowMajorMatrix};
-use rayon::iter::{IndexedParallelIterator, IntoParallelRefMutIterator, ParallelIterator};
+use p3::{
+    matrix::{Matrix, dense::RowMajorMatrix},
+    maybe_rayon::prelude::*,
+};
 #[cfg(feature = "parallel")]
 use rayon::join;
 use sumcheck::macros::{entered_span, exit_span};

crates/whir/src/ntt/transpose.rs

@@ -3,7 +3,7 @@ use p3::field::Field;
 use std::cmp::max;
 
 #[cfg(feature = "parallel")]
-use rayon::prelude::*;
+use p3::maybe_rayon::prelude::*;
 
 /// Fast Wavelet Transform.
 ///

crates/whir/src/ntt/wavelet.rs

@@ -1,9 +1,9 @@
 use super::proof::SumcheckPolynomial;
 use crate::sumcheck::prover_single::SumcheckSingle;
 use ff_ext::ExtensionField;
-use p3::{field::Field, util::log2_strict_usize};
+use p3::{field::Field, maybe_rayon::prelude::*, util::log2_strict_usize};
 #[cfg(feature = "parallel")]
-use rayon::{join, prelude::*};
+use rayon::join;
 
 pub struct SumcheckBatched<F: ExtensionField> {
     // The evaluation on each p and eq

crates/whir/src/sumcheck/prover_batched.rs

@@ -1,9 +1,9 @@
 use super::proof::SumcheckPolynomial;
 
 use ff_ext::ExtensionField;
-use p3::util::log2_strict_usize;
+use p3::{maybe_rayon::prelude::*, util::log2_strict_usize};
 #[cfg(feature = "parallel")]
-use rayon::{join, prelude::*};
+use rayon::join;
 
 pub struct SumcheckSingle<E: ExtensionField> {
     // The evaluation of p
@@ -261,12 +261,10 @@ mod tests {
 
         let eval = MultilinearExtension::from_evaluations_ext_vec(2, polynomial.clone())
             .evaluate(&eval_point);
-        let mut prover = SumcheckSingle::new(
-            polynomial,
-            &[eval_point],
-            &[E::from_canonical_u64(1)],
-            &[eval],
-        );
+        let mut prover =
+            SumcheckSingle::new(polynomial, &[eval_point], &[E::from_canonical_u64(1)], &[
+                eval,
+            ]);
 
         let poly_1 = prover.compute_sumcheck_polynomial();
 

crates/whir/src/sumcheck/prover_single.rs

@@ -4,10 +4,7 @@ use multilinear_extensions::mle::FieldType;
 use p3::{
     field::Field,
     matrix::{Matrix, dense::RowMajorMatrix},
-};
-use rayon::{
-    iter::ParallelIterator,
-    slice::{ParallelSlice, ParallelSliceMut},
+    maybe_rayon::prelude::*,
 };
 use std::collections::BTreeSet;
 use sumcheck::macros::{entered_span, exit_span};

crates/whir/src/utils.rs

@@ -19,7 +19,7 @@ use sumcheck::macros::{entered_span, exit_span};
 use transcript::{BasicTranscript, Transcript};
 
 #[cfg(feature = "parallel")]
-use rayon::prelude::*;
+use p3::maybe_rayon::prelude::*;
 
 #[derive(Debug)]
 pub struct Witnesses<E: ExtensionField> {