zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Radiuss-Spack-Configs update 2025-03-0 (#49637)

Browse Source 
* Clearly split old and new hip settings requirements

* Fix style

* TO REVERT: Trigger CI

* Apply generic rocm handling to every project

* TO REVERT: Trigger CI

* Revert "TO REVERT: Trigger CI"

This reverts commit dcedb2ead5.

* Revert "TO REVERT: Trigger CI"

This reverts commit 02f76a8ca6.

* Update RADIUSS packages with latest release and sync with RSC implementation

* Update CARE package

* make default logic for hip support more robust

* TO REVERT: Trigger CI

* Fix style

* Fix style (bis)

* Shorten message

* GPU_TARGET is only necessary under certain project specific conditions, it should not be necessary in general

* Update logic to find amdclang++

* Fix syntax

* Let's postpone update of hip handling in camp

* Revert "TO REVERT: Trigger CI"

This reverts commit 620fbc1b01.

* Remove unecessary logic from CARE

* Update CARE: add 0.15.1
This commit is contained in:
Adrien Bernede 2025-04-08 18:29:16 +02:00 committed by GitHub
parent 129338c4c9
commit dd8d2a2515
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 104 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/caliper/package.py
View File

@ -3,6 +3,7 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
import os
import socket
import sys
from spack.package import *
@ -149,6 +150,19 @@ def _get_sys_type(self, spec):
sys_type = env["SYS_TYPE"]
return sys_type
@property
def cache_name(self):
hostname = socket.gethostname()
if "SYS_TYPE" in env:
hostname = hostname.rstrip("1234567890")
return "{0}-{1}-{2}@{3}-{4}.cmake".format(
hostname,
self._get_sys_type(self.spec),
self.spec.compiler.name,
self.spec.compiler.version,
self.spec.dag_hash(8),
)
def initconfig_compiler_entries(self):
spec = self.spec
entries = super().initconfig_compiler_entries()

8
var/spack/repos/builtin/packages/camp/package.py
View File

@ -15,11 +15,17 @@ class Camp(CMakePackage, CudaPackage, ROCmPackage):
git = "https://github.com/LLNL/camp.git"
url = "https://github.com/LLNL/camp/archive/v0.1.0.tar.gz"
maintainers("trws", "adrienbernede")
maintainers("adrienbernede", "kab163", "trws")
license("BSD-3-Clause")
version("main", branch="main", submodules=False)
version(
"2025.03.0",
tag="v2025.03.0",
commit="ee0a3069a7ae72da8bcea63c06260fad34901d43",
submodules=False,
)
version(
"2024.07.0",
tag="v2024.07.0",

39
var/spack/repos/builtin/packages/care/package.py
View File

@ -24,6 +24,30 @@ class Care(CachedCMakePackage, CudaPackage, ROCmPackage):
version("develop", branch="develop", submodules=False)
version("master", branch="master", submodules=False)
version(
"0.15.1",
tag="v0.15.1",
commit="f198c8b3d5dcfd274107b4263331818e86b50c7a",
submodules=False,
)
version(
"0.15.0",
tag="v0.15.0",
commit="aff9eea69b6d95342371aacc44b73bef785255f3",
submodules=False,
)
version(
"0.14.1",
tag="v0.14.1",
commit="110c6e5766ead59b231e2b05deecd7567874e907",
submodules=False,
)
version(
"0.14.0",
tag="v0.14.0",
commit="2784188a067abac35747d58b5a5daa1b3852756b",
submodules=False,
)
version(
"0.13.3",
tag="v0.13.3",
@ -67,6 +91,7 @@ class Care(CachedCMakePackage, CudaPackage, ROCmPackage):
variant(
"implicit_conversions",
default=False,
when="@:0.14",
description="Enable implicit" "conversions to/from raw pointers",
)
variant("tests", default=False, description="Build tests")
@ -111,7 +136,6 @@ class Care(CachedCMakePackage, CudaPackage, ROCmPackage):
depends_on("raja@2024.02.0:", when="@0.12.0:")
depends_on("raja@2022.10.5:", when="@0.10.0:")
# TODO: Add an enable_pick variant
depends_on("chai+enable_pick+raja")
depends_on("chai@2024.07.0:", when="@0.13.2:")
depends_on("chai@2024.02.2:", when="@0.13.1:")
@ -209,12 +233,6 @@ def initconfig_hardware_entries(self):
if spec.satisfies("+rocm"):
entries.append(cmake_cache_option("ENABLE_HIP", True))
archs = self.spec.variants["amdgpu_target"].value
if archs != "none":
arch_str = ",".join(archs)
entries.append(
cmake_cache_string("HIP_HIPCC_FLAGS", "--amdgpu-target={0}".format(arch_str))
)
else:
entries.append(cmake_cache_option("ENABLE_HIP", False))
@ -250,6 +268,13 @@ def initconfig_package_entries(self):
entries.append(cmake_cache_string("CMAKE_BUILD_TYPE", spec.variants["build_type"].value))
# C++14
if spec.satisfies("@:0.14.1"):
entries.append(cmake_cache_string("BLT_CXX_STD", "c++14"))
# C++17
else:
entries.append(cmake_cache_string("BLT_CXX_STD", "c++17"))
entries.append(cmake_cache_option("ENABLE_TESTS", spec.satisfies("+tests")))
entries.append(cmake_cache_option("CARE_ENABLE_TESTS", spec.satisfies("+tests")))
# For tests to work, we also need BLT_ENABLE_TESTS to be on.

10
var/spack/repos/builtin/packages/chai/package.py
View File

@ -18,11 +18,17 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
git = "https://github.com/LLNL/CHAI.git"
tags = ["ecp", "e4s", "radiuss"]
maintainers("davidbeckingsale", "adayton1", "adrienbernede")
maintainers("adayton1", "adrienbernede", "davidbeckingsale", "kab163")
license("BSD-3-Clause")
version("develop", branch="develop", submodules=False)
version(
"2025.03.0",
tag="v2025.03.0",
commit="79f6414a00a89070054ac97baed47d21d10c83a4",
submodules=False,
)
version(
"2024.07.0",
tag="v2024.07.0",
@ -101,7 +107,7 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
# We propagate the patch here.
patch("change_mpi_target_name_umpire_patch.patch", when="@2022.10.0:2023.06.0")
variant("enable_pick", default=False, description="Enable pick method")
variant("enable_pick", default=False, when="@:2024", description="Enable pick method")
variant(
"separable_compilation",
default=True,

12
var/spack/repos/builtin/packages/raja-perf/package.py
View File

@ -97,6 +97,11 @@ class RajaPerf(CachedCMakePackage, CudaPackage, ROCmPackage):
description="Tests to run",
)
variant("caliper", default=False, description="Build with support for Caliper based profiling")
variant(
"lowopttest",
default=False,
description="For developers, lowers optimization level to pass tests with some compilers",
)
depends_on("cxx", type="build") # generated
@ -176,6 +181,9 @@ def initconfig_compiler_entries(self):
# Default entries are already defined in CachedCMakePackage, inherit them:
entries = super().initconfig_compiler_entries()
if spec.satisfies("+lowopttest"):
entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_RELEASE", "-O1"))
if spec.satisfies("+rocm ^blt@:0.6"):
entries.insert(0, cmake_cache_path("CMAKE_CXX_COMPILER", spec["hip"].hipcc))
@ -249,7 +257,7 @@ def initconfig_hardware_entries(self):
else:
entries.append(cmake_cache_option("ENABLE_HIP", False))
entries.append(cmake_cache_option("ENABLE_OPENMP_TARGET", "+omptarget" in spec))
entries.append(cmake_cache_option("RAJA_ENABLE_TARGET_OPENMP", "+omptarget" in spec))
if "+omptarget" in spec:
if "%xl" in spec:
entries.append(
@ -320,7 +328,7 @@ def initconfig_package_entries(self):
entries.append(cmake_cache_option("BUILD_SHARED_LIBS", "+shared" in spec))
entries.append(cmake_cache_option("ENABLE_OPENMP", "+openmp" in spec))
entries.append(cmake_cache_option("RAJA_ENABLE_OPENMP_TASK", "+omptask" in spec))
entries.append(cmake_cache_option("ENABLE_SYCL", spec.satisfies("+sycl")))
entries.append(cmake_cache_option("RAJA_ENABLE_SYCL", spec.satisfies("+sycl")))
# C++17
if spec.satisfies("@2024.07.0:") and spec.satisfies("+sycl"):

17
var/spack/repos/builtin/packages/raja/package.py
View File

@ -25,12 +25,18 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
git = "https://github.com/LLNL/RAJA.git"
tags = ["radiuss", "e4s"]
maintainers("davidbeckingsale", "adrienbernede")
maintainers("adrienbernede", "davidbeckingsale", "kab163")
license("BSD-3-Clause")
version("develop", branch="develop", submodules=submodules)
version("main", branch="main", submodules=submodules)
version(
"2025.03.0",
tag="v2025.03.0",
commit="1d70abf171474d331f1409908bdf1b1c3fe19222",
submodules=submodules,
)
version(
"2024.07.0",
tag="v2024.07.0",
@ -206,6 +212,12 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
description="Run all the tests, including those known to fail.",
)
variant(
"lowopttest",
default=False,
description="For developers, lowers optimization level to pass tests with some compilers",
)
depends_on("cxx", type="build") # generated
depends_on("blt", type="build")
@ -365,6 +377,9 @@ def initconfig_package_entries(self):
entries.append(cmake_cache_option("RAJA_ENABLE_SYCL", spec.satisfies("+sycl")))
if spec.satisfies("+lowopttest"):
entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_RELEASE", "-O1"))
# C++17
if spec.satisfies("@2024.07.0:") and spec.satisfies("+sycl"):
entries.append(cmake_cache_string("BLT_CXX_STD", "c++17"))

20
var/spack/repos/builtin/packages/umpire/package.py
View File

@ -18,11 +18,17 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
git = "https://github.com/LLNL/Umpire.git"
tags = ["radiuss", "e4s"]
maintainers("davidbeckingsale", "adrienbernede")
maintainers("adrienbernede", "davidbeckingsale", "kab163")
license("MIT")
version("develop", branch="develop", submodules=False)
version(
"2025.03.0",
tag="v2025.03.0",
commit="1ed0669c57f041baa1f1070693991c3a7a43e7ee",
submodules=False,
)
version(
"2024.07.0",
tag="v2024.07.0",
@ -189,6 +195,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
variant("c", default=True, description="Build C API")
variant("mpi", default=False, description="Enable MPI support")
variant("ipc_shmem", default=False, description="Enable POSIX shared memory")
variant("mpi3_shmem", default=False, description="Enable MPI3 shared memory")
variant(
"sqlite_experimental",
default=False,
@ -229,6 +236,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
depends_on("cmake@3.8:", type="build")
depends_on("blt", type="build")
depends_on("blt@0.7.0:", type="build", when="@2025.03.0:")
depends_on("blt@0.6.2:", type="build", when="@2024.02.1:")
depends_on("blt@0.6.1", type="build", when="@2024.02.0")
depends_on("blt@0.5.3", type="build", when="@2023.06.0")
@ -256,9 +264,9 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
depends_on("sqlite", when="+sqlite_experimental")
depends_on("mpi", when="+mpi")
depends_on("fmt@9.1:", when="@2024.02.0:")
depends_on("fmt@9.1:11.0", when="@2024.02.0:")
# For some reason, we need c++ 17 explicitly only with intel
depends_on("fmt@9.1: cxxstd=17", when="@2024.02.0: %intel@19.1")
depends_on("fmt@9.1:11.0 cxxstd=17", when="@2024.02.0: %intel@19.1")
with when("@5.0.0:"):
with when("+cuda"):
@ -291,6 +299,9 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
"+rocm", when="+omptarget", msg="Cant support both rocm and openmp device backends at once"
)
conflicts("+ipc_shmem", when="@:5.0.1")
conflicts("+mpi3_shmem", when="@:2024.07.0")
conflicts("+mpi3_shmem", when="~mpi")
conflicts("+ipc_shmem", when="+mpi3_shmem")
conflicts("+sqlite_experimental", when="@:6.0.0")
conflicts("+sanitizer_tests", when="~asan")
@ -386,6 +397,9 @@ def initconfig_mpi_entries(self):
entries = super().initconfig_mpi_entries()
entries.append(cmake_cache_option("ENABLE_MPI", spec.satisfies("+mpi")))
entries.append(
cmake_cache_option("UMPIRE_ENABLE_MPI3_SHARED_MEMORY", spec.satisfies("+mpi3_shmem"))
)
return entries