patch wasm

zkonduit · Sep 15, 2024 · 83dc4fa · 83dc4fa
1 parent dcc1ecd
commit 83dc4fa
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 20 deletions.
diff --git a/src/circuit/ops/layouts.rs b/src/circuit/ops/layouts.rs
@@ -4186,7 +4186,11 @@ pub(crate) fn decompose<F: PrimeField + TensorType + PartialOrd + std::hash::Has
                 sliced_input = region.assign(&config.custom_gates.inputs[0], &sliced_input)?;
             }
 
-            let mut claimed_output_slice = sliced_input.decompose(*base, *n)?;
+            let mut claimed_output_slice = if region.witness_gen() {
+                sliced_input.decompose(*base, *n)?
+            } else {
+                Tensor::from(vec![ValType::Value(Value::unknown()); *n + 1].into_iter()).into()
+            };
 
             claimed_output_slice =
                 region.assign(&config.custom_gates.inputs[1], &claimed_output_slice)?;

diff --git a/src/lib.rs b/src/lib.rs
@@ -153,12 +153,6 @@ lazy_static! {
 
 }
 
-#[cfg(target_arch = "wasm32")]
-const EZKL_DECOMP_BASE: &usize = &16384;
-
-#[cfg(target_arch = "wasm32")]
-const EZKL_DECOMP_LEN: &usize = &2;
-
 #[cfg(target_arch = "wasm32")]
 const EZKL_KEY_FORMAT: &str = "raw-bytes";
 

diff --git a/src/tensor/val.rs b/src/tensor/val.rs
@@ -541,7 +541,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> ValTensor<F> {
                 let mut is_empty = true;
                 x.map(|_| is_empty = false);
                 if is_empty {
-                    Ok::<_, TensorError>(vec![Value::<F>::unknown(); n + 1])
+                    return Ok::<_, TensorError>(vec![Value::<F>::unknown(); n + 1]);
                 } else {
                     let mut res = vec![Value::unknown(); n + 1];
                     let mut int_rep = 0;

diff --git a/src/wasm.rs b/src/wasm.rs
@@ -286,7 +286,15 @@ pub fn genWitness(
         .map_err(|e| JsError::new(&format!("{}", e)))?;
 
     let witness = circuit
-        .forward::<KZGCommitmentScheme<Bn256>>(&mut input, None, None, RegionSettings::all_false())
+        .forward::<KZGCommitmentScheme<Bn256>>(
+            &mut input,
+            None,
+            None,
+            RegionSettings::all_false(
+                circuit.settings().run_args.decomp_base,
+                circuit.settings().run_args.decomp_legs,
+            ),
+        )
         .map_err(|e| JsError::new(&format!("{}", e)))?;
 
     serde_json::to_vec(&witness)

diff --git a/tests/wasm/model.compiled b/tests/wasm/model.compiled
diff --git a/tests/wasm/pk.key b/tests/wasm/pk.key
diff --git a/tests/wasm/proof.json b/tests/wasm/proof.json
diff --git a/tests/wasm/settings.json b/tests/wasm/settings.json
@@ -8,7 +8,7 @@
         "param_scale": 0,
         "scale_rebase_multiplier": 10,
         "lookup_range": [
-            -2,
+            0,
             0
         ],
         "logrows": 6,
@@ -24,15 +24,18 @@
         "param_visibility": "Private",
         "div_rebasing": false,
         "rebase_frac_zero_constants": false,
-        "check_mode": "UNSAFE"
+        "check_mode": "UNSAFE",
+        "commitment": "KZG",
+        "decomp_base": 128,
+        "decomp_legs": 2
     },
-    "num_rows": 16,
+    "num_rows": 46,
+    "total_assignments": 92,
+    "total_const_size": 3,
     "total_dynamic_col_size": 0,
     "num_dynamic_lookups": 0,
     "num_shuffles": 0,
     "total_shuffle_col_size": 0,
-    "total_assignments": 32,
-    "total_const_size": 8,
     "model_instance_shapes": [
         [
             1,
@@ -54,12 +57,19 @@
             ]
         ]
     },
-    "required_lookups": [
-        "ReLU"
+    "required_lookups": [],
+    "required_range_checks": [
+        [
+            -1,
+            1
+        ],
+        [
+            0,
+            127
+        ]
     ],
-    "required_range_checks": [],
     "check_mode": "UNSAFE",
     "version": "0.0.0",
     "num_blinding_factors": null,
-    "timestamp": 1702474230544
+    "timestamp": 1726429587279
 }
diff --git a/tests/wasm/vk.key b/tests/wasm/vk.key
diff --git a/tests/wasm/witness.json b/tests/wasm/witness.json
@@ -1 +1 @@
-{"inputs":[["0200000000000000000000000000000000000000000000000000000000000000","0100000000000000000000000000000000000000000000000000000000000000","0100000000000000000000000000000000000000000000000000000000000000"]],"pretty_elements":{"rescaled_inputs":[["2","1","1"]],"inputs":[["0x0000000000000000000000000000000000000000000000000000000000000002","0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000001"]],"processed_inputs":[],"processed_params":[],"processed_outputs":[],"rescaled_outputs":[["0","0","0","0"]],"outputs":[["0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]]},"outputs":[["0000000000000000000000000000000000000000000000000000000000000000","0000000000000000000000000000000000000000000000000000000000000000","0000000000000000000000000000000000000000000000000000000000000000","0000000000000000000000000000000000000000000000000000000000000000"]],"processed_inputs":null,"processed_params":null,"processed_outputs":null,"max_lookup_inputs":0,"min_lookup_inputs":-1,"max_range_size":0}
+{"inputs":[["0200000000000000000000000000000000000000000000000000000000000000","0100000000000000000000000000000000000000000000000000000000000000","0100000000000000000000000000000000000000000000000000000000000000"]],"pretty_elements":{"rescaled_inputs":[["2","1","1"]],"inputs":[["0x0000000000000000000000000000000000000000000000000000000000000002","0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000001"]],"processed_inputs":[],"processed_params":[],"processed_outputs":[],"rescaled_outputs":[["0","0","0","0"]],"outputs":[["0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]]},"outputs":[["0000000000000000000000000000000000000000000000000000000000000000","0000000000000000000000000000000000000000000000000000000000000000","0000000000000000000000000000000000000000000000000000000000000000","0000000000000000000000000000000000000000000000000000000000000000"]],"processed_inputs":null,"processed_params":null,"processed_outputs":null,"max_lookup_inputs":0,"min_lookup_inputs":0,"max_range_size":127}