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

siliconcompiler/_metadata.py

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

siliconcompiler/apps/sc_dashboard.py

@@ -88,7 +88,7 @@ To include another chip object to compare to:
                 'cfg_path': os.path.abspath(file_path)
             })
 
-    chip._dashboard(wait=True, port=switches['port'], graph_chips=graph_chips)
+    chip.dashboard(wait=True, port=switches['port'], graph_chips=graph_chips)
 
     return 0
 

siliconcompiler/core.py

@@ -1363,7 +1363,7 @@ class Chip:
             basename = str(pathlib.PurePosixPath(*path_paths[0:n]))
             endname = str(pathlib.PurePosixPath(*path_paths[n:]))
 
-            import_name = self.__get_imported_filename(basename, package)
+            import_name = utils.get_hashed_filename(basename, package=package)
             if import_name not in collected_files:
                 continue
 
@@ -2051,6 +2051,30 @@ class Chip:
             dot.graph_attr['ranksep'] = '0.75'
         dot.attr(bgcolor=background)
 
+        subgraphs = {
+            "graphs": {
+                "sc-inputs": {
+                    "graphs": {},
+                    "nodes": []
+                }
+            },
+            "nodes": []
+        }
+        for node, info in nodes.items():
+            if info['is_input']:
+                subgraph_temp = subgraphs["graphs"]["sc-inputs"]
+            else:
+                subgraph_temp = subgraphs
+
+            for key in node.split(".")[0:-1]:
+                if key not in subgraph_temp["graphs"]:
+                    subgraph_temp["graphs"][key] = {
+                        "graphs": {},
+                        "nodes": []
+                    }
+                subgraph_temp = subgraph_temp["graphs"][key]
+            subgraph_temp["nodes"].append(node)
+
         with dot.subgraph(name='inputs') as input_graph:
             input_graph.graph_attr['cluster'] = 'true'
             input_graph.graph_attr['color'] = background
@@ -2062,34 +2086,72 @@ class Chip:
                     fontcolor=fontcolor, fontsize=fontsize, ordering="in",
                     penwidth=penwidth, fillcolor=fillcolor, shape="box")
 
-        with dot.subgraph(name='input_nodes') as input_graph_nodes:
-            input_graph_nodes.graph_attr['cluster'] = 'true'
-            input_graph_nodes.graph_attr['color'] = background
+        def make_node(graph, node, prefix):
+            info = nodes[node]
 
-            # add nodes
             shape = "oval" if not show_io else "Mrecord"
-            for node, info in nodes.items():
-                task_label = f"\\n ({info['task']})" if info['task'] is not None else ""
-                if show_io:
-                    input_labels = [f"<{ikey}> {ifile}" for ifile, ikey in info['inputs'].items()]
-                    output_labels = [f"<{okey}> {ofile}" for ofile, okey in info['outputs'].items()]
-                    center_text = f"\\n {node} {task_label} \\n\\n"
-                    labelname = "{"
-                    if input_labels:
-                        labelname += f"{{ {' | '.join(input_labels)} }} |"
-                    labelname += center_text
-                    if output_labels:
-                        labelname += f"| {{ {' | '.join(output_labels)} }}"
-                    labelname += "}"
+            task_label = f"\\n ({info['task']})" if info['task'] is not None else ""
+            if show_io:
+                input_labels = [f"<{ikey}> {ifile}" for ifile, ikey in info['inputs'].items()]
+                output_labels = [f"<{okey}> {ofile}" for ofile, okey in info['outputs'].items()]
+                center_text = f"\\n {node.replace(prefix, '')} {task_label} \\n\\n"
+                labelname = "{"
+                if input_labels:
+                    labelname += f"{{ {' | '.join(input_labels)} }} |"
+                labelname += center_text
+                if output_labels:
+                    labelname += f"| {{ {' | '.join(output_labels)} }}"
+                labelname += "}"
+            else:
+                labelname = f"{node.replace(prefix, '')}{task_label}"
+
+            graph.node(node, label=labelname, bordercolor=fontcolor, style='filled',
+                       fontcolor=fontcolor, fontsize=fontsize, ordering="in",
+                       penwidth=penwidth, fillcolor=fillcolor, shape=shape)
+
+        graph_idx = 0
+
+        def get_node_count(graph_info):
+            nodes = len(graph_info["nodes"])
+
+            for subgraph in graph_info["graphs"]:
+                nodes += get_node_count(graph_info["graphs"][subgraph])
+
+            return nodes
+
+        def build_graph(graph_info, parent, prefix):
+            nonlocal graph_idx
+
+            for subgraph in graph_info["graphs"]:
+                if get_node_count(graph_info["graphs"][subgraph]) > 1:
+                    graph = graphviz.Digraph(name=f"cluster_{graph_idx}")
+                    graph_idx += 1
+
+                    graph.graph_attr['rankdir'] = rankdir
+                    graph.attr(bgcolor=background)
+
+                    if subgraph == "sc-inputs":
+                        graph.attr(style='invis')
+                    else:
+                        graph.attr(color=fontcolor)
+                        graph.attr(style='rounded')
+                        graph.attr(shape='oval')
+                        graph.attr(label=subgraph)
+                        graph.attr(labeljust='l')
+                        graph.attr(fontcolor=fontcolor)
+                        graph.attr(fontsize=str(int(fontsize) + 2))
                 else:
