Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update dependency for halo2 MsmAccel trait #377

Merged
merged 2 commits into from
May 18, 2024
Merged

update dependency for halo2 MsmAccel trait #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12f5686
update dependency for halo2 MsmAccel trait
Vindaar May 6, 2024
4cbd2c5
remove halo2curves dep, use via halo2_middleware
Vindaar May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions constantine-rust/constantine-halo2-zal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repository = "https://github.com/mratsim/constantine"
[dependencies]
constantine-sys = { path = "../constantine-sys" }
constantine-core = { path = "../constantine-core" }
halo2curves = { git = 'https://github.com/taikoxyz/halo2curves', branch = "pr-pse-exec-engine" }
halo2_middleware = { git = 'https://github.com/privacy-scaling-explorations/halo2' }

[dev-dependencies]
ark-std = "0.3"
Expand All @@ -22,7 +22,7 @@ rand_xorshift = "0.3"
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" }
# halo2curves = { git = 'https://github.com/taikoxyz/halo2curves', branch = "pr-pse-exec-engine" }
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what should happen with this here.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover from when I enabled multicore and asm features for benching (and disabled it in CI) See: 231ccc7#diff-86e33129ff3e1c7ef4e097a64b3bba9f931352847b95fa0d7c9033665c10b8b6R26

It can be deleted with.

Note that if upstream is changed to reexport part of halo2curves, we might need it again for the benchmarks:

constantine/constantine-rust/constantine-halo2-zal/benches/msm.rs

Lines 18 to 21 in 12f5686

use halo2curves::bn256::{Fr as Scalar, G1Affine as Point};
use halo2curves::ff::Field;
use halo2curves::msm::best_multiexp;
use halo2curves::zal::MsmAccel;

at least the best_multi_exp part.


[[bench]]
name = "msm"
Expand Down
6 changes: 3 additions & 3 deletions constantine-rust/constantine-halo2-zal/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ use constantine_sys::*;
use ::core::mem::MaybeUninit;
use std::mem;

use halo2curves::bn256;
use halo2curves::zal::MsmAccel;
use halo2curves::CurveAffine;
use halo2_middleware::halo2curves::bn256;
use halo2_middleware::zal::traits::MsmAccel;
use halo2_middleware::halo2curves::CurveAffine;

#[derive(Debug)]
pub struct CttEngine(Threadpool);
Expand Down
12 changes: 6 additions & 6 deletions constantine-rust/constantine-halo2-zal/tests/t_zal_msm_accel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ use constantine_halo2_zal::CttEngine;
use ark_std::{end_timer, start_timer};
use rand_core::OsRng;

use halo2curves::bn256;
use halo2curves::ff::Field;
use halo2curves::group::prime::PrimeCurveAffine;
use halo2curves::group::{Curve, Group};
use halo2curves::msm::best_multiexp;
use halo2curves::zal::MsmAccel;
use halo2_middleware::halo2curves::bn256;
use halo2_middleware::halo2curves::ff::Field;
use halo2_middleware::halo2curves::group::prime::PrimeCurveAffine;
use halo2_middleware::halo2curves::group::{Curve, Group};
use halo2_middleware::halo2curves::msm::best_multiexp;
use halo2_middleware::zal::traits::MsmAccel;

#[test]
fn t_threadpool() {
Expand Down
Loading