Skip to content

Commit 47f0e0a

Browse files
fix: use branch of halo2curves without nostack (#2252)
Co-authored-by: Jonathan Wang <[email protected]>
1 parent 0cbc78c commit 47f0e0a

File tree

5 files changed

+6
-18
lines changed

5 files changed

+6
-18
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ snark-verifier-sdk = { version = "0.2.0", default-features = false, features = [
194194
"halo2-axiom",
195195
] }
196196
snark-verifier = { version = "0.2.0", default-features = false }
197-
halo2curves-axiom = "0.7.0"
197+
halo2curves-axiom = "^0.7.2"
198198

199199
forge-fmt = "0.2.0"
200200
cargo_metadata = "0.18"

extensions/algebra/circuit/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,8 @@ serde_with = { workspace = true }
3333
eyre = { workspace = true }
3434
cfg-if = { workspace = true }
3535

36-
[target.'cfg(not(target_arch = "x86_64"))'.dependencies]
3736
halo2curves-axiom = { workspace = true }
3837

39-
[target.'cfg(target_arch = "x86_64")'.dependencies]
40-
halo2curves-axiom = { workspace = true, features = ["asm"]}
41-
4238
[dev-dependencies]
4339
openvm-mod-circuit-builder = { workspace = true, features = ["test-utils"] }
4440
openvm-circuit = { workspace = true, features = ["test-utils"] }
@@ -52,7 +48,7 @@ openvm-cuda-builder = { workspace = true, optional = true }
5248
[features]
5349
default = []
5450
tco = ["openvm-rv32im-circuit/tco"]
55-
aot = ["openvm-circuit/aot", "openvm-rv32im-circuit/aot"]
51+
aot = ["openvm-circuit/aot", "openvm-rv32im-circuit/aot", "halo2curves-axiom/asm"]
5652
cuda = [
5753
"dep:openvm-cuda-common",
5854
"dep:openvm-cuda-backend",

extensions/ecc/circuit/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,8 @@ lazy_static = { workspace = true }
3434
hex-literal = { workspace = true }
3535
cfg-if = { workspace = true }
3636

37-
[target.'cfg(not(target_arch = "x86_64"))'.dependencies]
3837
halo2curves-axiom = { workspace = true }
3938

40-
[target.'cfg(target_arch = "x86_64")'.dependencies]
41-
halo2curves-axiom = { workspace = true, features = ["asm"]}
42-
4339
[dev-dependencies]
4440
openvm-pairing-guest = { workspace = true, features = ["halo2curves"] }
4541
openvm-stark-sdk = { workspace = true }
@@ -51,7 +47,7 @@ lazy_static = { workspace = true }
5147
[features]
5248
default = []
5349
tco = ["openvm-algebra-circuit/tco"]
54-
aot = ["openvm-circuit/aot", "openvm-algebra-circuit/aot"]
50+
aot = ["openvm-circuit/aot", "openvm-algebra-circuit/aot", "halo2curves-axiom/asm"]
5551
cuda = [
5652
"dep:openvm-cuda-common",
5753
"dep:openvm-cuda-backend",

extensions/pairing/circuit/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,8 @@ eyre = { workspace = true }
3838
serde = { workspace = true, features = ["derive", "std"] }
3939
cfg-if = { workspace = true }
4040

41-
[target.'cfg(not(target_arch = "x86_64"))'.dependencies]
4241
halo2curves-axiom = { workspace = true }
4342

44-
[target.'cfg(target_arch = "x86_64")'.dependencies]
45-
halo2curves-axiom = { workspace = true, features = ["asm"]}
46-
4743
[target.'cfg(not(target_os = "zkvm"))'.dependencies]
4844
openvm-pairing-guest = { workspace = true }
4945

@@ -62,7 +58,7 @@ openvm-pairing-guest = { workspace = true, features = [
6258
[features]
6359
default = []
6460
tco = ["openvm-rv32im-circuit/tco", "openvm-ecc-circuit/tco"]
65-
aot = ["openvm-circuit/aot", "openvm-rv32im-circuit/aot", "openvm-ecc-circuit/aot"]
61+
aot = ["openvm-circuit/aot", "openvm-rv32im-circuit/aot", "openvm-ecc-circuit/aot", "halo2curves-axiom/asm"]
6662
cuda = [
6763
"dep:openvm-cuda-backend",
6864
"dep:openvm-stark-sdk",

0 commit comments

Comments
 (0)