rename 'verifier_setup' to 'setup'

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)
 

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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),

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,