-                    labelname = f"{node}{task_label}"
+                    graph = parent
+
+                build_graph(graph_info["graphs"][subgraph], graph, f"{prefix}{subgraph}.")
+
+                if graph is not parent:
+                    parent.subgraph(graph)
 
-                dst = dot
-                if info['is_input']:
-                    dst = input_graph_nodes
-                dst.node(node, label=labelname, bordercolor=fontcolor, style='filled',
-                         fontcolor=fontcolor, fontsize=fontsize, ordering="in",
-                         penwidth=penwidth, fillcolor=fillcolor, shape=shape)
+            for subnode in graph_info["nodes"]:
+                make_node(parent, subnode, prefix)
+
+        build_graph(subgraphs, dot, "")
 
         for edge0, edge1, weight in edges:
             dot.edge(f'{edge0}{out_label_suffix}', f'{edge1}{in_label_suffix}', weight=str(weight))
@@ -2394,7 +2456,7 @@ class Chip:
 
             abspath = dirs[(package, path)]
             if abspath:
-                filename = self.__get_imported_filename(posix_path, package)
+                filename = utils.get_hashed_filename(posix_path, package=package)
                 dst_path = os.path.join(directory, filename)
                 if os.path.exists(dst_path):
                     continue
@@ -2466,7 +2528,7 @@ class Chip:
 
             abspath = files[(package, path)]
             if abspath:
-                filename = self.__get_imported_filename(posix_path, package)
+                filename = utils.get_hashed_filename(posix_path, package=package)
                 dst_path = os.path.join(directory, filename)
                 if verbose:
                     self.logger.info(f"Copying {abspath} to '{directory}' directory")
@@ -2702,12 +2764,12 @@ class Chip:
         return hashlist
 
     ###########################################################################
-    def _dashboard(self, wait=True, port=None, graph_chips=None):
+    def dashboard(self, wait=True, port=None, graph_chips=None):
         '''
         Open a session of the dashboard.
 
         The dashboard can be viewed in any webbrowser and can be accessed via:
-        http://localhost:8501/
+        http://localhost:<port>/
 
         Args:
             wait (bool): If True, this call will wait in this method
@@ -2718,7 +2780,7 @@ class Chip:
                 {'chip': chip object, 'name': chip name}
 
         Examples:
-            >>> chip._dashboard()
+            >>> chip.dashboard()
             Opens a sesison of the dashboard.
         '''
         if self._dash:
@@ -3143,6 +3205,7 @@ class Chip:
         self.set('option', 'nodisplay', False, clobber=True)
         self.set('option', 'continue', True, clobber=True)
         self.set('option', 'quiet', False, clobber=True)
+        self.set('option', 'clean', True, clobber=True)
         self.set('arg', 'step', None, clobber=True)
         self.set('arg', 'index', None, clobber=True)
         self.unset('option', 'to')
@@ -3237,31 +3300,6 @@ class Chip:
 
         return os.path.join(*dirlist)
 
