Merge branch 'master' of github.com:The-OpenROAD-Project-private/OpenROAD into cts-ndr-arg-tests

Signed-off-by: Jonas Gava <[email protected]>

Author: jfgava

src/Main.cc

@@ -5,7 +5,6 @@
 #include <tcl.h>
 
 #include <array>
-#include <boost/stacktrace.hpp>
 #include <climits>
 #include <clocale>
 #include <csignal>
@@ -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

src/ant/src/AntennaChecker.cc

@@ -6,7 +6,6 @@
 #include <omp.h>
 
 #include <algorithm>
-#include <boost/pending/disjoint_sets.hpp>
 #include <cstdio>
 #include <cstring>
 #include <fstream>
@@ -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"

src/ant/src/WireBuilder.cc

@@ -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"
 

src/cts/BUILD

@@ -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",
+    ],
 )
 
 cc_library(

src/cts/src/TechChar.h

@@ -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>
@@ -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"

src/cts/src/TreeBuilder.cpp

@@ -3,7 +3,6 @@
 
 #include "TreeBuilder.h"
 
-#include <boost/polygon/polygon.hpp>
 #include <cmath>
 #include <fstream>
 #include <iomanip>
@@ -14,6 +13,7 @@
 #include <string>
 #include <vector>
 
+#include "boost/polygon/polygon.hpp"
 #include "odb/geom_boost.h"
 #include "utl/Logger.h"
 

src/cts/src/TreeBuilder.h

@@ -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>
@@ -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;

src/dft/src/Dft.cpp

@@ -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>
@@ -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"
 

src/dft/src/architect/Opt.cpp

@@ -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>
@@ -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;

src/dft/src/stitch/ScanStitch.cpp

@@ -3,7 +3,6 @@
 
 #include "ScanStitch.hh"
 
-#include <boost/algorithm/string.hpp>
 #include <cstddef>
 #include <deque>
 #include <iostream>
@@ -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";