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

siliconcompiler/toolscripts/ubuntu24/install-opensta.sh

@@ -1,9 +1,13 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
+if [ ! -z ${PREFIX} ]; then
+    export PATH="$PREFIX/bin:$PATH"
+fi
+
 sudo apt-get install -y git build-essential wget
 sudo apt-get install -y tcl-dev tcl-tclreadline \
     bison flex libfl-dev zlib1g-dev automake autotools-dev
@@ -15,9 +19,17 @@ python3 -m venv .opensta --clear
 . .opensta/bin/activate
 python3 -m pip install cmake==3.31.6
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL="sudo -E PATH=$PATH"
+else
+    SUDO_INSTALL=""
+fi
+
 if [ ! -z ${PREFIX} ]; then
     cmake_args="-DCMAKE_INSTALL_PREFIX=$PREFIX"
     config_prefix="--prefix=$PREFIX"
+    export PATH="$PREFIX/bin:$PATH"
 fi
 
 # eigen
@@ -29,7 +41,7 @@ mkdir build
 cd build
 cmake $cmake_args ..
 make -j$(nproc)
-sudo make install
+$SUDO_INSTALL make install
 
 cd ../../..
 # cudd
@@ -40,7 +52,7 @@ cd cudd
 autoreconf
 ./configure $config_prefix
 make -j$(nproc)
-sudo make install
+$SUDO_INSTALL make install
 
 cd ../..
 #swig
@@ -54,7 +66,7 @@ wget https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-1
 ./autogen.sh
 ./configure $config_prefix
 make -j$(nproc)
-sudo make -j$(nproc) install
+$SUDO_INSTALL make -j$(nproc) install
 
 cd ../..
 # opensta
@@ -67,6 +79,6 @@ mkdir -p build
 cd build
 cmake .. $cmake_args
 make -j$(nproc)
-sudo make install
+$SUDO_INSTALL make install
 
 cd -

siliconcompiler/toolscripts/ubuntu24/install-slang.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
@@ -14,17 +14,24 @@ python3 -m venv .slang --clear
 . .slang/bin/activate
 python3 -m pip install cmake==3.31.6
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL="sudo -E PATH=$PATH"
+else
+    SUDO_INSTALL=""
+fi
+
 git clone $(python3 ${src_path}/_tools.py --tool slang --field git-url) slang
 cd slang
 git checkout $(python3 ${src_path}/_tools.py --tool slang --field git-commit)
 
 cfg_args=""
 if [ ! -z ${PREFIX} ]; then
-    cfg_args="--prefix=$PREFIX"
+    cfg_args="-D CMAKE_INSTALL_PREFIX=$PREFIX"
 fi
 
-cmake -B build
+cmake -B build $cfg_args
 cmake --build build -j$(nproc)
-cmake --install build --strip $cfg_args
+$SUDO_INSTALL make -C build install
 
 cd -

siliconcompiler/toolscripts/ubuntu24/install-slurm.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 sudo apt-get install -y munge libmunge-dev build-essential libmariadb-dev lbzip2 libjson-c-dev
 sudo apt-get install -y libdbus-1-dev
@@ -8,6 +8,13 @@ sudo apt-get install -y libdbus-1-dev
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL=sudo
+else
+    SUDO_INSTALL=""
+fi
+
 sudo apt-get install -y wget
 
 mkdir -p deps
@@ -31,4 +38,4 @@ fi
 
 make -j$(nproc)
 
-sudo make install
+$SUDO_INSTALL make install

siliconcompiler/toolscripts/ubuntu24/install-surelog.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
@@ -28,6 +28,14 @@ git checkout $(python3 ${src_path}/_tools.py --tool surelog --field git-commit)
 git submodule update --init --recursive
 
 make -j$(nproc)
-sudo -E PATH="$PATH" make install
+
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL="sudo -E PATH=$PATH"
+else
+    SUDO_INSTALL=""
+fi
+
+$SUDO_INSTALL make install
 
 cd -

siliconcompiler/toolscripts/ubuntu24/install-sv2v.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
@@ -16,7 +16,14 @@ if [ ! -z ${PREFIX} ]; then
     export PATH="$PREFIX:$PATH"
 fi
 
-curl -sSL https://get.haskellstack.org/ | sh -s - -f $haskell_args
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL="sudo -E PATH=$PATH"
+else
+    SUDO_INSTALL=""
+fi
+
+curl -sSL https://get.haskellstack.org/ | $SUDO_INSTALL sh -s - -f $haskell_args
 
 git clone $(python3 ${src_path}/_tools.py --tool sv2v --field git-url) sv2v
 cd sv2v
