Skip to content

Commit 654cd42

Browse files
noel2004noel2004
committed
update gpu dep
1 parent 0e1d3e4 commit 654cd42

File tree

3 files changed

+37
-34
lines changed

3 files changed

+37
-34
lines changed

‎build/dockerfiles/coordinator-api/checkout_all.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
set -uex
33

4-
PLONKY3_GPU_COMMIT=261b322 # v0.2.0
5-
OPENVM_STARK_GPU_COMMIT=3082234 # PR#48
6-
OPENVM_GPU_COMMIT=8094b4f # branch: patch-v1.2.0
4+
PLONKY3_GPU_COMMIT=450ec18 # feynman
5+
OPENVM_STARK_GPU_COMMIT=e3b2d6 # branch: sync/upstream-250702
6+
OPENVM_GPU_COMMIT=75df915 # branch: patch-v1.2.1-rc.1-pipe
77

88
DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)
99

‎build/dockerfiles/coordinator-api/config.toml‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
# openvm
22
# same order and features as zkvm-prover/Cargo.toml.gpu
3+
[patch."https://github.com/openvm-org/openvm.git"]
4+
openvm-build = { path = "/openvm-gpu/crates/toolchain/build", default-features = false }
5+
openvm-circuit = { path = "/openvm-gpu/crates/vm", default-features = false }
6+
openvm-continuations = { path = "/openvm-gpu/crates/continuations", default-features = false }
7+
openvm-instructions ={ path = "/openvm-gpu/crates/toolchain/instructions", default-features = false }
8+
openvm-native-circuit = { path = "/openvm-gpu/extensions/native/circuit", default-features = false }
9+
openvm-native-compiler = { path = "/openvm-gpu/extensions/native/compiler", default-features = false }
10+
openvm-native-recursion = { path = "/openvm-gpu/extensions/native/recursion", default-features = false }
11+
openvm-native-transpiler = { path = "/openvm-gpu/extensions/native/transpiler", default-features = false }
12+
openvm-rv32im-transpiler = { path = "/openvm-gpu/extensions/rv32im/transpiler", default-features = false }
13+
openvm-sdk = { path = "/openvm-gpu/crates/sdk", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] }
14+
openvm-transpiler = { path = "/openvm-gpu/crates/toolchain/transpiler", default-features = false }
15+
316
[patch."ssh://git@github.com/scroll-tech/openvm-gpu.git"]
4-
openvm = { path = "/openvm-gpu/crates/toolchain/openvm", default-features = false }
5-
openvm-algebra-complex-macros = { path = "/openvm-gpu/extensions/algebra/complex-macros", default-features = false }
6-
openvm-algebra-guest = { path = "/openvm-gpu/extensions/algebra/guest", default-features = false }
7-
openvm-bigint-guest = { path = "/openvm-gpu/extensions/bigint/guest", default-features = false }
817
openvm-build = { path = "/openvm-gpu/crates/toolchain/build", default-features = false }
918
openvm-circuit = { path = "/openvm-gpu/crates/vm", default-features = false }
10-
openvm-custom-insn = { path = "/openvm-gpu/crates/toolchain/custom_insn", default-features = false }
1119
openvm-continuations = { path = "/openvm-gpu/crates/continuations", default-features = false }
12-
openvm-ecc-guest = { path = "/openvm-gpu/extensions/ecc/guest", default-features = false }
1320
openvm-instructions ={ path = "/openvm-gpu/crates/toolchain/instructions", default-features = false }
14-
openvm-keccak256-guest = { path = "/openvm-gpu/extensions/keccak256/guest", default-features = false }
1521
openvm-native-circuit = { path = "/openvm-gpu/extensions/native/circuit", default-features = false }
1622
openvm-native-compiler = { path = "/openvm-gpu/extensions/native/compiler", default-features = false }
1723
openvm-native-recursion = { path = "/openvm-gpu/extensions/native/recursion", default-features = false }
1824
openvm-native-transpiler = { path = "/openvm-gpu/extensions/native/transpiler", default-features = false }
19-
openvm-pairing-guest = { path = "/openvm-gpu/extensions/pairing/guest", default-features = false }
20-
openvm-rv32im-guest = { path = "/openvm-gpu/extensions/rv32im/guest", default-features = false }
2125
openvm-rv32im-transpiler = { path = "/openvm-gpu/extensions/rv32im/transpiler", default-features = false }
2226
openvm-sdk = { path = "/openvm-gpu/crates/sdk", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] }
23-
openvm-sha256-guest = { path = "/openvm-gpu/extensions/sha256/guest", default-features = false }
2427
openvm-transpiler = { path = "/openvm-gpu/crates/toolchain/transpiler", default-features = false }
2528

