From 9a1aa6b84e336d1e477694e555f725c25af6573f Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:40:06 -0400 Subject: [PATCH 1/4] Test change --- circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests b/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests index d67176f098f..e9a5f611ec2 100755 --- a/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests +++ b/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests @@ -33,6 +33,8 @@ else BUILD_DIR=build-wasm fi + + echo "*** Running Aztec circuits tests on commit: $AZTEC_COMMIT" # run tests in docker RUN_ARGS="$@" # helper var necessary for some reason to pass all args to docker run From 0e091866d164bfa73bc41312fbe6101d8064672c Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:45:23 -0400 Subject: [PATCH 2/4] add retry_10 to ensure_repo --- build-system/scripts/build | 2 +- build-system/scripts/deploy_dockerhub | 2 +- build-system/scripts/deploy_ecr | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-system/scripts/build b/build-system/scripts/build index 4add19d1f1a..2f59649e273 100755 --- a/build-system/scripts/build +++ b/build-system/scripts/build @@ -45,7 +45,7 @@ function fetch_image() { } # Ensure ECR repository exists. -ensure_repo $REPOSITORY $ECR_REGION refresh_lifecycle +retry_10 ensure_repo $REPOSITORY $ECR_REGION refresh_lifecycle CONTENT_HASH=$(calculate_content_hash $REPOSITORY) echo "Content hash: $CONTENT_HASH" diff --git a/build-system/scripts/deploy_dockerhub b/build-system/scripts/deploy_dockerhub index d7e0442d30b..39e3f3c91ab 100755 --- a/build-system/scripts/deploy_dockerhub +++ b/build-system/scripts/deploy_dockerhub @@ -40,7 +40,7 @@ IMAGE_TAG=$COMMIT_TAG_VERSION echo "Deploying to dockerhub: $IMAGE_DEPLOY_URI" # Login. -ensure_repo $REPOSITORY $ECR_DEPLOY_REGION +retry_10 ensure_repo $REPOSITORY $ECR_DEPLOY_REGION # Pull image. docker pull $IMAGE_COMMIT_URI diff --git a/build-system/scripts/deploy_ecr b/build-system/scripts/deploy_ecr index aa512cc1b4b..27343ea48f3 100755 --- a/build-system/scripts/deploy_ecr +++ b/build-system/scripts/deploy_ecr @@ -5,11 +5,11 @@ REPOSITORY=$1 IMAGE_COMMIT_URI=$ECR_URL/$REPOSITORY:cache-$CONTENT_HASH # Login to build region and pull the build. -ensure_repo $REPOSITORY $ECR_REGION +retry_10 ensure_repo $REPOSITORY $ECR_REGION docker pull $IMAGE_COMMIT_URI > /dev/null 2>&1 # Ensure ECR repository exists in deployment region. -ensure_repo $REPOSITORY $ECR_DEPLOY_REGION +retry_10 ensure_repo $REPOSITORY $ECR_DEPLOY_REGION # Push image to deployment repo with commit hash tag e.g: # falafel:deadbeefcafebabe1337c0de From 35a110d1a245d6785fa3512422930de6651f0bdb Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:48:48 -0400 Subject: [PATCH 3/4] try trigger cpp rebuild --- circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests | 2 -- .../src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests b/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests index e9a5f611ec2..d67176f098f 100755 --- a/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests +++ b/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests @@ -33,8 +33,6 @@ else BUILD_DIR=build-wasm fi - - echo "*** Running Aztec circuits tests on commit: $AZTEC_COMMIT" # run tests in docker RUN_ARGS="$@" # helper var necessary for some reason to pass all args to docker run diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp index d2c89e30730..20dc997de47 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp @@ -315,6 +315,7 @@ uint_plookup uint_plookup::logic_operator(co **/ if (i != (num_accumulators() - 1)) { + result.accumulators.emplace_back( (lookup[ColumnIdx::C3][2 * i] - (lookup[ColumnIdx::C3][2 * (i + 1)] * scaling_factor)).witness_index); } else { @@ -333,4 +334,4 @@ INSTANTIATE_STDLIB_ULTRA_TYPE_VA(uint_plookup, uint32_t); INSTANTIATE_STDLIB_ULTRA_TYPE_VA(uint_plookup, uint64_t); } // namespace stdlib -} // namespace proof_system::plonk \ No newline at end of file +} // namespace proof_system::plonk From f7d7e3be0b31598ecfdc65a966b3173fc6e2a430 Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 19:02:09 -0400 Subject: [PATCH 4/4] Revert cpp --- .../src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp index 20dc997de47..d2c89e30730 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp @@ -315,7 +315,6 @@ uint_plookup uint_plookup::logic_operator(co **/ if (i != (num_accumulators() - 1)) { - result.accumulators.emplace_back( (lookup[ColumnIdx::C3][2 * i] - (lookup[ColumnIdx::C3][2 * (i + 1)] * scaling_factor)).witness_index); } else { @@ -334,4 +333,4 @@ INSTANTIATE_STDLIB_ULTRA_TYPE_VA(uint_plookup, uint32_t); INSTANTIATE_STDLIB_ULTRA_TYPE_VA(uint_plookup, uint64_t); } // namespace stdlib -} // namespace proof_system::plonk +} // namespace proof_system::plonk \ No newline at end of file