chore: error bubbling (#93)

Co-authored-by: jason <[email protected]>
zkonduit · Jan 15, 2023 · 16f746b · 16f746b
1 parent cc2cb51
commit 16f746b
Show file tree

Hide file tree

Showing 27 changed files with 1,055 additions and 951 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -6,12 +6,10 @@ on:
   pull_request:
     branches: [ "main" ]
 
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
-
 env:
   CARGO_TERM_COLOR: always
 
@@ -60,7 +58,7 @@ jobs:
 
   library-tests:
 
-    runs-on: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
@@ -108,9 +106,9 @@ jobs:
           components: rustfmt, clippy
 
     - name: IPA full-prove tests
-      run: cargo test --release --verbose tests::ipa_fullprove_ -- --test-threads 1
+      run: cargo test --release --verbose tests::ipa_fullprove_ -- --test-threads 4
     - name: KZG full-prove tests
-      run: cargo test --release --verbose tests::kzg_fullprove_ -- --test-threads 1
+      run: cargo test --release --verbose tests::kzg_fullprove_ -- --test-threads 4
 
   full-proving-evm-tests:
 
@@ -129,7 +127,7 @@ jobs:
     - name: Install solc
       run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.17 && solc --version
     - name: KZG full-prove tests (EVM)
-      run: cargo test --release --verbose tests_evm::kzg_evm_fullprove_ -- --test-threads 1
+      run: cargo test --release --verbose tests_evm::kzg_evm_fullprove_ -- --test-threads 3
 
   prove-and-verify-tests:
 
@@ -145,9 +143,9 @@ jobs:
           components: rustfmt, clippy
 
     - name: IPA prove and verify tests
-      run: cargo test --release --verbose tests::ipa_prove_and_verify_ -- --test-threads 1
+      run: cargo test --release --verbose tests::ipa_prove_and_verify_ -- --test-threads 4
     - name: KZG prove and verify tests
-      run: cargo test --release --verbose tests::kzg_prove_and_verify_ -- --test-threads 1
+      run: cargo test --release --verbose tests::kzg_prove_and_verify_ -- --test-threads 4
 
   examples:
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,6 +26,7 @@ halo2_wrong_ecc = { git = "https://github.com/zkonduit/halo2wrong", package = "e
 plonk_verifier = { git = "https://github.com/zkonduit/plonk-verifier", branch = "main"}
 colog = { version = "1.1.0", optional = true }
 eq-float = "0.1.0"
+thiserror = "1.0.38"
 
 [dev-dependencies]
 criterion = {version = "0.3",  features = ["html_reports"]}

diff --git a/benches/affine.rs b/benches/affine.rs
@@ -55,14 +55,16 @@ impl<F: FieldExt + TensorType> Circuit<F> for MyCircuit<F> {
         mut config: Self::Config,
         mut layouter: impl Layouter<F>,
     ) -> Result<(), Error> {
-        config.layout(
-            &mut layouter,
-            &[
-                self.input.clone(),
-                self.l0_params[0].clone(),
-                self.l0_params[1].clone(),
-            ],
-        );
+        config
+            .layout(
+                &mut layouter,
+                &[
+                    self.input.clone(),
+                    self.l0_params[0].clone(),
+                    self.l0_params[1].clone(),
+                ],
+            )
+            .unwrap();
         Ok(())
     }
 }

diff --git a/benches/range.rs b/benches/range.rs
@@ -44,11 +44,13 @@ impl<F: FieldExt + TensorType> Circuit<F> for MyCircuit<F> {
         config: Self::Config,
         mut layouter: impl Layouter<F>,
     ) -> Result<(), Error> {
-        config.layout(
-            layouter.namespace(|| "Assign value"),
-            self.input.clone(),
-            self.output.clone(),
-        );
+        config
+            .layout(
+                layouter.namespace(|| "Assign value"),
+                self.input.clone(),
+                self.output.clone(),
+            )
+            .unwrap();
 
         Ok(())
     }

diff --git a/benches/relu.rs b/benches/relu.rs
@@ -44,7 +44,7 @@ impl<F: FieldExt + TensorType> Circuit<F> for NLCircuit<F> {
         config: Self::Config,
         mut layouter: impl Layouter<F>, // layouter is our 'write buffer' for the circuit
     ) -> Result<(), Error> {
-        config.layout(&mut layouter, &self.input);
+        config.layout(&mut layouter, &self.input).unwrap();
 
         Ok(())
     }

diff --git a/examples/conv2d_mnist/main.rs b/examples/conv2d_mnist/main.rs
@@ -239,28 +239,30 @@ where
         mut config: Self::Config,
         mut layouter: impl Layouter<F>,
     ) -> Result<(), Error> {
-        let x = config.l0.layout(
-            &mut layouter,
-            &[
-                self.input.clone(),
-                self.l0_params[0].clone(),
-                self.l0_params[1].clone(),
-            ],
-        );
-        let mut x = config.l1.layout(&mut layouter, &x);
+        let x = config
+            .l0
+            .layout(
+                &mut layouter,
+                &[
+                    self.input.clone(),
+                    self.l0_params[0].clone(),
+                    self.l0_params[1].clone(),
+                ],
+            )
+            .unwrap();
+        let mut x = config.l1.layout(&mut layouter, &x).unwrap();
         x.flatten();
-        let l2out = config.l2.layout(
-            &mut layouter,
-            &[x, self.l2_params[0].clone(), self.l2_params[1].clone()],
-        );
+        let l2out = config
+            .l2
+            .layout(
+                &mut layouter,
+                &[x, self.l2_params[0].clone(), self.l2_params[1].clone()],
+            )
+            .unwrap();
 
         match l2out {
             ValTensor::PrevAssigned { inner: v, dims: _ } => v
-                .enum_map(|i, x| {
-                    layouter
-                        .constrain_instance(x.cell(), config.public_output, i)
-                        .unwrap()
-                })
+                .enum_map(|i, x| layouter.constrain_instance(x.cell(), config.public_output, i))
                 .unwrap(),
             _ => panic!("Should be assigned"),
         };
@@ -310,10 +312,11 @@ pub fn runconv() {
 
     let mut input: ValTensor<F> = train_data
         .get_slice(&[0..1, 0..28, 0..28])
+        .unwrap()
         .map(Value::known)
         .into();
 
-    input.reshape(&[1, 28, 28]);
+    input.reshape(&[1, 28, 28]).unwrap();
 
     let myparams = params::Params::new();
     let mut l0_kernels: ValTensor<F> = Tensor::<Value<F>>::from(
@@ -334,7 +337,9 @@ pub fn runconv() {
     )
     .into();
 
-    l0_kernels.reshape(&[OUT_CHANNELS, IN_CHANNELS, KERNEL_HEIGHT, KERNEL_WIDTH]);
+    l0_kernels
+        .reshape(&[OUT_CHANNELS, IN_CHANNELS, KERNEL_HEIGHT, KERNEL_WIDTH])
+        .unwrap();
 
     let l0_bias: ValTensor<F> = Tensor::<Value<F>>::from(
         (0..OUT_CHANNELS).map(|_| Value::known(fieldutils::i32_to_felt(0))),
@@ -360,7 +365,7 @@ pub fn runconv() {
         }))
         .into();
 
-    l2_weights.reshape(&[CLASSES, LEN]);
+    l2_weights.reshape(&[CLASSES, LEN]).unwrap();
 
     let circuit = MyCircuit::<
         F,

diff --git a/examples/mlp_4d.rs b/examples/mlp_4d.rs
@@ -83,7 +83,8 @@ impl<F: FieldExt + TensorType, const LEN: usize, const BITS: usize> Circuit<F>
             &output,
             BITS,
             &[LookupOp::ReLU { scale: 1 }],
-        );
+        )
+        .unwrap();
 
         // sets up a new Divide by table
         let l4 =
