From df040fddd9707bc145804e72ffcb071aa2552159 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 20 Mar 2025 10:08:28 +0100 Subject: [PATCH] Apply generic rocm handling to every project --- lib/spack/spack/build_systems/cached_cmake.py | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/lib/spack/spack/build_systems/cached_cmake.py b/lib/spack/spack/build_systems/cached_cmake.py index 8e43c5a6fd6..ec830c57cd2 100644 --- a/lib/spack/spack/build_systems/cached_cmake.py +++ b/lib/spack/spack/build_systems/cached_cmake.py @@ -278,20 +278,15 @@ def initconfig_hardware_entries(self): entries.append("# ROCm") 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:"): - rocm_root = os.path.dirname(spec["llvm-amdgpu"].prefix) - entries.append(cmake_cache_path("ROCM_PATH", rocm_root)) + rocm_root = os.path.dirname(spec["llvm-amdgpu"].prefix) + 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: + 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)) + + if spec.satisfies("^blt@:0.6"): # 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))) llvm_bin = spec["llvm-amdgpu"].prefix.bin @@ -304,10 +299,8 @@ def initconfig_hardware_entries(self): cmake_cache_filepath("CMAKE_HIP_COMPILER", os.path.join(llvm_bin, "clang++")) ) - 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)) entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str)) entries.append(cmake_cache_string("GPU_TARGETS", arch_str))