@@ -25,8 +32,8 @@ git checkout $(python3 ${src_path}/_tools.py --tool sv2v --field git-commit)
 make -j$(nproc)
 
 if [ ! -z ${PREFIX} ]; then
-    sudo mkdir -p ${PREFIX}/bin/
-    sudo cp bin/* ${PREFIX}/bin/
+    $SUDO_INSTALL mkdir -p ${PREFIX}/bin/
+    $SUDO_INSTALL cp bin/* ${PREFIX}/bin/
 fi
 
 cd -

siliconcompiler/toolscripts/ubuntu24/install-verible.sh

@@ -1,10 +1,17 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL=sudo
+else
+    SUDO_INSTALL=""
+fi
+
 sudo apt-get install -y wget
 
 mkdir -p deps
@@ -19,8 +26,9 @@ tar xzf $filename
 
 if [ -z ${PREFIX} ]; then
     PREFIX=/opt/verible
-    sudo mkdir -p $PREFIX
+    SUDO_INSTALL=sudo
+    $SUDO_INSTALL mkdir -p $PREFIX
     echo "Please add \"export PATH="/opt/verible/bin:\$PATH"\" to your .bashrc"
 fi
 
-sudo mv verible-$version/* $PREFIX
+$SUDO_INSTALL mv verible-$version/* $PREFIX

siliconcompiler/toolscripts/ubuntu24/install-verilator.sh

@@ -1,10 +1,17 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL=sudo
+else
+    SUDO_INSTALL=""
+fi
+
 sudo apt-get install -y git perl python3 make autoconf g++ flex bison ccache
 sudo apt-get install -y libgoogle-perftools-dev numactl perl-doc help2man
 sudo apt-get install -y libfl2
@@ -31,6 +38,6 @@ fi
 
 ./configure $args
 make -j$(nproc)
-sudo make install
+$SUDO_INSTALL make install
 
 cd -

siliconcompiler/toolscripts/ubuntu24/install-vpr.sh

@@ -1,10 +1,17 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL=sudo
+else
+    SUDO_INSTALL=""
+fi
+
 sudo apt-get install -y git wget
 
 mkdir -p deps
@@ -17,8 +24,6 @@ git submodule update --init --recursive
 
 ./install_apt_packages.sh
 
-sudo apt-get install -y libtbb-dev
-
 args=
 if [ ! -z ${PREFIX} ]; then
     args="-DCMAKE_INSTALL_PREFIX=$PREFIX"
@@ -26,4 +31,4 @@ fi
 
 make CMAKE_PARAMS="$args -DWITH_PARMYS=OFF -DWITH_ABC=OFF -DYOSYS_F4PGA_PLUGINS=OFF" -j$(nproc)
 cd build
-sudo make install
+$SUDO_INSTALL make install

siliconcompiler/toolscripts/ubuntu24/install-xdm.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
@@ -15,6 +15,7 @@ cd deps
 if [ -z ${PREFIX} ]; then
     PREFIX=~/.local
 fi
+export PATH="$PREFIX/bin:$PATH"
 
 # Download XDM
 git clone $(python3 ${src_path}/_tools.py --tool xdm --field git-url) xdm
@@ -29,6 +30,13 @@ python3 -m venv venv
 python3 -m pip install --upgrade pip
 python3 -m pip install PyInstaller
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL="sudo -E PATH=$PATH"
+else
+    SUDO_INSTALL=""
+fi
+
 args=
 if [ ! -z ${PREFIX} ]; then
     args="-DCMAKE_INSTALL_PREFIX=$PREFIX"
@@ -37,6 +45,6 @@ fi
 cmake .. $args
 make -j$(nproc)
 
-sudo make install
+$SUDO_INSTALL make install
 
 cd -

siliconcompiler/toolscripts/ubuntu24/install-xyce.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
@@ -24,6 +24,13 @@ python3 -m venv .xyce --clear
 . .xyce/bin/activate
 python3 -m pip install cmake>=3.23.0
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL="sudo -E PATH=$PATH"
+else
+    SUDO_INSTALL=""
+fi
+
 # Download Trilinos.
 ## Version specified in: https://github.com/Xyce/Xyce/blob/master/INSTALL.md#building-trilinos
 trilinos_version=14-4-0
@@ -32,12 +39,9 @@ mkdir -p trilinos
 tar --strip-components=1 -xf trilinos.tar.gz -C trilinos
 
 # Download Xyce.
-xyce_version=$(python3 ${src_path}/_tools.py --tool xyce --field version)
-wget https://xyce.sandia.gov/files/xyce/Xyce-${xyce_version}.tar.gz --no-verbose -O xyce.tar.gz
-mkdir -p xyce
-tar --strip-components=1 -xf xyce.tar.gz -C xyce
-
+git clone $(python3 ${src_path}/_tools.py --tool xyce --field git-url) xyce
 cd xyce
+git checkout $(python3 ${src_path}/_tools.py --tool xyce --field git-commit)
 
 # Build Trilinos
 mkdir trilinos-build
@@ -48,7 +52,8 @@ cmake \
     -D TPL_AMD_INCLUDE_DIRS="/usr/include/suitesparse" \
     -C ../cmake/trilinos/trilinos-base.cmake \
     ../../trilinos
-cmake --build . -j$(nproc) -t install
+cmake --build . -j$(nproc)
+$SUDO_INSTALL make install
 
 cd ..
 
@@ -64,4 +69,4 @@ cmake \
 
 cmake --build . -j$(nproc)
 cmake --build . -j$(nproc) --target xycecinterface
-sudo -E PATH="$PATH" make install
+$SUDO_INSTALL make install

siliconcompiler/toolscripts/ubuntu24/install-yosys-moosic.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL=sudo
+else
+    SUDO_INSTALL=""
+fi
+
 sudo apt-get install -y git
 
 mkdir -p deps
@@ -15,5 +22,5 @@ cd yosys-moosic
 git checkout $(python3 ${src_path}/_tools.py --tool yosys-moosic --field git-commit)
 
 make -j$(nproc)
-sudo PATH="$PATH" make install
+$SUDO_INSTALL make install
 cd -

siliconcompiler/toolscripts/ubuntu24/install-yosys-parmys.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL=sudo
+else
+    SUDO_INSTALL=""
+fi
+
 sudo apt-get install -y git
 
 mkdir -p deps
@@ -56,6 +63,6 @@ YOSYS_PLUGIN=$(yosys-config --datdir)/plugins/
 cd parmys
 
 make -j$(nproc)
-sudo mkdir -p $YOSYS_PLUGIN
-sudo cp parmys-plugin/build/parmys.so $YOSYS_PLUGIN
+$SUDO_INSTALL mkdir -p $YOSYS_PLUGIN
+$SUDO_INSTALL cp parmys-plugin/build/parmys.so $YOSYS_PLUGIN
 cd -

siliconcompiler/toolscripts/ubuntu24/install-yosys-slang.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
@@ -20,5 +20,13 @@ git checkout $(python3 ${src_path}/_tools.py --tool yosys-slang --field git-comm
 git submodule update --init --recursive
 
 make -j$(nproc)
-sudo PATH="$PATH" make install
+
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL="sudo -E PATH=$PATH"
+else
+    SUDO_INSTALL=""
+fi
+
+$SUDO_INSTALL make install
 cd -

siliconcompiler/toolscripts/ubuntu24/install-yosys.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
+USE_SUDO_INSTALL="${USE_SUDO_INSTALL:-yes}"
+if [ "${USE_SUDO_INSTALL:-yes}" = "yes" ]; then
+    SUDO_INSTALL=sudo
+else
+    SUDO_INSTALL=""
+fi
+
 # From: https://github.com/YosysHQ/yosys/blob/f2c689403ace0637b7455bac8f1e8d4bc312e74f/README.md
 sudo apt-get install -y build-essential clang bison flex \
 	libreadline-dev gawk tcl-dev libffi-dev git \
@@ -22,5 +29,5 @@ git checkout $(python3 ${src_path}/_tools.py --tool yosys --field git-commit)
 git submodule update --init --recursive
 
 make -j$(nproc) PREFIX="$PREFIX"
-sudo make install PREFIX="$PREFIX"
+$SUDO_INSTALL make install PREFIX="$PREFIX"
 cd -

siliconcompiler/utils/__init__.py

@@ -1,11 +1,13 @@
 import contextlib
-import hashlib
 import os
 import re
 import psutil
 import shutil
-from pathlib import Path, PurePosixPath
+import traceback
+from io import StringIO
+from pathlib import Path
 from jinja2 import Environment, FileSystemLoader
+from siliconcompiler.schema.parametervalue import PathNodeValue
 
 import sys
 if sys.version_info < (3, 10):
@@ -231,7 +233,9 @@ def sc_open(path, *args, **kwargs):
 def get_file_template(path,
                       root=os.path.join(
                           os.path.dirname(
-                              os.path.dirname(os.path.abspath(__file__))), 'templates')):
+                              os.path.dirname(os.path.abspath(__file__))),
+                          'data',
+                          'templates')):
     if os.path.isabs(path):
         root = os.path.dirname(path)
         path = os.path.basename(path)
@@ -325,31 +329,6 @@ def grep(chip, args, line):
         return line
 
 
-#######################################
-def _resolve_env_vars(chip, filepath, step, index):
-    if not filepath:
-        return None
-
-    env_save = os.environ.copy()
-
-    os.environ.update(get_env_vars(chip, step, index))
-    resolved_path = os.path.expandvars(filepath)
-
-    os.environ.clear()
-    os.environ.update(env_save)
-
-    resolved_path = os.path.expanduser(resolved_path)
-
-    # variables that don't exist in environment get ignored by `expandvars`,
-    # but we can do our own error checking to ensure this doesn't result in
-    # silent bugs
-    envvars = re.findall(r'\$\{?(\w+)\}?', resolved_path)
-    for var in envvars:
-        chip.logger.warning(f'Variable {var} in {filepath} not defined in environment')
-
-    return resolved_path
-
-
 #######################################
 def get_env_vars(chip, step, index):
     '''
@@ -373,69 +352,6 @@ def get_env_vars(chip, step, index):
     return schema_env
 
 
-###########################################################################
-def find_sc_file(chip, filename, missing_ok=False, search_paths=None, step=None, index=None):
-    """
-    Returns the absolute path for the filename provided.
-
-    Searches the for the filename provided and returns the absolute path.
-    If no valid absolute path is found during the search, None is returned.
-
-    Shell variables ('$' followed by strings consisting of numbers,
-    underscores, and digits) are replaced with the variable value.
-
-    Args:
-        filename (str): Relative or absolute filename.
-        missing_ok (bool): If False, error out if no valid absolute path
-            found, rather than returning None.
-        search_paths (list): List of directories to search under instead of
-            the defaults.
-        step (str): Step name
-        index (str): Index
-
-    Returns:
-        Returns absolute path of 'filename' if found, otherwise returns
-        None.
-
-    Examples:
-        >>> chip._find_sc_file('flows/asicflow.py')
-        Returns the absolute path based on the sc installation directory.
-
-    """
-
-    if not filename:
-        return None
-
-    # Replacing environment variables
-    filename = _resolve_env_vars(chip, filename, step, index)
-
-    # If we have an absolute path, pass-through here
-    if os.path.isabs(filename) and os.path.exists(filename):
-        return filename
-
-    # Otherwise, search relative to search_paths
-    if search_paths is None:
-        search_paths = [chip.cwd]
-
-    searchdirs = ', '.join([str(p) for p in search_paths])
-    chip.logger.debug(f"Searching for file {filename} in {searchdirs}")
-
-    result = None
-    for searchdir in search_paths:
-        if not os.path.isabs(searchdir):
-            searchdir = os.path.join(chip.cwd, searchdir)
-
-        abspath = os.path.abspath(os.path.join(searchdir, filename))
-        if os.path.exists(abspath):
-            result = abspath
-            break
-
-    if result is None and not missing_ok:
-        chip.error(f"File {filename} was not found")
-
-    return result
-
-
 def get_plugins(system, name=None):
     '''
     Search for python modules with a specific function
@@ -470,32 +386,14 @@ def truncate_text(text, width):
     return text
 
 
-def get_hashed_filename(path, package=None, hash=hashlib.sha1):
+def get_hashed_filename(path, package=None):
     '''
     Utility to map collected file to an unambiguous name based on its path.
 
     The mapping looks like:
-    path/to/file.ext => file_<hash('path/to/file')>.ext
+    path/to/file.ext => file_<hash('path/to')>.ext
     '''
-    path = PurePosixPath(path)
-    ext = ''.join(path.suffixes)
-
-    # strip off all file suffixes to get just the bare name
-    barepath = path
-    while barepath.suffix:
-        barepath = PurePosixPath(barepath.stem)
-    filename = str(barepath.parts[-1])
-
-    if not package:
-        package = ''
-    else:
-        package = f'{package}:'
-
-    path_to_hash = f'{package}{str(path)}'
-
-    pathhash = hash(path_to_hash.encode('utf-8')).hexdigest()
-
-    return f'{filename}_{pathhash}{ext}'
+    return PathNodeValue.generate_hashed_path(path, package)
 
 
 def get_cores(chip, physical=False):
@@ -518,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)