Merge branch 'tamir/v1.3.0-rc2' of github.com:succinctlabs/sp1 into t…

…amir/v1.3.0-rc2
succinctlabs · Oct 8, 2024 · e02bbd9 · e02bbd9
2 parents b2b47e6 + e64fe1c
commit e02bbd9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/suite.yml b/.github/workflows/suite.yml
@@ -22,6 +22,7 @@ jobs:
   test-cpu:
     if: ${{ fromJSON(github.event.inputs.cpu_workloads)[0] != null }}
     strategy:
+      fail-fast: false
       matrix:
         workload: ${{ fromJSON(github.event.inputs.cpu_workloads) }}
     name: ${{ matrix.workload }} (cpu)
@@ -60,6 +61,7 @@ jobs:
   test-cuda:
     if: ${{ fromJSON(github.event.inputs.cuda_workloads)[0] != null }}
     strategy:
+      fail-fast: false
       matrix:
         workload: ${{ fromJSON(github.event.inputs.cuda_workloads) }}
     name: ${{ matrix.workload }} (gpu)
@@ -99,6 +101,7 @@ jobs:
   test-network:
     if: ${{ fromJSON(github.event.inputs.network_workloads)[0] != null }}
     strategy:
+      fail-fast: false
       matrix:
         workload: ${{ fromJSON(github.event.inputs.network_workloads) }}
     name: ${{ matrix.workload }} (network)

diff --git a/crates/perf/src/main.rs b/crates/perf/src/main.rs
@@ -130,11 +130,12 @@ fn main() {
             let (_, verify_shrink_duration) =
                 time_operation(|| prover.verify_shrink(&shrink_proof, &vk));
 
-            let (wrapped_bn254_proof, wrap_duration) =
-                time_operation(|| prover.wrap_bn254(shrink_proof, opts).unwrap());
+            let (_, wrap_duration) = time_operation(|| server.wrap_bn254(shrink_proof).unwrap());
 
-            let (_, verify_wrap_duration) =
-                time_operation(|| prover.verify_wrap_bn254(&wrapped_bn254_proof, &vk));
+            // TODO: Verify wrapped bn254 proofs.
+            // let (_, verify_wrap_duration) =
+            //     time_operation(|| prover.verify_wrap_bn254(&wrapped_bn254_proof, &vk));
+            let verify_wrap_duration = Duration::from_secs(0);
 
             let result = PerfResult {
                 cycles,

diff --git a/crates/prover/Makefile b/crates/prover/Makefile
@@ -20,4 +20,4 @@ release-circuits:
 
 test-e2e:
 	RUSTFLAGS='-C target-cpu=native' \
-	cargo test --package sp1-prover --lib --release -- tests::test_e2e --exact --show-output 
+	cargo test --package sp1-prover --lib --release -- tests::test_e2e --exact --show-output