From dd7b2deb479006dc22fc60d7f10ea36cdac780b9 Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Mon, 12 Dec 2022 10:55:37 +0100 Subject: [PATCH] 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 --- var/spack/repos/builtin/packages/umpire/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 @@ def initconfig_hardware_entries(self): 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))