siliconcompiler 0.28.4__py3-none-any.whl → 0.28.6__py3-none-any.whl

siliconcompiler/_metadata.py

@@ -1,5 +1,5 @@
 # Version number following semver standard.
-version = '0.28.4'
+version = '0.28.6'
 
 # Default server address for remote runs, if unspecified.
 default_server = 'https://server.siliconcompiler.com'

siliconcompiler/apps/_common.py

@@ -1,7 +1,11 @@
-import glob
 import os
 
 
+# TODO: this is a hack to get around design name requirement: since legal
+# design names probably can't contain spaces, we can detect if it is unset.
+UNSET_DESIGN = '  unset  '
+
+
 def manifest_switches():
     '''
     Returns a list of manifest switches that can be used
@@ -14,63 +18,91 @@ def manifest_switches():
             '-jobname']
 
 
-def load_manifest(chip, src_file):
-    manifest = None
-    if (src_file is not None) and (not chip.get('option', 'cfg')):
-        if not os.path.exists(src_file):
-            chip.logger.error(f'{src_file} cannot be found.')
-            return False
-        # only autoload manifest if user doesn't supply manually
-        manifest = _get_manifest(os.path.dirname(src_file))
-        if not manifest:
-            design = os.path.splitext(os.path.basename(src_file))[0]
-            chip.logger.error(f'Unable to automatically find manifest for design {design}. '
-                              'Please provide a manifest explicitly using -cfg.')
-            return False
-    elif not chip.get('option', 'cfg'):
-        manifest = _get_manifest_from_design(chip)
-        if not manifest:
-            chip.logger.error(f'Could not find manifest for {chip.design}')
-            return False
+def _get_manifests(cwd):
+    manifests = {}
 
-    if manifest:
-        chip.logger.info(f'Loading manifest: {manifest}')
-        chip.read_manifest(manifest)
-    return True
-
-
-def _get_manifest(dirname, design='*'):
-    # pkg.json file may have a different name from the design due to the entrypoint
-    glob_paths = [os.path.join(dirname, f'{design}.pkg.json'),
-                  os.path.join(dirname, 'outputs', f'{design}.pkg.json')]
-    manifest = None
-    for path in glob_paths:
-        manifest = glob.glob(path)
-        if manifest:
-            manifest = manifest[0]
-            break
-
-    if not manifest or not os.path.isfile(manifest):
+    def get_dirs(cwd):
+        dirs = []
+        for dirname in os.listdir(cwd):
+            fullpath = os.path.join(cwd, dirname)
+            if os.path.isdir(fullpath):
+                dirs.append((dirname, fullpath))
+        return dirs
+
+    for _, buildpath in get_dirs(cwd):
+        for design, designdir in get_dirs(buildpath):
+            for jobname, jobdir in get_dirs(designdir):
+                manifest = os.path.join(jobdir, f'{design}.pkg.json')
+                if os.path.isfile(manifest):
+                    manifests[(design, jobname, None, None)] = manifest
+                for step, stepdir in get_dirs(jobdir):
+                    for index, indexdir in get_dirs(stepdir):
+                        manifest = os.path.join(indexdir, 'outputs', f'{design}.pkg.json')
+                        if os.path.isfile(manifest):
+                            manifests[(design, jobname, step, index)] = manifest
+                        else:
+                            manifest = os.path.join(indexdir, 'inputs', f'{design}.pkg.json')
+                            if os.path.isfile(manifest):
+                                manifests[(design, jobname, step, index)] = manifest
+
+    organized_manifest = {}
+    for (design, job, step, index), manifest in manifests.items():
+        jobs = organized_manifest.setdefault(design, {})
+        jobs.setdefault(job, {})[step, index] = os.path.abspath(manifest)
+
+    return organized_manifest
+
+
+def pick_manifest_from_file(chip, src_file, all_manifests):
+    if src_file is None:
         return None
-    return manifest
 
+    if not os.path.exists(src_file):
+        chip.logger.error(f'{src_file} cannot be found.')
+        return None
+
+    src_dir = os.path.abspath(os.path.dirname(src_file))
+    for _, jobs in all_manifests.items():
+        for _, nodes in jobs.items():
+            for manifest in nodes.values():
+                if src_dir == os.path.dirname(manifest):
+                    return manifest
 
-def _get_manifest_from_design(chip):
-    for jobname, step, index in [
-            (chip.get('option', 'jobname'),
-             chip.get('arg', 'step'),
-             chip.get('arg', 'index')),
-            (chip.get('option', 'jobname'),
-             None,
-             None),
-            (chip.schema.get_default('option', 'jobname'),
-             chip.get('arg', 'step'),
-             chip.get('arg', 'index')),
-            (chip.schema.get_default('option', 'jobname'),
-             None,
-             None)]:
-        manifest = _get_manifest(chip.getworkdir(jobname=jobname, step=step, index=index))
-
-        if manifest:
-            return manifest
     return None
+
+
+def pick_manifest(chip, src_file=None):
+    all_manifests = _get_manifests(os.getcwd())
+
+    manifest = pick_manifest_from_file(chip, src_file, all_manifests)
+    if manifest:
+        return manifest
+
+    if chip.design == UNSET_DESIGN:
+        if len(all_manifests) == 1:
+            chip.set('design', list(all_manifests.keys())[0])
+        else:
+            chip.logger.error('Design name is not set')
+            return None
+
+    if chip.design not in all_manifests:
+        chip.logger.error(f'Could not find manifest for {chip.design}')
+        return None
+
+    if chip.get('option', 'jobname') not in all_manifests[chip.design] and \
+            len(all_manifests[chip.design]) != 1:
+        chip.logger.error(f'Could not determine jobname for {chip.design}')
+        return None
+
+    jobname = chip.get('option', 'jobname')
+    if chip.get('option', 'jobname') not in all_manifests[chip.design]:
+        jobname = list(all_manifests[chip.design].keys())[0]
+
+    if (None, None) in all_manifests[chip.design][jobname]:
+        manifest = all_manifests[chip.design][jobname][None, None]
+    else:
+        # pick newest manifest
+        manifest = list(sorted(all_manifests[chip.design][jobname].values(),
+                               key=lambda file: os.stat(file).st_ctime))[-1]
+
+    return manifest

siliconcompiler/apps/sc.py

@@ -10,6 +10,37 @@ from siliconcompiler.targets import skywater130_demo
 from siliconcompiler import SiliconCompilerError
 
 
+def _infer_designname(chip):
+    topfile = None
+    sourcesets = chip.getkeys('input')
+    for sourceset in reversed(('rtl', 'hll')):
+        if sourceset in sourcesets:
+            sourcesets.remove(sourceset)
+            sourcesets.insert(0, sourceset)
+    for sourceset in sourcesets:
+        for filetype in chip.getkeys('input', sourceset):
+            all_vals = chip.schema._getvals('input', sourceset, filetype)
+            if all_vals:
+                # just look at first value
+                sources, _, _ = all_vals[0]
+                # grab first source
+                topfile = sources[0]
+                break
+        if topfile:
+            break
+
+    if not topfile:
+        return None
+
+    root = os.path.basename(topfile)
+    while True:
+        root, ext = os.path.splitext(root)
+        if not ext:
+            break
+
+    return root
+
+
 ###########################
 def main():
     progname = "sc"
@@ -50,24 +81,12 @@ def main():
 
     # Set design if none specified
     if chip.get('design') == UNSET_DESIGN:
-        topfile = None
-        for sourceset in ('rtl', 'hll'):
-            for filetype in chip.getkeys('input', sourceset):
-                all_vals = chip.schema._getvals('input', sourceset, filetype)
-                if all_vals:
-                    # just look at first value
-                    sources, _, _ = all_vals[0]
-                    # grab first source
-                    topfile = sources[0]
-                    break
-            if topfile:
-                break
+        topmodule = _infer_designname(chip)
 
-        if not topfile:
+        if not topmodule:
             chip.logger.error('Invalid arguments: either specify -design or provide sources.')
             return 1
 
-        topmodule = os.path.splitext(os.path.basename(topfile))[0]
         chip.set('design', topmodule)
 
     # Set demo target if none specified

siliconcompiler/apps/sc_dashboard.py

@@ -2,7 +2,7 @@
 import sys
 import siliconcompiler
 import os
-from siliconcompiler.apps._common import load_manifest, manifest_switches
+from siliconcompiler.apps._common import pick_manifest, manifest_switches, UNSET_DESIGN
 
 
 def main():
@@ -11,9 +11,16 @@ def main():
 -----------------------------------------------------------
 SC app to open a dashboard for a given manifest.
 
-To open:
+To open and allow sc-dashboard to autoload manifest:
+    sc-dashboard
+
+To open by specifying manifest:
     sc-dashboard -cfg <path to manifest>
 
+To open by specifying design and optionally jobname:
+    sc-dashboard -design <name>
+    sc-dashboard -design <name> -jobname <jobname>
+
 To specify a different port than the default:
     sc-dashboard -cfg <path to manifest> -port 10000
 
@@ -23,10 +30,6 @@ To include another chip object to compare to:
 -----------------------------------------------------------
 """
 
-    # TODO: this is a hack to get around design name requirement: since legal
-    # design names probably can't contain spaces, we can detect if it is unset.
-    UNSET_DESIGN = '  unset  '
-
     # Create a base chip class.
     chip = siliconcompiler.Chip(UNSET_DESIGN)
 
@@ -54,15 +57,19 @@ To include another chip object to compare to:
         chip.logger.error(e)
         return 1
 
+    if not chip.get('option', 'cfg'):
+        manifest = pick_manifest(chip)
+
+        if manifest:
+            chip.logger.info(f'Loading manifest: {manifest}')
+            chip.read_manifest(manifest)
+
     # Error checking
     design = chip.get('design')
     if design == UNSET_DESIGN:
         chip.logger.error('Design not loaded')
         return 1
 
-    if not load_manifest(chip, None):
-        return 1
-
     graph_chips = []
     if switches['graph_cfg']:
         for i, name_and_file_path in enumerate(switches['graph_cfg']):

siliconcompiler/apps/sc_show.py

@@ -3,7 +3,7 @@ import sys
 import os
 import siliconcompiler
 from siliconcompiler.utils import get_default_iomap
-from siliconcompiler.apps._common import load_manifest, manifest_switches
+from siliconcompiler.apps._common import manifest_switches, pick_manifest, UNSET_DESIGN
 from siliconcompiler.utils import get_file_ext
 
 
@@ -18,6 +18,9 @@ def main():
 
     Examples:
 
+    sc-show
+    (displays build/adder/job0/write_gds/0/outputs/adder.gds)
+
     sc-show -design adder
     (displays build/adder/job0/write_gds/0/outputs/adder.gds)
 
@@ -40,10 +43,6 @@ def main():
     (displays build/adder/job0/route/1/outputs/adder.def)
     """
 
-    # TODO: this is a hack to get around design name requirement: since legal
-    # design names probably can't contain spaces, we can detect if it is unset.
-    UNSET_DESIGN = '  unset  '
-
     # Create a base chip class.
     chip = siliconcompiler.Chip(UNSET_DESIGN)
 
@@ -81,10 +80,6 @@ def main():
         chip.logger.error(e)
         return 1
 
-    # Error checking
-    design = chip.get('design')
-    design_set = design != UNSET_DESIGN
-
     # Search input keys for files
     input_mode = []
     for fileset in chip.getkeys('input'):
@@ -92,11 +87,6 @@ def main():
             if chip.schema._getvals('input', fileset, mode):
                 input_mode = [('input', fileset, mode)]
 
-    if not (design_set or input_mode):
-        chip.logger.error('Nothing to load: please define a target with '
-                          '-cfg, -design, and/or inputs.')
-        return 1
-
     filename = None
     if input_mode:
         check_ext = list(chip._showtools.keys())
@@ -115,7 +105,19 @@ def main():
 
         filename = get_file_from_keys()
 
-    if not load_manifest(chip, filename):
+    # Attempt to load a manifest
+    if not chip.get('option', 'cfg'):
+        manifest = pick_manifest(chip, src_file=filename)
+        if manifest:
+            chip.logger.info(f'Loading manifest: {manifest}')
+            chip.read_manifest(manifest)
+
+    # Error checking
+    design = chip.get('design')
+    design_set = design != UNSET_DESIGN
+    if not (design_set or input_mode):
+        chip.logger.error('Nothing to load: please define a target with '
+                          '-cfg, -design, and/or inputs.')
         return 1
 
     # Read in file

siliconcompiler/apps/utils/summarize.py

@@ -0,0 +1,47 @@
+# Copyright 2024 Silicon Compiler Authors. All Rights Reserved.
+
+# Standard Modules
+import sys
+
+import siliconcompiler
+from siliconcompiler.apps._common import UNSET_DESIGN
+from siliconcompiler import SiliconCompilerError
+
+
+###########################
+def main():
+    progname = "summarize"
+    description = """
+    ------------------------------------------------------------
+    Utility script to print job summary from a manifest
+    ------------------------------------------------------------
+    """
+    # Create a base chip class.
+    chip = siliconcompiler.Chip(UNSET_DESIGN)
+
+    # Read command-line inputs and generate Chip objects to run the flow on.
+    try:
+        chip.create_cmdline(progname,
+                            description=description,
+                            switchlist=['-cfg',
+                                        '-loglevel'])
+    except SiliconCompilerError:
+        return 1
+    except Exception as e:
+        chip.logger.error(e)
+        return 1
+
+    design = chip.get('design')
+    if design == UNSET_DESIGN:
+        chip.logger.error('Design not loaded')
+        return 1
+
+    # Print Job Summary
+    chip.summary(generate_image=False, generate_html=False)
+
+    return 0
+
+
+#########################
+if __name__ == "__main__":
+    sys.exit(main())

siliconcompiler/core.py

@@ -399,7 +399,7 @@ class Chip:
                     self.set(*key, packages, field='package', step=step, index=index)
 
             # Read in target if set
-            if "target" in extra_params:
+            if extra_params is not None and "target" in extra_params:
                 if extra_params["target"]:
                     # running target command
                     # Search order "{name}", and "siliconcompiler.targets.{name}"
@@ -416,7 +416,7 @@ class Chip:
                     self.use(modules[0])
                     extra_params["target"] = modules[0].__name__
 
-            if "use" in extra_params:
+            if extra_params is not None and "use" in extra_params:
                 if extra_params["use"]:
                     for use in extra_params["use"]:
                         mod = self._load_module(use)
@@ -437,19 +437,25 @@ class Chip:
         if "-target" in additional_args:
             raise ValueError('-target cannot be used as an additional argument')
 
-        additional_args["-target"] = {
-            "help": "target to load",
-            "metavar": "<target>"
-        }
+        if switchlist is None or '-target' in switchlist:
+            additional_args["-target"] = {
+                "help": "target to load",
+                "metavar": "<target>"
+            }
+            if switchlist:
+                switchlist.remove('-target')
 
         if "-use" in additional_args:
             raise ValueError('-use cannot be used as an additional argument')
 
-        additional_args["-use"] = {
-            "action": "append",
-            "help": "modules to load",
-            "metavar": "<module>"
-        }
+        if switchlist is None or '-use' in switchlist:
+            additional_args["-use"] = {
+                "action": "append",
+                "help": "modules to load",
+                "metavar": "<module>"
+            }
+            if switchlist:
+                switchlist.remove('-use')
 
         try:
             return self.schema.create_cmdline(
@@ -2123,7 +2129,9 @@ class Chip:
             nonlocal graph_idx
 
             for subgraph in graph_info["graphs"]:
+                child_prefix = prefix
                 if get_node_count(graph_info["graphs"][subgraph]) > 1:
+                    child_prefix = f"{child_prefix}{subgraph}."
                     graph = graphviz.Digraph(name=f"cluster_{graph_idx}")
                     graph_idx += 1
 
@@ -2143,7 +2151,7 @@ class Chip:
                 else:
                     graph = parent
 
-                build_graph(graph_info["graphs"][subgraph], graph, f"{prefix}{subgraph}.")
+                build_graph(graph_info["graphs"][subgraph], graph, child_prefix)
 
                 if graph is not parent:
                     parent.subgraph(graph)

siliconcompiler/flows/drcflow.py

@@ -0,0 +1,13 @@
+from siliconcompiler import Flow
+
+from siliconcompiler.tools.klayout import drc
+
+
+def setup():
+    '''
+    Perform a DRC run on an input GDS
+    '''
+    flow = Flow('drcflow')
+    flow.node('drcflow', 'drc', drc)
+
+    return flow

siliconcompiler/flows/interposerflow.py

@@ -0,0 +1,17 @@
+from siliconcompiler import Flow
+
+from siliconcompiler.tools.openroad import rdlroute
+from siliconcompiler.tools.klayout import export
+
+
+def setup():
+    '''
+    A flow to perform RDL routing and generate a GDS
+    '''
+    flow = Flow('interposerflow')
+    flow.node('interposerflow', 'rdlroute', rdlroute)
+    flow.node('interposerflow', 'write_gds', export)
+
+    flow.edge('interposerflow', 'rdlroute', 'write_gds')
+
+    return flow

siliconcompiler/libs/interposer.py

@@ -0,0 +1,8 @@
+import siliconcompiler
+from lambdapdk.interposer.libs.bumps import setup
+
+
+#########################
+if __name__ == "__main__":
+    lib = setup(siliconcompiler.Chip('<lib>'))
+    lib.write_manifest(f'{lib.top()}.json')

siliconcompiler/pdks/interposer.py

@@ -0,0 +1,8 @@
+import siliconcompiler
+from lambdapdk.interposer import setup
+
+
+#########################
+if __name__ == "__main__":
+    pdk = setup(siliconcompiler.Chip('<lib>'))
+    pdk.write_manifest(f'{pdk.top()}.json')

siliconcompiler/remote/schema.py

@@ -2,7 +2,7 @@ from siliconcompiler.schema.schema_cfg import scparam
 from siliconcompiler.schema import Schema
 
 
-SCHEMA_VERSION = '0.0.1'
+SCHEMA_VERSION = '0.0.2'
 
 
 def schema_cfg():
@@ -93,6 +93,16 @@ def schema_cfg():
             schelp="""
             Provides explicit control over the level of debug logging printed.""")
 
+    scparam(cfg, ['option', 'checkinterval'],
+            sctype='int',
+            defvalue=30,
+            shorthelp="Interval for client",
+            switch="-checkinterval <int>",
+            example=["cli: -checkinterval 10",
+                     "api: chip.set('option', 'checkinterval', 10)"],
+            schelp="""
+            Interval between checks to announce to clients""")
+
     return cfg
 
 

siliconcompiler/remote/server.py

@@ -239,7 +239,7 @@ class Server:
 
         # Return a response to the client.
         return web.json_response({'message': f"Starting job: {job_hash}",
-                                  'interval': 30,
+                                  'interval': self.checkinterval,
                                   'job_hash': job_hash})
 
     ####################
@@ -375,7 +375,7 @@ class Server:
                 'sc_schema': sc_schema_version,
                 'sc_server': Server.__version__,
             },
-            'progress_interval': 30
+            'progress_interval': self.checkinterval
         }
 
         username = job_params['username']
@@ -490,6 +490,11 @@ class Server:
         # Ensure that NFS mounting path is absolute.
         return os.path.abspath(self.get('option', 'nfsmount'))
 
+    ###################
+    @property
+    def checkinterval(self):
+        return self.get('option', 'checkinterval')
+
     def get(self, *keypath, field='value'):
         return self.schema.get(*keypath, field=field)
 

siliconcompiler/report/dashboard/__init__.py

@@ -3,9 +3,6 @@ import time
 import tempfile
 import json
 
-from streamlit.web import bootstrap
-from streamlit import config as _config
-
 import multiprocessing
 import subprocess
 import atexit
@@ -16,6 +13,13 @@ import socketserver
 
 from siliconcompiler.report.dashboard import utils
 
+try:
+    from streamlit.web import bootstrap
+    from streamlit import config as _config
+except ModuleNotFoundError:
+    bootstrap = None
+    _config = None
+
 
 class Dashboard():
     __port = 8501
@@ -26,6 +30,9 @@ class Dashboard():
         pass
 
     def __init__(self, chip, port=None, graph_chips=None):
+        if not bootstrap:
+            raise NotImplementedError('streamlit is not available')
+
         if not port:
             port = Dashboard.get_next_port()
         if not port: