From d61d0a09bbc642ecdafdbdc26fb5b2db2640fe8b Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 28 Mar 2023 16:52:47 +0200 Subject: [PATCH] Rename commit evaluator. --- src/compiler.rs | 4 ++-- src/lib.rs | 2 +- .../affine_expression.rs | 2 +- .../bit_constraints.rs | 6 +++--- .../double_sorted_witness_machine.rs | 2 +- src/{commit_evaluator => witness_generator}/eval_error.rs | 0 .../expression_evaluator.rs | 0 .../fixed_evaluator.rs | 0 .../fixed_lookup_machine.rs | 6 +++--- .../evaluator.rs => witness_generator/generator.rs} | 0 src/{commit_evaluator => witness_generator}/machine.rs | 0 .../machine_extractor.rs | 0 src/{commit_evaluator => witness_generator}/mod.rs | 4 ++-- .../sorted_witness_machine.rs | 2 +- .../symbolic_evaluator.rs | 0 src/{commit_evaluator => witness_generator}/util.rs | 0 16 files changed, 14 insertions(+), 14 deletions(-) rename src/{commit_evaluator => witness_generator}/affine_expression.rs (99%) rename src/{commit_evaluator => witness_generator}/bit_constraints.rs (98%) rename src/{commit_evaluator => witness_generator}/double_sorted_witness_machine.rs (99%) rename src/{commit_evaluator => witness_generator}/eval_error.rs (100%) rename src/{commit_evaluator => witness_generator}/expression_evaluator.rs (100%) rename src/{commit_evaluator => witness_generator}/fixed_evaluator.rs (100%) rename src/{commit_evaluator => witness_generator}/fixed_lookup_machine.rs (97%) rename src/{commit_evaluator/evaluator.rs => witness_generator/generator.rs} (100%) rename src/{commit_evaluator => witness_generator}/machine.rs (100%) rename src/{commit_evaluator => witness_generator}/machine_extractor.rs (100%) rename src/{commit_evaluator => witness_generator}/mod.rs (98%) rename src/{commit_evaluator => witness_generator}/sorted_witness_machine.rs (99%) rename src/{commit_evaluator => witness_generator}/symbolic_evaluator.rs (100%) rename src/{commit_evaluator => witness_generator}/util.rs (100%) diff --git a/src/compiler.rs b/src/compiler.rs index ad2e1114c..2c7fddf93 100644 --- a/src/compiler.rs +++ b/src/compiler.rs @@ -7,7 +7,7 @@ use num_bigint::Sign; use crate::number::{abstract_to_degree, AbstractNumberType, DegreeType}; use crate::parser::ast::PILFile; -use crate::{analyzer, asm_compiler, commit_evaluator, constant_evaluator, json_exporter}; +use crate::{analyzer, asm_compiler, constant_evaluator, json_exporter, witness_generator}; pub fn no_callback() -> Option Option> { None @@ -140,7 +140,7 @@ fn compile( println!("Wrote constants.bin."); println!("Deducing witness columns..."); let commits = - commit_evaluator::generate(analyzed, degree, &constants, query_callback, verbose); + witness_generator::generate(analyzed, degree, &constants, query_callback, verbose); write_polys_file( &mut BufWriter::new(&mut fs::File::create(output_dir.join("commits.bin")).unwrap()), degree, diff --git a/src/lib.rs b/src/lib.rs index 0f1b9be6d..37a6e7c80 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,5 @@ pub mod analyzer; pub mod asm_compiler; -pub mod commit_evaluator; pub mod compiler; pub mod constant_evaluator; pub mod json_exporter; @@ -8,3 +7,4 @@ pub mod number; pub mod parser; pub mod riscv; pub mod utils; +pub mod witness_generator; diff --git a/src/commit_evaluator/affine_expression.rs b/src/witness_generator/affine_expression.rs similarity index 99% rename from src/commit_evaluator/affine_expression.rs rename to src/witness_generator/affine_expression.rs index 2d963eb7a..8bdb21c8b 100644 --- a/src/commit_evaluator/affine_expression.rs +++ b/src/witness_generator/affine_expression.rs @@ -349,8 +349,8 @@ mod test { use super::*; use crate::{ - commit_evaluator::{bit_constraints::BitConstraint, eval_error::EvalError}, number::AbstractNumberType, + witness_generator::{bit_constraints::BitConstraint, eval_error::EvalError}, }; use super::{AffineExpression, GOLDILOCKS_MOD}; diff --git a/src/commit_evaluator/bit_constraints.rs b/src/witness_generator/bit_constraints.rs similarity index 98% rename from src/commit_evaluator/bit_constraints.rs rename to src/witness_generator/bit_constraints.rs index 4d91fbb34..b4ca7df38 100644 --- a/src/commit_evaluator/bit_constraints.rs +++ b/src/witness_generator/bit_constraints.rs @@ -2,8 +2,8 @@ use std::collections::{BTreeMap, BTreeSet}; use std::fmt::{Display, Formatter}; use crate::analyzer::{BinaryOperator, Expression, Identity, IdentityKind, PolynomialReference}; -use crate::commit_evaluator::util::{contains_next_ref, WitnessColumnNamer}; use crate::number::{AbstractNumberType, GOLDILOCKS_MOD}; +use crate::witness_generator::util::{contains_next_ref, WitnessColumnNamer}; use super::expression_evaluator::ExpressionEvaluator; use super::symbolic_evaluator::SymbolicEvaluator; @@ -316,8 +316,8 @@ fn smallest_period_candidate(fixed: &[AbstractNumberType]) -> Option { mod test { use std::collections::BTreeMap; - use crate::commit_evaluator::bit_constraints::{propagate_constraints, BitConstraint}; - use crate::commit_evaluator::{FixedData, WitnessColumn}; + use crate::witness_generator::bit_constraints::{propagate_constraints, BitConstraint}; + use crate::witness_generator::{FixedData, WitnessColumn}; use super::process_fixed_column; diff --git a/src/commit_evaluator/double_sorted_witness_machine.rs b/src/witness_generator/double_sorted_witness_machine.rs similarity index 99% rename from src/commit_evaluator/double_sorted_witness_machine.rs rename to src/witness_generator/double_sorted_witness_machine.rs index e8b5fd946..da95f5ff3 100644 --- a/src/commit_evaluator/double_sorted_witness_machine.rs +++ b/src/witness_generator/double_sorted_witness_machine.rs @@ -5,8 +5,8 @@ use itertools::{Either, Itertools}; use crate::analyzer::PolynomialReference; use crate::analyzer::{Expression, Identity, IdentityKind, SelectedExpressions}; -use crate::commit_evaluator::eval_error; use crate::number::AbstractNumberType; +use crate::witness_generator::eval_error; use super::affine_expression::AffineExpression; use super::eval_error::EvalError; diff --git a/src/commit_evaluator/eval_error.rs b/src/witness_generator/eval_error.rs similarity index 100% rename from src/commit_evaluator/eval_error.rs rename to src/witness_generator/eval_error.rs diff --git a/src/commit_evaluator/expression_evaluator.rs b/src/witness_generator/expression_evaluator.rs similarity index 100% rename from src/commit_evaluator/expression_evaluator.rs rename to src/witness_generator/expression_evaluator.rs diff --git a/src/commit_evaluator/fixed_evaluator.rs b/src/witness_generator/fixed_evaluator.rs similarity index 100% rename from src/commit_evaluator/fixed_evaluator.rs rename to src/witness_generator/fixed_evaluator.rs diff --git a/src/commit_evaluator/fixed_lookup_machine.rs b/src/witness_generator/fixed_lookup_machine.rs similarity index 97% rename from src/commit_evaluator/fixed_lookup_machine.rs rename to src/witness_generator/fixed_lookup_machine.rs index a40805981..58dd20990 100644 --- a/src/commit_evaluator/fixed_lookup_machine.rs +++ b/src/witness_generator/fixed_lookup_machine.rs @@ -1,10 +1,10 @@ use std::collections::{HashMap, HashSet}; use crate::analyzer::{Expression, Identity, IdentityKind, SelectedExpressions}; -use crate::commit_evaluator::eval_error; -use crate::commit_evaluator::expression_evaluator::ExpressionEvaluator; -use crate::commit_evaluator::util::contains_witness_ref; use crate::number::{AbstractNumberType, DegreeType}; +use crate::witness_generator::eval_error; +use crate::witness_generator::expression_evaluator::ExpressionEvaluator; +use crate::witness_generator::util::contains_witness_ref; use super::affine_expression::AffineExpression; use super::eval_error::EvalError; diff --git a/src/commit_evaluator/evaluator.rs b/src/witness_generator/generator.rs similarity index 100% rename from src/commit_evaluator/evaluator.rs rename to src/witness_generator/generator.rs diff --git a/src/commit_evaluator/machine.rs b/src/witness_generator/machine.rs similarity index 100% rename from src/commit_evaluator/machine.rs rename to src/witness_generator/machine.rs diff --git a/src/commit_evaluator/machine_extractor.rs b/src/witness_generator/machine_extractor.rs similarity index 100% rename from src/commit_evaluator/machine_extractor.rs rename to src/witness_generator/machine_extractor.rs diff --git a/src/commit_evaluator/mod.rs b/src/witness_generator/mod.rs similarity index 98% rename from src/commit_evaluator/mod.rs rename to src/witness_generator/mod.rs index 350491e21..1a3bbd63b 100644 --- a/src/commit_evaluator/mod.rs +++ b/src/witness_generator/mod.rs @@ -11,10 +11,10 @@ mod affine_expression; mod bit_constraints; mod double_sorted_witness_machine; mod eval_error; -mod evaluator; mod expression_evaluator; pub mod fixed_evaluator; mod fixed_lookup_machine; +mod generator; mod machine; mod machine_extractor; mod sorted_witness_machine; @@ -53,7 +53,7 @@ pub fn generate<'a>( machine_extractor::split_out_machines(&fixed, &analyzed.identities, &witness_cols); let (global_bit_constraints, identities) = bit_constraints::determine_global_constraints(&fixed, identities); - let mut evaluator = evaluator::Evaluator::new( + let mut evaluator = generator::Evaluator::new( &fixed, identities, global_bit_constraints, diff --git a/src/commit_evaluator/sorted_witness_machine.rs b/src/witness_generator/sorted_witness_machine.rs similarity index 99% rename from src/commit_evaluator/sorted_witness_machine.rs rename to src/witness_generator/sorted_witness_machine.rs index 9ffe14975..1415dda7b 100644 --- a/src/commit_evaluator/sorted_witness_machine.rs +++ b/src/witness_generator/sorted_witness_machine.rs @@ -3,8 +3,8 @@ use std::collections::{BTreeMap, HashMap, HashSet}; use itertools::{Either, Itertools}; use crate::analyzer::{Expression, Identity, IdentityKind, SelectedExpressions}; -use crate::commit_evaluator::eval_error; use crate::number::AbstractNumberType; +use crate::witness_generator::eval_error; use super::affine_expression::AffineExpression; use super::eval_error::EvalError; diff --git a/src/commit_evaluator/symbolic_evaluator.rs b/src/witness_generator/symbolic_evaluator.rs similarity index 100% rename from src/commit_evaluator/symbolic_evaluator.rs rename to src/witness_generator/symbolic_evaluator.rs diff --git a/src/commit_evaluator/util.rs b/src/witness_generator/util.rs similarity index 100% rename from src/commit_evaluator/util.rs rename to src/witness_generator/util.rs