Skip to content

chore(avm): pilcom compatibility changes #10544

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

Merged
fcarreiro merged 5 commits into from
Dec 9, 2024
Merged

chore(avm): pilcom compatibility changes #10544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6197b42
pilcom compatibility changes
fcarreiro Dec 9, 2024
016ebe5
relative directories are more friendly
fcarreiro Dec 9, 2024
a0db609
fix namespaces in tests
fcarreiro Dec 9, 2024
75b7025
gcc stop being annoying
fcarreiro Dec 9, 2024
a6bd4dd
further fixes
fcarreiro Dec 9, 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
9 changes: 6 additions & 3 deletions barretenberg/cpp/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@
"binaryDir": "build-gcc",
"environment": {
"CC": "gcc",
"CXX": "g++"
"CXX": "g++",
"CXXFLAGS": "-Wno-missing-field-initializers"
}
},
{
Expand All @@ -233,7 +234,8 @@
"inherits": "default",
"environment": {
"CC": "gcc-10",
"CXX": "g++-10"
"CXX": "g++-10",
"CXXFLAGS": "-Wno-missing-field-initializers"
}
},
{
Expand All @@ -243,7 +245,8 @@
"inherits": "default",
"environment": {
"CC": "gcc-13",
"CXX": "g++-13"
"CXX": "g++-13",
"CXXFLAGS": "-Wno-missing-field-initializers"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// AUTOGENERATED FILE
#include "barretenberg/vm/avm/generated/circuit_builder.hpp"
#include "circuit_builder.hpp"

#include <mutex>
#include <set>
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include <vector>

#include "barretenberg/vm/avm/generated/flavor.hpp"
#include "barretenberg/vm/avm/generated/full_row.hpp"
#include "flavor.hpp"
#include "full_row.hpp"

namespace bb {

Expand Down
38 changes: 38 additions & 0 deletions barretenberg/cpp/src/barretenberg/vm/avm/generated/columns.hpp
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/vm/avm/generated/composer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// AUTOGENERATED FILE
#include "barretenberg/vm/avm/generated/composer.hpp"
#include "composer.hpp"
#include "barretenberg/vm/stats.hpp"

namespace bb {
Expand Down
6 changes: 3 additions & 3 deletions barretenberg/cpp/src/barretenberg/vm/avm/generated/composer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#pragma once

#include "barretenberg/srs/global_crs.hpp"
#include "barretenberg/vm/avm/generated/circuit_builder.hpp"
#include "barretenberg/vm/avm/generated/prover.hpp"
#include "barretenberg/vm/avm/generated/verifier.hpp"
#include "circuit_builder.hpp"
#include "prover.hpp"
#include "verifier.hpp"

namespace bb {

Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// AUTOGENERATED FILE
#include "barretenberg/vm/avm/generated/flavor.hpp"
#include "flavor.hpp"

namespace bb {

Expand Down
183 changes: 87 additions & 96 deletions barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// AUTOGENERATED FILE
#include "barretenberg/vm/avm/generated/full_row.hpp"
#include "barretenberg/vm/avm/generated/flavor_settings.hpp"
#include "full_row.hpp"
#include "flavor_settings.hpp"

namespace bb {
namespace bb::avm {
namespace {

template <typename FF> std::string field_to_string(const FF& ff)
Expand Down Expand Up @@ -1568,4 +1568,4 @@ template std::ostream& operator<<(std::ostream& os, AvmFullRow<AvmFlavorSettings
template std::vector<std::string> AvmFullRow<AvmFlavorSettings::FF>::names();
template RefVector<const AvmFlavorSettings::FF> AvmFullRow<AvmFlavorSettings::FF>::as_vector() const;

} // namespace bb
} // namespace bb::avm
Loading