chore: Revert TBB default and ivc matching regression mac build (#9901)

047a964 changed the default, which triggers on 2/2 of the non-mainframe builds I tried to make. It apparently also did not test the with-par-algos build because there is an unnamed symbol in paremutation_library.hpp. 90696cd changed the package.json of the ivc-integration tests suite in a way that that made the `yarn test` command _anti_-pattern matching. This reverts both. --------- Co-authored-by: ludamad <adam.domurad@gmail.com>
AztecProtocol · Nov 14, 2024 · 3b70bf0 · 3b70bf0
1 parent b6c3048
commit 3b70bf0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt
@@ -31,7 +31,7 @@ option(DISABLE_AZTEC_VM "Don't build Aztec VM (acceptable if iterating on core p
 option(MULTITHREADING "Enable multi-threading" ON)
 option(OMP_MULTITHREADING "Enable OMP multi-threading" OFF)
 option(FUZZING "Build ONLY fuzzing harnesses" OFF)
-option(ENABLE_PAR_ALGOS "Enable parallel algorithms" ON)
+option(ENABLE_PAR_ALGOS "Enable parallel algorithms" OFF)
 option(COVERAGE "Enable collecting coverage from tests" OFF)
 option(ENABLE_ASAN "Address sanitizer for debugging tricky memory corruption" OFF)
 option(ENABLE_HEAVY_TESTS "Enable heavy tests when collecting coverage" OFF)

diff --git a/barretenberg/cpp/src/barretenberg/common/zip_view.hpp b/barretenberg/cpp/src/barretenberg/common/zip_view.hpp
@@ -76,6 +76,7 @@ static_assert(__cplusplus >= 201703L,
               " must be c++17 or greater"); // could be rewritten in c++11, but the features you must use will be buggy
                                             // in an older compiler anyways.
 #include "barretenberg/common/assert.hpp"
+#include <algorithm>
 #include <cassert>
 #include <functional>
 #include <iostream>

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp
@@ -180,7 +180,7 @@ void compute_translator_range_constraint_ordered_polynomials(typename Flavor::Pr
 #ifdef NO_PAR_ALGOS
     std::sort(extra_denominator_uint.begin(), extra_denominator_uint.end());
 #else
-    std::sort(std::execution::par_unseq, extra_denominator_uint.begin(), extra_denominator.end());
+    std::sort(std::execution::par_unseq, extra_denominator_uint.begin(), extra_denominator_uint.end());
 #endif
 
     // Copy the values into the actual polynomial

diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp
@@ -2,6 +2,7 @@
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
+#include <execution>
 
 namespace bb::plonk {
 struct SelectorProperties {

diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.cpp
@@ -8,6 +8,7 @@
 #include "ultra_circuit_builder.hpp"
 #include "barretenberg/crypto/poseidon2/poseidon2_params.hpp"
 #include <barretenberg/plonk/proof_system/constants.hpp>
+#include <execution>
 #include <unordered_map>
 #include <unordered_set>
 

diff --git a/yarn-project/ivc-integration/package.json b/yarn-project/ivc-integration/package.json
@@ -18,7 +18,7 @@
     "formatting:fix:types": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types",
     "generate": "yarn generate:noir-circuits",
     "generate:noir-circuits": "mkdir -p ./artifacts && cp -r ../../noir-projects/mock-protocol-circuits/target/* ./artifacts && node --no-warnings --loader ts-node/esm src/scripts/generate_declaration_files.ts && node --no-warnings --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && run -T prettier -w ./src/types",
-    "test:non-browser": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --testPathIgnorePatterns=browser",
+    "test:non-browser": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testPathIgnorePatterns=browser --passWithNoTests ",
     "test:browser": "./run_browser_tests.sh",
     "test": "yarn test:non-browser",
     "codegen": "yarn noir-codegen",

diff --git a/yarn-project/ivc-integration/package.local.json b/yarn-project/ivc-integration/package.local.json
@@ -2,7 +2,7 @@
   "scripts": {
     "build": "yarn clean && yarn generate && rm -rf dest && webpack && tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo src/types artifacts",
-    "test:non-browser":"NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --testPathIgnorePatterns=browser",
+    "test:non-browser":"NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testPathIgnorePatterns=browser --passWithNoTests ",
     "test:browser": "./run_browser_tests.sh",
     "test": "yarn test:non-browser"
   },