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

feat: optimize LWG and NWG #2512

Merged
merged 31 commits into from
Aug 2, 2024
Merged

feat: optimize LWG and NWG #2512

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ff57b38
Move recursive circuits out of AggregationWrapper struct
0xVolosnikov Jul 26, 2024
64fb5b7
Add comments in prover tests
0xVolosnikov Jul 26, 2024
88e610c
Merge branch 'main' into vv-optimize-lwg-nwg
0xVolosnikov Jul 29, 2024
24ef093
Cargo fmt
0xVolosnikov Jul 29, 2024
cc583c7
Process LWG in batches
0xVolosnikov Jul 29, 2024
7c261a0
Move LWG processing in separate thread
0xVolosnikov Jul 29, 2024
a5105f3
Remove separate thread; cleanup
0xVolosnikov Jul 29, 2024
7b369d5
Fix after merge
0xVolosnikov Jul 30, 2024
69c80f8
Parallelize LWG
0xVolosnikov Jul 30, 2024
9b9c52d
Fix semaphore usage
0xVolosnikov Jul 30, 2024
5a3f20d
Merge branch 'main' into vv-optimize-lwg-nwg
0xVolosnikov Jul 30, 2024
89249e9
Add comments to constants
0xVolosnikov Jul 30, 2024
3ed06aa
Fix todos in basic_test
0xVolosnikov Jul 30, 2024
745461e
Cargo fmt
0xVolosnikov Jul 30, 2024
4b32eb0
Simplify LWG
0xVolosnikov Jul 30, 2024
2dbca20
Parallelize NWG as well
0xVolosnikov Jul 30, 2024
b5b9a04
Update deps
0xVolosnikov Aug 2, 2024
fb75fc2
Address comments
0xVolosnikov Aug 2, 2024
a119262
Cargo.lock
0xVolosnikov Aug 2, 2024
8b6add2
Merge remote-tracking branch 'origin/main' into vv-optimize-lwg-nwg
0xVolosnikov Aug 2, 2024
e7e0235
Hotfix
0xVolosnikov Aug 2, 2024
9899892
Cargo fmt
0xVolosnikov Aug 2, 2024
6468ddd
Use max_circuits_in_flight from config
0xVolosnikov Aug 2, 2024
c2a5e72
Fix
0xVolosnikov Aug 2, 2024
e0694a2
Fix lint issues
0xVolosnikov Aug 2, 2024
0f4db7c
Merge remote-tracking branch 'origin/main' into vv-optimize-lwg-nwg
0xVolosnikov Aug 2, 2024
b61d466
Revert unnessesary Cargo.lock changes
0xVolosnikov Aug 2, 2024
f8c3236
Add comments
0xVolosnikov Aug 2, 2024
1219f7f
Fix lint issues in tests
0xVolosnikov Aug 2, 2024
752c541
Revert blocking spawns
0xVolosnikov Aug 2, 2024
7486f2d
Cleanup
0xVolosnikov Aug 2, 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
6 changes: 2 additions & 4 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: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ circuit_sequencer_api_1_3_3 = { package = "circuit_sequencer_api", version = "=0
circuit_sequencer_api_1_4_0 = { package = "circuit_sequencer_api", version = "=0.140.0" }
circuit_sequencer_api_1_4_1 = { package = "circuit_sequencer_api", version = "=0.141.0" }
circuit_sequencer_api_1_4_2 = { package = "circuit_sequencer_api", version = "=0.142.0" }
circuit_sequencer_api_1_5_0 = { package = "circuit_sequencer_api", version = "=0.150.2-rc.1" }
circuit_sequencer_api_1_5_0 = { git = "https://github.com/matter-labs/era-zkevm_test_harness", branch="vv-optimize-lwg-nwg", package = "circuit_sequencer_api"}
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.1.0" }
kzg = { package = "zksync_kzg", version = "=0.150.2-rc.1" }
zk_evm = { version = "=0.133.0" }
Expand Down
Loading
Loading