@@ -107,28 +108,30 @@ impl<F: FieldExt + TensorType, const LEN: usize, const BITS: usize> Circuit<F>
         mut config: Self::Config,
         mut layouter: impl Layouter<F>,
     ) -> Result<(), Error> {
-        let x = config.l0.layout(
-            &mut layouter,
-            &[
-                self.input.clone(),
-                self.l0_params[0].clone(),
-                self.l0_params[1].clone(),
-            ],
-        );
-        let x = config.l1.layout(&mut layouter, &x);
-        let x = config.l2.layout(
-            &mut layouter,
-            &[x, self.l2_params[0].clone(), self.l2_params[1].clone()],
-        );
-        let x = config.l3.layout(&mut layouter, &x);
-        let x = config.l4.layout(&mut layouter, &x);
+        let x = config
+            .l0
+            .layout(
+                &mut layouter,
+                &[
+                    self.input.clone(),
+                    self.l0_params[0].clone(),
+                    self.l0_params[1].clone(),
+                ],
+            )
+            .unwrap();
+        let x = config.l1.layout(&mut layouter, &x).unwrap();
+        let x = config
+            .l2
+            .layout(
+                &mut layouter,
+                &[x, self.l2_params[0].clone(), self.l2_params[1].clone()],
+            )
+            .unwrap();
+        let x = config.l3.layout(&mut layouter, &x).unwrap();
+        let x = config.l4.layout(&mut layouter, &x).unwrap();
         match x {
             ValTensor::PrevAssigned { inner: v, dims: _ } => v
-                .enum_map(|i, x| {
-                    layouter
-                        .constrain_instance(x.cell(), config.public_output, i)
-                        .unwrap()
-                })
+                .enum_map(|i, x| layouter.constrain_instance(x.cell(), config.public_output, i))
                 .unwrap(),
             _ => panic!("Should be assigned"),
         };

diff --git a/src/bin/ezkl.rs b/src/bin/ezkl.rs
@@ -1,14 +1,20 @@
 use ezkl::commands::Cli;
 use ezkl::execute::run;
-use log::info;
+use log::{error, info};
 use rand::seq::SliceRandom;
+use std::error::Error;
 
-pub fn main() {
+pub fn main() -> Result<(), Box<dyn Error>> {
     let args = Cli::create();
     colog::init();
     banner();
-    info!("{}", &args.as_json());
-    run(args)
+    info!("{}", &args.as_json()?);
+    let res = run(args);
+    match &res {
+        Ok(_) => info!("verify succeeded"),
+        Err(e) => error!("verify failed: {}", e),
+    };
+    res
 }
 
 fn banner() {