From caa0a0b6d994ee82aecfb43b44f05c80f5d3ce86 Mon Sep 17 00:00:00 2001 From: mhchia Date: Mon, 19 Feb 2024 22:17:08 +0800 Subject: [PATCH] rename 'verifier_setup' to 'setup' --- bench.py | 4 ++-- examples/computation/computation.ipynb | 4 ++-- examples/correlation/correlation.ipynb | 2 +- examples/covariance/covariance.ipynb | 2 +- examples/geomean/geomean.ipynb | 2 +- examples/geomean/geomean_OG.ipynb | 2 +- examples/harmomean/harmomean.ipynb | 2 +- examples/mean+median/mean+median.ipynb | 2 +- examples/mean/mean.ipynb | 2 +- examples/mean/mean_OG.ipynb | 2 +- examples/median/median.ipynb | 4 ++-- examples/mode/mode.ipynb | 2 +- examples/pstdev/pstdev.ipynb | 2 +- examples/pvariance/pvariance.ipynb | 2 +- examples/regression/regression.ipynb | 2 +- examples/stdev/stdev.ipynb | 2 +- examples/variance/variance.ipynb | 2 +- examples/where+geomean/where+geomean.ipynb | 2 +- examples/where+mean/where+mean.ipynb | 2 +- examples/where+median/where+median.ipynb | 2 +- examples/where+mode/where+mode.ipynb | 2 +- examples/where+regression/where+regression.ipynb | 2 +- examples/where+stdev/where+stdev.ipynb | 2 +- tests/helpers.py | 4 ++-- zkstats/cli.py | 4 ++-- 25 files changed, 30 insertions(+), 30 deletions(-) diff --git a/bench.py b/bench.py index 536bdd6..7214aa8 100644 --- a/bench.py +++ b/bench.py @@ -137,7 +137,7 @@ def prover_gen_settings(data_path, col_array, sel_data_path, prover_model,prove # Here prover can concurrently call this since all params are public to get pk. # Here write as verifier function to emphasize that verifier must calculate its own vk to be sure -def verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path ): +def setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path ): # compile circuit res = ezkl.compile_circuit(verifier_model_path, verifier_compiled_model_path, settings_path) assert res == True @@ -285,7 +285,7 @@ def bench_one(data_path, col_array, model_func, gen_param_func, data_name, scale f_setting['run_args']['logrows']=logrow json.dump(f_setting, open(settings_path, "w"), indent=2) # You can adjust the 'indent' parameter for formatting print("logrow cal settings: ",json.loads(open(settings_path, "r").read()) ) - verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path ) + setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path) gen_prf_time = prover_gen_proof(prover_model_path, sel_data_path, witness_path, prover_compiled_model_path, settings_path, proof_path, pk_path) diff --git a/examples/computation/computation.ipynb b/examples/computation/computation.ipynb index 855a6c3..f8dbcae 100644 --- a/examples/computation/computation.ipynb +++ b/examples/computation/computation.ipynb @@ -76,7 +76,7 @@ "metadata": {}, "outputs": [], "source": [ - "from zkstats.core import prover_gen_settings, verifier_setup, prover_gen_proof, verifier_verify, get_data_commitment_maps" + "from zkstats.core import prover_gen_settings, setup, prover_gen_proof, verifier_verify, get_data_commitment_maps" ] }, { @@ -275,7 +275,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(prover_model_path, prover_compiled_model_path, settings_path, vk_path, pk_path )\n", + "setup(prover_model_path, prover_compiled_model_path, settings_path, vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/correlation/correlation.ipynb b/examples/correlation/correlation.ipynb index d0729b5..a7d91ef 100644 --- a/examples/correlation/correlation.ipynb +++ b/examples/correlation/correlation.ipynb @@ -358,7 +358,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/covariance/covariance.ipynb b/examples/covariance/covariance.ipynb index ea641d7..e8606ac 100644 --- a/examples/covariance/covariance.ipynb +++ b/examples/covariance/covariance.ipynb @@ -311,7 +311,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/geomean/geomean.ipynb b/examples/geomean/geomean.ipynb index 749efc3..b69f082 100644 --- a/examples/geomean/geomean.ipynb +++ b/examples/geomean/geomean.ipynb @@ -280,7 +280,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/geomean/geomean_OG.ipynb b/examples/geomean/geomean_OG.ipynb index 87f30f3..18b7104 100644 --- a/examples/geomean/geomean_OG.ipynb +++ b/examples/geomean/geomean_OG.ipynb @@ -288,7 +288,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/harmomean/harmomean.ipynb b/examples/harmomean/harmomean.ipynb index c4e6e58..37c7540 100644 --- a/examples/harmomean/harmomean.ipynb +++ b/examples/harmomean/harmomean.ipynb @@ -257,7 +257,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/mean+median/mean+median.ipynb b/examples/mean+median/mean+median.ipynb index ac8e7ea..ce528c7 100644 --- a/examples/mean+median/mean+median.ipynb +++ b/examples/mean+median/mean+median.ipynb @@ -393,7 +393,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/mean/mean.ipynb b/examples/mean/mean.ipynb index d217d9a..1d3f4fb 100644 --- a/examples/mean/mean.ipynb +++ b/examples/mean/mean.ipynb @@ -284,7 +284,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/mean/mean_OG.ipynb b/examples/mean/mean_OG.ipynb index 806c59e..eff0451 100644 --- a/examples/mean/mean_OG.ipynb +++ b/examples/mean/mean_OG.ipynb @@ -266,7 +266,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/median/median.ipynb b/examples/median/median.ipynb index 1901d61..25d0a02 100644 --- a/examples/median/median.ipynb +++ b/examples/median/median.ipynb @@ -330,9 +330,9 @@ } ], "source": [ - "# Here verifier & prover can concurrently call setup since all params are public to get pk. \n", + "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/mode/mode.ipynb b/examples/mode/mode.ipynb index 36e7267..39cd599 100644 --- a/examples/mode/mode.ipynb +++ b/examples/mode/mode.ipynb @@ -333,7 +333,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/pstdev/pstdev.ipynb b/examples/pstdev/pstdev.ipynb index 22bb953..f0a8c1e 100644 --- a/examples/pstdev/pstdev.ipynb +++ b/examples/pstdev/pstdev.ipynb @@ -269,7 +269,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/pvariance/pvariance.ipynb b/examples/pvariance/pvariance.ipynb index 4aa2354..0c64f59 100644 --- a/examples/pvariance/pvariance.ipynb +++ b/examples/pvariance/pvariance.ipynb @@ -267,7 +267,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/regression/regression.ipynb b/examples/regression/regression.ipynb index 8532cb8..51055b8 100644 --- a/examples/regression/regression.ipynb +++ b/examples/regression/regression.ipynb @@ -300,7 +300,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/stdev/stdev.ipynb b/examples/stdev/stdev.ipynb index ef6a256..fdc04c8 100644 --- a/examples/stdev/stdev.ipynb +++ b/examples/stdev/stdev.ipynb @@ -275,7 +275,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/variance/variance.ipynb b/examples/variance/variance.ipynb index d2f5834..ce22b70 100644 --- a/examples/variance/variance.ipynb +++ b/examples/variance/variance.ipynb @@ -270,7 +270,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/where+geomean/where+geomean.ipynb b/examples/where+geomean/where+geomean.ipynb index c98ae15..4b32076 100644 --- a/examples/where+geomean/where+geomean.ipynb +++ b/examples/where+geomean/where+geomean.ipynb @@ -292,7 +292,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/where+mean/where+mean.ipynb b/examples/where+mean/where+mean.ipynb index d2f097c..01386ac 100644 --- a/examples/where+mean/where+mean.ipynb +++ b/examples/where+mean/where+mean.ipynb @@ -279,7 +279,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/where+median/where+median.ipynb b/examples/where+median/where+median.ipynb index 8016dbe..c514fe0 100644 --- a/examples/where+median/where+median.ipynb +++ b/examples/where+median/where+median.ipynb @@ -335,7 +335,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/where+mode/where+mode.ipynb b/examples/where+mode/where+mode.ipynb index 0d3e1d2..f57ec75 100644 --- a/examples/where+mode/where+mode.ipynb +++ b/examples/where+mode/where+mode.ipynb @@ -319,7 +319,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/where+regression/where+regression.ipynb b/examples/where+regression/where+regression.ipynb index 0488b7d..8684a31 100644 --- a/examples/where+regression/where+regression.ipynb +++ b/examples/where+regression/where+regression.ipynb @@ -346,7 +346,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/examples/where+stdev/where+stdev.ipynb b/examples/where+stdev/where+stdev.ipynb index 1d54567..1ee95cd 100644 --- a/examples/where+stdev/where+stdev.ipynb +++ b/examples/where+stdev/where+stdev.ipynb @@ -304,7 +304,7 @@ "source": [ "# Here verifier & prover can concurrently call setup since all params are public to get pk.\n", "# Here write as verifier function to emphasize that verifier must calculate its own vk to be sure\n", - "verifier_setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", + "setup(verifier_model_path, verifier_compiled_model_path, settings_path,vk_path, pk_path )\n", "\n", "print(\"=======================================\")\n", "# Prover generates proof\n", diff --git a/tests/helpers.py b/tests/helpers.py index 8ac5941..5ab062e 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -4,7 +4,7 @@ from pathlib import Path import torch -from zkstats.core import prover_gen_settings, verifier_setup, prover_gen_proof, verifier_verify, get_data_commitment_maps +from zkstats.core import prover_gen_settings, setup, prover_gen_proof, verifier_verify, get_data_commitment_maps from zkstats.computation import IModel @@ -67,7 +67,7 @@ def compute( mode="resources", settings_path=str(settings_path), ) - verifier_setup( + setup( str(model_path), str(compiled_model_path), str(settings_path), diff --git a/zkstats/cli.py b/zkstats/cli.py index a85ca91..b7c6249 100644 --- a/zkstats/cli.py +++ b/zkstats/cli.py @@ -7,7 +7,7 @@ import importlib.util import click import torch -from .core import prover_gen_proof, prover_gen_settings, verifier_setup, verifier_verify, get_data_commitment_maps +from .core import prover_gen_proof, prover_gen_settings, setup, verifier_verify, get_data_commitment_maps from .computation import computation_to_model cwd = os.getcwd() @@ -53,7 +53,7 @@ def prove(computation_path: str, data_path: str): "resources", settings_path, ) - verifier_setup( + setup( model_onnx_path, compiled_model_path, settings_path,