From 146f78337122386598ac474560d1b08fb3e386ce Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 1 Sep 2026 14:00:27 -0700 Subject: [PATCH 1/5] add wsc-env-2 host-config to try out build farm deployments --- .../dane-toss_4_x86_64_ib-llvm@19.1.3.cmake | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 host-configs/wsc-environments/wsc-env-2/dane-toss_4_x86_64_ib-llvm@19.1.3.cmake diff --git a/host-configs/wsc-environments/wsc-env-2/dane-toss_4_x86_64_ib-llvm@19.1.3.cmake b/host-configs/wsc-environments/wsc-env-2/dane-toss_4_x86_64_ib-llvm@19.1.3.cmake new file mode 100644 index 0000000000..d33f02b43a --- /dev/null +++ b/host-configs/wsc-environments/wsc-env-2/dane-toss_4_x86_64_ib-llvm@19.1.3.cmake @@ -0,0 +1,116 @@ +#------------------------------------------------------------------------------ +# !!!! This is a generated file, edit at own risk !!!! +#------------------------------------------------------------------------------ +# CMake executable path: /usr/tce/packages/cmake/cmake-3.25.2/bin/cmake +#------------------------------------------------------------------------------ + +set(CMAKE_PREFIX_PATH "/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/adiak-7e8b7233f8a148b402128ed46b2f0c643e3b397e_0.4.0-myt47ruu7uee4gk4yfapfi44xxmnvmsy;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/blt-0.7.1-a4tnrqxf5qitxzjeiigat2dxo2emudxf;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/c2c-1.12.0-4noyed4ss5a3vwkigxyb32w5u3gn3in6;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/gmake-4.4.1-hi2n3r6azdx7sprdlfiqvk7dvfvp5leh;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/mfem-8efb9483bc8353cfcda3cc2531427f048f606e01_4.8.0.1-7oqsdkhxbj5vrvysbadfeuxwrrxeudxn;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/conduit-0d8db6d00441d97a095f817bd416c3e04eec153c_0.9.2.1-2f6mwaf3eohly6s3ojvkg4ecmtu2o7a4;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/gslib-1.0.9-osz5qel53t26e2nnixu26ljup5d32q73;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/hypre-9dc9e18aed6a945a95f966e57daacfb1c269f6ec_3.1-qqdsa625rohwy273zipoeyczypge2ia2;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/metis-5.1.0-y4kf4e6454dthot3u6gbn2impvzs2a7t;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/netcdf-c-4.7.3-txkdvnjo5std4p4g6ypcfshpcm5aj6rl;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/raja-1e0756eda3c344da362e483afb9100ebd8137a2c_2025.09.0-n2iy7qoownbmnwefqnxz4u7a4r2ixd6w;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/umpire-6b0ea9edbbbc741c8a429768d946549cd3bd7d33_2025.09.0-okgoweu4fqlve6mwtxqdu7logtiympks;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/hdf5-1.8.16-bucctjd5uesjvd2wrcvpo77wchvlfk3a;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/camp-4070ce93a802849d61037310a87c50cc24c9e498_2025.09.2-rt2s4uffmcqx4o5kw3mh7mfng253mosq;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/fmt-10.2.1-mhy4prnpa4ybvlqwnkdngewqkacrdq7x;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/none-none/gcc-runtime-13.3.1-isq5jzvatvjv2yum5lqwzntcu5jmauqh;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/zlib-1.3.1-fnv23sdolvdmjchplzh7ycsrtlaypsbg;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/none-none/compiler-wrapper-1.0-khhherr3atykg7gg7csummm35dodqwsz;/usr/tce/packages/cmake/cmake-3.25.2;/usr/tce/packages/gcc/gcc-13.3.1-magic;/usr/tce/packages/clang/clang-19.1.3;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-19.1.3-magic" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/axom-d732a8e83fdb25c1fe1a67ae325114c6832b688b_0.11.0.1-pvj3cvpcoeemisbdhaob3c4jqppv3hcd/lib;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/axom-d732a8e83fdb25c1fe1a67ae325114c6832b688b_0.11.0.1-pvj3cvpcoeemisbdhaob3c4jqppv3hcd/lib64;;/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-13.3.1/llvm-19.1.3-gy2lu5xbi4csr2k47emlajzfs5mlsd4g/lib/x86_64-unknown-linux-gnu;/opt/rh/gcc-toolset-13/root/usr/lib/gcc/x86_64-redhat-linux/13;/usr/tce/packages/clang/clang-19.1.3/lib;/collab/usr/global/tools/tce4/packages/gcc/gcc-13.3.1/lib/gcc/x86_64-redhat-linux/13" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/axom-d732a8e83fdb25c1fe1a67ae325114c6832b688b_0.11.0.1-pvj3cvpcoeemisbdhaob3c4jqppv3hcd/lib;/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3/axom-d732a8e83fdb25c1fe1a67ae325114c6832b688b_0.11.0.1-pvj3cvpcoeemisbdhaob3c4jqppv3hcd/lib64;;/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-13.3.1/llvm-19.1.3-gy2lu5xbi4csr2k47emlajzfs5mlsd4g/lib/x86_64-unknown-linux-gnu;/opt/rh/gcc-toolset-13/root/usr/lib/gcc/x86_64-redhat-linux/13;/usr/tce/packages/clang/clang-19.1.3/lib;/collab/usr/global/tools/tce4/packages/gcc/gcc-13.3.1/lib/gcc/x86_64-redhat-linux/13" CACHE STRING "") + +set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") + +#------------------------------------------------------------------------------ +# Compilers +#------------------------------------------------------------------------------ +# Compiler Spec: llvm@19.1.3/agyc2dw4n7auinmieeekiapmocjrpbwz +#------------------------------------------------------------------------------ +if(DEFINED ENV{SPACK_CC}) + + set(CMAKE_C_COMPILER "/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/none-none/compiler-wrapper-1.0-khhherr3atykg7gg7csummm35dodqwsz/libexec/spack/clang/clang" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/none-none/compiler-wrapper-1.0-khhherr3atykg7gg7csummm35dodqwsz/libexec/spack/clang/clang++" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/none-none/compiler-wrapper-1.0-khhherr3atykg7gg7csummm35dodqwsz/libexec/spack/gcc/gfortran" CACHE PATH "") + +else() + + set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-19.1.3-magic/bin/clang" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-19.1.3-magic/bin/clang++" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-13.3.1-magic/bin/gfortran" CACHE PATH "") + +endif() + +set(CMAKE_C_FLAGS "-O3 -march=core-avx2" CACHE STRING "") + +set(CMAKE_CXX_FLAGS "-O3 -march=core-avx2" CACHE STRING "") + +set(CMAKE_EXE_LINKER_FLAGS "-no-pie" CACHE STRING "") + +set(CMAKE_MODULE_LINKER_FLAGS "-no-pie" CACHE STRING "") + +set(CMAKE_SHARED_LINKER_FLAGS "-no-pie" CACHE STRING "") + +set(ENABLE_FORTRAN ON CACHE BOOL "") + +set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/tce/packages/clang/clang-19.1.3-magic/lib" CACHE STRING "Adds a missing libstdc++ rpath") + +#------------------------------------------------------------------------------ +# MPI +#------------------------------------------------------------------------------ + +set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-19.1.3-magic/bin/mpicc" CACHE PATH "") + +set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-19.1.3-magic/bin/mpicxx" CACHE PATH "") + +set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-13.3.1-magic/bin/mpif90" CACHE PATH "") + +set(MPIEXEC_EXECUTABLE "/usr/bin/flux;run" CACHE PATH "") + +set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") + +set(ENABLE_MPI ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# Hardware +#------------------------------------------------------------------------------ + +#------------------------------------------------ +# Hardware Specifics +#------------------------------------------------ + +set(ENABLE_OPENMP OFF CACHE BOOL "") + +set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# TPLs +#------------------------------------------------------------------------------ + +set(TPL_ROOT "/usr/WS2/sduser/wscdevops/spack/views/install_root/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholde/linux-rhel8-x86_64_v3/llvm-19.1.3" CACHE PATH "") + +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0d8db6d00441d97a095f817bd416c3e04eec153c_0.9.2.1-2f6mwaf3eohly6s3ojvkg4ecmtu2o7a4" CACHE PATH "") + +set(MFEM_DIR "${TPL_ROOT}/mfem-8efb9483bc8353cfcda3cc2531427f048f606e01_4.8.0.1-7oqsdkhxbj5vrvysbadfeuxwrrxeudxn" CACHE PATH "") + +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.16-bucctjd5uesjvd2wrcvpo77wchvlfk3a" CACHE PATH "") + +# LUA not built + +set(RAJA_DIR "${TPL_ROOT}/raja-1e0756eda3c344da362e483afb9100ebd8137a2c_2025.09.0-n2iy7qoownbmnwefqnxz4u7a4r2ixd6w" CACHE PATH "") + +set(UMPIRE_DIR "${TPL_ROOT}/umpire-6b0ea9edbbbc741c8a429768d946549cd3bd7d33_2025.09.0-okgoweu4fqlve6mwtxqdu7logtiympks" CACHE PATH "") + +# OPENCASCADE not built + +set(CAMP_DIR "${TPL_ROOT}/camp-4070ce93a802849d61037310a87c50cc24c9e498_2025.09.2-rt2s4uffmcqx4o5kw3mh7mfng253mosq" CACHE PATH "") + +# scr not built + +#------------------------------------------------------------------------------ +# Devtools +#------------------------------------------------------------------------------ + +# ClangFormat disabled due to llvm and devtools not in spec + +set(ENABLE_CLANGFORMAT OFF CACHE BOOL "") + +set(ENABLE_DOCS OFF CACHE BOOL "") + + From 1a9ba35941c09aae1ac1abc4ec006ae9103b00de Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 1 Sep 2026 14:05:19 -0700 Subject: [PATCH 2/5] add new wsc-env-2 job --- .gitlab/build_dane.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab/build_dane.yml b/.gitlab/build_dane.yml index 18f5ba1a9d..9383c52a9a 100644 --- a/.gitlab/build_dane.yml +++ b/.gitlab/build_dane.yml @@ -82,6 +82,14 @@ dane-sanitizers-gcc_13_3_1-src: # extends: .src_build_on_dane +#### +# WSC Environment jobs +dane-wsc_env_2-llvm_19_1_3: + COMPILER: "llvm@19.1.3" + HOST_CONFIG: "host-configs/wsc-environments/wsc-env-2/dane-toss_4_x86_64_ib-${COMPILER}.cmake" + extends: .src_build_on_dane + + #### # Full Build jobs dane-llvm_19_1_3-full: From 4a3b409c0ed6b46f1f33e3adc12ebb9f0fab9148 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 1 Sep 2026 14:06:52 -0700 Subject: [PATCH 3/5] fix yml --- .gitlab/build_dane.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/build_dane.yml b/.gitlab/build_dane.yml index 9383c52a9a..b457226e05 100644 --- a/.gitlab/build_dane.yml +++ b/.gitlab/build_dane.yml @@ -85,6 +85,7 @@ dane-sanitizers-gcc_13_3_1-src: #### # WSC Environment jobs dane-wsc_env_2-llvm_19_1_3: + variables: COMPILER: "llvm@19.1.3" HOST_CONFIG: "host-configs/wsc-environments/wsc-env-2/dane-toss_4_x86_64_ib-${COMPILER}.cmake" extends: .src_build_on_dane From 6644a97c09b5e1e4a5dc2a6a1d325782ec6dd271 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 1 Sep 2026 15:57:57 -0700 Subject: [PATCH 4/5] allow passing a full path to build_src for the host-config --- scripts/llnl_scripts/build_src.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/llnl_scripts/build_src.py b/scripts/llnl_scripts/build_src.py index 4992dc4371..006c688bd8 100755 --- a/scripts/llnl_scripts/build_src.py +++ b/scripts/llnl_scripts/build_src.py @@ -76,6 +76,19 @@ def parse_args(): return opts +def normalized_hostconfig_build_name(hostconfig): + "Normalizes a host-config path into a string safe for build directory names" + hostconfig_build_name = hostconfig.replace(".cmake", "").replace("@", "_") + hostconfig_build_name = hostconfig_build_name.replace("\\", "/") + + # Drop the common host-configs path component before flattening separators. + hostconfig_build_name = hostconfig_build_name.replace("/host-configs/", "/") + if hostconfig_build_name.startswith("host-configs/"): + hostconfig_build_name = hostconfig_build_name[len("host-configs/"):] + + return hostconfig_build_name.replace("/", "_") + + def main(): opts = parse_args() @@ -158,7 +171,8 @@ def main(): print(binfo_str) test_root = get_build_and_test_root(repo_dir, timestamp) - test_root = "{0}_{1}".format(test_root, hostconfig.replace(".cmake", "").replace("@","_")) + test_root = "{0}_{1}".format(test_root, + normalized_hostconfig_build_name(hostconfig)) os.mkdir(test_root) res = build_and_test_host_config(test_root, hostconfig_path, report_to_stdout = opts["verbose"], From 074962247e6bec7bb1aced922eba2ce86de08613 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 2 Sep 2026 14:02:19 -0700 Subject: [PATCH 5/5] support older umpires --- src/cmake/thirdparty/SetupAxomThirdParty.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake index b6a89a110b..318fa8e9f0 100644 --- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake +++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake @@ -52,13 +52,21 @@ endif() if (UMPIRE_DIR) axom_assert_is_directory(DIR_VARIABLE UMPIRE_DIR) find_dependency(umpire REQUIRED PATHS "${UMPIRE_DIR}" NO_SYSTEM_ENVIRONMENT_PATH) - axom_assert_find_succeeded(PROJECT_NAME Umpire - TARGET umpire::umpire - DIR_VARIABLE UMPIRE_DIR) + if(TARGET umpire::umpire) + axom_assert_find_succeeded(PROJECT_NAME Umpire + TARGET umpire::umpire + DIR_VARIABLE UMPIRE_DIR) + blt_convert_to_system_includes(TARGET umpire::umpire) + elseif(TARGET umpire) + # Backwards compatibility + axom_assert_find_succeeded(PROJECT_NAME Umpire + TARGET umpire + DIR_VARIABLE UMPIRE_DIR) + blt_convert_to_system_includes(TARGET umpire) + add_library(umpire::umpire ALIAS umpire) + endif() set(UMPIRE_FOUND TRUE) - blt_convert_to_system_includes(TARGET umpire::umpire) - # Check whether the Umpire defines symbols for shared memory blt_check_code_compiles(CODE_COMPILES UMPIRE_SHARED_MEMORY VERBOSE_OUTPUT OFF