Merge pull request #2736 from The-OpenROAD-Project-staging/pdn-py

Pdn py

Author: maliberty

src/pdn/include/pdn/PdnGen.hh

@@ -80,6 +80,7 @@ class PdnGen
 {
  public:
   PdnGen();
+  ~PdnGen();
 
   void init(dbDatabase* db, Logger* logger);
 

src/pdn/src/PdnGen-py.i

@@ -34,40 +34,26 @@
 ///////////////////////////////////////////////////////////////////////////////
 %module pdngen
 %{
-
-// These includes are needed by the SWIG generated CXX files mostly 
-// for determining the size of Classes that they define. Since that are
-// not actually wrapped, the classes defined in these files will appear as
-// opaque pointers in Python.
-#include "../src/connect.h"
-#include "../src/domain.h"
-#include "../src/grid.h"
-#include "../src/power_cells.h"
-#include "../src/renderer.h"
-
 #include "pdn/PdnGen.hh"
 #include "odb/db.h"
 #include <array>
 #include <string>
 #include <memory>
 #include <vector>
 
-using pdn::ExtensionMode;
 using namespace pdn;
- 
 %}
 
 %include <std_vector.i>
 %include <std_array.i>
 %include <std_map.i>
+%include <std_set.i>
+%include <std_string.i>
 
-// this maps unsigned long to the enum ExtensionMode
 %include typemaps.i
-%apply unsigned long { ExtensionMode };
 
 %import "odb.i"
 %clear int & x, int & y; // defined in dbtypes.i, must be cleared here.
-%include <std_string.i>
 
 // These are needed to coax swig into sending or returning Python 
 // lists, arrays, or sets (as appropriate) of opaque pointers. Note 
@@ -83,19 +69,8 @@ namespace std {
   %template(viagen_list)  std::vector<odb::dbTechViaGenerateRule *>;
   %template(techvia_list) std::vector<odb::dbTechVia *>;
   %template(layer_list)   std::vector<odb::dbTechLayer *>;
+  %template(net_set)      std::set<odb::dbNet*>;
 }
 
 %include "../../Exception-py.i"
 %include "pdn/PdnGen.hh"
-
-%inline %{
-
-namespace pdn {
-
-// difficult to pass a set. repair_pdn_via takes a vector and then
-// rebuilds the set in C++, so we just borrow that here.
-void repair_pdn_vias(const std::vector<odb::dbNet*>& nets);
- 
-}  // namespace
-
-%} //  %inline

src/pdn/src/PdnGen.cc

@@ -69,6 +69,8 @@ PdnGen::PdnGen() : db_(nullptr), logger_(nullptr)
 {
 }
 
+PdnGen::~PdnGen() = default;
+
 void PdnGen::init(dbDatabase* db, Logger* logger)
 {
   db_ = db;

src/pdn/test/pdn_aux.py

@@ -665,5 +665,5 @@ def repair_pdn_vias(design, *, net=None, all=False):
             if net.getSigType() == "POWER" or net.getSigType() == "GROUND":
                 nets.append(net)
 
-    pdn.repair_pdn_vias(nets)
+    pdngen.repairVias(nets)