Merge pull request #1509 from llnl/feature/chapman39/tpl-2025-12-15

TPL Update 2025-12-15

Author: chapman39

.github/workflows/ci-tests.yml

@@ -12,9 +12,9 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
 
 env:
-  CLANG_DOCKER_IMAGE: seracllnl/tpls:clang-19_11-24-25_18h-57m
-  CUDA_DOCKER_IMAGE: seracllnl/tpls:cuda-12_04-16-25_20h-55m
-  GCC_DOCKER_IMAGE: seracllnl/tpls:gcc-14_11-24-25_18h-57m
+  CLANG_DOCKER_IMAGE: seracllnl/tpls:clang-19_01-09-26_03h-59m
+  CUDA_DOCKER_IMAGE: seracllnl/tpls:cuda-12_01-09-26_02h-37m
+  GCC_DOCKER_IMAGE: seracllnl/tpls:gcc-14_01-09-26_03h-42m
 
 jobs:
   # Hacky solution to reference env variables outside of `run` steps https://stackoverflow.com/a/74217028
@@ -40,10 +40,10 @@ jobs:
           host_config: llvm@19.1.1.cmake
           compiler_image: ${{ needs.set_image_vars.outputs.clang_docker_image }}
           cmake_opts: "-DBUILD_SHARED_LIBS=ON -DENABLE_DOCS=OFF"
-        # TODO re-add cuda testing
+        # # Not enough disk space to run CUDA container
         # https://github.com/LLNL/smith/issues/1479
-        # - job_name: gcc@12.3.0, shared, cuda, no tests/install/warnings as errors
-        #   host_config: gcc@12.3.0_cuda.cmake
+        # - job_name: gcc@13.3.0, shared, cuda, no tests/install/warnings as errors
+        #   host_config: gcc@13.3.0_cuda.cmake
         #   compiler_image: ${{ needs.set_image_vars.outputs.cuda_docker_image }}
         #   cmake_opts: "-DBUILD_SHARED_LIBS=ON -DENABLE_DOCS=OFF -DENABLE_WARNINGS_AS_ERRORS=OFF"
         #   build_src_opts: "--skip-install --skip-tests"
@@ -69,7 +69,7 @@ jobs:
     steps:
       - name: Checkout Smith
         uses: actions/checkout@v4
-        with: 
+        with:
           submodules: recursive
       - name: Print Matrix Variables
         run: |

.github/workflows/docker_build_tpls.yml

@@ -11,7 +11,7 @@ jobs:
     name: Docker TPL build
     strategy:
       matrix:
-        dockerfile_suffix: [clang-19, gcc-14] #, cuda-12]
+        dockerfile_suffix: [clang-19, gcc-14, cuda-12]
     env:
       REPO: seracllnl/tpls
       HOSTCONFIG_LOC: /home/smith/export_hostconfig

.gitlab/build_toss4.yml

@@ -43,7 +43,7 @@ toss4-llvm_19_1_3-src:
   variables:
     COMPILER: "llvm@19.1.3"
     HOST_CONFIG: "dane-toss_4_x86_64_ib-${COMPILER}.cmake"
-    EXTRA_CMAKE_OPTIONS: "-DENABLE_BENCHMARKS=ON -DENABLE_DOCS=OFF -DCMAKE_BUILD_TYPE=Debug -DSMITH_USE_DFEM=ON"
+    EXTRA_CMAKE_OPTIONS: "-DENABLE_BENCHMARKS=ON -DENABLE_DOCS=OFF -DCMAKE_BUILD_TYPE=Debug"
     # Only run integration tests on one spec (Disabled until integration tests are reenabled)
     # DO_INTEGRATION_TESTS: "yes"
     # ALLOC_NODES: "2"
@@ -55,7 +55,7 @@ toss4-llvm_19_1_3-src-codevelop:
   variables:
     COMPILER: "llvm@19.1.3"
     HOST_CONFIG: "dane-toss_4_x86_64_ib-${COMPILER}.cmake"
