From 04c76fab632817665395ee571038368aa2e297a0 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 28 Nov 2024 10:23:09 +0100 Subject: hip: hints for find_package llvm/clang (#47788) LLVM can be a transitive link dependency of hip through gl's dependency mesa, which uses it for software rendering. In this case make sure llvm-amdgpu is found with find_package(LLVM) and find_package(Clang) by setting LLVM_ROOT and Clang_ROOT. That makes the patch of find_package's HINTS redundant, so remove that. It did not work anyways, because CMAKE_PREFIX_PATH has higher precedence than HINTS. --- var/spack/repos/builtin/packages/hip/package.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index fa2c892f16..3a6610f94b 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -531,12 +531,6 @@ class Hip(CMakePackage): "clr/hipamd/hip-config-amd.cmake", string=True, ) - filter_file( - '"${ROCM_PATH}/llvm"', - self.spec["llvm-amdgpu"].prefix, - "clr/hipamd/src/hiprtc/CMakeLists.txt", - string=True, - ) perl = self.spec["perl"].command if self.spec.satisfies("@:5.5"): @@ -561,7 +555,12 @@ class Hip(CMakePackage): filter_file(" -lnuma", f" -L{numactl} -lnuma", "hipBin_amd.h") def cmake_args(self): - args = [] + args = [ + # find_package(Clang) and find_package(LLVM) in clr/hipamd/src/hiprtc/CMakeLists.txt + # should find llvm-amdgpu + self.define("LLVM_ROOT", self.spec["llvm-amdgpu"].prefix), + self.define("Clang_ROOT", self.spec["llvm-amdgpu"].prefix), + ] if self.spec.satisfies("+rocm"): args.append(self.define("HSA_PATH", self.spec["hsa-rocr-dev"].prefix)) args.append(self.define("HIP_COMPILER", "clang")) -- cgit v1.2.3-70-g09d2