-    #######################################
-    def __get_imported_filename(self, pathstr, package=None):
-        ''' Utility to map collected file to an unambiguous name based on its path.
-
-        The mapping looks like:
-        path/to/file.ext => file_<md5('path/to/file.ext')>.ext
-        '''
-        path = pathlib.PurePosixPath(pathstr)
-        ext = ''.join(path.suffixes)
-
-        # strip off all file suffixes to get just the bare name
-        barepath = path
-        while barepath.suffix:
-            barepath = pathlib.PurePosixPath(barepath.stem)
-        filename = str(barepath.parts[-1])
-
-        if not package:
-            package = ''
-        else:
-            package = f'{package}:'
-        path_to_hash = f'{package}{str(path)}'
-        pathhash = hashlib.sha1(path_to_hash.encode('utf-8')).hexdigest()
-
-        return f'{filename}_{pathhash}{ext}'
-
     def error(self, msg):
         '''
         Raises error.

siliconcompiler/fpgas/vpr_example.py

@@ -43,6 +43,14 @@ def setup():
 
         fpga.set('fpga', part_name, 'vendor', vendor)
 
+        # Part name is specified per architecture file.  Device code specifies
+        # which <fixed_layout> name to use when running VPR.  These examples
+        # use the following names:
+        if (part_name == 'example_arch_X005Y005'):
+            fpga.set('fpga', part_name, 'var', 'vpr_device_code', 'fpga_beta')
+        else:
+            fpga.set('fpga', part_name, 'var', 'vpr_device_code', part_name)
+
         fpga.set('fpga', part_name, 'lutsize', lut_size)
 
         arch_root = os.path.join(flow_root, 'arch', part_name)

siliconcompiler/package.py

@@ -88,7 +88,8 @@ def _path(chip, package, download_handler):
             chip._packages[package] = data_path
         return data_path
 
-    raise SiliconCompilerError(f'Extracting {package} data to {data_path} failed')
+    raise SiliconCompilerError(f'Extracting {package} data to {data_path} failed',
+                               chip=chip)
 
 
 def path(chip, package):
@@ -188,7 +189,7 @@ def clone_synchronized(chip, package, data, data_path):
             elif url.scheme in ['git', 'git+https']:
                 chip.logger.error('Failed to authenticate. Please use a token or ssh.')
         else:
-            raise e
+            chip.logger.error(str(e))
 
 
 def clone_from_git(chip, package, data, repo_path):

siliconcompiler/report/dashboard/__init__.py

@@ -12,6 +12,7 @@ import atexit
 import shutil
 import fasteners
 import signal
+import socketserver
 
 from siliconcompiler.report.dashboard import utils
 
@@ -25,6 +26,8 @@ class Dashboard():
         pass
 
     def __init__(self, chip, port=None, graph_chips=None):
+        if not port:
+            port = Dashboard.get_next_port()
         if not port:
             port = Dashboard.__port
 
@@ -172,3 +175,9 @@ class Dashboard():
 
         if os.path.exists(self.__directory):
             shutil.rmtree(self.__directory)
+
+    @staticmethod
+    def get_next_port():
+        with socketserver.TCPServer(("localhost", 0), None) as s:
+            return s.server_address[1]
+        return None

siliconcompiler/report/dashboard/components/__init__.py

@@ -194,7 +194,7 @@ def setup_page():
         menu_items=SC_MENU)
 
 
-def file_viewer(chip, path, header_col_width=0.89):
+def file_viewer(chip, path, page_key=None, header_col_width=0.89):
     if not path:
         streamlit.error('Select a file')
         return
@@ -243,14 +243,25 @@ def file_viewer(chip, path, header_col_width=0.89):
 
             file_section = streamlit.container()
 
+            if page_key:
+                if state.get_key(page_key) is None:
+                    state.set_key(page_key, 1)
+                index = state.get_key(page_key)
+            else:
+                index = 1
+
             page = sac.pagination(
                 align='center',
+                index=index,
                 jump=True,
                 show_total=True,
                 page_size=page_size,
                 total=max_pages,
                 disabled=max_pages < state.get_key(state.MAX_FILE_LINES_TO_SHOW))
 
+            if page_key:
+                state.set_key(page_key, page)
+
             start_idx = (page - 1) * state.get_key(state.MAX_FILE_LINES_TO_SHOW)
             end_idx = start_idx + state.get_key(state.MAX_FILE_LINES_TO_SHOW)
             file_show = file_data[start_idx:end_idx]
@@ -465,6 +476,7 @@ def node_file_tree_viewer(chip, step, index):
 
     if selected and os.path.isfile(selected):
         state.set_key(state.SELECTED_FILE, selected)
+        state.set_key(state.SELECTED_FILE_PAGE, None)
 
 
 def node_viewer(chip, step, index, metric_dataframe, height=None):

siliconcompiler/report/dashboard/layouts/vertical_flowgraph.py

@@ -80,9 +80,10 @@ def layout():
         components.manifest_viewer(chip)
 
     with tabs["File Viewer"]:
-        path = state.get_key(state.SELECTED_FILE)
-
-        components.file_viewer(chip, path)
+        components.file_viewer(
+            chip,
+            state.get_key(state.SELECTED_FILE),
+            page_key=state.SELECTED_FILE_PAGE)
 
     if "Design Preview" in tabs:
         with tabs["Design Preview"]:

siliconcompiler/report/dashboard/layouts/vertical_flowgraph_node_tab.py

@@ -103,7 +103,10 @@ def layout():
         components.manifest_viewer(chip)
 
     if tab_selected == "File Viewer":
-        components.file_viewer(chip, state.get_key(state.SELECTED_FILE))
+        components.file_viewer(
+            chip,
+            state.get_key(state.SELECTED_FILE),
+            page_key=state.SELECTED_FILE_PAGE)
 
     if tab_selected == "Design Preview":
         components.file_viewer(chip, f'{chip.getworkdir()}/{chip.design}.png')

siliconcompiler/report/dashboard/layouts/vertical_flowgraph_sac_tabs.py

@@ -96,7 +96,10 @@ def layout():
         components.manifest_viewer(chip)
 
     if tab_selected == "File Viewer":
-        components.file_viewer(chip, state.get_key(state.SELECTED_FILE))
+        components.file_viewer(
+            chip,
+            state.get_key(state.SELECTED_FILE),
+            page_key=state.SELECTED_FILE_PAGE)
 
     if tab_selected == "Design Preview":
         components.file_viewer(chip, f'{chip.getworkdir()}/{chip.design}.png')

siliconcompiler/report/dashboard/state.py

@@ -16,6 +16,7 @@ SELECTED_FLOWGRAPH_NODE = "selected_flowgraph_node"
 SELECTED_SELECTOR_NODE = "selected_selector_node"
 NODE_SOURCE = "node_source"
 SELECTED_FILE = "selected_file"
+SELECTED_FILE_PAGE = "selected_file_page"
 LOADED_CHIPS = "loaded_chips"
 UI_WIDTH = "ui_width"
 MANIFEST_FILE = "manifest_file"
@@ -73,6 +74,7 @@ def init():
     _add_default(SELECTED_SELECTOR_NODE, None)
     _add_default(NODE_SOURCE, None)
     _add_default(SELECTED_FILE, None)
+    _add_default(SELECTED_FILE_PAGE, None)
     _add_default(LOADED_CHIPS, {})
     _add_default(MANIFEST_FILE, None)
     _add_default(MANIFEST_LOCK, None)
@@ -80,7 +82,7 @@ def init():
     _add_default(IS_RUNNING, False)
     _add_default(GRAPH_JOBS, None)
     _add_default(UI_WIDTH, None)
-    _add_default(APP_LAYOUT, "vertical_flowgraph")
+    _add_default(APP_LAYOUT, "vertical_flowgraph_sac_tabs")
     _add_default(APP_RERUN, None)
     _add_default(APP_RUNNING_REFRESH, 2 * 1000)
     _add_default(APP_STOPPED_REFRESH, 30 * 1000)

siliconcompiler/report/summary_table.py

@@ -12,10 +12,9 @@ def _show_summary_table(chip, flow, flowgraph_nodes, show_all_indices):
     '''
 
     # Display data
