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: use new IVC scheme #8480

Merged
merged 23 commits into from
Sep 17, 2024
Merged

feat: use new IVC scheme #8480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
379b8b0
introduce auto verify mode, basic ClientIvc tests pass using AztecIvc
ledwards2225 Sep 10, 2024
2045e41
all ClientIvc tests pass with auto AztecIvc swapped in
ledwards2225 Sep 10, 2024
5c5160f
client ivc integration tests passes with aztec ivc
ledwards2225 Sep 11, 2024
dbc37ff
pub inputs hack
ledwards2225 Sep 12, 2024
4878db2
cleanup and trigger e2e on aztec ivc changes
ledwards2225 Sep 12, 2024
6cd39f9
fixx gcc
ledwards2225 Sep 12, 2024
2a24811
update fold basic prgram to have even num circuits
ledwards2225 Sep 16, 2024
d0e9a58
Merge branch 'master' into lde/integrate_new_ivc
ledwards2225 Sep 16, 2024
b48bb6e
bump grump in main ts
ledwards2225 Sep 16, 2024
b547310
remove old client ivc
ledwards2225 Sep 16, 2024
c6b99ae
fix bb method type in ivc integration tests
ledwards2225 Sep 16, 2024
8f413e0
ensure even number of circuits in ts integration test
ledwards2225 Sep 16, 2024
7526125
smaller test case in ivc recursion tests
ledwards2225 Sep 16, 2024
5bc512d
fix yarn formatter
ledwards2225 Sep 16, 2024
29bb769
rename bench
ledwards2225 Sep 16, 2024
b48c3a6
try to fix linker for bench
ledwards2225 Sep 16, 2024
f5d5c6f
Merge branch 'master' into lde/integrate_new_ivc
ledwards2225 Sep 16, 2024
d50f435
fix pinning and update bench name
ledwards2225 Sep 16, 2024
3cb8e05
Merge branch 'master' into lde/integrate_new_ivc
ledwards2225 Sep 16, 2024
ba053f4
rename AztecIVC to ClientIVC
ledwards2225 Sep 17, 2024
331a2c8
complete all renaming
ledwards2225 Sep 17, 2024
8dc7768
comments etc
ledwards2225 Sep 17, 2024
9742c6e
Merge branch 'master' into lde/integrate_new_ivc
ledwards2225 Sep 17, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
- barretenberg/cpp/pil/**
- barretenberg/cpp/src/barretenberg/vm/**
- barretenberg/cpp/src/barretenberg/**/generated/*
- barretenberg/cpp/src/barretenberg/client_ivc.{hpp,cpp}
- barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.{hpp,cpp}
non-docs:
- '!(docs/**)'
non-misc-ci:
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,5 @@ if [ ! -d ./srs_db/grumpkin ]; then
# The Grumpkin SRS is generated manually at the moment, only up to a large enough size for tests
# If tests require more points, the parameter can be increased here. Note: IPA requires
# dyadic_circuit_size + 1 points so in general this number will be a power of two plus 1
cd ./build && cmake --build . --parallel --target grumpkin_srs_gen && ./bin/grumpkin_srs_gen 8193
cd ./build && cmake --build . --parallel --target grumpkin_srs_gen && ./bin/grumpkin_srs_gen 32769
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this has been too low for our tests for a long time - unrelated to this PR

fi
11 changes: 1 addition & 10 deletions barretenberg/cpp/scripts/benchmark_client_ivc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,7 @@
set -eu

TARGET=${1:-"client_ivc_bench"}

if [ "$TARGET" = "client_ivc_bench" ]; then
BENCHMARK="ClientIVCBench/Full/6"
elif [ "$TARGET" = "aztec_ivc_bench" ]; then
BENCHMARK="AztecIVCBench/FullStructured/6"
else
echo "Error: Unrecognized TARGET '$TARGET'."
exit 1
fi

BENCHMARK="ClientIVCBench/Full/6"
BUILD_DIR="build-op-count-time"
FILTER="${BENCHMARK}$" # '$' to ensure only specified bench is run

Expand Down
6 changes: 2 additions & 4 deletions barretenberg/cpp/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,9 @@ if (ENABLE_PIC AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_subdirectory(barretenberg/world_state_napi)
endif()

add_subdirectory(barretenberg/aztec_ivc)
add_subdirectory(barretenberg/client_ivc)
add_subdirectory(barretenberg/bb)
add_subdirectory(barretenberg/circuit_checker)
add_subdirectory(barretenberg/client_ivc)
add_subdirectory(barretenberg/commitment_schemes)
add_subdirectory(barretenberg/commitment_schemes_recursion)
add_subdirectory(barretenberg/common)
Expand Down Expand Up @@ -112,10 +111,9 @@ include(GNUInstallDirs)
message(STATUS "Compiling all-in-one barretenberg archive")

set(BARRETENBERG_TARGET_OBJECTS
$<TARGET_OBJECTS:aztec_ivc_objects>
$<TARGET_OBJECTS:client_ivc_objects>
$<TARGET_OBJECTS:commitment_schemes_objects>
$<TARGET_OBJECTS:common_objects>
$<TARGET_OBJECTS:client_ivc_objects>
$<TARGET_OBJECTS:crypto_aes128_objects>
$<TARGET_OBJECTS:crypto_blake2s_objects>
$<TARGET_OBJECTS:crypto_blake3s_objects>
Expand Down
1 change: 0 additions & 1 deletion barretenberg/cpp/src/barretenberg/aztec_ivc/CMakeLists.txt
View file
Open in desktop

This file was deleted.

272 changes: 0 additions & 272 deletions barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading