diff --git a/vlsisapd/examples/agds/python/driveAgds.py b/vlsisapd/examples/agds/python/driveAgds.py index b547af43..8543afa3 100644 --- a/vlsisapd/examples/agds/python/driveAgds.py +++ b/vlsisapd/examples/agds/python/driveAgds.py @@ -1,12 +1,12 @@ -import pyAGDS -lib = pyAGDS.Library("myTestLib") +import AGDS +lib = AGDS.Library("myTestLib") lib.setUserUnits(0.001) lib.setPhysUnits(1.0e-9) -active = pyAGDS.Rectangle( 6, 120, 290, 540, 690) # layer 6 corresponds to active -poly = pyAGDS.Rectangle(17, 305, 150, 365, 830) # layer 17 corresponds to polysilicium +active = AGDS.Rectangle( 6, 120, 290, 540, 690) # layer 6 corresponds to active +poly = AGDS.Rectangle(17, 305, 150, 365, 830) # layer 17 corresponds to polysilicium -str = pyAGDS.Structure("Transistor") +str = AGDS.Structure("Transistor") str.addElement(active) str.addElement(poly) diff --git a/vlsisapd/examples/cif/python/driveCif.py b/vlsisapd/examples/cif/python/driveCif.py index 4d434176..60d9a946 100644 --- a/vlsisapd/examples/cif/python/driveCif.py +++ b/vlsisapd/examples/cif/python/driveCif.py @@ -1,13 +1,13 @@ -import pyCIF -circuit = pyCIF.Circuit("Transistor", "micro", 0.001) -poly1 = pyCIF.Polygon(6) +import CIF +circuit = CIF.Circuit("Transistor", "micro", 0.001) +poly1 = CIF.Polygon(6) poly1.addPoint(130, 290) poly1.addPoint(540, 290) poly1.addPoint(540, 690) poly1.addPoint(130, 690) circuit.addPolygon(poly1) -poly2 = pyCIF.Polygon(17) +poly2 = CIF.Polygon(17) poly2.addPoint(305, 150); poly2.addPoint(365, 150); poly2.addPoint(365, 830); diff --git a/vlsisapd/examples/dtr/python/driveDtr.py b/vlsisapd/examples/dtr/python/driveDtr.py index 741441b0..d2819f3b 100644 --- a/vlsisapd/examples/dtr/python/driveDtr.py +++ b/vlsisapd/examples/dtr/python/driveDtr.py @@ -1,4 +1,4 @@ -from pyDTR import * +from DTR import * techno = Techno(Name("myTech"), Name("micro")) diff --git a/vlsisapd/examples/dtr/python/parseDtr.py b/vlsisapd/examples/dtr/python/parseDtr.py index e07ff615..2252da58 100644 --- a/vlsisapd/examples/dtr/python/parseDtr.py +++ b/vlsisapd/examples/dtr/python/parseDtr.py @@ -1,4 +1,4 @@ -from pyDTR import * +from DTR import * from decimal import Decimal techno = Techno.readFromFile("./example.dtr.xml") diff --git a/vlsisapd/src/agds/src/CMakeLists.txt b/vlsisapd/src/agds/src/CMakeLists.txt index 2d46f66a..16c2cc78 100644 --- a/vlsisapd/src/agds/src/CMakeLists.txt +++ b/vlsisapd/src/agds/src/CMakeLists.txt @@ -21,6 +21,7 @@ IF(Boost_FOUND) ADD_LIBRARY(pyAGDS MODULE ${pycpps}) SET_TARGET_PROPERTIES(pyAGDS PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" + OUTPUT_NAME "AGDS" PREFIX "" ) TARGET_LINK_LIBRARIES(pyAGDS agds ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) diff --git a/vlsisapd/src/agds/src/PyAgds.cpp b/vlsisapd/src/agds/src/PyAgds.cpp index 7b64bbb9..b229f1f7 100644 --- a/vlsisapd/src/agds/src/PyAgds.cpp +++ b/vlsisapd/src/agds/src/PyAgds.cpp @@ -9,7 +9,7 @@ using namespace boost::python; #include "vlsisapd/agds/Rectangle.h" namespace AGDS { -BOOST_PYTHON_MODULE(pyAGDS) { +BOOST_PYTHON_MODULE(AGDS) { // class AGDS::Element class_("Element", no_init) // abstract class : noncopyable + no_init ; diff --git a/vlsisapd/src/cif/src/CMakeLists.txt b/vlsisapd/src/cif/src/CMakeLists.txt index f2439ed5..2ea64b79 100644 --- a/vlsisapd/src/cif/src/CMakeLists.txt +++ b/vlsisapd/src/cif/src/CMakeLists.txt @@ -18,6 +18,7 @@ IF(Boost_FOUND) ADD_LIBRARY(pyCIF MODULE ${pycpps}) SET_TARGET_PROPERTIES(pyCIF PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" + OUTPUT_NAME "CIF" PREFIX "" ) TARGET_LINK_LIBRARIES(pyCIF cif ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) diff --git a/vlsisapd/src/cif/src/PyCif.cpp b/vlsisapd/src/cif/src/PyCif.cpp index b85ebf2b..82d07397 100644 --- a/vlsisapd/src/cif/src/PyCif.cpp +++ b/vlsisapd/src/cif/src/PyCif.cpp @@ -7,7 +7,7 @@ using namespace boost::python; #include "vlsisapd/cif/Circuit.h" namespace CIF { -BOOST_PYTHON_MODULE(pyCIF) { +BOOST_PYTHON_MODULE(CIF) { // class CIF::Polygon class_("Polygon", init()) .def("addPoint", &Polygon::addPoint) diff --git a/vlsisapd/src/dtr/src/CMakeLists.txt b/vlsisapd/src/dtr/src/CMakeLists.txt index 7d8fc05c..bd552668 100644 --- a/vlsisapd/src/dtr/src/CMakeLists.txt +++ b/vlsisapd/src/dtr/src/CMakeLists.txt @@ -21,6 +21,7 @@ IF (Boost_FOUND) ADD_LIBRARY(pyDTR MODULE ${pycpps}) SET_TARGET_PROPERTIES(pyDTR PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" + OUTPUT_NAME "DTR" PREFIX "" ) TARGET_LINK_LIBRARIES(pyDTR dtr ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) diff --git a/vlsisapd/src/dtr/src/PyDtr.cpp b/vlsisapd/src/dtr/src/PyDtr.cpp index b4e227e9..4a2402e5 100644 --- a/vlsisapd/src/dtr/src/PyDtr.cpp +++ b/vlsisapd/src/dtr/src/PyDtr.cpp @@ -20,7 +20,7 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getValueAsString_overloads, getValueAsStr // specify that Techno::addRule method has optional arguments BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(addRule_overloads, addRule, 3, 5); -BOOST_PYTHON_MODULE(pyDTR) { +BOOST_PYTHON_MODULE(DTR) { // class DTR::Name class_("Name", init()) .def("getString", &Name::getString, return_value_policy()) // return_value_policy because this method return a reference on string diff --git a/vlsisapd/src/openChams/src/CMakeLists.txt b/vlsisapd/src/openChams/src/CMakeLists.txt index 367ba1de..b9529452 100644 --- a/vlsisapd/src/openChams/src/CMakeLists.txt +++ b/vlsisapd/src/openChams/src/CMakeLists.txt @@ -36,6 +36,7 @@ IF(Boost_FOUND) ADD_LIBRARY(pyOPENCHAMS MODULE ${pycpps}) SET_TARGET_PROPERTIES(pyOPENCHAMS PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" + OUTPUT_NAME "OPENCHAMS" PREFIX "" ) TARGET_LINK_LIBRARIES(pyOPENCHAMS openChams ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) diff --git a/vlsisapd/src/openChams/src/PyOpenChams.cpp b/vlsisapd/src/openChams/src/PyOpenChams.cpp index 755e0a7a..c559cc16 100644 --- a/vlsisapd/src/openChams/src/PyOpenChams.cpp +++ b/vlsisapd/src/openChams/src/PyOpenChams.cpp @@ -24,7 +24,7 @@ void translator(OpenChamsException const& e) { PyErr_SetString(PyExc_UserWarning, e.what()); } -BOOST_PYTHON_MODULE(pyOPENCHAMS) { +BOOST_PYTHON_MODULE(OPENCHAMS) { // class OpenChams::Name class_("Name", init()) .def(init<>())