diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/umpire/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/umpire/package.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index aa391c3fc1..20f113be7a 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -9,6 +9,7 @@ import socket import llnl.util.tty as tty from spack.package import * +from spack.pkg.builtin.camp import hip_repair_options class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): @@ -93,7 +94,10 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("camp", when="@5.0.0:") depends_on("camp@0.2.2:0.2.3", when="@6.0.0") depends_on("camp@0.1.0", when="@5.0.0:5.0.1") - depends_on("camp@2022.03.0:", when="@2022.03.0:") + depends_on("camp@2022.03.2:", when="@2022.03.0:") + depends_on("camp@main", when="@main") + depends_on("camp@main", when="@develop") + depends_on("camp+openmp", when="+openmp") with when("@5.0.0:"): with when("+cuda"): @@ -184,6 +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) archs = self.spec.variants["amdgpu_target"].value if archs != "none": arch_str = ",".join(archs) |