siliconcompiler 0.32.0__py3-none-any.whl → 0.32.2__py3-none-any.whl

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

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+
+# Get directory of script
+src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
+
+mkdir -p deps
+cd deps
+
+git clone $(python3 ${src_path}/_tools.py --tool yosys-parmys --field git-url) yosys-parmys
+cd yosys-parmys
+git checkout $(python3 ${src_path}/_tools.py --tool yosys-parmys --field git-commit)
+git submodule update --init --recursive
+
+# apply patch
+cat > build_patch <<EOF
+diff --git a/parmys/parmys-plugin/Makefile b/parmys/parmys-plugin/Makefile
+index dbb3eb11e..cb85631bc 100644
+--- a/parmys/parmys-plugin/Makefile
++++ b/parmys/parmys-plugin/Makefile
+@@ -49,7 +49,7 @@ VTR_INSTALL_DIR ?= /usr/local
+ 
+ include ../Makefile_plugin.common
+ 
+-CXXFLAGS += -std=c++14 -Wall -W -Wextra \\
++CXXFLAGS += -std=c++17 -Wall -W -Wextra \\
+             -Wno-deprecated-declarations \\
+             -Wno-unused-parameter \\
+             -I. \\
+diff --git a/parmys/parmys-plugin/parmys_update.cc b/parmys/parmys-plugin/parmys_update.cc
+index ef55213c5..4e4d6dd15 100644
+--- a/parmys/parmys-plugin/parmys_update.cc
++++ b/parmys/parmys-plugin/parmys_update.cc
+@@ -506,9 +506,9 @@ void define_logical_function_yosys(nnode_t *node, Module *module)
+         lutptr = &cell->parameters.at(ID::LUT);
+         for (int i = 0; i < (1 << node->num_input_pins); i++) {
+             if (i == 3 || i == 5 || i == 6 || i == 7) //"011 1\n101 1\n110 1\n111 1\n"
+-                lutptr->bits.at(i) = RTLIL::State::S1;
++                lutptr->bits().at(i) = RTLIL::State::S1;
+             else
+-                lutptr->bits.at(i) = RTLIL::State::S0;
++                lutptr->bits().at(i) = RTLIL::State::S0;
+         }
+     } else {
+         cell->parameters[ID::A_WIDTH] = RTLIL::Const(int(node->num_input_pins));
+EOF
+
+git apply build_patch
+
+export VTR_INSTALL_DIR=$(dirname $(which vpr))/..
+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
+cd -

siliconcompiler/toolscripts/ubuntu22/install-bluespec.sh

@@ -5,13 +5,36 @@ set -e
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
-sudo apt-get install -y ghc libghc-regex-compat-dev libghc-syb-dev \
-    libghc-old-time-dev libghc-split-dev tcl-dev build-essential pkg-config \
+sudo apt-get install -y tcl-dev build-essential pkg-config \
     autoconf gperf flex bison
 
 mkdir -p deps
 cd deps
 
+if [ "$(uname -m)" = "x86_64" ]; then
+    sudo apt-get install -y ghc libghc-regex-compat-dev libghc-syb-dev \
+        libghc-old-time-dev libghc-split-dev
+else
+    sudo apt-get install -y build-essential curl libffi-dev libffi8 libgmp-dev \
+        libgmp10 libncurses-dev libncurses5 libtinfo5 pkg-config
+    if [ ! -z ${PREFIX} ]; then
+        export PATH="$PREFIX/bin:$PATH"
+        export GHCUP_INSTALL_BASE_PREFIX=$PREFIX
+    fi
+
+    export BOOTSTRAP_HASKELL_NONINTERACTIVE=yes
+
+    curl -sSL https://get-ghcup.haskell.org | sh -s
+
+    if [ ! -z ${PREFIX} ]; then
+        . ${PREFIX}/.ghcup/env
+    else
+        . ${HOME}/.ghcup/env
+    fi
+
+    cabal v1-install regex-compat syb old-time split
+fi
+
 git clone $(python3 ${src_path}/_tools.py --tool bluespec --field git-url) bluespec
 cd bluespec
 git checkout $(python3 ${src_path}/_tools.py --tool bluespec --field git-commit)

siliconcompiler/toolscripts/ubuntu22/install-ghdl.sh

@@ -5,7 +5,7 @@ set -e
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
-sudo apt-get install -y gnat libgnat-9 libz-dev
+sudo apt-get install -y llvm-dev clang gnat libgnat-9 libz-dev
 
 mkdir -p deps
 cd deps
@@ -19,7 +19,7 @@ if [ ! -z ${PREFIX} ]; then
     args=--prefix="$PREFIX"
 fi
 
-./configure $args
+./configure --with-llvm-config $args
 make -j$(nproc)
 sudo make install
 cd -

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

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+
+# Get directory of script
+src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
+
+mkdir -p deps
+cd deps
+
+git clone $(python3 ${src_path}/_tools.py --tool yosys-parmys --field git-url) yosys-parmys
+cd yosys-parmys
+git checkout $(python3 ${src_path}/_tools.py --tool yosys-parmys --field git-commit)
+git submodule update --init --recursive
+
+# apply patch
+cat > build_patch <<EOF
+diff --git a/parmys/parmys-plugin/Makefile b/parmys/parmys-plugin/Makefile
+index dbb3eb11e..cb85631bc 100644
+--- a/parmys/parmys-plugin/Makefile
++++ b/parmys/parmys-plugin/Makefile
+@@ -49,7 +49,7 @@ VTR_INSTALL_DIR ?= /usr/local
+ 
+ include ../Makefile_plugin.common
+ 
+-CXXFLAGS += -std=c++14 -Wall -W -Wextra \\
++CXXFLAGS += -std=c++17 -Wall -W -Wextra \\
+             -Wno-deprecated-declarations \\
+             -Wno-unused-parameter \\
+             -I. \\
+diff --git a/parmys/parmys-plugin/parmys_update.cc b/parmys/parmys-plugin/parmys_update.cc
+index ef55213c5..4e4d6dd15 100644
+--- a/parmys/parmys-plugin/parmys_update.cc
++++ b/parmys/parmys-plugin/parmys_update.cc
+@@ -506,9 +506,9 @@ void define_logical_function_yosys(nnode_t *node, Module *module)
+         lutptr = &cell->parameters.at(ID::LUT);
+         for (int i = 0; i < (1 << node->num_input_pins); i++) {
+             if (i == 3 || i == 5 || i == 6 || i == 7) //"011 1\n101 1\n110 1\n111 1\n"
+-                lutptr->bits.at(i) = RTLIL::State::S1;
++                lutptr->bits().at(i) = RTLIL::State::S1;
+             else
+-                lutptr->bits.at(i) = RTLIL::State::S0;
++                lutptr->bits().at(i) = RTLIL::State::S0;
+         }
+     } else {
+         cell->parameters[ID::A_WIDTH] = RTLIL::Const(int(node->num_input_pins));
+EOF
+
+git apply build_patch
+
+export VTR_INSTALL_DIR=$(dirname $(which vpr))/..
+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
+cd -

siliconcompiler/toolscripts/ubuntu24/install-ghdl.sh

@@ -5,7 +5,7 @@ set -e
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
-sudo apt-get install -y gnat libgnat-9 libz-dev
+sudo apt-get install -y llvm-dev clang gnat libgnat-9 libz-dev
 
 mkdir -p deps
 cd deps
@@ -19,7 +19,7 @@ if [ ! -z ${PREFIX} ]; then
     args=--prefix="$PREFIX"
 fi
 
-./configure $args
+./configure --with-llvm-config $args
 make -j$(nproc)
 sudo make install
 cd -

siliconcompiler/toolscripts/ubuntu24/install-icarus.sh

@@ -5,7 +5,8 @@ set -e
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
-sudo apt-get install -y build-essential bison flex gperf libreadline-dev libncurses-dev
+sudo apt-get install -y build-essential bison flex gperf libreadline-dev libncurses-dev \
+    autotools-dev automake
 
 mkdir -p deps
 cd deps

siliconcompiler/toolscripts/ubuntu24/install-netgen.sh

@@ -5,7 +5,7 @@ set -e
 # Get directory of script
 src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
 
-sudo apt-get install -y build-essential tcl-dev tk-dev
+sudo apt-get install -y build-essential tcl-dev tk-dev m4
 
 mkdir -p deps
 cd deps

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

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+
+# Get directory of script
+src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
+
+mkdir -p deps
+cd deps
+
+git clone $(python3 ${src_path}/_tools.py --tool yosys-parmys --field git-url) yosys-parmys
+cd yosys-parmys
+git checkout $(python3 ${src_path}/_tools.py --tool yosys-parmys --field git-commit)
+git submodule update --init --recursive
+
+# apply patch
+cat > build_patch <<EOF
+diff --git a/parmys/parmys-plugin/Makefile b/parmys/parmys-plugin/Makefile
+index dbb3eb11e..cb85631bc 100644
+--- a/parmys/parmys-plugin/Makefile
++++ b/parmys/parmys-plugin/Makefile
+@@ -49,7 +49,7 @@ VTR_INSTALL_DIR ?= /usr/local
+ 
+ include ../Makefile_plugin.common
+ 
+-CXXFLAGS += -std=c++14 -Wall -W -Wextra \\
++CXXFLAGS += -std=c++17 -Wall -W -Wextra \\
+             -Wno-deprecated-declarations \\
+             -Wno-unused-parameter \\
+             -I. \\
+diff --git a/parmys/parmys-plugin/parmys_update.cc b/parmys/parmys-plugin/parmys_update.cc
+index ef55213c5..4e4d6dd15 100644
+--- a/parmys/parmys-plugin/parmys_update.cc
++++ b/parmys/parmys-plugin/parmys_update.cc
+@@ -506,9 +506,9 @@ void define_logical_function_yosys(nnode_t *node, Module *module)
+         lutptr = &cell->parameters.at(ID::LUT);
+         for (int i = 0; i < (1 << node->num_input_pins); i++) {
+             if (i == 3 || i == 5 || i == 6 || i == 7) //"011 1\n101 1\n110 1\n111 1\n"
+-                lutptr->bits.at(i) = RTLIL::State::S1;
++                lutptr->bits().at(i) = RTLIL::State::S1;
+             else
+-                lutptr->bits.at(i) = RTLIL::State::S0;
++                lutptr->bits().at(i) = RTLIL::State::S0;
+         }
+     } else {
+         cell->parameters[ID::A_WIDTH] = RTLIL::Const(int(node->num_input_pins));
+EOF
+
+git apply build_patch
+
+export VTR_INSTALL_DIR=$(dirname $(which vpr))/..
+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
+cd -

siliconcompiler/utils/__init__.py

@@ -5,7 +5,6 @@ import re
 import psutil
 import shutil
 from pathlib import Path, PurePosixPath
-from siliconcompiler._metadata import version as sc_version
 from jinja2 import Environment, FileSystemLoader
 
 import sys
@@ -15,11 +14,6 @@ else:
     from importlib.metadata import entry_points
 
 
-PACKAGE_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-_siliconcompiler_data_path = 'git+https://github.com/siliconcompiler/siliconcompiler'
-
-
 def link_symlink_copy(srcfile, dstfile):
     # first try hard linking, then symbolic linking,
     # and finally just copy the file
@@ -223,12 +217,6 @@ def default_email_credentials_file():
     return cfg_file
 
 
-def register_sc_data_source(chip):
-    chip.register_source('siliconcompiler_data',
-                         _siliconcompiler_data_path,
-                         'v'+sc_version)
-
-
 @contextlib.contextmanager
 def sc_open(path, *args, **kwargs):
     kwargs['errors'] = 'ignore_with_warning'
@@ -240,12 +228,18 @@ def sc_open(path, *args, **kwargs):
         pass
 
 
-def get_file_template(path, root=os.path.join(PACKAGE_ROOT, 'templates')):
+def get_file_template(path,
+                      root=os.path.join(
+                          os.path.dirname(
+                              os.path.dirname(os.path.abspath(__file__))), 'templates')):
     if os.path.isabs(path):
         root = os.path.dirname(path)
         path = os.path.basename(path)
 
-    env = Environment(loader=FileSystemLoader(root))
+    import siliconcompiler
+    scroot = os.path.dirname(siliconcompiler.__file__)
+
+    env = Environment(loader=FileSystemLoader([root, scroot]))
     return env.get_template(path)
 
 
@@ -266,7 +260,7 @@ def safecompare(chip, value, op, goal):
     elif op == "!=":
         return bool(value != goal)
     else:
-        chip.error(f"Illegal comparison operation {op}")
+        raise ValueError(f"Illegal comparison operation {op}")
 
 
 ###########################################################################

siliconcompiler/utils/logging.py

@@ -55,7 +55,7 @@ class ColorStreamFormatter(LoggerFormatter):
 
     @staticmethod
     def supports_color(handler):
-        if not isinstance(handler, logging.StreamHandler):
+        if type(handler) is not logging.StreamHandler:
             return False
 
         supported_platform = sys.platform != 'win32'

{siliconcompiler-0.32.0.dist-info → siliconcompiler-0.32.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: siliconcompiler
-Version: 0.32.0
+Version: 0.32.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.11.13; python_version >= "3.9"
+Requires-Dist: aiohttp==3.11.14; python_version >= "3.9"
 Requires-Dist: requests==2.32.3
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: pandas>=1.1.5
@@ -45,10 +45,11 @@ 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
+Requires-Dist: orjson==3.10.15; python_version <= "3.8"
+Requires-Dist: orjson==3.10.16; python_version >= "3.9"
 Requires-Dist: pyslang==8.0.0
 Requires-Dist: streamlit==1.40.1; python_version <= "3.8"
-Requires-Dist: streamlit==1.43.1; python_version >= "3.9" and python_full_version != "3.9.7"
+Requires-Dist: streamlit==1.44.0; 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,14 +59,15 @@ Requires-Dist: pytest==8.3.5; extra == "test"
 Requires-Dist: pytest-xdist==3.6.1; extra == "test"
 Requires-Dist: pytest-timeout==2.3.1; extra == "test"
 Requires-Dist: pytest-asyncio==0.24.0; python_version <= "3.8" and extra == "test"
-Requires-Dist: pytest-asyncio==0.25.3; python_version >= "3.9" 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.0.0; python_version >= "3.9" and extra == "test"
-Requires-Dist: responses==0.25.6; 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.1.2; extra == "lint"
-Requires-Dist: tclint==0.5.3; extra == "lint"
+Requires-Dist: flake8==7.2.0; extra == "lint"
+Requires-Dist: tclint==0.5.4; extra == "lint"
 Requires-Dist: codespell==2.4.1; extra == "lint"
 Provides-Extra: docs
 Requires-Dist: Sphinx==8.2.3; extra == "docs"
@@ -76,6 +78,7 @@ Provides-Extra: profile
 Requires-Dist: gprof2dot==2024.6.6; extra == "profile"
 Provides-Extra: optimizer
 Requires-Dist: google-vizier[jax]==0.1.21; python_version >= "3.10" and extra == "optimizer"
+Dynamic: license-file
 
 ![SiliconCompiler](https://raw.githubusercontent.com/siliconcompiler/siliconcompiler/main/docs/_static/sc_logo_with_text.png)