Skip to content
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

Jump to bottom

Speed up incremental build #1682

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Speed up incremental build #1682

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
882a88b
Separate out clap derive stuff
matthiasgoergens May 9, 2024
15f8e10
Clean up
matthiasgoergens May 9, 2024
6bda1ad
Move stuff
matthiasgoergens May 9, 2024
6399fec
Move benchs
matthiasgoergens May 9, 2024
0caf013
Make clippy happy
matthiasgoergens May 9, 2024
bd87dc6
Merge remote-tracking branch 'origin/main' into matthias/speed-up-cli…
matthiasgoergens May 9, 2024
9748451
CLean up
matthiasgoergens May 9, 2024
6b18afc
Slim down
matthiasgoergens May 9, 2024
dc923c5
Format
matthiasgoergens May 9, 2024
7693224
Upgrade clio
matthiasgoergens May 9, 2024
9604a44
Shuffle tests
matthiasgoergens May 9, 2024
4c81c6a
Restore test
matthiasgoergens May 9, 2024
19c59c6
Read at runtime
matthiasgoergens May 9, 2024
57a4507
Read at compile time
matthiasgoergens May 9, 2024
9d5253c
Clippy
matthiasgoergens May 9, 2024
ba18db8
Fix
matthiasgoergens May 9, 2024
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
143 changes: 47 additions & 96 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
[workspace]
exclude = ["sdk"]
members = [
"args",
"circuits",
"cli",
"examples-builder",
Expand Down Expand Up @@ -56,6 +57,7 @@ plonky2_crypto = { git = "https://github.com/0xmozak/plonky2-crypto.git" }
criterion = { version = "0.5", default-features = false, features = ["html_reports", "plotters", "cargo_bench_support"] }

[patch.crates-io]
clio = { git = "https://github.com/0xmozak/clio.git" }
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change can go into its own PR.

plonky2 = { git = "https://github.com/0xmozak/plonky2.git" }
plonky2_maybe_rayon = { git = "https://github.com/0xmozak/plonky2.git" }
starky = { git = "https://github.com/0xmozak/plonky2.git" }
23 changes: 23 additions & 0 deletions args/Cargo.toml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm all for improving compilation speed but seems like this comes at the cost of reordering our CLI logic in a somewhat confusing manner, I'm not sure if args should belong outside of the cli.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[package]
categories = ["cryptography"]
description = "MozakVM cli"
edition = "2021"
keywords = ["crypto", "zero-knowledge", "vm"]
license = "All rights reserved"
name = "mozak-cli-args"
readme = "README.md"
repository = "https://github.com/0xmozak/mozak-vm"
version = "0.1.0"

[dependencies]
clap = { version = "4.5", features = [
"derive",
"cargo",
"env",
"unicode",
] }
# TODO(Matthias): implement shell completion for CLI via clap_complete
# clap_complete = "4.3"
clap-verbosity-flag = "2.2"
clap_derive = "4.5"
clio = { version = "0.3", features = ["clap-parse"] }
Loading
Loading