2629
# stark-backend
@@ -38,7 +41,9 @@ p3-air = { path = "/plonky3-gpu/air" }
3841
p3-field = { path = "/plonky3-gpu/field" }
3942
p3-commit = { path = "/plonky3-gpu/commit" }
4043
p3-matrix = { path = "/plonky3-gpu/matrix" }
41-
p3-baby-bear = { path = "/plonky3-gpu/baby-bear" }
44+
p3-baby-bear = { path = "/plonky3-gpu/baby-bear", features = [
45+
"nightly-features",
46+
]}
4247
p3-koala-bear = { path = "/plonky3-gpu/koala-bear" }
4348
p3-util = { path = "/plonky3-gpu/util" }
4449
p3-challenger = { path = "/plonky3-gpu/challenger" }
@@ -49,8 +54,8 @@ p3-keccak = { path = "/plonky3-gpu/keccak" }
4954
p3-keccak-air = { path = "/plonky3-gpu/keccak-air" }
5055
p3-blake3 = { path = "/plonky3-gpu/blake3" }
5156
p3-mds = { path = "/plonky3-gpu/mds" }
52-
p3-monty-31 = { path = "/plonky3-gpu/monty-31" }
5357
p3-merkle-tree = { path = "/plonky3-gpu/merkle-tree" }
58+
p3-monty-31 = { path = "/plonky3-gpu/monty-31" }
5459
p3-poseidon = { path = "/plonky3-gpu/poseidon" }
5560
p3-poseidon2 = { path = "/plonky3-gpu/poseidon2" }
5661
p3-poseidon2-air = { path = "/plonky3-gpu/poseidon2-air" }
@@ -61,16 +66,13 @@ p3-bn254-fr = { path = "/plonky3-gpu/bn254-fr" }
6166

6267
# gpu crates
6368
[patch."ssh://git@github.com/scroll-tech/plonky3-gpu.git"]
64-
p3-gpu-base = { path = "/plonky3-gpu/gpu-base" }
65-
p3-gpu-build = { path = "/plonky3-gpu/gpu-build" }
66-
p3-gpu-field = { path = "/plonky3-gpu/gpu-field" }
67-
p3-gpu-backend = { path = "/plonky3-gpu/gpu-backend" }
68-
p3-gpu-module = { path = "/plonky3-gpu/gpu-module" }
6969
p3-air = { path = "/plonky3-gpu/air" }
7070
p3-field = { path = "/plonky3-gpu/field" }
7171
p3-commit = { path = "/plonky3-gpu/commit" }
7272
p3-matrix = { path = "/plonky3-gpu/matrix" }
73-
p3-baby-bear = { path = "/plonky3-gpu/baby-bear" }
73+
p3-baby-bear = { path = "/plonky3-gpu/baby-bear", features = [
74+
"nightly-features",
75+
]}
7476
p3-koala-bear = { path = "/plonky3-gpu/koala-bear" }
7577
p3-util = { path = "/plonky3-gpu/util" }
7678
p3-challenger = { path = "/plonky3-gpu/challenger" }
@@ -81,12 +83,13 @@ p3-keccak = { path = "/plonky3-gpu/keccak" }
8183
p3-keccak-air = { path = "/plonky3-gpu/keccak-air" }
8284
p3-blake3 = { path = "/plonky3-gpu/blake3" }
8385
p3-mds = { path = "/plonky3-gpu/mds" }
84-
p3-monty-31 = { path = "/plonky3-gpu/monty-31" }
8586
p3-merkle-tree = { path = "/plonky3-gpu/merkle-tree" }
87+
p3-monty-31 = { path = "/plonky3-gpu/monty-31" }
8688
p3-poseidon = { path = "/plonky3-gpu/poseidon" }
8789
p3-poseidon2 = { path = "/plonky3-gpu/poseidon2" }
8890
p3-poseidon2-air = { path = "/plonky3-gpu/poseidon2-air" }
8991
p3-symmetric = { path = "/plonky3-gpu/symmetric" }
9092
p3-uni-stark = { path = "/plonky3-gpu/uni-stark" }
9193
p3-maybe-rayon = { path = "/plonky3-gpu/maybe-rayon" }
9294
p3-bn254-fr = { path = "/plonky3-gpu/bn254-fr" }
95+

‎crates/gpu_override/.cargo/config.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11

2-
# [patch."https://github.com/openvm-org/openvm.git"]
3-
# openvm-build = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
4-
# openvm-circuit = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
5-
# openvm-continuations = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
6-
# openvm-instructions ={ git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
7-
# openvm-native-circuit = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
8-
# openvm-native-compiler = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
9-
# openvm-native-recursion = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
10-
# openvm-native-transpiler = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
11-
# openvm-rv32im-transpiler = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
12-
# openvm-sdk = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] }
13-
# openvm-transpiler = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
2+
[patch."https://github.com/openvm-org/openvm.git"]
3+
openvm-build = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
4+
openvm-circuit = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
5+
openvm-continuations = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
6+
openvm-instructions ={ git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
7+
openvm-native-circuit = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
8+
openvm-native-compiler = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
9+
openvm-native-recursion = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
10+
openvm-native-transpiler = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
11+
openvm-rv32im-transpiler = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
12+
openvm-sdk = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] }
13+
openvm-transpiler = { git = "ssh://[email protected]/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
1414

1515
[patch."https://github.com/openvm-org/stark-backend.git"]
1616
openvm-stark-backend = { git = "ssh://[email protected]/scroll-tech/openvm-stark-gpu.git", branch = "sync/upstream-250702", features = ["gpu"] }

0 commit comments

Comments
 (0)