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.

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

Debug println statements for review only - don't merge #10

Draft
wants to merge 5 commits into
base: better-polyeval
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions halo2_proofs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ memmap = "0.7"
plotters = { version = "0.3.0", optional = true }
tabbycat = { version = "0.1", features = ["attributes"], optional = true }

poly-optimizer = { path = "../../polyeval/" }

[target.'cfg(target_arch = "wasm32")'.dependencies]
# plotters depends on web-sys, which eventually depends on bumpalo 3. This dependency is
# required because our MSRV is 1.51, but bumpalo 3.9 increased its MSRV to 1.54. We can
Expand Down
4 changes: 2 additions & 2 deletions halo2_proofs/src/arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ pub fn gpu_ifft<G: Group>(a: &mut [G], omega: G::Scalar, log_n: u32, divisor: G:
/// by $n$.
///
/// This will use multithreading if beneficial.
pub fn best_fft<G: Group>(a: &mut [G], omega: G::Scalar, log_n: u32) {
pub fn best_fft<G: Group+ std::fmt::Debug>(a: &mut [G], omega: G::Scalar, log_n: u32) {
cfg_if::cfg_if! {
if #[cfg(feature = "cuda")]{
return gpu_fft(a, omega, log_n);
Expand All @@ -553,7 +553,7 @@ pub fn best_fft<G: Group>(a: &mut [G], omega: G::Scalar, log_n: u32) {
}
}

pub fn best_fft_cpu<G: Group>(a: &mut [G], omega: G::Scalar, log_n: u32) {
pub fn best_fft_cpu<G: Group + std::fmt::Debug>(a: &mut [G], omega: G::Scalar, log_n: u32) {
fn bitreverse(mut n: usize, l: usize) -> usize {
let mut r = 0;
for _ in 0..l {
Expand Down
3 changes: 3 additions & 0 deletions halo2_proofs/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#![allow(incomplete_features)]
#![feature(generic_const_exprs)]

//! # halo2_proofs
#![feature(local_key_cell_methods)]

Expand Down
3 changes: 3 additions & 0 deletions halo2_proofs/src/plonk/evaluation.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use super::{evaluation_gpu, ConstraintSystem, Expression};
use crate::multicore;
use crate::helpers::Serializable;
use crate::plonk::symbol::ProveExpression;
use crate::plonk::symbol::ProveExpressionUnit;
use crate::plonk::symbol;
Expand Down Expand Up @@ -890,6 +891,8 @@ impl<C: CurveAffine> Evaluator<C> {
let l_active_row = &pk.l_active_row;
let p = &pk.vk.cs.permutation;



let timer = ark_std::start_timer!(|| "permutations");
// Permutations
let permutation = &permutations[0];
Expand Down
Loading