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

siliconcompiler/utils/__init__.py

@@ -3,6 +3,8 @@ import os
 import re
 import psutil
 import shutil
+import traceback
+from io import StringIO
 from pathlib import Path
 from jinja2 import Environment, FileSystemLoader
 from siliconcompiler.schema.parametervalue import PathNodeValue
@@ -414,3 +416,12 @@ def get_cores(chip, physical=False):
         cores = 1
 
     return cores
+
+
+def print_traceback(logger, exception):
+    logger.error(f'{exception}')
+    trace = StringIO()
+    traceback.print_tb(exception.__traceback__, file=trace)
+    logger.error("Backtrace:")
+    for line in trace.getvalue().splitlines():
+        logger.error(line)

siliconcompiler/utils/flowgraph.py

@@ -6,88 +6,6 @@ from siliconcompiler.tools._common import input_file_node_name, get_tool_task
 from siliconcompiler.flowgraph import RuntimeFlowgraph
 
 
-def _get_pruned_node_inputs(chip, flow, node):
-    # Ignore option from/to, we want reachable nodes of the whole flowgraph
-    flow_schema = chip.schema.get("flowgraph", flow, field="schema")
-    runtime = RuntimeFlowgraph(
-        flow_schema,
-        from_steps=set([step for step, _ in flow_schema.get_entry_nodes()]),
-        prune_nodes=chip.get('option', 'prune'))
-
-    return runtime.get_node_inputs(*node, record=chip.schema.get("record", field="schema"))
-
-
-#######################################
-def _get_flowgraph_execution_order(chip, flow, reverse=False):
-    return chip.schema.get("flowgraph", flow, field="schema").get_execution_order(reverse=reverse)
-
-
-def get_nodes_from(chip, flow, nodes):
-    runtime = RuntimeFlowgraph(
-        chip.schema.get("flowgraph", flow, field="schema"),
-        from_steps=chip.get('option', 'from'),
-        to_steps=chip.get('option', 'to'),
-        prune_nodes=chip.get('option', 'prune'))
-
-    all_nodes = set()
-    for node in nodes:
-        all_nodes.update(runtime.get_nodes_starting_at(*node))
-
-    return all_nodes
-
-
-###########################################################################
-def nodes_to_execute(chip, flow=None):
-    '''
-    Returns an ordered list of flowgraph nodes which will be executed.
-    This takes the from/to options into account if flow is the current flow or None.
-
-    Returns:
-        A list of nodes that will get executed during run() (or a specific flow).
-
-    Example:
-        >>> nodes = nodes_to_execute()
-    '''
-    if flow is None:
-        flow = chip.get('option', 'flow')
-
-    runtime = RuntimeFlowgraph(
-        chip.schema.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'))
-
-    return runtime.get_nodes()
-
-
-###########################################################################
-def _check_flowgraph(chip, flow=None):
-    '''
-    Check if flowgraph is valid.
-
-    * Checks if all edges have valid nodes
-    * Checks that there are no duplicate edges
-    * Checks if from/to is valid
-
-    Returns True if valid, False otherwise.
-    '''
-
-    if not flow:
-        flow = chip.get('option', 'flow')
-
-    error = not chip.schema.get("flowgraph", flow, field="schema").validate(logger=chip.logger)
-    if not error:
-        error = not RuntimeFlowgraph.validate(
-            chip.schema.get("flowgraph", flow, field="schema"),
-            from_steps=chip.get('option', 'from'),
-            to_steps=chip.get('option', 'to'),
-            prune_nodes=chip.get('option', 'prune'),
-            logger=chip.logger)
-
-    return not error
-
-
 ###########################################################################
 def _check_flowgraph_io(chip, nodes=None):
     '''Check if flowgraph is valid in terms of input and output files.
@@ -98,7 +16,6 @@ def _check_flowgraph_io(chip, nodes=None):
 
     runtime_full = RuntimeFlowgraph(
         chip.schema.get("flowgraph", flow, field='schema'),
-        args=(chip.get('arg', 'step'), chip.get('arg', 'index')),
         to_steps=chip.get('option', 'to'),
         prune_nodes=chip.get('option', 'prune'))
     runtime_flow = RuntimeFlowgraph(
@@ -144,7 +61,11 @@ 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:
-                inputs = _gather_outputs(chip, in_step, in_index)
+                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)
+
+                inputs = task_class.get_output_files()
 
             for inp in inputs:
                 node_inp = input_file_node_name(inp, in_step, in_index)
@@ -165,22 +86,6 @@ def _check_flowgraph_io(chip, nodes=None):
     return True
 
 
-###########################################################################
-def _gather_outputs(chip, step, index):
-    '''Return set of filenames that are guaranteed to be in outputs
-    directory after a successful run of step/index.'''
-
-    flow = chip.get('option', 'flow')
-    task_gather = getattr(chip._get_task_module(step, index, flow=flow, error=False),
-                          '_gather_outputs',
-                          None)
-    if task_gather:
-        return set(task_gather(chip, step, index))
-
-    tool, task = get_tool_task(chip, step, index, flow=flow)
-    return set(chip.get('tool', tool, 'task', task, 'output', step=step, index=index))
-
-
 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
@@ -190,7 +95,7 @@ def _get_flowgraph_information(chip, flow, io=True):
     chip.schema = chip.schema.copy()
 
     # Setup nodes
-    node_exec_order = _get_flowgraph_execution_order(chip, flow)
+    node_exec_order = chip.schema.get("flowgraph", flow, field="schema").get_execution_order()
     if io:
         # try:
         for layer_nodes in node_exec_order:

siliconcompiler/utils/issue.py

@@ -8,7 +8,6 @@ import time
 import tempfile
 from datetime import datetime
 from siliconcompiler.utils import get_file_template
-from siliconcompiler.scheduler import _makecmd, _write_task_manifest
 from siliconcompiler.tools._common import get_tool_task
 from siliconcompiler import RecordSchema
 
@@ -24,7 +23,6 @@ def generate_testcase(chip,
                       include_specific_libraries=None,
                       hash_files=False,
                       verbose_collect=True):
-
     # Save original schema since it will be modified
     schema_copy = chip.schema.copy()
 
@@ -153,38 +151,32 @@ def generate_testcase(chip,
     current_work_dir = os.getcwd()
     os.chdir(new_work_dir)
 
+    flow = chip.get('option', 'flow')
+
+    task_class = chip.get("tool", tool, field="schema")
+
+    task_class.set_runtime(chip, 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)
-    from siliconcompiler import SiliconCompilerError
     try:
-        # Rerun setup
-        chip.set('arg', 'step', step)
-        chip.set('arg', 'index', index)
-        func = getattr(chip._get_task_module(step, index, flow=flow), 'pre_process', None)
-        if func:
-            try:
-                # Rerun pre_process
-                func(chip)
-            except Exception:
-                pass
-    except SiliconCompilerError:
+        # Rerun pre_process
+        task_class.pre_process()
+    except Exception:
         pass
     chip.set('option', 'quiet', prev_quiet, step=step, index=index)
 
-    flow = chip.get('option', 'flow')
-    is_python_tool = hasattr(chip._get_task_module(step, index, flow=flow), 'run')
+    is_python_tool = task_class.get_exe() is None
 
     if not is_python_tool:
-        _makecmd(chip,
-                 tool, task, step, index,
-                 script_name=f'{chip.getworkdir(step=step, index=index)}/replay.sh',
-                 include_path=False)
+        task_class.generate_replay_script(
+            f'{chip.getworkdir(step=step, index=index)}/replay.sh',
+            '.',
+            include_path=False)
 
     # Rewrite tool manifest
-    chip.set('arg', 'step', step)
-    chip.set('arg', 'index', index)
-    _write_task_manifest(chip, tool, path=new_work_dir)
+    task_class.write_task_manifest('.')
 
     # Restore normal path behavior
     chip._relative_path = None

siliconcompiler/utils/logging.py

@@ -32,12 +32,12 @@ class SCLoggerFormatter(logging.Formatter):
 class SCInRunLoggerFormatter(logging.Formatter):
     def __init__(self, chip, jobname, step, index):
         super().__init__(
-            SCInRunLoggerFormatter.configureFormat(
+            SCInRunLoggerFormatter.configure_format(
                 "| %(levelname)-8s | {} | {} | {} | %(message)s",
                 chip, step, index))
 
     @staticmethod
-    def configureFormat(fmt, chip, step, index):
+    def configure_format(fmt, chip, step, index):
         max_width = 20
 
         flow = chip.get('option', 'flow')

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: siliconcompiler
-Version: 0.33.0
+Version: 0.33.2
 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
@@ -26,7 +26,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp==3.10.11; python_version <= "3.8"
-Requires-Dist: aiohttp<3.12.0,>=3.10.11; python_version >= "3.9"
+Requires-Dist: aiohttp<3.13.0,>=3.10.11; python_version >= "3.9"
 Requires-Dist: requests==2.32.3
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: pandas>=1.1.5
@@ -47,9 +47,9 @@ 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: pyslang==8.0.0
+Requires-Dist: pyslang==8.1.0
 Requires-Dist: streamlit==1.40.1; python_version <= "3.8"
-Requires-Dist: streamlit==1.45.0; python_version >= "3.9" and python_full_version != "3.9.7"
+Requires-Dist: streamlit==1.45.1; python_version >= "3.9" and 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"
@@ -58,7 +58,8 @@ Requires-Dist: rich==13.9.4; python_version <= "3.8"
 Requires-Dist: rich<15.0.0,>=14.0.0; python_version >= "3.9"
 Provides-Extra: test
 Requires-Dist: pytest==8.3.5; extra == "test"
-Requires-Dist: pytest-xdist==3.6.1; 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-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"