Merge branch 'master' into ipa-multiproof-serde

mratsim · Jan 23, 2024 · 10b51ac · 10b51ac
2 parents 27b2982 + 00945ae
commit 10b51ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/constantine-rust/constantine-halo2-zal/Cargo.toml b/constantine-rust/constantine-halo2-zal/Cargo.toml
@@ -19,10 +19,10 @@ rand_core = { version = "0.6", default-features = false }
 # Benchmark-only dependencies
 criterion = { version = "0.3", features = ["html_reports"] }
 rand_xorshift = "0.3"
-maybe-rayon = { version = "0.1.0", default-features = false }
+rayon = "1.8"
 
 # In CI "asm" needs to be disabled as some agents don't support ADX.
-halo2curves = { git = 'https://github.com/taikoxyz/halo2curves', branch = "pr-pse-exec-engine", features = ["multicore"]}
+halo2curves = { git = 'https://github.com/taikoxyz/halo2curves', branch = "pr-pse-exec-engine" }
 
 [[bench]]
 name = "msm"

diff --git a/constantine-rust/constantine-halo2-zal/benches/msm.rs b/constantine-rust/constantine-halo2-zal/benches/msm.rs
@@ -20,8 +20,8 @@ use halo2curves::ff::Field;
 use halo2curves::msm::best_multiexp;
 use halo2curves::zal::MsmAccel;
 
-use maybe_rayon::current_thread_index;
-use maybe_rayon::prelude::{IntoParallelIterator, ParallelIterator};
+use rayon::current_thread_index;
+use rayon::prelude::{IntoParallelIterator, ParallelIterator};
 use rand_core::SeedableRng;
 use rand_xorshift::XorShiftRng;
 

diff --git a/constantine-rust/constantine-halo2-zal/src/lib.rs b/constantine-rust/constantine-halo2-zal/src/lib.rs
@@ -16,7 +16,7 @@ use ::core::mem::MaybeUninit;
 use std::mem;
 
 use halo2curves::bn256;
-use halo2curves::zal::{MsmAccel, ZalEngine};
+use halo2curves::zal::MsmAccel;
 use halo2curves::CurveAffine;
 
 #[derive(Debug)]
@@ -39,8 +39,6 @@ pub struct CttMsmBaseDesc<'b, C: CurveAffine> {
     raw: &'b [C],
 }
 
-impl ZalEngine for CttEngine {}
-
 impl MsmAccel<bn256::G1Affine> for CttEngine {
     fn msm(&self, coeffs: &[bn256::Fr], bases: &[bn256::G1Affine]) -> bn256::G1 {
         assert_eq!(coeffs.len(), bases.len());