Merge remote-tracking branch 'origin/tamir/v1.3.0-rc2' into scroll-de…

…v-0914
scroll-tech · Oct 9, 2024 · 28a41a2 · 28a41a2
2 parents 6911fdd + 069cc25
commit 28a41a2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 34 deletions.
diff --git a/crates/cuda/src/lib.rs b/crates/cuda/src/lib.rs
@@ -84,7 +84,7 @@ impl SP1CudaProver {
     /// [SP1ProverClient] that can be used to communicate with the container.
     pub fn new() -> Result<Self, Box<dyn StdError>> {
         let container_name = "sp1-gpu";
-        let image_name = "public.ecr.aws/succinct-labs/sp1-gpu:b0756e2";
+        let image_name = "public.ecr.aws/succinct-labs/sp1-gpu:a4e646b";
 
         let cleaned_up = Arc::new(AtomicBool::new(false));
         let cleanup_name = container_name;
@@ -107,8 +107,6 @@ impl SP1CudaProver {
                 "run",
                 "-e",
                 &format!("RUST_LOG={}", rust_log_level),
-                "-e",
-                &format!("VERIFY_VK={}", "false"),
                 "-p",
                 "3000:3000",
                 "--rm",

diff --git a/crates/perf/workflow.sh b/crates/perf/workflow.sh
@@ -24,26 +24,6 @@ CPU_WORKLOADS=(
 
 # Define the list of CUDA workloads.
 CUDA_WORKLOADS=(
-    # "fibonacci-17k"
-    # "ssz-withdrawals"
-    # "tendermint"
-    # "rsp-20526624"
-    # "rsa"
-    # "regex"
-    # "chess"
-    # "json"
-    # "blobstream-01j6z63fgafrc8jeh0k12gbtvw"
-    # "blobstream-01j6z95bdme9svevmfyc974bja"
-    # "blobstream-01j6z9ak0ke9srsppgywgke6fj"
-    # "vector-01j6xsv35re96tkgyda115320t"
-    # "vector-01j6xzy366ff5tbkzcrs8pma02"
-    # "vector-01j6y06de0fdaafemr8b1t69z3"
-    # "raiko-a7-10"   
-    # "op-succinct-op-sepolia-range-17985900-17985905"
-)
-
-# Define the list of network workloads.
-NETWORK_WORKLOADS=(
     "fibonacci-17k"
     "ssz-withdrawals"
     "tendermint"
@@ -58,14 +38,34 @@ NETWORK_WORKLOADS=(
     "vector-01j6xsv35re96tkgyda115320t"
     "vector-01j6xzy366ff5tbkzcrs8pma02"
     "vector-01j6y06de0fdaafemr8b1t69z3"
-    "raiko-a7-10"
-    "op-succinct-op-sepolia-1818303090-18303120"
-    "op-succinct-op-sepolia-18200000-18200030" 
-    "op-succinct-op-sepolia-18250000-18250030"
-    "op-succinct-op-sepolia-18303044-18303074"
-    "op-succinct-op-sepolia-range-17685896-17685897"
+    "raiko-a7-10"   
     "op-succinct-op-sepolia-range-17985900-17985905"
-    "op-succinct-op-sepolia-range-18129400-18129401"
+)
+
+# Define the list of network workloads.
+NETWORK_WORKLOADS=(
+    # "fibonacci-17k"
+    # "ssz-withdrawals"
+    # "tendermint"
+    # "rsp-20526624"
+    # "rsa"
+    # "regex"
+    # "chess"
+    # "json"
+    # "blobstream-01j6z63fgafrc8jeh0k12gbtvw"
+    # "blobstream-01j6z95bdme9svevmfyc974bja"
+    # "blobstream-01j6z9ak0ke9srsppgywgke6fj"
+    # "vector-01j6xsv35re96tkgyda115320t"
+    # "vector-01j6xzy366ff5tbkzcrs8pma02"
+    # "vector-01j6y06de0fdaafemr8b1t69z3"
+    # "raiko-a7-10"
+    # "op-succinct-op-sepolia-1818303090-18303120"
+    # "op-succinct-op-sepolia-18200000-18200030" 
+    # "op-succinct-op-sepolia-18250000-18250030"
+    # "op-succinct-op-sepolia-18303044-18303074"
+    # "op-succinct-op-sepolia-range-17685896-17685897"
+    # "op-succinct-op-sepolia-range-17985900-17985905"
+    # "op-succinct-op-sepolia-range-18129400-18129401"
 )
 
 # Create a JSON object with the list of workloads.

diff --git a/crates/prover/src/lib.rs b/crates/prover/src/lib.rs
@@ -109,7 +109,7 @@ const COMPRESS_CACHE_SIZE: usize = 3;
 pub const REDUCE_BATCH_SIZE: usize = 2;
 
 const SHAPES_URL_PREFIX: &str = "https://sp1-circuits.s3.us-east-2.amazonaws.com/shapes";
-const SHAPES_VERSION: &str = "5202143e0";
+const SHAPES_VERSION: &str = "146079e0e";
 lazy_static! {
     static ref SHAPES_INIT: Once = Once::new();
 }
@@ -233,16 +233,16 @@ impl<C: SP1ProverComponents> SP1Prover<C> {
 
         let core_shape_config = env::var("FIX_CORE_SHAPES")
             .map(|v| v.eq_ignore_ascii_case("true"))
-            .unwrap_or(true)
+            .unwrap_or(false)
             .then_some(CoreShapeConfig::default());
 
         let recursion_shape_config = env::var("FIX_RECURSION_SHAPES")
             .map(|v| v.eq_ignore_ascii_case("true"))
-            .unwrap_or(true)
+            .unwrap_or(false)
             .then_some(RecursionShapeConfig::default());
 
         let vk_verification =
-            env::var("VERIFY_VK").map(|v| v.eq_ignore_ascii_case("true")).unwrap_or(true);
+            env::var("VERIFY_VK").map(|v| v.eq_ignore_ascii_case("true")).unwrap_or(false);
 
         tracing::info!("vk verification: {}", vk_verification);