Pre develop tod (#157)

* barriers and threads managment * Overwritting const tree file whenever needed (#148) * Overwritting const tree file whenever needed * Properly handling setup writing for when distributed * Cargo clippy * Improving print summary with memory setup * Cargo fmt and clippy * Minor fixes recursivef and final (#150) * Minor opts * Minor fix starks_api * Feature/fixed cols bin (#152) * Fixed cols binary * Cargo fmt * Keep working * Cargo fmt and clippy * Adding file * Minor fix * Debug mode fast implemented (#151) * Register_std separated (#154) * Fix pil-helpers (#156) * Fix pil-helpers * Cargo.toml * Cargo lock * Adding fixed to pil-helpers * Allow clippy for traces file * Fixing std_range_check.pil for pil-helpers * Fixing connection traces for fixed * Poseidon 2 (#153) * Working in poseidon2 * Update ci test * Disallowing poseidon2 when AVX512 * Avoid clone (#158) * Minor changes * Minor modification (#159) * add parallel iterators to trace macro (#160) * add parallel iterators to trace macro * Fix test std and cargo fmt --------- Co-authored-by: Xavier Pinsach <[email protected]> * adding rayon to pil helpers * Adding debug feature (#161) * Adding debug feature * Fix pil-helpers * Update ci --------- Co-authored-by: rickb80 <[email protected]> Co-authored-by: Xavier Pinsach <[email protected]>
0xPolygonHermez · Feb 4, 2025 · 17ad6ad · 17ad6ad
1 parent 466702f
commit 17ad6ad
Show file tree

Hide file tree

Showing 90 changed files with 3,773 additions and 959 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -51,5 +51,6 @@ num-traits = "0.2"
 rayon = "1"
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.68"
+serde_arrays = "0.1"
 serde_derive = "1.0.196"
 colored = "3"
diff --git a/cli/assets/templates/pil_helpers_trace.rs.tt b/cli/assets/templates/pil_helpers_trace.rs.tt
@@ -1,11 +1,16 @@
 // WARNING: This file has been autogenerated from the PILOUT file.
 // Manual modifications are not recommended and may be overwritten.
+#![allow(clippy::all)]
+#![allow(non_snake_case)]
+
 use proofman_common as common;
 pub use proofman_macros::trace;
 pub use proofman_macros::values;
 
 use std::fmt;
 
+use rayon::prelude::*;
+
 #[allow(dead_code)]
 type FieldExtension<F> = [F; 3];
 
@@ -23,13 +28,29 @@ pub const { constant.0 }_AIR_IDS: &[usize] = &[{ constant.3 }];
 //PUBLICS
 use serde::Deserialize;
 use serde::Serialize;
-#[derive(Default, Debug, Serialize, Deserialize)]
+use serde_arrays;
+
+{{ for column in public_values.values_u64 }}{{ if column.array }}
+fn default_array_{column.name}() -> {column.type} \{
+    {column.type_default}
+}
+{{endif}}{{ endfor }}
+
+#[derive(Debug, Serialize, Deserialize)]
 pub struct {project_name}Publics \{
-    {{ for column in public_values.values_u64 }}#[serde(default)] 
+    {{ for column in public_values.values_u64 }}{{ if column.array }}#[serde(default = "default_array_{column.name}", with = "serde_arrays")]{{ else }}#[serde(default)]{{ endif }}
     pub {column.name}: {column.type},
     {{ endfor }}
 }
 
+impl Default for {project_name}Publics \{
+    fn default() -> Self \{
+        Self \{ {{ for column in public_values.values_default }} 
+            {column.name}: {column.type}, {{ endfor }}
+        }
+    }
+}
+
 values!({ project_name }PublicValues<F> \{
 {{ for column in public_values.values }} { column.name }: { column.type },{{ endfor }}
 });
@@ -38,6 +59,10 @@ values!({ project_name }ProofValues<F> \{
 {{ for column in proof_vals.values }} { column.name }: { column.type },{{ endfor }}
 });
 {{ endfor }} {{ for air_group in air_groups }}{{ for air in air_group.airs }}
+trace!({ air.name }Fixed<F> \{
+{{ for column in air.fixed }} { column.name }: { column.type },{{ endfor }}
+},  { air_group.airgroup_id }, { air.id }, { air.num_rows } );
+
 trace!({ air.name }Trace<F> \{
 {{ for column in air.columns }} { column.name }: { column.type },{{ endfor }}
 },  { air_group.airgroup_id }, { air.id }, { air.num_rows } );

diff --git a/cli/src/commands/get_constraints.rs b/cli/src/commands/get_constraints.rs
@@ -1,5 +1,6 @@
 // extern crate env_logger;
 use clap::Parser;
+use p3_goldilocks::Goldilocks;
 use proofman_common::initialize_logger;
 use std::path::PathBuf;
 use colored::Colorize;
@@ -24,7 +25,7 @@ impl GetConstraintsCmd {
         println!();
 
         let global_info = GlobalInfo::new(&self.proving_key);
-        let setups = Arc::new(SetupsVadcop::new(&global_info, false, false));
+        let setups = Arc::new(SetupsVadcop::<Goldilocks>::new(&global_info, false, false, false));
 
         initialize_logger(proofman_common::VerboseMode::Info);