Skip to content

Use "" instead of <> for vendored boost dependency headers. #8128

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
maliberty merged 1 commit into from
Aug 27, 2025
Merged

Use "" instead of <> for vendored boost dependency headers. #8128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/Main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <tcl.h>

#include <array>
#include <boost/stacktrace.hpp>
#include <climits>
#include <clocale>
#include <csignal>
Expand All @@ -15,6 +14,8 @@
#include <iostream>
#include <memory>
#include <string>

#include "boost/stacktrace.hpp"
#ifdef ENABLE_READLINE
// If you get an error on this include be sure you have
// the package tcl-tclreadline-devel installed
Expand Down
2 changes: 1 addition & 1 deletion src/ant/src/AntennaChecker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <omp.h>

#include <algorithm>
#include <boost/pending/disjoint_sets.hpp>
#include <cstdio>
#include <cstring>
#include <fstream>
Expand All @@ -21,6 +20,7 @@

#include "Polygon.hh"
#include "WireBuilder.hh"
#include "boost/pending/disjoint_sets.hpp"
#include "odb/db.h"
#include "odb/dbShape.h"
#include "odb/dbTypes.h"
Expand Down
2 changes: 1 addition & 1 deletion src/ant/src/WireBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

#include "WireBuilder.hh"

#include <boost/functional/hash.hpp>
#include <limits>

#include "boost/functional/hash.hpp"
#include "odb/dbShape.h"
#include "utl/Logger.h"

Expand Down
6 changes: 5 additions & 1 deletion src/cts/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ cc_library(
"src/Util.h",
],
visibility = ["//visibility:private"],
deps = ["//src/sta:opensta_lib"],
deps = [
"//src/sta:opensta_lib",
"@boost.container_hash",
"@boost.unordered",
],
Comment on lines +27 to +31
Copy link
Member

@maliberty maliberty Aug 27, 2025

Choose a reason for hiding this comment

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

I'm curious why this change would require changes to the deps. Were we getting these by some non-hermetic means before?

Copy link
Collaborator Author

@hzeller hzeller Aug 27, 2025

Choose a reason for hiding this comment

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

Simple: In the course of fixing the headers I discovered that these deps were missing

Copy link
Member

@maliberty maliberty Aug 27, 2025

Choose a reason for hiding this comment

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

Wouldn't the code fail to compile without them then?

Copy link
Collaborator Author

@hzeller hzeller Aug 27, 2025

Choose a reason for hiding this comment

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

maybe there was boost installed on the system, so it was accidentally compiling.

Because the include was with angle-brackets and thus looked as system header, the blaze would also not necessarily do a layering check.

Copy link
Member

@maliberty maliberty Aug 27, 2025

Choose a reason for hiding this comment

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

Can we avoid having it look at anything outside the sandbox? This seems like a hole in the hermetic nature.

)

