From 7f2b579ccdc0c5d8c375c44c2e2a8006aaaccc20 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 27 Mar 2025 15:28:21 +0100 Subject: [PATCH] Update logic to find amdclang++ --- lib/spack/spack/build_systems/cached_cmake.py | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/lib/spack/spack/build_systems/cached_cmake.py b/lib/spack/spack/build_systems/cached_cmake.py index d6cab3fd5ee..a78855c00b8 100644 --- a/lib/spack/spack/build_systems/cached_cmake.py +++ b/lib/spack/spack/build_systems/cached_cmake.py @@ -286,25 +286,11 @@ def initconfig_hardware_entries(self): arch_str = ";".join(archs) entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str)) - llvm_prefix = spec["llvm-amdgpu"].prefix llvm_bin = spec["llvm-amdgpu"].prefix.bin - # Some ROCm systems seem to point to //rocm-/ and - # others point to //rocm-/llvm - if os.path.basename(os.path.normpath(llvm_prefix)) != "llvm": - llvm_bin = os.path.join(llvm_prefix, "llvm/bin/") entries.append( cmake_cache_filepath("CMAKE_HIP_COMPILER", os.path.join(llvm_bin, "amdclang++")) ) - if not spec.satisfies("^blt"): - # 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))) - - if archs[0] != "none": - arch_str = ";".join(archs) - entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str)) - entries.append(cmake_cache_string("GPU_TARGETS", arch_str)) - if spec.satisfies("%gcc"): entries.append( cmake_cache_string( @@ -312,6 +298,15 @@ def initconfig_hardware_entries(self): ) ) + # Extra definitions that might be required in other cases + if not spec.satisfies("^blt"): + entries.append(cmake_cache_path("HIP_ROOT_DIR", "{0}".format(spec["hip"].prefix))) + + if archs[0] != "none": + arch_str = ";".join(archs) + entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str)) + entries.append(cmake_cache_string("GPU_TARGETS", arch_str)) + return entries def std_initconfig_entries(self):