diff options
| author | Tom Scogland <scogland1@llnl.gov> | 2022-09-26 13:52:00 -0700 |
|---|---|---|
| committer | Tom Scogland <tom.scogland@gmail.com> | 2022-09-27 14:21:59 -0700 |
| commit | d0136899a292640c90f7c9438e3587c6fbe99c33 (patch) | |
| tree | df4690a2a023478ddb642b48dad07647543db2f4 | |
| parent | 90b86a226646e366073c0c61b6ba6890ddc7db6b (diff) | |
| download | spack-d0136899a292640c90f7c9438e3587c6fbe99c33.tar.gz spack-d0136899a292640c90f7c9438e3587c6fbe99c33.tar.bz2 spack-d0136899a292640c90f7c9438e3587c6fbe99c33.tar.xz spack-d0136899a292640c90f7c9438e3587c6fbe99c33.zip | |
fix cmake cache package handling for hip workaround
| -rw-r--r-- | var/spack/repos/builtin/packages/camp/package.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/raja/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/umpire/package.py | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/camp/package.py b/var/spack/repos/builtin/packages/camp/package.py index 8f40f6b295..2a759ef880 100644 --- a/var/spack/repos/builtin/packages/camp/package.py +++ b/var/spack/repos/builtin/packages/camp/package.py @@ -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): """ Compiler agnostic metaprogramming library providing concepts, diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index 4850ed1c54..b9e1f6fe8f 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -6,7 +6,7 @@ import socket 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): @@ -125,7 +125,7 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage): if "+rocm" in spec: entries.append(cmake_cache_option("ENABLE_HIP", True)) 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 if archs != "none": arch_str = ",".join(archs) diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index 20f113be7a..3916b7a234 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -9,7 +9,7 @@ import socket import llnl.util.tty as tty 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): @@ -188,7 +188,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): if "+rocm" in spec: entries.append(cmake_cache_option("ENABLE_HIP", True)) 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 if archs != "none": arch_str = ",".join(archs) |