Skip to content

chore: Localize feature import to crate for circuit prover #3502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EmilLuta merged 5 commits into from
Jan 20, 2025
Merged

chore: Localize feature import to crate for circuit prover #3502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
950092e
fix: enable rt feature in Tokio to resolve JoinHandle import issue
tahsintunan Jan 17, 2025
6166a7f
enable gpu feature for prover keystore
tahsintunan Jan 20, 2025
1827057
enable keystore.gpu in circuit_prover_service only
tahsintunan Jan 20, 2025
f522a67
Merge branch 'main' into fix/tokio-joinhandle-import
tahsintunan Jan 20, 2025
e77e39e
enable keystore.gpu-light in circuit_prover_service
tahsintunan Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions prover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ vise = "0.2.0"
circuit_definitions = "=0.150.19"
circuit_sequencer_api = "=0.150.19"
zkevm_test_harness = "=0.150.19"
proof-compression-gpu = { package = "proof-compression", version = "=0.152.10"}
fflonk-gpu = { package = "fflonk-cuda", version = "=0.152.10"}
proof-compression-gpu = { package = "proof-compression", version = "=0.152.10" }
fflonk-gpu = { package = "fflonk-cuda", version = "=0.152.10" }
fflonk = "=0.30.12"
franklin-crypto = "=0.30.12"

# GPU proving dependencies
wrapper_prover = { package = "zksync-wrapper-prover", version = "=0.152.10"}
wrapper_prover = { package = "zksync-wrapper-prover", version = "=0.152.10" }
shivini = "=0.152.10"
boojum-cuda = "=0.152.10"

Expand Down
6 changes: 2 additions & 4 deletions prover/crates/lib/circuit_prover_service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories.workspace = true
[dependencies]
zksync_prover_job_processor.workspace = true
zksync_prover_fri_types.workspace = true
zksync_prover_keystore.workspace = true
zksync_prover_keystore = { workspace = true, features = ["gpu-light"] }
zksync_prover_dal.workspace = true
zksync_types.workspace = true
zksync_object_store.workspace = true
Expand All @@ -24,8 +24,6 @@ tokio = { workspace = true, features = ["macros", "time"] }
tokio-util.workspace = true
tracing.workspace = true

shivini = { workspace = true, features = [
"circuit_definitions",
] }
shivini = { workspace = true, features = ["circuit_definitions"] }
zkevm_test_harness.workspace = true
vise.workspace = true
2 changes: 1 addition & 1 deletion prover/crates/lib/prover_job_processor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories.workspace = true
async-trait.workspace = true
anyhow.workspace = true
futures.workspace = true
tokio.workspace = true
tokio = { workspace = true, features = ["rt"] }
tokio-stream.workspace = true
tokio-util.workspace = true
tracing.workspace = true
Expand Down
Loading