*updated settings.json files, wasm.rs and integration

tests.

src/wasm.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use halo2_proofs::plonk::*;
 use halo2_proofs::poly::commitment::{CommitmentScheme, ParamsProver};
 use halo2_proofs::poly::kzg::{
@@ -39,8 +37,7 @@ pub fn gen_circuit_settings_wasm(
     // Read in circuit
     let mut reader = std::io::BufReader::new(&model_ser[..]);
     let model = crate::graph::Model::new(&mut reader, run_args).unwrap();
-    let circuit =
-        GraphCircuit::new(Arc::new(model), run_args, crate::circuit::CheckMode::UNSAFE).unwrap();
+    let circuit = GraphCircuit::new(model, run_args, crate::circuit::CheckMode::UNSAFE).unwrap();
     let circuit_settings = circuit.settings;
     serde_json::to_vec(&circuit_settings).unwrap()
 }
@@ -64,7 +61,7 @@ pub fn gen_pk_wasm(
     let model = crate::graph::Model::new(&mut circuit_reader, circuit_settings.run_args).unwrap();
 
     let circuit = GraphCircuit::new(
-        Arc::new(model),
+        model,
         circuit_settings.run_args,
         crate::circuit::CheckMode::UNSAFE,
     )
@@ -205,7 +202,7 @@ pub fn prove_wasm(
     let model = crate::graph::Model::new(&mut reader, circuit_settings.run_args).unwrap();
 
     let mut circuit = GraphCircuit::new(
-        Arc::new(model),
+        model,
         circuit_settings.run_args,
         crate::circuit::CheckMode::UNSAFE,
     )
@@ -248,4 +245,4 @@ where
     let vk = keygen_vk(params, &empty_circuit)?;
     let pk = keygen_pk(params, vk, &empty_circuit)?;
     Ok(pk)
-}
+}

tests/integration_tests.rs

@@ -481,18 +481,18 @@ macro_rules! test_func {
             use crate::native_tests::kzg_evm_aggr_prove_and_verify;
             use crate::native_tests::kzg_fuzz;
 
-            /// Currently only on chain inputs that return a non-negative value are supported,
-            const TESTS_ON_CHAIN_INPUT: [&str; 11] = [
+            /// Currently only on chain inputs that return a non-negative value are supported.
+            const TESTS_ON_CHAIN_INPUT: [&str; 9] = [
                 "1l_mlp",
                 "1l_average",
                 "1l_reshape",
                 // "1l_sigmoid",
                 "1l_div",
                 "1l_sqrt",
                 // "1l_prelu",
-                "1l_var",
+                //"1l_var",
                 "1l_leakyrelu",
-                "1l_gelu_noappx",
+                //"1l_gelu_noappx",
                 "1l_relu",
                 //"1l_tanh",
                 // "2l_relu_sigmoid_small",
@@ -524,7 +524,7 @@ macro_rules! test_func {
                 "max",
             ];
 
-            seq!(N in 0..= 10 {
+            seq!(N in 0..= 8 {
                 #(#[test_case(TESTS_ON_CHAIN_INPUT[N])])*
                 fn kzg_evm_on_chain_input_prove_and_verify_(test: &str) {
                     crate::native_tests::init_binary();

tests/python/1l_relu_settings.json

@@ -1 +1 @@
-{"run_args":{"tolerance":{"Abs":{"val":0}},"scale":4,"bits":7,"logrows":8,"batch_size":1,"on_chain_inputs":false,"input_visibility":"Public","output_visibility":"Public","param_visibility":"Private","pack_base":1,"allocated_constraints":null},"num_constraints":6,"model_instance_shapes":[[1,3],[1,3]],"num_hashes":0,"required_lookups":[{"ReLU":{"scale":1}}],"check_mode":"SAFE"}
+{"run_args":{"tolerance":{"Abs":{"val":0}},"scale":4,"bits":7,"logrows":8,"batch_size":1,"on_chain_inputs":false,"input_visibility":"Public","output_visibility":"Public","param_visibility":"Private","pack_base":1,"allocated_constraints":null},"num_constraints":6,"model_instance_shapes":[[1,3],[1,3]],"module_sizes":{"poseidon":[0,[0]],"elgamal":[0,[0,0,0]]},"required_lookups":[{"ReLU":{"scale":1}}],"check_mode":"SAFE"}

tests/python/settings.json

@@ -1 +1 @@
-{"run_args":{"tolerance":{"Abs":{"val":0}},"scale":11,"bits":1,"logrows":9,"batch_size":1,"on_chain_inputs":false,"input_visibility":"Public","output_visibility":"Public","param_visibility":"Private","pack_base":1,"allocated_constraints":null},"num_constraints":136,"model_instance_shapes":[[1,3,2,2],[3,3,3]],"num_hashes":0,"required_lookups":[],"check_mode":"SAFE"}
+{"run_args":{"tolerance":{"Abs":{"val":0}},"scale":11,"bits":1,"logrows":9,"batch_size":1,"on_chain_inputs":false,"input_visibility":"Public","output_visibility":"Public","param_visibility":"Private","pack_base":1,"allocated_constraints":null},"num_constraints":136,"model_instance_shapes":[[1,3,2,2],[3,3,3]],"module_sizes":{"poseidon":[0,[0]],"elgamal":[0,[0,0,0]]},"required_lookups":[],"check_mode":"SAFE"}

tests/wasm/settings.json

@@ -1 +1 @@
-{"run_args":{"tolerance":{"Abs":{"val":0}},"scale":0,"bits":5,"logrows":7,"batch_size":1,"on_chain_inputs":false,"input_visibility":"Private","output_visibility":"Public","param_visibility":"Private","pack_base":1,"allocated_constraints":null},"num_constraints":24,"model_instance_shapes":[[1,4]],"num_hashes":0,"required_lookups":[{"ReLU":{"scale":1}}],"check_mode":"SAFE"}
+{"run_args":{"tolerance":{"Abs":{"val":0}},"scale":0,"bits":5,"logrows":7,"batch_size":1,"on_chain_inputs":false,"input_visibility":"Private","output_visibility":"Public","param_visibility":"Private","pack_base":1,"allocated_constraints":null},"num_constraints":24,"model_instance_shapes":[[1,4]],"module_sizes":{"poseidon":[0,[0]],"elgamal":[0,[0,0,0]]},"required_lookups":[{"ReLU":{"scale":1}}],"check_mode":"SAFE"}