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

siliconcompiler/scheduler/run_node.py

@@ -4,6 +4,8 @@ import argparse
 import os
 import sys
 import tarfile
+import os.path
+
 from siliconcompiler import Chip, Schema
 from siliconcompiler.package import path as sc_path
 from siliconcompiler.scheduler import _runtask, _executenode
@@ -38,7 +40,6 @@ def main():
                                         field='shorthelp'))
     parser.add_argument('-cachedir',
                         metavar='<directory>',
-                        required=True,
                         help=schema.get('option', 'cachedir',
                                         field='shorthelp'))
     parser.add_argument('-cachemap',
@@ -72,12 +73,15 @@ def main():
     parser.add_argument('-unset_scheduler',
                         action='store_true',
                         help='Unset scheduler to ensure local run')
+    parser.add_argument('-replay',
+                        action='store_true',
+                        help='Running as replay')
     args = parser.parse_args()
 
     # Change to working directory to allow rel path to be build dir
     # this avoids needing to deal with the job hash on the client
     # side
-    os.chdir(args.cwd)
+    os.chdir(os.path.abspath(args.cwd))
 
     # Create the Chip object.
     chip = Chip('<design>')
@@ -86,8 +90,10 @@ def main():
     # setup work directory
     chip.set('arg', 'step', args.step)
     chip.set('arg', 'index', args.index)
-    chip.set('option', 'builddir', args.builddir)
-    chip.set('option', 'cachedir', args.cachedir)
+    chip.set('option', 'builddir', os.path.abspath(args.builddir))
+
+    if args.cachedir:
+        chip.set('option', 'cachedir', os.path.abspath(args.cachedir))
 
     if args.remoteid:
         chip.set('record', 'remoteid', args.remoteid)
@@ -118,7 +124,8 @@ def main():
                  chip.get('option', 'flow'),
                  chip.get('arg', 'step'),
                  chip.get('arg', 'index'),
-                 _executenode)
+                 _executenode,
+                 replay=args.replay)
         error = False
 
     finally:

siliconcompiler/schema/baseschema.py

@@ -225,7 +225,13 @@ class BaseSchema:
             raise KeyError(f"[{','.join(keypath)}] is not a valid keypath")
         if field is None:
             return param
-        return param.get(field, step=step, index=index)
+
+        try:
+            return param.get(field, step=step, index=index)
+        except Exception as e:
+            new_msg = f"error while accessing [{','.join(keypath)}]: {e.args[0]}"
+            e.args = (new_msg, *e.args[1:])
+            raise e
 
     def set(self, *args, field='value', clobber=True, step=None, index=None):
         '''
@@ -259,7 +265,12 @@ class BaseSchema:
         except KeyError:
             raise KeyError(f"[{','.join(keypath)}] is not a valid keypath")
 
-        return param.set(value, field=field, clobber=clobber, step=step, index=index)
+        try:
+            return param.set(value, field=field, clobber=clobber, step=step, index=index)
+        except Exception as e:
+            new_msg = f"error while setting [{','.join(keypath)}]: {e.args[0]}"
+            e.args = (new_msg, *e.args[1:])
+            raise e
 
     def add(self, *args, field='value', step=None, index=None):
         '''
@@ -292,7 +303,12 @@ class BaseSchema:
         except KeyError:
             raise KeyError(f"[{','.join(keypath)}] is not a valid keypath")
 
-        return param.add(value, field=field, step=step, index=index)
+        try:
+            return param.add(value, field=field, step=step, index=index)
+        except Exception as e:
+            new_msg = f"error while adding to [{','.join(keypath)}]: {e.args[0]}"
+            e.args = (new_msg, *e.args[1:])
+            raise e
 
     def unset(self, *keypath, step=None, index=None):
         '''
@@ -325,7 +341,12 @@ class BaseSchema:
         except KeyError:
             raise KeyError(f"[{','.join(keypath)}] is not a valid keypath")
 
-        param.unset(step=step, index=index)
+        try:
+            param.unset(step=step, index=index)
+        except Exception as e:
+            new_msg = f"error while unsetting [{','.join(keypath)}]: {e.args[0]}"
+            e.args = (new_msg, *e.args[1:])
+            raise e
 
     def remove(self, *keypath):
         '''

siliconcompiler/schema/journalingschema.py

@@ -45,6 +45,10 @@ class JournalingSchema(BaseSchema):
 
         self.__parent = self
 
