Add Family object to API + delist asap7

efabless · Jan 10, 2024 · 15acc9c · 15acc9c
1 parent 8221a19
commit 15acc9c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 26 deletions.
diff --git a/volare/__init__.py b/volare/__init__.py
@@ -24,9 +24,9 @@
     Version,
     root_for,
 )
+from .families import Family
 from .github import (
     GitHubSession,
 )
 from .build import build
-
 from .__version__ import __version__
diff --git a/volare/__version__.py b/volare/__version__.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-__version__ = "0.15.2"
+__version__ = "0.16.0"
 
 if __name__ == "__main__":
     print(__version__, end="")
diff --git a/volare/build/asap7.py b/volare/build/asap7.py
@@ -146,8 +146,8 @@ def build(
     using_repos: Optional[Dict[str, str]] = None,
     build_magic: bool = False,
 ):
-    family = Family.by_name["asap7"]
-    _ = family.resolve_libraries(include_libraries)
+    # family = Family.by_name["asap7"]
+    # _ = family.resolve_libraries(include_libraries)
 
     if using_repos is None:
         using_repos = {}

diff --git a/volare/families.py b/volare/families.py
@@ -19,15 +19,18 @@ class Family(object):
 
     def __init__(
         self,
+        *,
         name: str,
         variants: List[str],
-        default_includes: List[str],
         all_libraries: List[str],
+        default_variant: Optional[str] = None,
+        default_includes: Optional[List[str]] = None,
     ):
         self.name = name
         self.variants = variants
-        self.default_includes = default_includes
         self.all_libraries = all_libraries
+        self.default_variant = default_variant or variants[0]
+        self.default_includes = default_includes or all_libraries.copy()
 
     def resolve_libraries(
         self,
@@ -51,17 +54,10 @@ def resolve_libraries(
 
 Family.by_name = {}
 Family.by_name["sky130"] = Family(
-    "sky130",
-    ["sky130A", "sky130B"],
-    [
-        "sky130_fd_io",
-        "sky130_fd_pr",
-        "sky130_fd_sc_hd",
-        "sky130_fd_sc_hvl",
-        "sky130_ml_xx_hd",
-        "sky130_sram_macros",
-    ],
-    [
+    name="sky130",
+    variants=["sky130A", "sky130B"],
+    default_variant="sky130A",
+    all_libraries=[
         "sky130_fd_io",
         "sky130_fd_pr",
         "sky130_ml_xx_hd",
@@ -74,27 +70,36 @@ def resolve_libraries(
         "sky130_fd_sc_hs",
         "sky130_sram_macros",
     ],
+    default_includes=[
+        "sky130_fd_io",
+        "sky130_fd_pr",
+        "sky130_fd_sc_hd",
+        "sky130_fd_sc_hvl",
+        "sky130_ml_xx_hd",
+        "sky130_sram_macros",
+    ],
 )
 Family.by_name["gf180mcu"] = Family(
-    "gf180mcu",
-    ["gf180mcuA", "gf180mcuB", "gf180mcuC", "gf180mcuD"],
-    [
+    name="gf180mcu",
+    variants=["gf180mcuA", "gf180mcuB", "gf180mcuC", "gf180mcuD"],
+    default_variant="gf180mcuD",
+    all_libraries=[
         "gf180mcu_fd_io",
         "gf180mcu_fd_pr",
         "gf180mcu_fd_sc_mcu7t5v0",
         "gf180mcu_fd_sc_mcu9t5v0",
         "gf180mcu_fd_ip_sram",
+        "gf180mcu_osu_sc_gp12t3v3",
+        "gf180mcu_osu_sc_gp9t3v3",
     ],
-    [
+    default_includes=[
         "gf180mcu_fd_io",
         "gf180mcu_fd_pr",
         "gf180mcu_fd_sc_mcu7t5v0",
         "gf180mcu_fd_sc_mcu9t5v0",
         "gf180mcu_fd_ip_sram",
-        "gf180mcu_osu_sc_gp12t3v3",
-        "gf180mcu_osu_sc_gp9t3v3",
     ],
 )
-Family.by_name["asap7"] = Family(
-    "asap7", ["asap7"], default_includes=[], all_libraries=[]
-)
+# Family.by_name["asap7"] = Family(
+#     name="asap7", variants=["asap7"], default_includes=[], all_libraries=[]
+# )