-    EXTRA_CMAKE_OPTIONS: "-DENABLE_BENCHMARKS=ON -DENABLE_DOCS=OFF -DCMAKE_BUILD_TYPE=Debug -DSMITH_ENABLE_CODEVELOP=ON -DSMITH_USE_DFEM=ON"
+    EXTRA_CMAKE_OPTIONS: "-DENABLE_BENCHMARKS=ON -DENABLE_DOCS=OFF -DCMAKE_BUILD_TYPE=Debug -DSMITH_ENABLE_CODEVELOP=ON"
     EXTRA_BUILD_OPTIONS: "--skip-install"
     ALLOC_NODES: "1"
     ALLOC_TIME: "30"

.gitlab/build_toss4_cray.yml

@@ -38,12 +38,11 @@ toss4_cray-llvm_amdgpu_6_4_2-src:
   variables:
     EXTRA_CMAKE_OPTIONS: "-DENABLE_BENCHMARKS=ON -DENABLE_DOCS=OFF -DCMAKE_BUILD_TYPE=Debug"
     ALLOC_NODES: "1"
-    ALLOC_TIME: "60"
+    ALLOC_TIME: "75"
   extends: .src_build_on_toss4_cray
 
 toss4_cray-llvm_amdgpu_6_4_2-src-codevelop:
   variables:
-    # TODO: Add -DSMITH_USE_DFEM=ON when enzyme is enabled in toss4_cray host configs
     EXTRA_CMAKE_OPTIONS: "-DENABLE_BENCHMARKS=ON -DENABLE_DOCS=OFF -DCMAKE_BUILD_TYPE=Debug -DSMITH_ENABLE_CODEVELOP=ON"
     EXTRA_BUILD_OPTIONS: "--skip-install"
     ALLOC_NODES: "1"

.gitmodules

@@ -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

.uberenv_config.json

@@ -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": "88ce9cc7d9f1cad16375ef90825cb1d3098eeb73",
 "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"]
 }

axom

@@ -22,14 +22,7 @@ if (NOT SMITH_BASICS_SETUP)
         "Enable Smith's codevelop build (MFEM and Axom included as CMake subdirectories)"
         OFF)
 
-    # Only enable Smith's code checks by default if it is the top-level project
-    # or a user overrides it
-    if("${CMAKE_PROJECT_NAME}" STREQUAL "smith")
-        set(_enable_smith_code_checks ON)
-    else()
-        set(_enable_smith_code_checks OFF)
-    endif()
-    option(SMITH_ENABLE_CODE_CHECKS "Enable Smith's code checks" ${_enable_smith_code_checks})
+    option(SMITH_ENABLE_CODE_CHECKS "Enable Smith's code checks" ON)
 
     cmake_dependent_option(SMITH_ENABLE_TESTS "Enables Smith Tests" ON "ENABLE_TESTS" OFF)
     cmake_dependent_option(SMITH_ENABLE_CUDA "Enables Smith with CUDA support" ON "ENABLE_CUDA" OFF)

cmake/SmithBasics.cmake

@@ -38,7 +38,6 @@ if(NOT SMITH_FOUND)
   set(SMITH_USE_CALIPER        @SMITH_USE_CALIPER@)
   set(SMITH_USE_CONDUIT        @SMITH_USE_CONDUIT@)
   set(SMITH_USE_CONTINUATION   @SMITH_USE_CONTINUATION@)
-  set(SMITH_USE_DFEM           @SMITH_USE_DFEM@)
   set(SMITH_USE_ENZYME         @SMITH_USE_ENZYME@)
   set(SMITH_USE_GRETL          @SMITH_USE_GRETL@)
   set(SMITH_USE_HDF5           @SMITH_USE_HDF5@)

cmake/smith-config.cmake.in

@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
 
-if(SMITH_USE_DFEM)
+if(SMITH_USE_ENZYME)
     set(EXPLICIT_DYNAMICS_EXAMPLES_SOURCES
         dfem_gpu.cpp
         dfem_force_gpu.cpp