Merge branch 'main' into ac/numerical-accuracy-report

zkonduit · Jan 6, 2024 · 955bec6 · 955bec6
2 parents 9b0df1e + e97713f
commit 955bec6
Show file tree

Hide file tree

Showing 35 changed files with 330 additions and 7,660 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["profile-rustflags"]
+
 [package]
 name = "ezkl"
 version = "0.0.0"
@@ -27,7 +29,7 @@ hex = { version = "0.4.3", default_features = false }
 halo2_wrong_ecc = { git = "https://github.com/zkonduit/halo2wrong", branch = "ac/chunked-mv-lookup", package = "ecc" }
 snark-verifier = { git = "https://github.com/zkonduit/snark-verifier", branch = "ac/chunked-mv-lookup", features=["derive_serde"]}
 halo2_solidity_verifier = { git = "https://github.com/alexander-camuto/halo2-solidity-verifier",  branch= "ac/lookup-modularity" }
-rayon = { version = "1.7.0",  default_features = false }
+maybe-rayon = { version = "0.1.1",  default_features = false }
 bincode = { version = "1.3.3", default_features = false }
 ark-std = { version = "^0.3.0", default-features = false }
 unzip-n = "0.1.2"
@@ -155,3 +157,11 @@ ezkl = ["onnx", "serde", "serde_json", "log", "colored", "env_logger", "tabled/c
 mv-lookup = ["halo2_proofs/mv-lookup", "snark-verifier/mv-lookup", "halo2_solidity_verifier/mv-lookup"]
 det-prove = []
 icicle = ["halo2_proofs/icicle_gpu"]
+
+
+# icicle patch to 0.1.0 if feature icicle is enabled
+[patch.'https://github.com/ingonyama-zk/icicle']
+icicle = { git = "https://github.com/ingonyama-zk/icicle?rev=45b00fb", package = "icicle", branch = "fix/vhnat/ezkl-build-fix"}
+
+[profile.release]
+rustflags = [ "-C", "relocation-model=pic" ]
diff --git a/examples/notebooks/data_attest.ipynb b/examples/notebooks/data_attest.ipynb
@@ -512,7 +512,6 @@
                 "\n",
                 "res = ezkl.create_evm_data_attestation(\n",
                 "        input_path,\n",
-                "        vk_path,\n",
                 "        settings_path,\n",
                 "        sol_code_path,\n",
                 "        abi_path,\n",

diff --git a/examples/notebooks/data_attest_hashed.ipynb b/examples/notebooks/data_attest_hashed.ipynb
@@ -274,7 +274,7 @@
         },
         {
             "cell_type": "code",
-            "execution_count": 21,
+            "execution_count": null,
             "metadata": {},
             "outputs": [],
             "source": [
@@ -568,7 +568,6 @@
                 "\n",
                 "res = ezkl.create_evm_data_attestation(\n",
                 "        input_path,\n",
-                "        vk_path,\n",
                 "        settings_path,\n",
                 "        sol_code_path,\n",
                 "        abi_path,\n",
@@ -649,7 +648,7 @@
             "name": "python",
             "nbconvert_exporter": "python",
             "pygments_lexer": "ipython3",
-            "version": "3.9.15"
+            "version": "3.9.13"
         },
         "orig_nbformat": 4
     },

diff --git a/examples/notebooks/ezkl_demo.ipynb b/examples/notebooks/ezkl_demo.ipynb
@@ -589,7 +589,6 @@
         "        proof_path,\n",
         "        settings_path,\n",
         "        vk_path,\n",
-        "        \n",
         "    )\n",
         "\n",
         "assert res == True\n",

diff --git a/examples/notebooks/svm.ipynb b/examples/notebooks/svm.ipynb
@@ -220,7 +220,7 @@
         },
         {
             "cell_type": "code",
-            "execution_count": null,
+            "execution_count": 10,
             "id": "b1c561a8",
             "metadata": {},
             "outputs": [],

diff --git a/examples/notebooks/world_rotation.ipynb b/examples/notebooks/world_rotation.ipynb
@@ -387,7 +387,6 @@
     "\n",
     "res = ezkl.create_evm_data_attestation(\n",
     "        input_path,\n",
-    "        vk_path,\n",
     "        settings_path,\n",
     "        sol_code_path,\n",
     "        abi_path,\n",

diff --git a/examples/onnx/1l_topk/gen.py b/examples/onnx/1l_topk/gen.py
@@ -8,9 +8,11 @@ def __init__(self):
         super(MyModel, self).__init__()
 
     def forward(self, x):
-        topk = torch.topk(x, 4)
-        print(topk)
-        return [topk.values]
+        topk_largest = torch.topk(x, 4)
+        topk_smallest = torch.topk(x, 4, largest=False)
+        print(topk_largest)
+        print(topk_smallest)
+        return topk_largest.values + topk_smallest.values
 
 
 circuit = MyModel()
@@ -21,7 +23,7 @@ def forward(self, x):
 
 torch.onnx.export(circuit, x, "network.onnx",
                   export_params=True,        # store the trained parameter weights inside the model file
-                  opset_version=10,          # the ONNX version to export the model to
+                  opset_version=14,          # the ONNX version to export the model to
                   do_constant_folding=True,  # whether to execute constant folding for optimization
                   input_names=['input'],   # the model's input names
                   output_names=['output'],  # the model's output names

diff --git a/examples/onnx/1l_topk/input.json b/examples/onnx/1l_topk/input.json
@@ -1 +1 @@
-{"input_data": [[2, 1, 5, 3, 3, 7]], "output_data": [[7, 5, 3, 3]]}
+{"input_data": [[2, 1, 5, 4, 8, 2]], "output_data": [[9, 7, 6, 6]]}
diff --git a/examples/onnx/1l_topk/network.onnx b/examples/onnx/1l_topk/network.onnx
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"input_data": [[2, 1, 5, 3, 3, 7]], "output_data": [[7, 5, 3, 3]]}
		{"input_data": [[2, 1, 5, 4, 8, 2]], "output_data": [[9, 7, 6, 6]]}