ci: update version string in docs

docs/python/src/conf.py

@@ -1,7 +1,7 @@
 import ezkl
 
 project = 'ezkl'
-release = '21.0.4'
+release = '21.0.1'
 version = release
 
 

src/bindings/python.rs

@@ -1,34 +1,34 @@
-use crate::Commitments;
-use crate::RunArgs;
-use crate::circuit::CheckMode;
-use crate::circuit::InputType;
-use crate::circuit::modules::Module;
 use crate::circuit::modules::polycommit::PolyCommitChip;
 use crate::circuit::modules::poseidon::{
+    spec::{PoseidonSpec, POSEIDON_RATE, POSEIDON_WIDTH},
     PoseidonChip,
-    spec::{POSEIDON_RATE, POSEIDON_WIDTH, PoseidonSpec},
 };
+use crate::circuit::modules::Module;
+use crate::circuit::CheckMode;
+use crate::circuit::InputType;
 use crate::commands::*;
-use crate::fieldutils::{IntegerRep, felt_to_integer_rep, integer_rep_to_felt};
+use crate::fieldutils::{felt_to_integer_rep, integer_rep_to_felt, IntegerRep};
 use crate::graph::TestDataSource;
 use crate::graph::{
-    GraphCircuit, GraphSettings, Model, Visibility, quantize_float, scale_to_multiplier,
+    quantize_float, scale_to_multiplier, GraphCircuit, GraphSettings, Model, Visibility,
 };
 use crate::pfsys::evm::aggregation_kzg::AggregationCircuit;
 use crate::pfsys::{
-    ProofType, TranscriptType, load_pk, load_vk, save_params, save_vk,
-    srs::gen_srs as ezkl_gen_srs, srs::load_srs_prover,
+    load_pk, load_vk, save_params, save_vk, srs::gen_srs as ezkl_gen_srs, srs::load_srs_prover,
+    ProofType, TranscriptType,
 };
+use crate::Commitments;
+use crate::RunArgs;
 use halo2_proofs::poly::ipa::commitment::IPACommitmentScheme;
 use halo2_proofs::poly::kzg::commitment::KZGCommitmentScheme;
-use halo2curves::bn256::{Bn256, Fq, Fr, G1, G1Affine};
+use halo2curves::bn256::{Bn256, Fq, Fr, G1Affine, G1};
 use pyo3::exceptions::{PyIOError, PyRuntimeError};
 use pyo3::prelude::*;
 use pyo3::wrap_pyfunction;
 use pyo3_log;
 use pyo3_stub_gen::{
-    TypeInfo, define_stub_info_gatherer, derive::gen_stub_pyclass, derive::gen_stub_pyclass_enum,
-    derive::gen_stub_pyfunction,
+    define_stub_info_gatherer, derive::gen_stub_pyclass, derive::gen_stub_pyclass_enum,
+    derive::gen_stub_pyfunction, TypeInfo,
 };
 use snark_verifier::util::arithmetic::PrimeField;
 use std::collections::HashSet;
