Merge pull request #6427 from The-OpenROAD-Project-staging/par-misc-i…

…nclude-cleaner

par: fix clang-tidy misc-include-cleaner

src/par/include/par/PartitionMgr.h

@@ -36,9 +36,9 @@
 #pragma once
 
 #include <map>
-#include <memory>
-#include <random>
 #include <set>
+#include <string>
+#include <vector>
 
 namespace ord {
 class dbVerilogNetwork;

src/par/src/Coarsener.cpp

@@ -40,9 +40,17 @@
 
 #include "Coarsener.h"
 
+#include <algorithm>
+#include <chrono>
+#include <cstdlib>
+#include <limits>
+#include <map>
+#include <memory>
 #include <numeric>
 #include <random>
 #include <set>
+#include <utility>
+#include <vector>
 
 #include "Evaluator.h"
 #include "Hypergraph.h"
@@ -511,12 +519,6 @@ void Coarsener::VertexMatching(
         = hgraph->GetNumVertices() + cluster_id - num_visited_vertices;
     // check the early-stop condition
     if (remaining_vertices <= num_early_stop_visited_vertices) {
-      int num_visited_vertices_new = 0;
-      for (auto flag_new : vertex_cluster_id_vec) {
-        if (flag_new > -1) {
-          num_visited_vertices_new++;
-        }
-      }
       v_iter++;
       while (v_iter != unvisited.end()) {
         const int cur_vertex = *v_iter;

src/par/src/Coarsener.h

@@ -40,8 +40,13 @@
 // It will accept a HGraphPtr (std::shared_ptr<Hypergraph>) as input
 // and return a sequence of coarser hypergraphs
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "Evaluator.h"
 #include "Hypergraph.h"
+#include "Utilities.h"
 #include "utl/Logger.h"
 
 namespace par {

src/par/src/Evaluator.cpp

@@ -34,9 +34,21 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "Evaluator.h"
 
+#include <algorithm>
+#include <boost/range/iterator_range_core.hpp>
+#include <cmath>
 #include <fstream>
 #include <functional>
+#include <iomanip>
+#include <ios>
+#include <limits>
+#include <map>
 #include <numeric>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "Hypergraph.h"
 #include "Utilities.h"

src/par/src/Evaluator.h

@@ -34,8 +34,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <set>
-#include <tuple>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "Hypergraph.h"
 #include "Utilities.h"

src/par/src/GreedyRefine.cpp

@@ -34,6 +34,15 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "GreedyRefine.h"
 
+#include <memory>
+#include <set>
+#include <vector>
+
+#include "Evaluator.h"
+#include "Hypergraph.h"
+#include "Refiner.h"
+#include "Utilities.h"
+
 // ------------------------------------------------------------------------------
 // K-way hyperedge greedy refinement
 // ------------------------------------------------------------------------------

src/par/src/GreedyRefine.h

@@ -34,9 +34,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <set>
+#include <memory>
+#include <vector>
 
+#include "Evaluator.h"
+#include "Hypergraph.h"
 #include "Refiner.h"
+#include "Utilities.h"
 
 namespace par {
 

src/par/src/Hypergraph.cpp

@@ -35,8 +35,10 @@
 
 #include "Hypergraph.h"
 
-#include <iostream>
-#include <string>
+#include <algorithm>
+#include <limits>
+#include <set>
+#include <vector>
 
 #include "Utilities.h"
 #include "utl/Logger.h"

src/par/src/Hypergraph.h

@@ -43,8 +43,8 @@
 // Rule2 : Each hyperedge can include a vertex at most once.
 ////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include <boost/range/iterator_range.hpp>
-#include <functional>
+#include <boost/range/iterator_range_core.hpp>
+#include <memory>
 #include <set>
 #include <vector>
 

src/par/src/ILPRefine.cpp

@@ -34,6 +34,16 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "ILPRefine.h"
 
+#include <map>
+#include <set>
+#include <vector>
+
+#include "Evaluator.h"
+#include "Hypergraph.h"
+#include "Refiner.h"
+#include "Utilities.h"
+#include "utl/Logger.h"
+
 // ------------------------------------------------------------------------------
 // ILP-based refinement
 // ILP-based hypergraph partitioning cannot optimize path cost

src/par/src/ILPRefine.h

@@ -34,9 +34,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <set>
+#include <memory>
+#include <vector>
 
+#include "Evaluator.h"
+#include "Hypergraph.h"
 #include "Refiner.h"
+#include "Utilities.h"
 
 namespace par {
 

src/par/src/KWayFMRefine.cpp

@@ -34,7 +34,20 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "KWayFMRefine.h"
 
+#include <functional>
+#include <limits>
+#include <memory>
+#include <set>
 #include <thread>
+#include <utility>
+#include <vector>
+
+#include "Evaluator.h"
+#include "Hypergraph.h"
+#include "PriorityQueue.h"
+#include "Refiner.h"
+#include "Utilities.h"
+#include "utl/Logger.h"
 
 // Implement the direct k-way FM refinement
 namespace par {

src/par/src/KWayFMRefine.h

@@ -34,9 +34,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <set>
+#include <memory>
+#include <vector>
 
+#include "Evaluator.h"
+#include "Hypergraph.h"
 #include "Refiner.h"
+#include "Utilities.h"
+#include "utl/Logger.h"
 
 namespace par {
 

src/par/src/KWayPMRefine.cpp

@@ -34,7 +34,20 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "KWayPMRefine.h"
 
+#include <algorithm>
+#include <functional>
+#include <map>
+#include <memory>
 #include <thread>
+#include <utility>
+#include <vector>
+
+#include "Evaluator.h"
+#include "Hypergraph.h"
+#include "KWayFMRefine.h"
+#include "PriorityQueue.h"
+#include "Refiner.h"
+#include "Utilities.h"
 
 // ------------------------------------------------------------------------------
 // K-way pair-wise FM refinement

src/par/src/KWayPMRefine.h

@@ -34,9 +34,16 @@
 ///////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <set>
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
 
+#include "Evaluator.h"
+#include "Hypergraph.h"
 #include "KWayFMRefine.h"
+#include "Refiner.h"
+#include "Utilities.h"
 
 namespace par {
 

src/par/src/MakePartitionMgr.cpp

@@ -35,7 +35,6 @@
 
 #include "par/MakePartitionMgr.h"
 
-#include "odb/db.h"
 #include "ord/OpenRoad.hh"
 #include "par/PartitionMgr.h"
 #include "sta/StaMain.hh"

src/par/src/Multilevel.cpp

@@ -35,14 +35,26 @@
 
 #include "Multilevel.h"
 
+#include <algorithm>
+#include <boost/range/iterator_range_core.hpp>
 #include <functional>
+#include <limits>
+#include <numeric>
 #include <queue>
 #include <random>
 #include <thread>
+#include <utility>
+#include <vector>
 
+#include "Coarsener.h"
 #include "Evaluator.h"
+#include "GreedyRefine.h"
 #include "Hypergraph.h"
+#include "ILPRefine.h"
+#include "KWayFMRefine.h"
+#include "KWayPMRefine.h"
 #include "Partitioner.h"
+#include "Utilities.h"
 #include "utl/Logger.h"
 
 namespace par {

src/par/src/Multilevel.h

@@ -34,6 +34,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 #pragma once
 
+#include <memory>
+#include <vector>
+
 #include "Coarsener.h"
 #include "Evaluator.h"
 #include "GreedyRefine.h"

src/par/src/PartitionMgr.cpp

@@ -36,17 +36,24 @@
 #include "par/PartitionMgr.h"
 
 #include <algorithm>
-#include <chrono>
 #include <cmath>
 #include <ctime>
 #include <fstream>
 #include <iostream>
+#include <map>
+#include <memory>
+#include <set>
+#include <stdexcept>
+#include <string>
+#include <vector>
 
 #include "TritonPart.h"
-#include "Utilities.h"
 #include "db_sta/dbSta.hh"
 #include "odb/db.h"
+#include "sta/ConcreteNetwork.hh"
+#include "sta/Liberty.hh"
 #include "sta/MakeConcreteNetwork.hh"
+#include "sta/NetworkClass.hh"
 #include "sta/ParseBus.hh"
 #include "sta/PortDirection.hh"
 #include "sta/VerilogWriter.hh"

src/par/src/Partitioner.cpp

@@ -35,7 +35,13 @@
 
 #include "Partitioner.h"
 
+#include <algorithm>
+#include <map>
+#include <numeric>
 #include <random>
+#include <set>
+#include <utility>
+#include <vector>
 
 #include "Evaluator.h"
 #include "Hypergraph.h"

src/par/src/Partitioner.h

@@ -43,6 +43,9 @@
 // then put remaining vertices into the first block 3) ILP-based Partitioning
 // (INIT_DIRECT_ILP)
 
+#include <memory>
+#include <vector>
+
 #include "Evaluator.h"
 #include "Hypergraph.h"
 #include "Utilities.h"

src/par/src/PriorityQueue.cpp

@@ -35,7 +35,12 @@
 
 #include "PriorityQueue.h"
 
+#include <algorithm>
+#include <memory>
+#include <utility>
+
 #include "Hypergraph.h"
+#include "Utilities.h"
 
 namespace par {
 

src/par/src/PriorityQueue.h

@@ -34,9 +34,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <set>
+#include <cmath>
+#include <limits>
+#include <map>
+#include <memory>
+#include <vector>
 
 #include "Hypergraph.h"
+#include "Utilities.h"
 
 namespace par {
 

src/par/src/Refiner.cpp

@@ -34,6 +34,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "Refiner.h"
 
+#include <map>
+#include <memory>
+#include <set>
+#include <utility>
+#include <vector>
+
 #include "Evaluator.h"
 #include "Hypergraph.h"
 #include "Utilities.h"