diff options
| author | Mikael Simberg <mikael.simberg@iki.fi> | 2022-12-12 10:55:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-12 10:55:37 +0100 |
| commit | dd7b2deb479006dc22fc60d7f10ea36cdac780b9 (patch) | |
| tree | 83bc8a8d29c52037a8ecd1dca7d551ef45864af5 /var | |
| parent | 7d72aeb4fe4930cd9e1544910d31a207dd3273b1 (diff) | |
| download | spack-dd7b2deb479006dc22fc60d7f10ea36cdac780b9.tar.gz spack-dd7b2deb479006dc22fc60d7f10ea36cdac780b9.tar.bz2 spack-dd7b2deb479006dc22fc60d7f10ea36cdac780b9.tar.xz spack-dd7b2deb479006dc22fc60d7f10ea36cdac780b9.zip | |
Only restrict CMake version in Umpire when `examples` and `rocm` are enabled (#32025)
* Only restrict CMake version in umpire when examples and rocm are enabled
* Add CMAKE_HIP_ARCHITECTURES to Umpire and lift cmake version restriction
Co-authored-by: Tom Scogland <scogland1@llnl.gov>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/umpire/package.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index f24fb8d660..351a843251 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -84,7 +84,6 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("cmake@3.8:", type="build") depends_on("cmake@3.9:", when="+cuda", type="build") - depends_on("cmake@:3.20", when="+rocm", type="build") depends_on("cmake@3.14:", when="@2022.03.0:") depends_on("blt@0.5.0:", type="build", when="@2022.03.0:") @@ -199,6 +198,9 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): entries.append( cmake_cache_string("HIP_HIPCC_FLAGS", "--amdgpu-target={0}".format(arch_str)) ) + entries.append( + cmake_cache_string("CMAKE_HIP_ARCHITECTURES", "{0}".format(arch_str)) + ) else: entries.append(cmake_cache_option("ENABLE_HIP", False)) |