@@ -962,8 +962,6 @@ fn gen_settings(
     output=PathBuf::from(DEFAULT_SETTINGS),
     variables=Vec::from([("batch_size".to_string(), 1)]),
     seed=DEFAULT_SEED.parse().unwrap(),
-    min=None, 
-    max=None
 ))]
 #[gen_stub_pyfunction]
 fn gen_random_data(
@@ -971,10 +969,8 @@ fn gen_random_data(
     output: PathBuf,
     variables: Vec<(String, usize)>,
     seed: u64,
-    min: Option<f32>,
-    max: Option<f32>,
 ) -> Result<bool, PyErr> {
-    crate::execute::gen_random_data(model, output, variables, seed, min, max).map_err(|e| {
+    crate::execute::gen_random_data(model, output, variables, seed).map_err(|e| {
         let err_str = format!("Failed to generate settings: {}", e);
         PyRuntimeError::new_err(err_str)
     })?;

src/commands.rs

@@ -382,44 +382,6 @@ pub struct Cli {
     pub command: Option<Commands>,
 }
 
-/// Custom parser for data field that handles both direct JSON strings and file paths with '@' prefix
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, PartialOrd)]
-pub struct DataField(pub String);
-
-impl FromStr for DataField {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        // Check if the input starts with '@'
-        if s.starts_with('@') {
-            // Extract the file path (remove the '@' prefix)
-            let file_path = &s[1..];
-
-            // Read the file content
-            let content = std::fs::read_to_string(file_path)
-                .map_err(|e| format!("Failed to read data file '{}': {}", file_path, e))?;
-
-            // Return the file content as the data field value
-            Ok(DataField(content))
-        } else {
-            // Use the input string directly
-            Ok(DataField(s.to_string()))
-        }
-    }
-}
-
-impl ToFlags for DataField {
-    fn to_flags(&self) -> Vec<String> {
-        vec![self.0.clone()]
-    }
-}
-
-impl std::fmt::Display for DataField {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
 #[allow(missing_docs)]
 #[derive(Debug, Subcommand, Clone, Deserialize, Serialize, PartialEq, PartialOrd, ToSubcommand)]
 pub enum Commands {
@@ -438,9 +400,9 @@ pub enum Commands {
 
     /// Generates the witness from an input file.
     GenWitness {
-        /// The path to the .json data file (with @ prefix) or a raw data string of the form '{"input_data": [[1, 2, 3]]}'
-        #[arg(short = 'D', long, default_value = DEFAULT_DATA, value_parser = DataField::from_str)]
-        data: Option<DataField>,
+        /// The path to the .json data file
+        #[arg(short = 'D', long, default_value = DEFAULT_DATA, value_hint = clap::ValueHint::FilePath)]
+        data: Option<String>,
         /// The path to the compiled model file (generated using the compile-circuit command)
         #[arg(short = 'M', long, default_value = DEFAULT_COMPILED_CIRCUIT, value_hint = clap::ValueHint::FilePath)]
         compiled_circuit: Option<PathBuf>,
@@ -481,12 +443,6 @@ pub enum Commands {
         /// random seed for reproducibility (optional)
         #[arg(long, value_hint = clap::ValueHint::Other, default_value = DEFAULT_SEED)]
         seed: u64,
-        /// min value for random data
-        #[arg(long, value_hint = clap::ValueHint::Other)]
-        min: Option<f32>,
-        /// max value for random data
-        #[arg(long, value_hint = clap::ValueHint::Other)]
-        max: Option<f32>,
     },
     /// Calibrates the proving scale, lookup bits and logrows from a circuit settings file.
     CalibrateSettings {
@@ -772,7 +728,7 @@ pub enum Commands {
     },
     /// Creates an Evm verifier artifact for a single proof to be used by the reusable verifier
     #[command(name = "create-evm-vka")]
-    CreateEvmVka {
+    CreateEvmVKArtifact {
         /// The path to SRS, if None will use ~/.ezkl/srs/kzg{logrows}.srs
         #[arg(long, value_hint = clap::ValueHint::FilePath)]
         srs_path: Option<PathBuf>,
@@ -791,7 +747,7 @@ pub enum Commands {
     },
     /// Creates an Evm verifier that attests to on-chain inputs for a single proof
     #[command(name = "create-evm-da")]
-    CreateEvmDa {
+    CreateEvmDataAttestation {
         /// The path to load circuit settings .json file from (generated using the gen-settings command)
         #[arg(short = 'S', long, default_value = DEFAULT_SETTINGS, value_hint = clap::ValueHint::FilePath)]
         settings_path: Option<PathBuf>,
@@ -900,7 +856,7 @@ pub enum Commands {
     },
     /// Deploys an evm verifier that allows for data attestation
     #[command(name = "deploy-evm-da")]
-    DeployEvmDa {
+    DeployEvmDataAttestation {
         /// The path to the .json data file, which should include both the network input (possibly private) and the network output (public input to the proof)
         #[arg(short = 'D', long, default_value = DEFAULT_DATA, value_hint = clap::ValueHint::FilePath)]
         data: Option<String>,

src/execute.rs

@@ -45,7 +45,6 @@ use halo2curves::serde::SerdeObject;
 use indicatif::{ProgressBar, ProgressStyle};
 use instant::Instant;
 use itertools::Itertools;
-use lazy_static::lazy_static;
 use log::debug;
 use log::{info, trace, warn};
 use serde::Serialize;
@@ -66,6 +65,8 @@ use thiserror::Error;
 use tract_onnx::prelude::IntoTensor;
 use tract_onnx::prelude::Tensor as TractTensor;
 
+use lazy_static::lazy_static;
+
 lazy_static! {
     #[derive(Debug)]
     /// The path to the ezkl related data.
@@ -137,15 +138,11 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             data,
             variables,
             seed,
-            min,
-            max,
         } => gen_random_data(
             model.unwrap_or(DEFAULT_MODEL.into()),
             data.unwrap_or(DEFAULT_DATA.into()),
             variables,
             seed,
-            min,
-            max,
         ),
         Commands::CalibrateSettings {
             model,
@@ -176,7 +173,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             srs_path,
         } => gen_witness(
             compiled_circuit.unwrap_or(DEFAULT_COMPILED_CIRCUIT.into()),
-            data.unwrap_or(DataField(DEFAULT_DATA.into())).to_string(),
+            data.unwrap_or(DEFAULT_DATA.into()),
             Some(output.unwrap_or(DEFAULT_WITNESS.into())),
             vk_path,
             srs_path,
@@ -215,7 +212,8 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             addr_vk,
         )
         .map(|e| serde_json::to_string(&e).unwrap()),
-        Commands::CreateEvmVka {
+
+        Commands::CreateEvmVKArtifact {
             vk_path,
             srs_path,
             settings_path,
@@ -231,7 +229,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             )
             .await
         }
-        Commands::CreateEvmDa {
+        Commands::CreateEvmDataAttestation {
             settings_path,
             sol_code_path,
             abi_path,
@@ -436,7 +434,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             )
             .await
         }
-        Commands::DeployEvmDa {
+        Commands::DeployEvmDataAttestation {
             data,
             settings_path,
             sol_code_path,
@@ -843,8 +841,6 @@ pub(crate) fn gen_random_data(
     data_path: PathBuf,
     variables: Vec<(String, usize)>,
     seed: u64,
-    min: Option<f32>,
-    max: Option<f32>,
 ) -> Result<String, EZKLError> {
     let mut file = std::fs::File::open(&model_path).map_err(|e| {
         crate::graph::errors::GraphError::ReadWriteFileError(
@@ -863,32 +859,22 @@ pub(crate) fn gen_random_data(
         .collect::<tract_onnx::prelude::TractResult<Vec<_>>>()
         .map_err(|e| EZKLError::from(e.to_string()))?;
 
-    let min = min.unwrap_or(0.0);
-    let max = max.unwrap_or(1.0);
-
     /// Generates a random tensor of a given size and type.
     fn random(
         sizes: &[usize],
         datum_type: tract_onnx::prelude::DatumType,
         seed: u64,
-        min: f32,
-        max: f32,
     ) -> TractTensor {
         use rand::{Rng, SeedableRng};
         let mut rng = rand::rngs::StdRng::seed_from_u64(seed);
 
         let mut tensor = TractTensor::zero::<f32>(sizes).unwrap();
         let slice = tensor.as_slice_mut::<f32>().unwrap();
-        slice.iter_mut().for_each(|x| *x = rng.gen_range(min..max));
+        slice.iter_mut().for_each(|x| *x = rng.r#gen());
         tensor.cast_to_dt(datum_type).unwrap().into_owned()
     }
 
-    fn tensor_for_fact(
-        fact: &tract_onnx::prelude::TypedFact,
-        seed: u64,
-        min: f32,
-        max: f32,
-    ) -> TractTensor {
+    fn tensor_for_fact(fact: &tract_onnx::prelude::TypedFact, seed: u64) -> TractTensor {
         if let Some(value) = &fact.konst {
             return value.clone().into_tensor();
         }
@@ -899,14 +885,12 @@ pub(crate) fn gen_random_data(
                 .expect("Expected concrete shape, found: {fact:?}"),
             fact.datum_type,
             seed,
-            min,
-            max,
         )
     }
 
     let generated = input_facts
         .iter()
-        .map(|v| tensor_for_fact(v, seed, min, max))
+        .map(|v| tensor_for_fact(v, seed))
         .collect_vec();
 
     let data = GraphData::from_tract_data(&generated)?;