siliconcompiler 0.33.2__py3-none-any.whl → 0.34.1__py3-none-any.whl

siliconcompiler/utils/flowgraph.py

@@ -4,6 +4,7 @@ from siliconcompiler import NodeStatus
 from siliconcompiler.tools._common import input_file_node_name, get_tool_task
 
 from siliconcompiler.flowgraph import RuntimeFlowgraph
+from siliconcompiler.scheduler.schedulernode import SchedulerNode
 
 
 ###########################################################################
@@ -15,16 +16,16 @@ def _check_flowgraph_io(chip, nodes=None):
     flow = chip.get('option', 'flow')
 
     runtime_full = RuntimeFlowgraph(
-        chip.schema.get("flowgraph", flow, field='schema'),
+        chip.get("flowgraph", flow, field='schema'),
         to_steps=chip.get('option', 'to'),
         prune_nodes=chip.get('option', 'prune'))
     runtime_flow = RuntimeFlowgraph(
-        chip.schema.get("flowgraph", flow, field='schema'),
+        chip.get("flowgraph", flow, field='schema'),
         args=(chip.get('arg', 'step'), chip.get('arg', 'index')),
         from_steps=chip.get('option', 'from'),
         to_steps=chip.get('option', 'to'),
         prune_nodes=chip.get('option', 'prune'))
-    record = chip.schema.get("record", field='schema')
+    record = chip.get("record", field='schema')
 
     if not nodes:
         nodes = runtime_flow.get_nodes()
@@ -61,25 +62,25 @@ def _check_flowgraph_io(chip, nodes=None):
                 manifest = f'{design}.pkg.json'
                 inputs = [inp for inp in os.listdir(in_step_out_dir) if inp != manifest]
             else:
-                in_tool, _ = get_tool_task(chip, in_step, in_index, flow=flow)
-                task_class = chip.get("tool", in_tool, field="schema")
-                task_class.set_runtime(chip, step=in_step, index=in_index)
+                in_tool, in_task = get_tool_task(chip, in_step, in_index, flow=flow)
+                task_class = chip.get("tool", in_tool, "task", in_task, field="schema")
 
-                inputs = task_class.get_output_files()
+                with task_class.runtime(chip, step=in_step, index=in_index) as task:
+                    inputs = task.get_output_files()
 
             for inp in inputs:
                 node_inp = input_file_node_name(inp, in_step, in_index)
                 if node_inp in requirements:
                     inp = node_inp
                 if inp in all_inputs:
