Merge pull request #2050 from KLayout/dev-polygon-graph

Dev polygon graph

Author: klayoutmatthias

scripts/make_stubs.sh

@@ -57,6 +57,9 @@ $python $inst/stubgen.py tl >$pyi_srcdir/tlcore.pyi
 echo "Generating stubs for db .."
 $python $inst/stubgen.py db tl,lay,rdb >$pyi_srcdir/dbcore.pyi
 
+echo "Generating stubs for pex .."
+$python $inst/stubgen.py pex tl,db >$pyi_srcdir/pexcore.pyi
+
 echo "Generating stubs for rdb .."
 $python $inst/stubgen.py rdb tl,db >$pyi_srcdir/rdbcore.pyi
 

setup.py

@@ -592,6 +592,25 @@ def version(self):
 )
 config.add_extension(_db)
 
+# ------------------------------------------------------------------
+# _pex dependency library
+
+_pex_path = os.path.join("src", "pex", "pex")
+_pex_sources = set(glob.glob(os.path.join(_pex_path, "*.cc")))
+
+_pex = Library(
+    config.root + "._pex",
+    define_macros=config.macros() + [("MAKE_PEX_LIBRARY", 1)],
+    include_dirs=[_tl_path, _gsi_path, _db_path, _pex_path],
+    extra_objects=[config.path_of("_tl", _tl_path), config.path_of("_gsi", _gsi_path), config.path_of("_db", _db_path)],
+    language="c++",
+    libraries=config.libraries('_pex'),
+    extra_link_args=config.link_args("_pex"),
+    extra_compile_args=config.compile_args("_pex"),
+    sources=list(_pex_sources),
+)
+config.add_extension(_pex)
+
 # ------------------------------------------------------------------
 # _lib dependency library
 
@@ -869,6 +888,28 @@ def version(self):
     sources=list(db_sources),
 )
 
+# ------------------------------------------------------------------
+# pex extension library
+
+pex_path = os.path.join("src", "pymod", "pex")
+pex_sources = set(glob.glob(os.path.join(pex_path, "*.cc")))
+
+pex = Extension(
+    config.root + ".pexcore",
+    define_macros=config.macros(),
+    include_dirs=[_db_path, _tl_path, _gsi_path, _pya_path, _pex_path],
+    extra_objects=[
+        config.path_of("_db", _db_path),
+        config.path_of("_pex", _pex_path),
+        config.path_of("_tl", _tl_path),
+        config.path_of("_gsi", _gsi_path),
+        config.path_of("_pya", _pya_path),
+    ],
+    extra_link_args=config.link_args("pexcore"),
+    extra_compile_args=config.compile_args("pexcore"),
+    sources=list(pex_sources),
+)
+
 # ------------------------------------------------------------------
 # lib extension library
 
@@ -1010,8 +1051,8 @@ def version(self):
         package_data={config.root: ["src/pymod/distutils_src/klayout/*.pyi"]},
         data_files=[(config.root, ["src/pymod/distutils_src/klayout/py.typed"])],
         include_package_data=True,
-        ext_modules=[_tl, _gsi, _pya, _rba, _db, _lib, _rdb, _lym, _laybasic, _layview, _ant, _edt, _img]
+        ext_modules=[_tl, _gsi, _pya, _rba, _db, _pex, _lib, _rdb, _lym, _laybasic, _layview, _ant, _edt, _img]
             + db_plugins
-            + [tl, db, lib, rdb, lay, pya],
+            + [tl, db, pex, lib, rdb, lay, pya],
         cmdclass={'build_ext': klayout_build_ext}
     )

src/buddies/src/bd/bd.pro

@@ -32,9 +32,9 @@ HEADERS = \
 
 RESOURCES = \
 
-INCLUDEPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC $$LYM_INC
-DEPENDPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC $$LYM_INC
-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_lym
+INCLUDEPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC $$PEX_INC $$LYM_INC
+DEPENDPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC $$PEX_INC $$LYM_INC
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_pex -lklayout_lym
 
 INCLUDEPATH += $$RBA_INC
 DEPENDPATH += $$RBA_INC

src/buddies/src/bd/strmrun.cc

@@ -35,6 +35,7 @@
 #include "gsiExpression.h"
 #include "libForceLink.h"
 #include "rdbForceLink.h"
+#include "pexForceLink.h"
 #include "lymMacro.h"
 #include "lymMacroCollection.h"
 

src/buddies/src/buddy_app.pri

@@ -19,7 +19,7 @@ SOURCES = $$PWD/bd/main.cc
 
 INCLUDEPATH += $$BD_INC $$TL_INC $$GSI_INC
 DEPENDPATH += $$BD_INC $$TL_INC $$GSI_INC
-LIBS += -L$$DESTDIR -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_lym
+LIBS += -L$$DESTDIR -lklayout_bd -lklayout_db -lklayout_pex -lklayout_tl -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_lym
 
 INCLUDEPATH += $$RBA_INC
 DEPENDPATH += $$RBA_INC

src/db/db/db.pro

@@ -70,6 +70,9 @@ SOURCES = \
   dbNetlistSpiceReaderExpressionParser.cc \
   dbObject.cc \
   dbObjectWithProperties.cc \
+  dbPLC.cc \
+  dbPLCConvexDecomposition.cc \
+  dbPLCTriangulation.cc \
   dbPath.cc \
   dbPCellDeclaration.cc \
   dbPCellHeader.cc \
@@ -105,8 +108,6 @@ SOURCES = \
   dbTextWriter.cc \
   dbTilingProcessor.cc \
   dbTrans.cc \
-  dbTriangle.cc \
-  dbTriangles.cc \
   dbUserObject.cc \
   dbUtils.cc \
   dbVector.cc \
@@ -308,6 +309,9 @@ HEADERS = \
   dbObject.h \
   dbObjectTag.h \
   dbObjectWithProperties.h \
+  dbPLC.h \
+  dbPLCConvexDecomposition.h \
+  dbPLCTriangulation.h \
   dbPath.h \
   dbPCellDeclaration.h \
   dbPCellHeader.h \
@@ -343,8 +347,6 @@ HEADERS = \
   dbTextWriter.h \
   dbTilingProcessor.h \
   dbTrans.h \
-  dbTriangle.h \
-  dbTriangles.h \
   dbTypes.h \
   dbUserObject.h \
   dbUtils.h \

src/db/db/dbMutableRegion.cc

@@ -83,7 +83,7 @@ MutableRegion::insert (const db::SimplePolygon &polygon)
 {
   if (polygon.vertices () > 0) {
     db::Polygon poly;
-    poly.assign_hull (polygon.begin_hull (), polygon.end_hull ());
+    poly.assign_hull (polygon.hull ());
     do_insert (poly, 0);
   }
 }
@@ -93,7 +93,7 @@ MutableRegion::insert (const db::SimplePolygonWithProperties &polygon)
 {
   if (polygon.vertices () > 0) {
     db::Polygon poly;
-    poly.assign_hull (polygon.begin_hull (), polygon.end_hull ());
+    poly.assign_hull (polygon.hull ());
     do_insert (poly, polygon.properties_id ());
   }
 }