Skip to content

Commit 06c63d0

Browse files
authored
refactor dependency point to new gkr-backend (#1045)
To enable shared lib between cpu/gpu besides, add a new feature "parallel" `ceno_zkvm/Cargo.toml` to enable parallel features on dependency of `gkr-backend`, as `gkr-backend` default features was disabled. ### benchmarks shows no impact | Benchmark | Median Time (s) | Median Change (%) | |----------------------------------|------------------|----------------------------------| | fibonacci_max_steps_1048576 | 2.5186 | +2.51% (Change within noise) | | fibonacci_max_steps_2097152 | 4.4531 | +0.32% (No change detected) | | fibonacci_max_steps_4194304 | 8.5974 | +2.60% (No change detected) |
1 parent 6c24f18 commit 06c63d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+45
-12765
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ members = [
77
"ceno_zkvm",
88
"examples-builder",
99
"examples",
10-
"mpcs",
11-
"multilinear_extensions",
12-
"sumcheck_macro",
13-
"poseidon",
14-
"gkr_iop",
15-
"sumcheck",
16-
"transcript",
17-
"whir",
18-
"witness",
19-
"p3",
2010
]
2111
resolver = "2"
2212

@@ -30,34 +20,26 @@ repository = "https://github.com/scroll-tech/ceno"
3020
version = "0.1.0"
3121

3222
[workspace.dependencies]
23+
ff_ext = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "ff_ext", rev = "v1.0.0-alpha.2" }
24+
mpcs = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "mpcs", rev = "v1.0.0-alpha.2" }
25+
multilinear_extensions = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "multilinear_extensions", rev = "v1.0.0-alpha.2" }
26+
p3 = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "p3", rev = "v1.0.0-alpha.2" }
27+
poseidon = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "poseidon", rev = "v1.0.0-alpha.2" }
28+
sumcheck = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "sumcheck", rev = "v1.0.0-alpha.2" }
29+
transcript = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "transcript", rev = "v1.0.0-alpha.2" }
30+
whir = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "whir", rev = "v1.0.0-alpha.2" }
31+
witness = { git = "https://github.com/scroll-tech/gkr-backend.git", package = "witness", rev = "v1.0.0-alpha.2" }
32+
3333
anyhow = { version = "1.0", default-features = false }
3434
bincode = "1"
3535
clap = { version = "4.5", features = ["derive"] }
3636
criterion = { version = "0.5", features = ["html_reports"] }
3737
either = { version = "1.15.*", features = ["serde"] }
3838
itertools = "0.13"
3939
ndarray = "*"
40-
num-bigint = { version = "0.4.6" }
4140
num-derive = "0.4"
4241
num-traits = "0.2"
43-
p3 = { path = "p3" }
44-
p3-baby-bear = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
45-
p3-challenger = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
46-
p3-commit = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
47-
p3-dft = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
48-
p3-field = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
49-
p3-fri = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
50-
p3-goldilocks = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
51-
p3-matrix = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
52-
p3-maybe-rayon = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
53-
p3-mds = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
54-
p3-merkle-tree = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
55-
p3-poseidon = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
56-
p3-poseidon2 = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
57-
p3-symmetric = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
58-
p3-util = { git = "https://github.com/Plonky3/plonky3", rev = "1ba4e5c" }
59-
paste = "1"
60-
poseidon = { path = "./poseidon" }
42+
6143
pprof2 = { version = "0.13", features = ["flamegraph"] }
6244
prettytable-rs = "^0.10"
6345
proptest = "1"
@@ -72,7 +54,6 @@ serde_json = "1.0"
7254
strum = "0.26"
7355
strum_macros = "0.26"
7456
substrate-bn = { version = "0.6.0" }
75-
sumcheck = { path = "sumcheck" }
7657
thiserror = "1" # do we need this?
7758
thread_local = "1.1"
7859
tiny-keccak = { version = "2.0.2", features = ["keccak"] }

ceno_cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ tikv-jemallocator = { version = "0.6", optional = true }
2929
ceno_emul = { path = "../ceno_emul" }
3030
ceno_host = { path = "../ceno_host" }
3131
ceno_zkvm = { path = "../ceno_zkvm" }
32-
ff_ext = { path = "../ff_ext" }
32+
ff_ext.workspace = true
3333
gkr_iop = { path = "../gkr_iop" }
34-
mpcs = { path = "../mpcs" }
34+
mpcs.workspace = true
3535

3636
[build-dependencies]
3737
vergen-git2 = { version = "1", features = ["build", "cargo", "rustc", "emit_and_set"] }

ceno_emul/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ version.workspace = true
1313
anyhow.workspace = true
1414
ceno_rt = { path = "../ceno_rt" }
1515
elf = "0.7"
16-
ff_ext = { version = "0", path = "../ff_ext" }
16+
ff_ext.workspace = true
1717
itertools.workspace = true
18-
multilinear_extensions = { version = "0", path = "../multilinear_extensions" }
18+
multilinear_extensions.workspace = true
1919
num-derive.workspace = true
2020
num-traits.workspace = true
2121
rrs_lib = { package = "rrs-succinct", version = "0.1.0" }

ceno_zkvm/Cargo.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@ ceno-examples = { path = "../examples-builder" }
1515
ceno_emul = { path = "../ceno_emul" }
1616
ceno_host = { path = "../ceno_host" }
1717
either.workspace = true
18-
ff_ext = { path = "../ff_ext" }
18+
ff_ext.workspace = true
1919
gkr_iop = { path = "../gkr_iop" }
20-
mpcs = { path = "../mpcs" }
21-
multilinear_extensions = { version = "0", path = "../multilinear_extensions" }
20+
mpcs.workspace = true
21+
multilinear_extensions.workspace = true
2222
p3.workspace = true
2323
rayon.workspace = true
2424
serde.workspace = true
2525
serde_json.workspace = true
2626
sumcheck.workspace = true
27-
transcript = { path = "../transcript" }
28-
witness = { path = "../witness" }
27+
transcript.workspace = true
28+
whir.workspace = true
29+
witness.workspace = true
2930

3031
itertools.workspace = true
3132
ndarray.workspace = true
@@ -59,7 +60,7 @@ ceno-examples = { path = "../examples-builder" }
5960
glob = "0.3"
6061

6162
[features]
62-
default = ["forbid_overflow", "nightly-features", "u16limb_circuit"]
63+
default = ["forbid_overflow", "nightly-features", "u16limb_circuit", "parallel"]
6364
flamegraph = ["pprof2/flamegraph", "pprof2/criterion"]
6465
forbid_overflow = []
6566
goldilocks = ["forbid_overflow", "nightly-features"]
@@ -74,6 +75,7 @@ nightly-features = [
7475
"transcript/nightly-features",
7576
"witness/nightly-features",
7677
]
78+
parallel = ["whir/parallel", "p3/parallel", "multilinear_extensions/parallel", "mpcs/parallel"]
7779
sanity-check = ["mpcs/sanity-check"]
7880
u16limb_circuit = ["ceno_emul/u16limb_circuit"]
7981

ff_ext/Cargo.toml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)