Merge pull request #114 from ThomasPluck/gf180mcu2

GF180MCU w/ Simulation Tests
dan-fritchman · Jul 11, 2023 · 690ce06 · 690ce06
2 parents 803af90 + 05ab13a
commit 690ce06
Show file tree

Hide file tree

Showing 43 changed files with 18,286 additions and 14,595 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -37,7 +37,7 @@ jobs:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         pydantic-version: ["==1.9.0", ""] 
         dep-installer: ["dev", "pypi"]
-    continue-on-error: ${{ matrix.dep-installer == 'pypi' }}
+    continue-on-error: ${{ matrix.dep-installer == 'pypi' || matrix.python-version == '3.11' }}
 
     steps:
       - name: Checkout Repo

diff --git a/SampleSitePdks/setup.py b/SampleSitePdks/setup.py
@@ -30,7 +30,7 @@
     python_requires=">=3.7",
     install_requires=[
         f"sky130-hdl21=={_VLSIR_VERSION}",
-        f"asap7-hdl21=={_VLSIR_VERSION}",
+        # f"asap7-hdl21=={_VLSIR_VERSION}",
     ],
     extras_require={
         "dev": ["pytest==7.1", "coverage", "pytest-cov", "black==22.6", "twine"]

diff --git a/SampleSitePdks/sitepdks.py b/SampleSitePdks/sitepdks.py
@@ -26,15 +26,23 @@
 import os
 
 # Sky 130
-import sky130
+import sky130_hdl21
 
-sky130.install = sky130.Install(
+sky130_hdl21.install = sky130_hdl21.Install(
     pdk_path=Path(os.environ["PDK_ROOT"] + "/" + os.environ["PDK"]),
     lib_path=Path("libs.tech/ngspice/sky130.lib.spice"),
     model_ref=Path("libs.ref/sky130_fd_pr/spice"),
 )
 
 # ASAP7
-import asap7
+import asap7_hdl21
 
-# asap7.install = asap7.Install(model_lib=Path("pdks") / "asap7" / ... / "7nm_TT.pm")
+# FIXME: Complete implementation
+# asap7_hdl21.install = asap7_hdl21.Install(Path("pdks") / "asap7" / "..." / "7nm_TT.pm")
+
+# GF180
+import gf180_hdl21
+
+gf180_hdl21.install = gf180_hdl21.Install(
+    model_lib=Path("/usr/local/share/pdk/gf180mcuC/libs.tech/ngspice/sm141064.ngspice")
+)
diff --git a/pdks/Asap7/asap7/__init__.py → pdks/Asap7/asap7_hdl21/__init__.py b/pdks/Asap7/asap7/__init__.py → pdks/Asap7/asap7_hdl21/__init__.py
diff --git a/pdks/Asap7/asap7/pdk.py → pdks/Asap7/asap7_hdl21/pdk.py b/pdks/Asap7/asap7/pdk.py → pdks/Asap7/asap7_hdl21/pdk.py
diff --git a/pdks/Asap7/asap7/test_pdk.py → pdks/Asap7/asap7_hdl21/test_pdk.py b/pdks/Asap7/asap7/test_pdk.py → pdks/Asap7/asap7_hdl21/test_pdk.py
diff --git a/pdks/Sky130/sky130/__init__.py → pdks/Gf180/gf180_hdl21/__init__.py b/pdks/Sky130/sky130/__init__.py → pdks/Gf180/gf180_hdl21/__init__.py
diff --git a/pdks/Gf180/gf180_hdl21/digital_cells/__init__.py b/pdks/Gf180/gf180_hdl21/digital_cells/__init__.py
@@ -0,0 +1,2 @@
+from . import seven_track
+from . import nine_track