From 26ac35d5997dea9baed08dc5f65fdeabc2eaf0b2 Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 18 Mar 2024 16:00:44 -0700 Subject: [PATCH 1/4] pull in change from spack --- scripts/spack/packages/axom/package.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index b5cd2a296e..697e070ef2 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -419,21 +419,21 @@ def initconfig_mpi_entries(self): entries.append(cmake_cache_option("ENABLE_MPI", True)) if spec["mpi"].name == "spectrum-mpi": entries.append(cmake_cache_string("BLT_MPI_COMMAND_APPEND", "mpibind")) + + # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 + # TODO: Remove this logic by adding `using_flux` case in + # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded + # path to srun in same file. + if "toss_4" in self._get_sys_type(spec): + srun_wrapper = which_string("srun") + mpi_exec_index = [ + index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry + ] + del entries[mpi_exec_index[0]] + entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper)) else: entries.append(cmake_cache_option("ENABLE_MPI", False)) - # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 - # TODO: Remove this logic by adding `using_flux` case in - # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded - # path to srun in same file. - if "toss_4" in self._get_sys_type(spec): - srun_wrapper = which_string("srun") - mpi_exec_index = [ - index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry - ] - del entries[mpi_exec_index[0]] - entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper)) - return entries def find_path_replacement(self, path1, path2, path_replacements, name, entries): From b13cc80068457c920b42414e9e0d5a8e653d5458 Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 18 Mar 2024 16:55:25 -0700 Subject: [PATCH 2/4] bump radiuss-spack-configs --- scripts/spack/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/radiuss-spack-configs b/scripts/spack/radiuss-spack-configs index c5854178b6..6c5c6362bb 160000 --- a/scripts/spack/radiuss-spack-configs +++ b/scripts/spack/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit c5854178b618b882386dd5f3c82fd34528b85522 +Subproject commit 6c5c6362bb7cdbf16ce826ffd95146ed5ff14cab From fcb02aefd94a70876c15f7ac2e8c762604c9a0c5 Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 18 Mar 2024 18:26:53 -0700 Subject: [PATCH 3/4] add new version constraints to the next release (TBD 0.9.0 --- scripts/spack/packages/axom/package.py | 3 +++ scripts/spack/packages/blt/package.py | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 scripts/spack/packages/blt/package.py diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index 697e070ef2..cd85f139a0 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -105,6 +105,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("blt", type="build") depends_on("blt@0.5.1:", type="build", when="@0.6.1:") + depends_on("blt@0.6.2:", type="build", when="@0.9:") depends_on("mpi", when="+mpi") @@ -122,12 +123,14 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("scr~fortran", when="+scr~fortran") with when("+umpire"): + depends_on("umpire@2024.02.0:", when="@0.9:") depends_on("umpire@2022.03.0:", when="@0.7.0:") depends_on("umpire@6.0.0", when="@0.6.0") depends_on("umpire@5:5.0.1", when="@:0.5.0") depends_on("umpire +openmp", when="+openmp") with when("+raja"): + depends_on("raja@2024.02.0:", when="@0.9:") depends_on("raja@2022.03.0:", when="@0.7.0:") depends_on("raja@0.14.0", when="@0.6.0") depends_on("raja@:0.13.0", when="@:0.5.0") diff --git a/scripts/spack/packages/blt/package.py b/scripts/spack/packages/blt/package.py deleted file mode 100644 index a4872d865e..0000000000 --- a/scripts/spack/packages/blt/package.py +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.pkg.llnl.radiuss.blt import Blt as RadiussBlt - -class Blt(RadiussBlt): - # Note: This just points at a commit in the bugfix/white238/openmp branch. - # It also has a made up version - version("0.6.1.4", commit="c98f320835d71f778fbffcc48f07675142c08635") From 3bce6c5f7244965ef8455aabb2c48102b54b7be7 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 19 Mar 2024 13:22:33 -0700 Subject: [PATCH 4/4] put radiuss spack configs to main --- scripts/spack/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/radiuss-spack-configs b/scripts/spack/radiuss-spack-configs index 6c5c6362bb..d43946bed0 160000 --- a/scripts/spack/radiuss-spack-configs +++ b/scripts/spack/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 6c5c6362bb7cdbf16ce826ffd95146ed5ff14cab +Subproject commit d43946bed028933a8b8770adca3dde78987f6626