Merge pull request #10440 from hzeller/feature-20260515-cleaner-inc

Fix includes in dpl/src/infrastructure

Author: maliberty

src/dpl/BUILD

@@ -27,6 +27,7 @@ cc_library(
     includes = ["src"],
     visibility = ["//visibility:private"],
     deps = [
+        # note: cyclic dependency, headers include things provided by :dpl
         "//src/odb/src/db",
         "//src/utl",
         "@boost.icl",

src/dpl/src/infrastructure/DecapObjects.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "Coordinates.h"
 #include "dpl/Opendp.h"
+#include "infrastructure/Coordinates.h"
 #include "odb/db.h"
 
 namespace dpl {

src/dpl/src/infrastructure/Grid.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2018-2025, The OpenROAD Authors
 
-#include "Grid.h"
+#include "infrastructure/Grid.h"
 
 #include <algorithm>
 #include <cmath>
@@ -14,15 +14,14 @@
 #include <utility>
 #include <vector>
 
-#include "Coordinates.h"
-#include "Objects.h"
-#include "Padding.h"
 #include "boost/polygon/polygon.hpp"  // NOLINT(misc-include-cleaner) Boost polygon headers require a specific include order.
 #include "boost/polygon/polygon_90_set_data.hpp"
 #include "boost/polygon/rectangle_concept.hpp"
 #include "boost/polygon/rectangle_data.hpp"
 #include "dpl/Opendp.h"
 #include "infrastructure/Coordinates.h"
+#include "infrastructure/Objects.h"
+#include "infrastructure/Padding.h"
 #include "infrastructure/network.h"
 #include "odb/db.h"
 #include "odb/dbShape.h"

src/dpl/src/infrastructure/Objects.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2024-2025, The OpenROAD Authors
 
-#include "Objects.h"
+#include "infrastructure/Objects.h"
 
 #include <algorithm>
 #include <cstdint>

src/dpl/src/infrastructure/Padding.cpp

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2024-2025, The OpenROAD Authors
 
-#include "Padding.h"
+#include "infrastructure/Padding.h"
 
-#include "Objects.h"
 #include "dpl/Opendp.h"
 #include "infrastructure/Coordinates.h"
+#include "infrastructure/Objects.h"
 #include "odb/db.h"
 #include "odb/dbTypes.h"
 

src/dpl/src/infrastructure/Padding.h

@@ -6,8 +6,8 @@
 #include <map>
 #include <utility>
 
-#include "Coordinates.h"
 #include "dpl/Opendp.h"
+#include "infrastructure/Coordinates.h"  // IWYU pragma: keep (GridX type)
 #include "odb/PtrSetMap.h"
 #include "odb/db.h"
 

src/dpl/src/infrastructure/architecture.cxx

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2021-2025, The OpenROAD Authors
 
-#include "architecture.h"
+#include "infrastructure/architecture.h"
 
 #include <algorithm>
 #include <cmath>
@@ -12,11 +12,11 @@
 #include <utility>
 #include <vector>
 
-#include "Objects.h"
-#include "Padding.h"
 #include "dpl/Opendp.h"
 #include "infrastructure/Coordinates.h"
-#include "network.h"
+#include "infrastructure/Objects.h"
+#include "infrastructure/Padding.h"
+#include "infrastructure/network.h"
 #include "odb/db.h"
 #include "odb/dbTransform.h"
 

src/dpl/src/infrastructure/detailed_segment.h

@@ -5,8 +5,9 @@
 
 #include <limits>
 
-#include "Coordinates.h"
 #include "dpl/Opendp.h"
+#include "infrastructure/Coordinates.h"  // IWYU pragma: keep (DbuX type)
+
 namespace dpl {
 class DetailedSeg
 {

src/dpl/src/infrastructure/network.cxx

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2021-2025, The OpenROAD Authors
 
-#include "network.h"
+#include "infrastructure/network.h"
 
 #include <algorithm>
 #include <cstddef>

src/mpl/BUILD

@@ -41,6 +41,9 @@ cc_library(
         "src/pusher.h",
         "src/shapes.h",
     ],
+    includes = [
+        "src",
+    ],
     deps = [
         "//src/odb/src/db",
         "//src/utl",
@@ -56,6 +59,9 @@ cc_library(
         "src/MplObserver.h",
         "src/clusterEngine.h",
     ],
+    includes = [
+        "src",
+    ],
     visibility = ["//visibility:private"],
     deps = [
         ":pusher",