+    @classmethod
+    def from_manifest(cls, filepath=None, cfg=None):
+        raise RuntimeError("Journal cannot be generated from manifest")
+
     def get(self, *keypath, field='value', step=None, index=None):
         get_ret = super().get(*keypath, field=field, step=step, index=index)
         self.__record_journal("get", keypath, field=field, step=step, index=index)

siliconcompiler/schema/schema_cfg.py

@@ -3,7 +3,7 @@
 from . import EditableSchema, Parameter, Scope, PerNode
 from .utils import trim
 
-SCHEMA_VERSION = '0.51.3'
+SCHEMA_VERSION = '0.51.4'
 
 
 #############################################################################

siliconcompiler/tool.py

@@ -144,6 +144,14 @@ class ToolSchema(NamedSchema):
 
         return self.__step, self.__index
 
+    def tool(self):
+        '''
+        Returns:
+            task name
+        '''
+
+        return self.__tool
+
     def task(self):
         '''
         Returns:
@@ -417,6 +425,10 @@ class ToolSchema(NamedSchema):
         replay_opts["exports"] = self.get_runtime_environmental_variables(include_path=include_path)
 
         replay_opts["executable"] = self.get('exe')
+        replay_opts["step"] = self.__step
+        replay_opts["index"] = self.__index
+        replay_opts["cfg_file"] = f"inputs/{self.__chip.design}.pkg.json"
+        replay_opts["node_only"] = 0 if replay_opts["executable"] else 1
 
         vswitch = self.get('vswitch')
         if vswitch:
@@ -428,23 +440,25 @@ class ToolSchema(NamedSchema):
         # detect file paths
         file_test = re.compile(r'^[/\.]')
 
-        format_cmd = [replay_opts["executable"]]
+        if replay_opts["executable"]:
+            format_cmd = [replay_opts["executable"]]
 
-        for cmdarg in self.get_runtime_arguments():
-            add_new_line = len(format_cmd) == 1
+            for cmdarg in self.get_runtime_arguments():
+                add_new_line = len(format_cmd) == 1
 
-            if arg_test.match(cmdarg) or file_test.match(cmdarg):
-                add_new_line = True
-            else:
-                if not arg_test.match(format_cmd[-1]):
+                if arg_test.match(cmdarg) or file_test.match(cmdarg):
                     add_new_line = True
+                else:
+                    if not arg_test.match(format_cmd[-1]):
+                        add_new_line = True
 
-            cmdarg = shlex.quote(cmdarg)
-            if add_new_line:
-                format_cmd.append(cmdarg)
-            else:
-                format_cmd[-1] += f' {cmdarg}'
-
+                cmdarg = shlex.quote(cmdarg)
+                if add_new_line:
+                    format_cmd.append(cmdarg)
+                else:
+                    format_cmd[-1] += f' {cmdarg}'
+        else:
+            format_cmd = []
         replay_opts["cmds"] = format_cmd
 
         # create replay file
@@ -864,28 +878,60 @@ class ToolSchemaTmp(ToolSchema):
         _, task = self.__tool_task_modules()
         method = self.__module_func("setup", [task])
         if method:
-            return method(self._ToolSchema__chip)
+            prev_step, prev_index = self._ToolSchema__chip.get('arg', 'step'), \
+                self._ToolSchema__chip.get('arg', 'index')
+            step, index = self.node()
+            self._ToolSchema__chip.set('arg', 'step', step)
+            self._ToolSchema__chip.set('arg', 'index', index)
+            ret = method(self._ToolSchema__chip)
+            self._ToolSchema__chip.set('arg', 'step', prev_step)
+            self._ToolSchema__chip.set('arg', 'index', prev_index)
+            return ret
         return ToolSchema.setup(self)
 
     def select_input_nodes(self):
         _, task = self.__tool_task_modules()
         method = self.__module_func("_select_inputs", [task])
         if method:
-            return method(self._ToolSchema__chip, *self.node())
+            prev_step, prev_index = self._ToolSchema__chip.get('arg', 'step'), \
+                self._ToolSchema__chip.get('arg', 'index')
+            step, index = self.node()
+            self._ToolSchema__chip.set('arg', 'step', step)
+            self._ToolSchema__chip.set('arg', 'index', index)
+            ret = method(self._ToolSchema__chip, *self.node())
+            self._ToolSchema__chip.set('arg', 'step', prev_step)
+            self._ToolSchema__chip.set('arg', 'index', prev_index)
+            return ret
         return ToolSchema.select_input_nodes(self)
 
     def pre_process(self):
         _, task = self.__tool_task_modules()
         method = self.__module_func("pre_process", [task])
         if method:
-            return method(self._ToolSchema__chip)
+            prev_step, prev_index = self._ToolSchema__chip.get('arg', 'step'), \
+                self._ToolSchema__chip.get('arg', 'index')
+            step, index = self.node()
+            self._ToolSchema__chip.set('arg', 'step', step)
+            self._ToolSchema__chip.set('arg', 'index', index)
+            ret = method(self._ToolSchema__chip)
+            self._ToolSchema__chip.set('arg', 'step', prev_step)
+            self._ToolSchema__chip.set('arg', 'index', prev_index)
+            return ret
         return ToolSchema.pre_process(self)
 
     def runtime_options(self):
         tool, task = self.__tool_task_modules()
         method = self.__module_func("runtime_options", [task, tool])
         if method:
-            return method(self._ToolSchema__chip)
+            prev_step, prev_index = self._ToolSchema__chip.get('arg', 'step'), \
+                self._ToolSchema__chip.get('arg', 'index')
+            step, index = self.node()
+            self._ToolSchema__chip.set('arg', 'step', step)
+            self._ToolSchema__chip.set('arg', 'index', index)
+            ret = method(self._ToolSchema__chip)
+            self._ToolSchema__chip.set('arg', 'step', prev_step)
+            self._ToolSchema__chip.set('arg', 'index', prev_index)
+            return ret
         return ToolSchema.runtime_options(self)
 
     def run(self):
@@ -898,7 +944,14 @@ class ToolSchemaTmp(ToolSchema):
             if self._ToolSchema__chip.get('option', 'quiet', step=step, index=index):
                 self._ToolSchema__chip.logger._console.setLevel(logging.CRITICAL)
 
+            prev_step, prev_index = self._ToolSchema__chip.get('arg', 'step'), \
+                self._ToolSchema__chip.get('arg', 'index')
+            step, index = self.node()
+            self._ToolSchema__chip.set('arg', 'step', step)
+            self._ToolSchema__chip.set('arg', 'index', index)
             retcode = method(self._ToolSchema__chip)
+            self._ToolSchema__chip.set('arg', 'step', prev_step)
+            self._ToolSchema__chip.set('arg', 'index', prev_index)
 
             self._ToolSchema__chip.logger._console.setLevel(stdout_handler_level)
 
@@ -909,7 +962,15 @@ class ToolSchemaTmp(ToolSchema):
         _, task = self.__tool_task_modules()
         method = self.__module_func("post_process", [task])
         if method:
-            return method(self._ToolSchema__chip)
+            prev_step, prev_index = self._ToolSchema__chip.get('arg', 'step'), \
+                self._ToolSchema__chip.get('arg', 'index')
+            step, index = self.node()
+            self._ToolSchema__chip.set('arg', 'step', step)
+            self._ToolSchema__chip.set('arg', 'index', index)
+            ret = method(self._ToolSchema__chip)
+            self._ToolSchema__chip.set('arg', 'step', prev_step)
+            self._ToolSchema__chip.set('arg', 'index', prev_index)
+            return ret
         return ToolSchema.post_process(self)
 
 

siliconcompiler/tools/_common/__init__.py

@@ -377,17 +377,20 @@ def input_file_node_name(filename, step, index):
 
     file_type = get_file_ext(filename)
 
-    base = filename
-    total_ext = []
-    ext = None
-    while ext != file_type:
-        base, ext = os.path.splitext(base)
-        ext = ext[1:].lower()
-        total_ext.append(ext)
-
-    total_ext.reverse()
-
-    return f'{base}.{step}{index}.{".".join(total_ext)}'
+    if file_type:
+        base = filename
+        ext = None
+        total_ext = []
+        while ext != file_type:
+            base, ext = os.path.splitext(base)
+            ext = ext[1:].lower()
+            total_ext.append(ext)
+
+        total_ext.reverse()
+
+        return f'{base}.{step}{index}.{".".join(total_ext)}'
+    else:
+        return f'{filename}.{step}{index}'
 
 
 def add_common_file(chip, key, file):

siliconcompiler/tools/slang/__init__.py

@@ -11,6 +11,7 @@ Sources: https://github.com/MikePopoloski/slang
 Installation: https://sv-lang.com/building.html
 '''
 import os