-    max_line_width = 135
     column_width = 15
 
-    max_line_width = max(max_line_width, int(0.9*shutil.get_terminal_size((80, 20)).columns))
+    max_line_width = max(2 * column_width, int(0.95*shutil.get_terminal_size().columns))
 
     nodes, _, metrics, metrics_unit, metrics_to_show, _ = \
         _collect_data(chip, flow, flowgraph_nodes)

siliconcompiler/report/utils.py

@@ -143,8 +143,7 @@ def _get_flowgraph_path(chip, flow, nodes_to_execute, only_include_successful=Fa
     end_nodes = _get_flowgraph_exit_nodes(chip, flow, steps=flowgraph_steps)
     for node in end_nodes:
         if only_include_successful:
-            if chip.get('record', 'status', step=node[0], index=node[1]) == \
-               NodeStatus.SUCCESS:
+            if NodeStatus.is_success(chip.get('record', 'status', step=node[0], index=node[1])):
                 selected_nodes.add(node)
                 to_search.append(node)
         else:

siliconcompiler/scheduler/__init__.py

@@ -898,6 +898,7 @@ def _run_executable_or_builtin(chip, step, index, version, toolpath, workdir, ru
 
                 cmd_start_time = time.time()
                 proc = subprocess.Popen(cmdlist,
+                                        stdin=subprocess.DEVNULL,
                                         stdout=stdout_writer,
                                         stderr=stderr_writer,
                                         preexec_fn=preexec_fn)
@@ -1118,6 +1119,7 @@ def _check_tool_version(chip, step, index, run_func=None):
             cmdlist = [exe]
             cmdlist.extend(veropt)
             proc = subprocess.run(cmdlist,
+                                  stdin=subprocess.DEVNULL,
                                   stdout=subprocess.PIPE,
                                   stderr=subprocess.STDOUT,
                                   universal_newlines=True)

siliconcompiler/sphinx_ext/dynamicgen.py

@@ -343,6 +343,8 @@ class DynamicGen(SphinxDirective):
             type_heading = "Variables"
         elif type == "file":
             type_heading = "Files"
+        elif type == "dir":
+            type_heading = "Directories"
 
         table = [[strong('Parameters'), strong('Help')]]
         for key, params in cfg.items():
@@ -657,6 +659,9 @@ class ToolGen(DynamicGen):
         '''Display config under `eda, <modname>` in a single table.'''
         cfg = chip.getdict('tool', toolname, 'task', taskname)
         schema = Schema(cfg=cfg)
+        for vals, step, index in schema._getvals('require'):
+            schema.set('require', sorted(set(vals)),
+                       step=step, index=index)
         schema.prune()
         pruned = schema.cfg
         table = build_schema_value_table(pruned, self.env.docname,
@@ -789,6 +794,7 @@ class ToolGen(DynamicGen):
         key_path = ['tool', '<tool>', 'task', '<task>']
         self._document_free_params(cfg, 'var', key_path + ['var'], reference_prefix, s)
         self._document_free_params(cfg, 'file', key_path + ['file'], reference_prefix, s)
+        self._document_free_params(cfg, 'dir', key_path + ['dir'], reference_prefix, s)
 
     def _handle_setup(self, chip, module):
         setup = self.get_setup_method(module)

siliconcompiler/tools/_common/__init__.py

@@ -2,7 +2,7 @@ import os
 import pkgutil
 
 
-def get_libraries(chip, include_asic=True, library=None, libraries=None):
+def __get_library_keys(chip, include_asic=True, library=None, libraries=None):
     '''
     Returns a list of libraries included in this step/index
 
@@ -24,18 +24,52 @@ def get_libraries(chip, include_asic=True, library=None, libraries=None):
 
     def get_libs(*key):
         if chip.valid(*key) and chip.get(*key, step=step, index=index):
-            return chip.get(*key, step=step, index=index)
+            if chip.get(*key, step=step, index=index):
+                return [key]
         return []
 
     if include_asic:
         libs.extend(get_libs(*pref_key, 'asic', 'logiclib'))
         libs.extend(get_libs(*pref_key, 'asic', 'macrolib'))
 
-    for lib in get_libs(*pref_key, 'option', 'library'):
-        if lib in libs or lib in libraries:
+    libnames = set()
+    if library:
+        libnames.add(library)
+    for lib_key in get_libs(*pref_key, 'option', 'library'):
+        if lib_key in libs:
             continue
-        libs.append(lib)
-        libs.extend(get_libraries(chip, include_asic=include_asic, library=lib, libraries=libs))
+
+        libs.append(lib_key)
+
+        for libname in chip.get(*lib_key, step=step, index=index):
+            if libname in libnames:
+                continue
+
+            libnames.add(libname)
+            libs.extend(__get_library_keys(
+                chip,
+                include_asic=include_asic,
+                library=libname,
+                libraries=libnames))
+
+    return set(libs)
+
+
+def get_libraries(chip, include_asic=True):
+    '''
+    Returns a list of libraries included in this step/index
+
+    Args:
+        chip (Chip): Chip object
+        include_asic (bool): include the asic libraries.
+    '''
+    step = chip.get('arg', 'step')
+    index = chip.get('arg', 'index')
+
+    libs = []
+
+    for key in __get_library_keys(chip, include_asic=include_asic):
+        libs.extend(chip.get(*key, step=step, index=index))
 
     return set(libs)
 
@@ -212,6 +246,10 @@ def add_frontend_requires(chip, supports=None):
     step = chip.get('arg', 'step')
     index = chip.get('arg', 'index')
     tool, task = get_tool_task(chip, step, index)
+
+    for libkey in __get_library_keys(chip):
+        chip.add('tool', tool, 'task', task, 'require', ','.join(libkey), step=step, index=index)
+
     for opt in supports:
         for key in opt_keys[opt]:
             chip.add('tool', tool, 'task', task, 'require', ','.join(key), step=step, index=index)