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

Clearly split old and new hip settings requirements

Browse Source
This commit is contained in:
Adrien M. BERNEDE 2025-03-19 11:53:27 +01:00
parent 9dada76d34
commit 89c8d44418
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/spack/spack/build_systems/cached_cmake.py
View File

@ -278,9 +278,19 @@ def initconfig_hardware_entries(self):
entries.append("# ROCm") entries.append("# ROCm")
entries.append("#------------------{0}\n".format("-" * 30)) entries.append("#------------------{0}\n".format("-" * 30))
# Starting with blt@0.7, support for hip is handled with
# CMake enable_language(HIP).
# TODO: consider applying this all the time, and let package
# add specifics when necessary, e.g. when not using CMake
# support for HIP.
if spec.satisfies("^blt@0.7:"): if spec.satisfies("^blt@0.7:"):
rocm_root = os.path.dirname(spec["llvm-amdgpu"].prefix) rocm_root = os.path.dirname(spec["llvm-amdgpu"].prefix)
entries.append(cmake_cache_path("ROCM_PATH", rocm_root)) entries.append(cmake_cache_path("ROCM_PATH", rocm_root))
archs = self.spec.variants["amdgpu_target"].value
if archs[0] != "none":
arch_str = ";".join(archs)
entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str))
else: else:
# Explicitly setting HIP_ROOT_DIR may be a patch that is no longer necessary # Explicitly setting HIP_ROOT_DIR may be a patch that is no longer necessary
entries.append(cmake_cache_path("HIP_ROOT_DIR", "{0}".format(spec["hip"].prefix))) entries.append(cmake_cache_path("HIP_ROOT_DIR", "{0}".format(spec["hip"].prefix)))
@ -292,16 +302,17 @@ def initconfig_hardware_entries(self):
llvm_bin = os.path.join(llvm_prefix, "llvm/bin/") llvm_bin = os.path.join(llvm_prefix, "llvm/bin/")
entries.append( entries.append(
cmake_cache_filepath( cmake_cache_filepath(
"CMAKE_HIP_COMPILER", os.path.join(llvm_bin, "amdclang++") "CMAKE_HIP_COMPILER", os.path.join(llvm_bin, "clang++")
) )
) )
archs = self.spec.variants["amdgpu_target"].value archs = self.spec.variants["amdgpu_target"].value
if archs[0] != "none": if archs[0] != "none":
arch_str = ";".join(archs) arch_str = ";".join(archs)
entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str)) entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str))
entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str)) entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str))
entries.append(cmake_cache_string("GPU_TARGETS", arch_str)) entries.append(cmake_cache_string("GPU_TARGETS", arch_str))
if spec.satisfies("%gcc"): if spec.satisfies("%gcc"):
entries.append( entries.append(