-                    chip.logger.error(f'Invalid flow: {step}{index} '
+                    chip.logger.error(f'Invalid flow: {step}/{index} '
                                       f'receives {inp} from multiple input tasks')
                     return False
                 all_inputs.add(inp)
 
         for requirement in requirements:
             if requirement not in all_inputs:
-                chip.logger.error(f'Invalid flow: {step}{index} will '
+                chip.logger.error(f'Invalid flow: {step}/{index} will '
                                   f'not receive required input {requirement}.')
                 return False
 
@@ -87,7 +88,6 @@ def _check_flowgraph_io(chip, nodes=None):
 
 
 def _get_flowgraph_information(chip, flow, io=True):
-    from siliconcompiler.scheduler import _setup_node
     from siliconcompiler.tools._common import input_provides, input_file_node_name
 
     # Save schema to avoid making permanent changes
@@ -95,24 +95,24 @@ def _get_flowgraph_information(chip, flow, io=True):
     chip.schema = chip.schema.copy()
 
     # Setup nodes
-    node_exec_order = chip.schema.get("flowgraph", flow, field="schema").get_execution_order()
+    node_exec_order = chip.get("flowgraph", flow, field="schema").get_execution_order()
     if io:
-        # try:
+        prev_flow = chip.get("option", "flow")
+        chip.set("option", "flow", flow)
         for layer_nodes in node_exec_order:
             for step, index in layer_nodes:
-                _setup_node(chip, step, index, flow=flow)
-        # except:  # noqa E722
-        #     io = False
+                SchedulerNode(chip, step, index).setup()
+        chip.set("option", "flow", prev_flow)
 
     node_rank = {}
     for rank, rank_nodes in enumerate(node_exec_order):
         for step, index in rank_nodes:
-            node_rank[f'{step}{index}'] = rank
+            node_rank[f'{step}/{index}'] = rank
 
     graph_inputs = {}
     all_graph_inputs = set()
     if io:
-        for step, index in chip.schema.get("flowgraph", flow, field="schema").get_nodes():
+        for step, index in chip.get("flowgraph", flow, field="schema").get_nodes():
             tool, task = get_tool_task(chip, step, index, flow=flow)
             for keypath in chip.get('tool', tool, 'task', task, 'require', step=step, index=index):
                 key = tuple(keypath.split(','))
@@ -122,7 +122,7 @@ def _get_flowgraph_information(chip, flow, io=True):
         for inputs in graph_inputs.values():
             all_graph_inputs.update(inputs)
 
-    exit_nodes = [f'{step}{index}' for step, index in chip.schema.get(
+    exit_nodes = [f'{step}/{index}' for step, index in chip.get(
         "flowgraph", flow, field="schema").get_exit_nodes()]
 
     nodes = {}
@@ -135,11 +135,11 @@ def _get_flowgraph_information(chip, flow, io=True):
         return label.replace("<", r"\<").replace(">", r"\>")
 
     all_nodes = [(step, index) for step, index in sorted(
-                    chip.schema.get("flowgraph", flow, field="schema").get_nodes())
+                    chip.get("flowgraph", flow, field="schema").get_nodes())
                  if chip.get('record', 'status', step=step, index=index) != NodeStatus.SKIPPED]
 
-    runtime_flow = RuntimeFlowgraph(chip.schema.get("flowgraph", flow, field='schema'))
-    record = chip.schema.get("record", field='schema')
+    runtime_flow = RuntimeFlowgraph(chip.get("flowgraph", flow, field='schema'))
+    record = chip.get("record", field='schema')
 
     for step, index in all_nodes:
         tool, task = get_tool_task(chip, step, index, flow=flow)
@@ -153,7 +153,7 @@ def _get_flowgraph_information(chip, flow, io=True):
             inputs = []
             outputs = []
 
-        node = f'{step}{index}'
+        node = f'{step}/{index}'
         if io and (step, index) in graph_inputs:
             inputs.extend(graph_inputs[(step, index)])
 
@@ -173,11 +173,12 @@ def _get_flowgraph_information(chip, flow, io=True):
 
         rank_diff = {}
         for in_step, in_index in runtime_flow.get_node_inputs(step, index, record=record):
-            rank_diff[f'{in_step}{in_index}'] = node_rank[node] - node_rank[f'{in_step}{in_index}']
+            in_node_name = f'{in_step}/{in_index}'
+            rank_diff[in_node_name] = node_rank[node] - node_rank[in_node_name]
         nodes[node]["rank_diff"] = rank_diff
 
     for step, index in all_nodes:
-        node = f'{step}{index}'
+        node = f'{step}/{index}'
         if io:
             # get inputs
             edge_stats = {}
@@ -189,9 +190,9 @@ def _get_flowgraph_information(chip, flow, io=True):
                         infile = input_file_node_name(infile, in_step, in_index)
                         if infile not in nodes[node]["file_inputs"]:
                             continue
-                    in_node_name = f"{in_step}{in_index}"
+                    in_node_name = f"{in_step}/{in_index}"
                     outlabel = f"{in_node_name}:output-{clean_label(outfile)}"
-                    inlabel = f"{step}{index}:input-{clean_label(infile)}"
+                    inlabel = f"{step}/{index}:input-{clean_label(infile)}"
 
                     if in_node_name not in edge_stats:
                         edge_stats[in_node_name] = {
@@ -229,12 +230,12 @@ def _get_flowgraph_information(chip, flow, io=True):
 
             if (step, index) in graph_inputs:
                 for key in graph_inputs[(step, index)]:
-                    inlabel = f"{step}{index}:input-{clean_label(key)}"
+                    inlabel = f"{step}/{index}:input-{clean_label(key)}"
                     edges.append((key, inlabel, 1))
         else:
             all_inputs = []
             for in_step, in_index in chip.get('flowgraph', flow, step, index, 'input'):
-                all_inputs.append(f'{in_step}{in_index}')
+                all_inputs.append(f'{in_step}/{in_index}')
             for item in all_inputs:
                 edges.append((item, node, 1 if node in exit_nodes else 2))
 

siliconcompiler/utils/issue.py

@@ -41,7 +41,7 @@ def generate_testcase(chip,
             sc_type = chip.get(*key, field='type')
             if 'file' not in sc_type and 'dir' not in sc_type:
                 continue
-            for _, key_step, key_index in chip.schema.get(*key, field=None).getvalues():
+            for _, key_step, key_index in chip.get(*key, field=None).getvalues():
                 chip.hash_files(*key,
                                 check=False,
                                 allow_cache=True,
@@ -145,7 +145,6 @@ def generate_testcase(chip,
     chip.collect(directory=collection_dir, verbose=verbose_collect)
 
     # Set relative path to generate runnable files
-    chip._relative_path = new_work_dir
     chip.cwd = issue_dir.name
 
     current_work_dir = os.getcwd()
@@ -153,33 +152,28 @@ def generate_testcase(chip,
 
     flow = chip.get('option', 'flow')
 
-    task_class = chip.get("tool", tool, field="schema")
+    task_class = chip.get("tool", tool, "task", task, field="schema")
 
-    task_class.set_runtime(chip, step=step, index=index)
+    with task_class.runtime(chip, step=step, index=index, relpath=new_work_dir) as task:
+        # Rewrite replay.sh
+        prev_quiet = chip.get('option', 'quiet', step=step, index=index)
+        chip.set('option', 'quiet', True, step=step, index=index)
+        try:
+            # Rerun pre_process
+            task.pre_process()
+        except Exception:
+            pass
+        chip.set('option', 'quiet', prev_quiet, step=step, index=index)
 
-    # Rewrite replay.sh
-    prev_quiet = chip.get('option', 'quiet', step=step, index=index)
-    chip.set('option', 'quiet', True, step=step, index=index)
-    try:
-        # Rerun pre_process
-        task_class.pre_process()
-    except Exception:
-        pass
-    chip.set('option', 'quiet', prev_quiet, step=step, index=index)
-
-    is_python_tool = task_class.get_exe() is None
-
-    if not is_python_tool:
-        task_class.generate_replay_script(
-            f'{chip.getworkdir(step=step, index=index)}/replay.sh',
-            '.',
-            include_path=False)
-
-    # Rewrite tool manifest
-    task_class.write_task_manifest('.')
+        is_python_tool = task.get_exe() is None
+        if not is_python_tool:
+            task.generate_replay_script(
+                f'{chip.getworkdir(step=step, index=index)}/replay.sh',
+                '.',
+                include_path=False)
 
-    # Restore normal path behavior
-    chip._relative_path = None
+        # Rewrite tool manifest
+        task.write_task_manifest('.')
 
     # Restore current directory
     chip.cwd = original_cwd
@@ -234,7 +228,7 @@ def generate_testcase(chip,
         design = chip.design
         job = chip.get('option', 'jobname')
         file_time = datetime.fromtimestamp(issue_time).strftime('%Y%m%d-%H%M%S')
-        archive_name = f'sc_issue_{design}_{job}_{step}{index}_{file_time}.tar.gz'
+        archive_name = f'sc_issue_{design}_{job}_{step}_{index}_{file_time}.tar.gz'
 
     # Make support files
     issue_path = os.path.join(issue_dir.name, 'issue.json')
@@ -254,7 +248,7 @@ def generate_testcase(chip,
         with open(run_path, 'w') as f:
             replay_dir = os.path.relpath(chip.getworkdir(step=step, index=index),
                                          chip.cwd)
-            issue_title = f'{chip.design} for {step}{index} using {tool}/{task}'
+            issue_title = f'{chip.design} for {step}/{index} using {tool}/{task}'
             f.write(get_file_template('issue/run.sh').render(
                 title=issue_title,
                 exec_dir=replay_dir
@@ -288,7 +282,7 @@ def generate_testcase(chip,
 
     issue_dir.cleanup()
 
-    chip.logger.info(f'Generated testcase for {step}{index} in: '
+    chip.logger.info(f'Generated testcase for {step}/{index} in: '
                      f'{full_archive_path}')
 
     # Restore original schema

siliconcompiler/utils/logging.py

@@ -1,6 +1,5 @@
 import logging
 import sys
-from siliconcompiler.remote import client
 from siliconcompiler import utils
 
 
@@ -38,11 +37,13 @@ class SCInRunLoggerFormatter(logging.Formatter):
 
     @staticmethod
     def configure_format(fmt, chip, step, index):
+        from siliconcompiler.remote import client
+
         max_width = 20
 
         flow = chip.get('option', 'flow')
         if flow:
-            nodes_to_run = list(chip.schema.get("flowgraph", flow, field="schema").get_nodes())
+            nodes_to_run = list(chip.get("flowgraph", flow, field="schema").get_nodes())
         else:
             nodes_to_run = []
 
@@ -107,14 +108,43 @@ class SCColorLoggerFormatter(logging.Formatter):
         return log_fmt.format(record)
 
     @staticmethod
-    def supports_color(handler):
-        if type(handler) is not logging.StreamHandler:
-            return False
-
+    def supports_color(stream):
         supported_platform = sys.platform != 'win32'
         try:
-            is_a_tty = hasattr(handler.stream, 'isatty') and handler.stream.isatty()
+            is_a_tty = hasattr(stream, 'isatty') and stream.isatty()
         except:  # noqa E722
             is_a_tty = False
 
         return supported_platform and is_a_tty
+
+
+def get_console_formatter(chip, in_run, step, index):
+    if not hasattr(chip, "schema"):
+        return SCLoggerFormatter()
+
+    loglevel = chip.schema.get('option', 'loglevel',
+                               step=step, index=index)
+
+    if loglevel == 'quiet':
+        base_format = SCBlankLoggerFormatter()
+    elif in_run:
+        if loglevel == 'debug':
+            base_format = SCDebugInRunLoggerFormatter(
+                chip,
+                chip.get('option', 'jobname'),
+                step, index)
+        else:
+            base_format = SCInRunLoggerFormatter(
+                chip,
+                chip.get('option', 'jobname'),
+                step, index)
+    else:
+        if loglevel == 'debug':
+            base_format = SCDebugLoggerFormatter()
+        else:
+            base_format = SCLoggerFormatter()
+
+    support_color = SCColorLoggerFormatter.supports_color(sys.stdout)
+    if support_color:
+        return SCColorLoggerFormatter(base_format)
+    return base_format

siliconcompiler/utils/showtools.py

@@ -6,8 +6,10 @@ from siliconcompiler.tools.vpr import show as vpr_show
 from siliconcompiler.tools.vpr import screenshot as vpr_screenshot
 from siliconcompiler.tools.yosys import screenshot as yosys_screenshot
 from siliconcompiler.tools.gtkwave import show as gtkwave_show
+from siliconcompiler.tools.surfer import show as surfer_show
 from siliconcompiler.tools.graphviz import show as graphviz_show
 from siliconcompiler.tools.graphviz import screenshot as graphviz_screenshot
+from shutil import which
 
 
 def setup(chip):
@@ -33,7 +35,10 @@ def setup(chip):
     chip.register_showtool('v', yosys_screenshot)
     chip.register_showtool('vg', yosys_screenshot)
 
-    chip.register_showtool('vcd', gtkwave_show)
+    if which('surfer') is not None:
+        chip.register_showtool('vcd', surfer_show)
+    else:
+        chip.register_showtool('vcd', gtkwave_show)
 
     chip.register_showtool('dot', graphviz_show)
     chip.register_showtool('dot', graphviz_screenshot)

{siliconcompiler-0.33.2.dist-info → siliconcompiler-0.34.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: siliconcompiler
-Version: 0.33.2
+Version: 0.34.1
 Summary: A compiler framework that automates translation from source code to silicon.
 Author-email: Andreas Olofsson <andreas.d.olofsson@gmail.com>
 License: Apache License 2.0
@@ -11,7 +11,6 @@ Project-URL: Issues, https://github.com/siliconcompiler/siliconcompiler/issues
 Project-URL: Discussion, https://github.com/siliconcompiler/siliconcompiler/discussions
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -22,21 +21,19 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)
 Classifier: Topic :: Software Development :: Build Tools
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp==3.10.11; python_version <= "3.8"
-Requires-Dist: aiohttp<3.13.0,>=3.10.11; python_version >= "3.9"
-Requires-Dist: requests==2.32.3
+Requires-Dist: aiohttp<3.13.0,>=3.10.11
+Requires-Dist: requests==2.32.4
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: pandas>=1.1.5
 Requires-Dist: Jinja2>=2.11.3
-Requires-Dist: graphviz==0.20.3
+Requires-Dist: graphviz==0.21
 Requires-Dist: distro==1.9.0
 Requires-Dist: packaging<25,>=21.3
 Requires-Dist: psutil>=5.8.0
-Requires-Dist: Pillow==10.4.0; python_version <= "3.8"
-Requires-Dist: Pillow==11.2.1; python_version >= "3.9"
+Requires-Dist: Pillow==11.3.0
 Requires-Dist: GitPython==3.1.44
 Requires-Dist: lambdapdk>=0.1.47
 Requires-Dist: PyGithub==2.6.1
@@ -45,32 +42,26 @@ Requires-Dist: fasteners==0.19
 Requires-Dist: fastjsonschema==2.21.1
 Requires-Dist: docker==7.1.0
 Requires-Dist: importlib_metadata; python_version < "3.10"
-Requires-Dist: orjson==3.10.15; python_version <= "3.8"
-Requires-Dist: orjson==3.10.18; python_version >= "3.9"
+Requires-Dist: orjson==3.10.18
 Requires-Dist: pyslang==8.1.0
-Requires-Dist: streamlit==1.40.1; python_version <= "3.8"
-Requires-Dist: streamlit==1.45.1; python_version >= "3.9" and python_full_version != "3.9.7"
+Requires-Dist: streamlit==1.46.1; python_full_version != "3.9.7"
 Requires-Dist: streamlit_agraph==0.0.45; python_full_version != "3.9.7"
 Requires-Dist: streamlit-antd-components==0.3.2; python_full_version != "3.9.7"
 Requires-Dist: streamlit_javascript==0.1.5; python_full_version != "3.9.7"
 Requires-Dist: streamlit-autorefresh==1.0.1; python_full_version != "3.9.7"
-Requires-Dist: rich==13.9.4; python_version <= "3.8"
-Requires-Dist: rich<15.0.0,>=14.0.0; python_version >= "3.9"
+Requires-Dist: rich<15.0.0,>=14.0.0
 Provides-Extra: test
-Requires-Dist: pytest==8.3.5; extra == "test"
-Requires-Dist: pytest-xdist==3.6.1; python_version <= "3.8" and extra == "test"
-Requires-Dist: pytest-xdist==3.7.0; python_version >= "3.9" and extra == "test"
+Requires-Dist: pytest==8.4.1; extra == "test"
+Requires-Dist: pytest-xdist==3.8.0; extra == "test"
 Requires-Dist: pytest-timeout==2.4.0; extra == "test"
-Requires-Dist: pytest-asyncio==0.24.0; python_version <= "3.8" and extra == "test"
-Requires-Dist: pytest-asyncio==0.26.0; python_version >= "3.9" and extra == "test"
-Requires-Dist: pytest-cov==5.0.0; python_version <= "3.8" and extra == "test"
-Requires-Dist: pytest-cov==6.1.1; python_version >= "3.9" and extra == "test"
+Requires-Dist: pytest-asyncio==1.0.0; extra == "test"
+Requires-Dist: pytest-cov==6.2.1; extra == "test"
 Requires-Dist: responses==0.25.7; extra == "test"
 Requires-Dist: PyVirtualDisplay==3.0; extra == "test"
 Requires-Dist: logiklib==0.1.0; extra == "test"
 Provides-Extra: lint
-Requires-Dist: flake8==7.2.0; extra == "lint"
-Requires-Dist: tclint==0.5.4; extra == "lint"
+Requires-Dist: flake8==7.3.0; extra == "lint"
+Requires-Dist: tclint==0.6.0; extra == "lint"
 Requires-Dist: codespell==2.4.1; extra == "lint"
 Provides-Extra: docs
 Requires-Dist: Sphinx==8.2.3; extra == "docs"
@@ -114,7 +105,7 @@ SiliconCompiler is a modular hardware build system ("make for silicon"). The pro
 # Getting Started
 
 SiliconCompiler is available as wheel packages on PyPI for macOS, Windows and
-Linux platforms. For working Python 3.8-3.13 environment, just use pip.
+Linux platforms. For working Python 3.9-3.13 environment, just use pip.
 
 ```sh
 python3 -m pip install --upgrade siliconcompiler