+import shlex
 
 try:
     import pyslang
@@ -121,7 +122,6 @@ def common_runtime_options(chip):
     ###############################
     # Set up user-provided parameters to ensure we elaborate the correct modules
     for param, value in opts['param']:
-        value = value.replace('"', '\\"')
         options.extend(['-G', f'{param}={value}'])
 
     return options
@@ -135,7 +135,8 @@ def _get_driver(chip, options_func, ignored_diagnotics=None):
 
     parse_options = pyslang.CommandLineOptions()
     parse_options.ignoreProgramName = True
-    opts = " ".join(options)
+    opts = shlex.join(options)
+    chip.logger.info(f"runtime arguments: {opts}")
     code = 0
     if not driver.parseCommandLine(opts, parse_options):
         code = 1

siliconcompiler/tools/yosys/sc_synth_asic.tcl

@@ -120,10 +120,6 @@ if { [lindex [sc_cfg_tool_task_get var use_slang] 0] == "true" && [sc_load_plugi
     set slang_params []
     if { [sc_cfg_exists option param] } {
         dict for {key value} [sc_cfg_get option param] {
-            if { ![string is integer $value] } {
-                set value [concat \"$value\"]
-            }
-
             lappend slang_params -G "${key}=${value}"
         }
     }

siliconcompiler/toolscripts/_tools.json

@@ -1,7 +1,7 @@
 {
   "openroad": {
     "git-url": "https://github.com/The-OpenROAD-Project/OpenROAD.git",
-    "git-commit": "b0107893ea0693f3cf09bbf95450a38c1b26b950",
+    "git-commit": "cd121c095a6f77a501166e0961b2e93763c51b17",
     "docker-cmds": [
       "# Remove OR-Tools files",
       "RUN rm -f $SC_PREFIX/Makefile $SC_PREFIX/README.md",
@@ -17,7 +17,7 @@
   },
   "opensta": {
     "git-url": "https://github.com/parallaxsw/OpenSTA.git",
-    "git-commit": "71bdfb99049f33a010bb23527c5c921c925378a0",
+    "git-commit": "0b59461bddb4ebc2228a20f17c9089be1f8c19da",
     "auto-update": true
   },
   "netgen": {
@@ -41,12 +41,17 @@
     "auto-update": false
   },
   "klayout": {
-    "version": "0.30.1",
+    "version": "0.30.2",
     "git-url": "https://github.com/KLayout/klayout.git",
-    "docker-skip": true,
     "auto-update": true,
     "run-version": "source version.sh && echo $KLAYOUT_VERSION",
-    "release-notes": "https://www.klayout.de/development.html"
+    "release-notes": "https://www.klayout.de/development.html",
+    "docker-cmds": [
+      "RUN echo \"#!/bin/bash\" > $SC_PREFIX/install-klayout.sh",
+      "RUN echo \"sudo apt-get install -y $SC_PREFIX/klayout.deb\" >> $SC_PREFIX/install-klayout.sh",
+      "RUN echo \"sudo rm $SC_PREFIX/klayout.deb\" >> $SC_PREFIX/install-klayout.sh",
+      "RUN chmod +x $SC_PREFIX/install-klayout.sh"
+    ]
   },
   "sv2v": {
     "git-url": "https://github.com/zachjs/sv2v.git",
@@ -135,7 +140,7 @@
     "auto-update": false
   },
   "slang": {
-    "git-commit": "v8.0",
+    "git-commit": "v8.1",
     "git-url": "https://github.com/MikePopoloski/slang.git",
     "auto-update": true
   },
@@ -146,7 +151,7 @@
   },
   "yosys-slang": {
     "git-url": "https://github.com/povik/yosys-slang.git",
-    "git-commit": "34753c07b7bd285b784b3a2c756cfac56e1a26ab",
+    "git-commit": "7da40107a513f0094d209ab3b0899f64e8dbeb0e",
     "docker-depends": "yosys",
     "auto-update": true
   },

siliconcompiler/toolscripts/ubuntu22/install-klayout.sh

@@ -35,4 +35,8 @@ wget -O klayout.deb $url
 # Install package
 sudo apt-get install -y ./klayout.deb
 
+if [ ! -z ${SC_PREFIX+x} ]; then
+    sudo cp ./klayout.deb "${SC_PREFIX}/"
+fi
+
 cd -

siliconcompiler/toolscripts/ubuntu24/install-klayout.sh

@@ -37,4 +37,8 @@ wget -O klayout.deb $url
 # Install package
 sudo apt-get install -y ./klayout.deb
 
+if [ ! -z ${SC_PREFIX+x} ]; then
+    sudo cp ./klayout.deb "${SC_PREFIX}/"
+fi
+
 cd -

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: siliconcompiler
-Version: 0.33.1
+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,7 +47,7 @@ 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.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"
@@ -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"