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

hip: apply LLVM_ROOT and Clang_ROOT args only when installing hip+rocm (#49368)

Browse Source
This commit is contained in:
afzpatel 2025-03-17 02:37:31 -04:00 committed by GitHub
parent 2b0d985714
commit d409126c27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/hip/package.py
View File

@ -588,18 +588,19 @@ def patch(self):
def cmake_args(self): 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),
# Use the new behaviour of the policy CMP0074 # Use the new behaviour of the policy CMP0074
# (https://cmake.org/cmake/help/latest/policy/CMP0074.html) which will search # (https://cmake.org/cmake/help/latest/policy/CMP0074.html) which will search
# "prefixes specified by the <PackageName>_ROOT CMake variable". # "prefixes specified by the <PackageName>_ROOT CMake variable".
# From HIP 6.2 onwards the policy is set explicitly by HIP itself: # From HIP 6.2 onwards the policy is set explicitly by HIP itself:
# https://github.com/ROCm/clr/commit/a2a8dad980b0fa1a6086e0c0f95847ae80f5a2c6. # https://github.com/ROCm/clr/commit/a2a8dad980b0fa1a6086e0c0f95847ae80f5a2c6.
self.define("CMAKE_POLICY_DEFAULT_CMP0074", "NEW"), self.define("CMAKE_POLICY_DEFAULT_CMP0074", "NEW")
] ]
if self.spec.satisfies("+rocm"): if self.spec.satisfies("+rocm"):
# find_package(Clang) and find_package(LLVM) in clr/hipamd/src/hiprtc/CMakeLists.txt
# should find llvm-amdgpu
args.append(self.define("LLVM_ROOT", self.spec["llvm-amdgpu"].prefix))
args.append(self.define("Clang_ROOT", self.spec["llvm-amdgpu"].prefix))
args.append(self.define("HSA_PATH", self.spec["hsa-rocr-dev"].prefix)) args.append(self.define("HSA_PATH", self.spec["hsa-rocr-dev"].prefix))
args.append(self.define("HIP_COMPILER", "clang")) args.append(self.define("HIP_COMPILER", "clang"))
args.append( args.append(