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

fix cmake cache package handling for hip workaround

Browse Source
This commit is contained in:
Tom Scogland 2022-09-26 13:52:00 -07:00 committed by Tom Scogland
parent 90b86a2266
commit d0136899a2
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/camp/package.py
View File

@ -16,6 +16,16 @@ def hip_repair_options(options, spec):
) )
def hip_repair_cache(options, spec):
# there is only one dir like this, but the version component is unknown
options.append(
cmake_cache_path(
"HIP_CLANG_INCLUDE_PATH",
glob.glob("{}/lib/clang/*/include".format(spec["llvm-amdgpu"].prefix))[0],
)
)
class Camp(CMakePackage, CudaPackage, ROCmPackage): class Camp(CMakePackage, CudaPackage, ROCmPackage):
""" """
Compiler agnostic metaprogramming library providing concepts, Compiler agnostic metaprogramming library providing concepts,

4
var/spack/repos/builtin/packages/raja/package.py
View File

@ -6,7 +6,7 @@
import socket import socket
from spack.package import * from spack.package import *
from spack.pkg.builtin.camp import hip_repair_options from spack.pkg.builtin.camp import hip_repair_cache
class Raja(CachedCMakePackage, CudaPackage, ROCmPackage): class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
@ -125,7 +125,7 @@ def initconfig_hardware_entries(self):
if "+rocm" in spec: if "+rocm" in spec:
entries.append(cmake_cache_option("ENABLE_HIP", True)) entries.append(cmake_cache_option("ENABLE_HIP", True))
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)))
hip_repair_options(entries, spec) hip_repair_cache(entries, spec)
archs = self.spec.variants["amdgpu_target"].value archs = self.spec.variants["amdgpu_target"].value
if archs != "none": if archs != "none":
arch_str = ",".join(archs) arch_str = ",".join(archs)

4
var/spack/repos/builtin/packages/umpire/package.py
View File

@ -9,7 +9,7 @@
import llnl.util.tty as tty import llnl.util.tty as tty
from spack.package import * from spack.package import *
from spack.pkg.builtin.camp import hip_repair_options from spack.pkg.builtin.camp import hip_repair_cache
class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
@ -188,7 +188,7 @@ def initconfig_hardware_entries(self):
if "+rocm" in spec: if "+rocm" in spec:
entries.append(cmake_cache_option("ENABLE_HIP", True)) entries.append(cmake_cache_option("ENABLE_HIP", True))
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)))
hip_repair_options(entries, spec) hip_repair_cache(entries, spec)
archs = self.spec.variants["amdgpu_target"].value archs = self.spec.variants["amdgpu_target"].value
if archs != "none": if archs != "none":
arch_str = ",".join(archs) arch_str = ",".join(archs)