Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1648378
remove radius-spack-configs
chapman39 Dec 16, 2025
65c1bf8
compiler_mixing: false
chapman39 Dec 16, 2025
7f8cb7d
cleanup packages + update spack/ spack-packages
chapman39 Dec 16, 2025
b797ad7
Merge remote-tracking branch 'origin/develop' into feature/chapman39/…
chapman39 Dec 16, 2025
18cf423
update uberenv to not mix compilers automatically
chapman39 Dec 18, 2025
5431705
update packages
chapman39 Dec 18, 2025
189aa76
fix axom
chapman39 Dec 19, 2025
eaf47c6
revert uberenv
chapman39 Dec 19, 2025
f3f9600
add cuda
chapman39 Dec 19, 2025
5f0fe81
use newer cmake on docker containers
chapman39 Dec 19, 2025
9aaad28
remove cmake version
chapman39 Dec 19, 2025
d7ae7ba
Merge branch 'develop' into feature/chapman39/tpl-2025-12-15
chapman39 Dec 19, 2025
0a33d25
fix undefined reference to `ParMETIS_V32_NodeND' and upgrade cmake in…
chapman39 Dec 19, 2025
8a58a86
switch from +profiling to use +adiak+caliper, also organizes smith va…
chapman39 Dec 19, 2025
68e683a
Merge remote-tracking branch 'origin/develop' into feature/chapman39/…
chapman39 Dec 30, 2025
6061aac
update submodules
chapman39 Dec 30, 2025
cc59fa1
update spack, axom, mfem, tribol again
chapman39 Dec 30, 2025
48bd61d
fix axom array type + add sundials finalize to app manager
chapman39 Dec 30, 2025
77e7fde
temp disable cuda docker tpl for testing
chapman39 Dec 31, 2025
73b4e68
attempt to force hypre to use openblas
chapman39 Dec 31, 2025
1c9daa6
install correct fortran for cuda container
chapman39 Dec 31, 2025
521d643
fix macro name
chapman39 Dec 31, 2025
71ba4ff
Merge branch 'feature/chapman39/tpl-2025-12-15' of github.com:llnl/sm…
chapman39 Dec 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
[submodule "tests"]
path = tests
url = https://github.com/LLNL/serac_tests.git
[submodule "scripts/spack/radiuss-spack-configs"]
path = scripts/spack/radiuss-spack-configs
url = https://github.com/LLNL/radiuss-spack-configs.git
[submodule "tribol"]
path = tribol
url = https://github.com/LLNL/Tribol.git
Expand Down
6 changes: 3 additions & 3 deletions .uberenv_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"package_final_phase" : "initconfig",
"package_source_dir" : "../..",
"spack_url": "https://github.com/spack/spack.git",
"spack_commit": "734c5db2121b01c373eed6538e452f18887e9e44",
"spack_commit": "0154734bd44cb9230fcadecf2e6567c9d22ce5ab",
"spack_packages_url": "https://github.com/spack/spack-packages.git",
"spack_packages_commit": "a75a7f75182ffc7a51c6ca7f0fec4bf9b2705be8",
"spack_packages_commit": "05639b4dac34682e5d8fada712f23cc174dd9bf4",
"spack_configs_path": "scripts/spack/configs",
"spack_packages_path": ["scripts/spack/radiuss-spack-configs/spack_repo/llnl_radiuss/packages", "scripts/spack/spack_repo/smith/packages"]
"spack_packages_path": ["scripts/spack/spack_repo/smith/packages"]
}
2 changes: 1 addition & 1 deletion axom
Submodule axom updated 436 files
2 changes: 1 addition & 1 deletion mfem
Submodule mfem updated 362 files
2 changes: 1 addition & 1 deletion scripts/docker/dockerfile_cuda-12
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV spec="~devtools~enzyme+cuda cuda_arch=70 %gcc_13"

SHELL ["/bin/bash", "-c"]
RUN sudo apt-get update -y
RUN sudo apt-get install gettext gfortran-$(gcc -dumpversion) libopenblas-dev \
RUN sudo apt-get install gettext gfortran-13 libopenblas-dev \
lsb-release lua5.2 lua5.2-dev ssh -fy

RUN sudo useradd -m -s /bin/bash -G sudo smith
Expand Down
10 changes: 9 additions & 1 deletion scripts/docker/dockerfile_gcc-14
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
FROM ghcr.io/llnl/radiuss:gcc-14-ubuntu-24.04
LABEL maintainer="[email protected]"
ARG branch=develop
ENV spec="~devtools~enzyme %gcc_14"
ENV llvm_version="19"
ENV spec="+devtools~enzyme %gcc_14"

SHELL ["/bin/bash", "-c"]
RUN sudo apt-get update -y
RUN sudo apt-get install gettext gfortran-$(gcc -dumpversion) libopenblas-dev \
lsb-release lua5.2 lua5.2-dev ssh -fy

# Install devtool-related packages
# NOTE: Skipping this can significantly save disk space
RUN sudo apt-get install libclang-rt-${llvm_version}-dev clang-tidy-${llvm_version} cppcheck graphviz python3-sphinx texlive-full -fy; \
sudo wget https://github.com/doxygen/doxygen/releases/download/Release_1_9_8/doxygen-1.9.8.linux.bin.tar.gz; \
sudo tar -xf doxygen-1.9.8.linux.bin.tar.gz; \
cd doxygen-1.9.8 && sudo make && sudo make install && doxygen --version;

RUN sudo useradd -m -s /bin/bash -G sudo smith
WORKDIR "/home/smith"
USER smith
Expand Down
8 changes: 1 addition & 7 deletions scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,10 @@ spack:
externals:
- spec: [email protected]+clang+python
prefix: /usr/tce/packages/clang/clang-14.0.5
py-ats:
version: [7.0.105]
externals:
- spec: [email protected]
prefix: /usr/workspace/smithdev/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.11.7
buildable: false
py-sphinx:
version: [7.2.6]
externals:
- spec: [email protected]
- spec: [email protected] ^python
prefix: /usr/workspace/smithdev/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.11.7
buildable: false
python:
Expand Down
2 changes: 1 addition & 1 deletion scripts/spack/configs/darwin/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,5 +220,5 @@ spack:
py-sphinx:
buildable: false
externals:
- spec: [email protected]
- spec: [email protected] ^python
prefix: /Users/chapman39/dev/smith/venv
16 changes: 11 additions & 5 deletions scripts/spack/configs/docker/ubuntu24/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ spack:
tbb: [intel-tbb]
jpeg: [libjpeg-turbo, libjpeg]

# Prevent building other blas/ lapack providers
amdblis:
buildable: false
amdlibflame:
buildable: false

# Compiler packages
gcc:
externals:
Expand Down Expand Up @@ -126,8 +132,8 @@ spack:
cuda:
buildable: false
externals:
- spec: [email protected]
prefix: /usr/local/cuda-12.5
- spec: [email protected]
prefix: /usr/local/cuda-12.5
curl:
buildable: false
externals:
Expand Down Expand Up @@ -206,10 +212,10 @@ spack:

# Globally lock in version of CMake
cmake:
version: [3.23.1]
version: [3.24.2]
buildable: false
externals:
- spec: cmake@3.23.1
- spec: cmake@3.24.2
prefix: /usr/local
doxygen:
version: [1.9.8]
Expand All @@ -221,7 +227,7 @@ spack:
version: [4.3.2]
buildable: false
externals:
- spec: [email protected]
- spec: [email protected] ^python
prefix: /usr
cppcheck:
version: [2.13.0]
Expand Down
14 changes: 4 additions & 10 deletions scripts/spack/configs/toss_4_x86_64_ib/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,11 @@ spack:

# Lock in versions of Devtools
cmake:
version: [3.23.1]
buildable: false
externals:
- spec: [email protected]
prefix: /usr/tce
- spec: [email protected]
modules:
- cmake/3.30.5
cppcheck:
version: [2.9]
buildable: false
Expand All @@ -286,17 +286,11 @@ spack:
externals:
- spec: [email protected]
prefix: /usr/workspace/smithdev/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.8
py-ats:
version: [7.0.105]
buildable: false
externals:
- spec: [email protected]
prefix: /usr/workspace/smithdev/devtools/toss_4_x86_64_ib/latest/python-3.11.7
py-sphinx:
version: [7.2.6]
buildable: false
externals:
- spec: [email protected]
- spec: [email protected] ^python
prefix: /usr/workspace/smithdev/devtools/toss_4_x86_64_ib/latest/python-3.11.7
python:
buildable: false
Expand Down
5 changes: 3 additions & 2 deletions scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,9 @@ spack:
cmake:
buildable: false
externals:
- spec: [email protected]
prefix: /usr/tce
- spec: [email protected]
modules:
- cmake/3.29.2
python:
buildable: false
externals:
Expand Down
8 changes: 4 additions & 4 deletions scripts/spack/configs/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
packages:
axom:
require:
- spec: "@0.12.0.0"
- spec: "@0.12.0.1"
adiak:
require:
- spec: "@0.4.1"
Expand All @@ -17,7 +17,7 @@ packages:
- spec: "@0.9.5"
mfem:
require:
- spec: "@4.9.0.2"
- spec: "@4.9.0.3"
petsc:
require:
- spec: "@3.21.6"
Expand All @@ -26,10 +26,10 @@ packages:
- spec: "@2025.09.0"
sundials:
require:
- spec: "@6.7.0"
- spec: "@7.5.0"
tribol:
require:
- spec: "@0.1.0.23"
- spec: "@0.1.0.24"
umpire:
require:
- spec: "@2025.09.0"
1 change: 0 additions & 1 deletion scripts/spack/radiuss-spack-configs
Submodule radiuss-spack-configs deleted from b39030
Loading
Loading