From 6a86c72b696f462ce2def5811d4cb8299e76e780 Mon Sep 17 00:00:00 2001 From: Peter Gadfort Date: Mon, 19 Aug 2024 14:20:06 -0400 Subject: [PATCH 1/2] update interface to allow for use of lambdalib importing --- scgallery/designs/_common.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scgallery/designs/_common.py b/scgallery/designs/_common.py index f57130c..42e5ca9 100644 --- a/scgallery/designs/_common.py +++ b/scgallery/designs/_common.py @@ -1,4 +1,4 @@ -from siliconcompiler import Chip +from siliconcompiler import Chip, Schema from lambdapdk.freepdk45.libs import fakeram45 from lambdapdk.asap7.libs import fakeram7 from lambdapdk.sky130.libs import sky130sram @@ -53,6 +53,11 @@ def add_lambdalib_memory(chip): chip.add('option', 'library', [lib for lib in libs if lib.startswith('lambdalib_')]) - # Add non-lambdalib - chip.add('asic', 'macrolib', - [lib for lib in libs if not lib.startswith('lambdalib_')]) + has_asic_macros = any( + [len(chip.get('asic', 'macrolib', + step=Schema.GLOBAL_KEY, index=Schema.GLOBAL_KEY)) > 0 + for lib in libs if lib.startswith('lambdalib_')]) + if not has_asic_macros: + # Add non-lambdalib + chip.add('asic', 'macrolib', + [lib for lib in libs if not lib.startswith('lambdalib_')]) From 22427457f6c06b3a54ae02ec89229c574a534313 Mon Sep 17 00:00:00 2001 From: Peter Gadfort Date: Wed, 21 Aug 2024 09:26:23 -0400 Subject: [PATCH 2/2] update lambdapdk --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 500c266..3127461 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ license = {file = "LICENSE"} dependencies = [ "siliconcompiler>=0.26.2", "Jinja2>=3.1.2", - "lambdapdk>=0.1.12", + "lambdapdk>=0.1.28", "lambdalib>=0.2.0" ] dynamic = ["version"]