cc_library(
Expand Down
4 changes: 2 additions & 2 deletions src/cts/src/TechChar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

#include <algorithm>
#include <bitset>
#include <boost/functional/hash.hpp>
#include <boost/unordered/unordered_map.hpp>
#include <cassert>
#include <chrono>
#include <cstddef>
Expand All @@ -23,6 +21,8 @@
#include <vector>

#include "CtsOptions.h"
#include "boost/functional/hash.hpp"
#include "boost/unordered/unordered_map.hpp"
#include "db_sta/dbNetwork.hh"
#include "est/EstimateParasitics.h"
#include "rsz/Resizer.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/cts/src/TreeBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "TreeBuilder.h"

#include <boost/polygon/polygon.hpp>
#include <cmath>
#include <fstream>
#include <iomanip>
Expand All @@ -14,6 +13,7 @@
#include <string>
#include <vector>

#include "boost/polygon/polygon.hpp"
#include "odb/geom_boost.h"
#include "utl/Logger.h"

Expand Down
6 changes: 3 additions & 3 deletions src/cts/src/TreeBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

#pragma once

#include <boost/functional/hash.hpp>
#include <boost/unordered/unordered_map.hpp>
#include <boost/unordered/unordered_set.hpp>
#include <deque>
#include <functional>
#include <set>
Expand All @@ -17,6 +14,9 @@
#include "CtsOptions.h"
#include "TechChar.h"
#include "Util.h"
#include "boost/functional/hash.hpp"
#include "boost/unordered/unordered_map.hpp"
#include "boost/unordered/unordered_set.hpp"

namespace utl {
class Logger;
Expand Down
4 changes: 2 additions & 2 deletions src/dft/src/Dft.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#include "dft/Dft.hh"

#include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp>
#include <iostream>
#include <memory>
#include <optional>
Expand All @@ -18,6 +16,8 @@
#include "ScanCellFactory.hh"
#include "ScanReplace.hh"
#include "ScanStitch.hh"
#include "boost/property_tree/json_parser.hpp"
#include "boost/property_tree/ptree.hpp"
#include "odb/db.h"
#include "utl/Logger.h"

Expand Down
6 changes: 3 additions & 3 deletions src/dft/src/architect/Opt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

#include "Opt.hh"

#include <boost/geometry.hpp>
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/index/rtree.hpp>
#include <cstddef>
#include <iostream>
#include <limits>
Expand All @@ -14,6 +11,9 @@
#include <vector>

#include "ClockDomain.hh"
#include "boost/geometry.hpp"
#include "boost/geometry/geometries/register/point.hpp"
#include "boost/geometry/index/rtree.hpp"

namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
Expand Down
3 changes: 2 additions & 1 deletion src/dft/src/stitch/ScanStitch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "ScanStitch.hh"

#include <boost/algorithm/string.hpp>
#include <cstddef>
#include <deque>
#include <iostream>
Expand All @@ -13,6 +12,8 @@
#include <utility>
#include <vector>

#include "boost/algorithm/string.hpp"

namespace {
constexpr std::string_view kScanEnable = "scan-enable";
constexpr std::string_view kScanIn = "scan-in";
Expand Down
4 changes: 2 additions & 2 deletions src/dpl/include/dpl/Opendp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#pragma once

#include <boost/geometry.hpp>
#include <boost/geometry/index/rtree.hpp>
#include <functional>
#include <map>
#include <memory>
Expand All @@ -16,6 +14,8 @@
#include <utility> // pair
#include <vector>

#include "boost/geometry.hpp"
#include "boost/geometry/index/rtree.hpp"
#include "odb/db.h"

namespace utl {
Expand Down
2 changes: 1 addition & 1 deletion src/dpl/src/Place.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Copyright (c) 2018-2025, The OpenROAD Authors

#include <algorithm>
#include <boost/random/uniform_int_distribution.hpp>
#include <cmath>
#include <cstdlib>
#include <limits>
Expand All @@ -13,6 +12,7 @@
#include <vector>

#include "PlacementDRC.h"
#include "boost/random/uniform_int_distribution.hpp"
#include "dpl/Opendp.h"
#include "graphics/DplObserver.h"
#include "infrastructure/Grid.h"
Expand Down
2 changes: 1 addition & 1 deletion src/dpl/src/infrastructure/Coordinates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#pragma once

#include <algorithm>
#include <boost/operators.hpp>
#include <cmath>
#include <functional>
#include <limits>
#include <ostream>

#include "boost/operators.hpp"
#include "dpl/Opendp.h"

namespace dpl {
Expand Down
2 changes: 1 addition & 1 deletion src/dpl/src/infrastructure/Grid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "Grid.h"

#include <boost/polygon/polygon.hpp>
#include <cmath>
#include <functional>
#include <limits>
Expand All @@ -13,6 +12,7 @@

#include "Objects.h"
#include "Padding.h"
#include "boost/polygon/polygon.hpp"
#include "dpl/Opendp.h"
#include "odb/dbShape.h"
#include "odb/dbTransform.h"
Expand Down
2 changes: 1 addition & 1 deletion src/dpl/src/infrastructure/Grid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <boost/icl/interval_map.hpp>
#include <functional>
#include <map>
#include <memory>
Expand All @@ -13,6 +12,7 @@

#include "Coordinates.h"
#include "Objects.h"
#include "boost/icl/interval_map.hpp"
#include "dpl/Opendp.h"

namespace dpl {
Expand Down
2 changes: 1 addition & 1 deletion src/dpl/src/util/utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include <boost/random/mersenne_twister.hpp>
#include "boost/random/mersenne_twister.hpp"

namespace dpl {
}
Expand Down
1 change: 1 addition & 0 deletions src/drt/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ cc_library(
"src/db/tech/frViaDef.h",
"src/db/tech/frViaRuleGenerate.h",
],
deps = ["@boost.polygon"],
)

cc_library(
Expand Down
2 changes: 1 addition & 1 deletion src/drt/include/triton_route/TritonRoute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <boost/asio/thread_pool.hpp>
#include <list>
#include <memory>
#include <mutex>
Expand All @@ -14,6 +13,7 @@
#include <utility>
#include <vector>

#include "boost/asio/thread_pool.hpp"
#include "odb/geom.h"

namespace odb {
Expand Down
4 changes: 2 additions & 2 deletions src/drt/src/TritonRoute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#include "triton_route/TritonRoute.h"

#include <algorithm>
#include <boost/asio/post.hpp>
#include <boost/bind/bind.hpp>
#include <fstream>
#include <iostream>
#include <map>
Expand All @@ -19,6 +17,8 @@
#include "AbstractGraphicsFactory.h"
#include "DesignCallBack.h"
#include "PACallBack.h"
#include "boost/asio/post.hpp"
#include "boost/bind/bind.hpp"
#include "db/tech/frTechObject.h"
#include "distributed/PinAccessJobDescription.h"
#include "distributed/RoutingCallBack.h"
Expand Down
2 changes: 1 addition & 1 deletion src/drt/src/db/gcObj/gcShape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#pragma once

#include <algorithm>
#include <boost/polygon/polygon.hpp>
#include <vector>

#include "boost/polygon/polygon.hpp"
#include "db/gcObj/gcFig.h"

namespace gtl = boost::polygon;
Expand Down
2 changes: 1 addition & 1 deletion src/drt/src/db/infra/frTime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

#include "frTime.h"

#include <boost/io/ios_state.hpp>
#include <iomanip>

#include "boost/io/ios_state.hpp"
#include "utl/mem_stats.h"

namespace drt {
Expand Down
2 changes: 1 addition & 1 deletion src/drt/src/distributed/PinAccessJobDescription.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Copyright (c) 2023-2025, The OpenROAD Authors

#pragma once
#include <boost/serialization/base_object.hpp>
#include <string>
#include <vector>

#include "boost/serialization/base_object.hpp"
#include "dst/JobMessage.h"
#include "paUpdate.h"
namespace boost::serialization {
Expand Down
6 changes: 3 additions & 3 deletions src/drt/src/distributed/RoutingCallBack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
#pragma once
#include <omp.h>

#include <boost/asio/post.hpp>
#include <boost/asio/thread_pool.hpp>
#include <boost/bind/bind.hpp>
#include <cstdio>
#include <cstdlib>
#include <iostream>
Expand All @@ -16,6 +13,9 @@
#include <utility>
#include <vector>

#include "boost/asio/post.hpp"
#include "boost/asio/thread_pool.hpp"
#include "boost/bind/bind.hpp"
#include "db/infra/frTime.h"
#include "distributed/PinAccessJobDescription.h"
#include "distributed/RoutingJobDescription.h"
Expand Down
2 changes: 1 addition & 1 deletion src/drt/src/distributed/RoutingJobDescription.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Copyright (c) 2021-2025, The OpenROAD Authors

#pragma once
#include <boost/serialization/base_object.hpp>
#include <string>
#include <utility>
#include <vector>

#include "boost/serialization/base_object.hpp"
#include "dst/JobMessage.h"
namespace boost::serialization {
class access;
Expand Down
15 changes: 7 additions & 8 deletions src/drt/src/distributed/frArchive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
// Copyright (c) 2021-2025, The OpenROAD Authors

#pragma once
#include <boost/archive/binary_iarchive.hpp>
#include <boost/archive/binary_oarchive.hpp>

#include "boost/archive/binary_iarchive.hpp"
#include "boost/archive/binary_oarchive.hpp"
#include "frDesign.h"
#include "serialization.h"

Expand Down Expand Up @@ -55,8 +54,8 @@ struct frIArchive : InputArchive
} // namespace drt

// template implementations
#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/archive/impl/basic_binary_iarchive.ipp>
#include <boost/archive/impl/basic_binary_iprimitive.ipp>
#include <boost/archive/impl/basic_binary_oarchive.ipp>
#include <boost/archive/impl/basic_binary_oprimitive.ipp>
#include "boost/archive/impl/archive_serializer_map.ipp"
#include "boost/archive/impl/basic_binary_iarchive.ipp"
#include "boost/archive/impl/basic_binary_iprimitive.ipp"
#include "boost/archive/impl/basic_binary_oarchive.ipp"
#include "boost/archive/impl/basic_binary_oprimitive.ipp"
Loading