From 58ee1647778f7dd799848119236e6831ba26daee Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Fri, 22 Apr 2022 16:26:38 -0700 Subject: hiop +rocm: add amdgpu_target for deps (#30184) * hiop +rocm: add amdgpu_target for deps * Update var/spack/repos/builtin/packages/hiop/package.py Perfect! Thanks! Co-authored-by: Asher Mancinelli * don't use f-string, not compatible with py 2 Co-authored-by: Asher Mancinelli --- var/spack/repos/builtin/packages/hiop/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index ca4d0a67e8..90270457e6 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -66,7 +66,12 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): depends_on('mpi', when='+mpi') depends_on('magma+cuda', when='+cuda') - depends_on('magma+rocm', when='+rocm') + + for arch in ROCmPackage.amdgpu_targets: + rocm_dep = "+rocm amdgpu_target={0}".format(arch) + depends_on("magma {0}".format(rocm_dep), when=rocm_dep) + depends_on("raja {0}".format(rocm_dep), when="+raja {0}".format(rocm_dep)) + depends_on("umpire {0}".format(rocm_dep), when="+raja {0}".format(rocm_dep)) # Depends on Magma when +rocm or +cuda magma_ver_constraints = ( @@ -82,10 +87,8 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): depends_on('raja+openmp', when='+raja~cuda~rocm') depends_on('raja@0.14.0:', when='@0.5.0:+raja') depends_on('raja+cuda', when='+raja+cuda') - depends_on('raja+rocm', when='+raja+rocm') depends_on('umpire', when='+raja') depends_on('umpire+cuda~shared', when='+raja+cuda') - depends_on('umpire+rocm', when='+raja+rocm') depends_on('umpire@6.0.0:', when='@0.5.0:+raja') depends_on('hip', when='+rocm') depends_on('hipblas', when='+rocm') -- cgit v1.2.3-70-g09d2