update to xyce 7.9

gadfort · gadfort · commit d73c3e407aaa · 2025-05-22T21:18:34.000-04:00
diff --git a/siliconcompiler/toolscripts/_tools.json b/siliconcompiler/toolscripts/_tools.json
@@ -101,8 +101,10 @@
     "auto-update": true
   },
   "xyce": {
-    "version": "7.8",
-    "auto-update": false
+    "git-url": "https://github.com/Xyce/Xyce.git",
+    "git-commit": "Release-7.9.0",
+    "version-prefix": "Release-",
+    "auto-update": true
   },
   "xdm": {
     "git-url": "https://github.com/Xyce/XDM.git",
diff --git a/siliconcompiler/toolscripts/rhel8/install-xyce.sh b/siliconcompiler/toolscripts/rhel8/install-xyce.sh
@@ -37,12 +37,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
-rm xyce.tar.gz
-XYCE_DIR=$(realpath 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
 cd trilinos
@@ -52,7 +49,7 @@ cmake \
     -D CMAKE_INSTALL_PREFIX="$PREFIX/trilinos" \
     -D AMD_LIBRARY_DIRS="/usr/lib" \
     -D TPL_AMD_INCLUDE_DIRS="/usr/include/suitesparse" \
-    -C "$XYCE_DIR/cmake/trilinos/trilinos-base.cmake" \
+    -C "../cmake/trilinos/trilinos-base.cmake" \
     ..
 cmake --build . -j$(nproc)
 $SUDO_INSTALL make install
diff --git a/siliconcompiler/toolscripts/rhel9/install-xyce.sh b/siliconcompiler/toolscripts/rhel9/install-xyce.sh
@@ -37,12 +37,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
-rm xyce.tar.gz
-XYCE_DIR=$(realpath 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
 cd trilinos
@@ -52,7 +49,7 @@ cmake \
     -D CMAKE_INSTALL_PREFIX="$PREFIX/trilinos" \
     -D AMD_LIBRARY_DIRS="/usr/lib" \
     -D TPL_AMD_INCLUDE_DIRS="/usr/include/suitesparse" \
-    -C "$XYCE_DIR/cmake/trilinos/trilinos-base.cmake" \
+    -C "../cmake/trilinos/trilinos-base.cmake" \
     ..
 cmake --build . -j$(nproc)
 $SUDO_INSTALL make install
diff --git a/siliconcompiler/toolscripts/ubuntu20/install-xyce.sh b/siliconcompiler/toolscripts/ubuntu20/install-xyce.sh
@@ -39,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
diff --git a/siliconcompiler/toolscripts/ubuntu22/install-xyce.sh b/siliconcompiler/toolscripts/ubuntu22/install-xyce.sh
@@ -39,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
diff --git a/siliconcompiler/toolscripts/ubuntu24/install-xyce.sh b/siliconcompiler/toolscripts/ubuntu24/install-xyce.sh
@@ -39,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
