hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only restrict CMake version in Umpire when examples and rocm are enabled (#32025)

Browse source 
* 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>
This commit is contained in:
Mikael Simberg 2022-12-12 10:55:37 +01:00 committed by GitHub
parent 7d72aeb4fe
commit dd7b2deb47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
var/spack/repos/builtin/packages/umpire/package.py
View file

@ -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))