From 97f0c3ccd9f0a40896998a7580150a514ec3bc37 Mon Sep 17 00:00:00 2001 From: Uwe Sauter <19325781+UweSauter@users.noreply.github.com> Date: Wed, 23 Jun 2021 11:35:49 +0200 Subject: [PATCH] Add dependency on rocm-cmake to various ROCm related packages (#24427) --- var/spack/repos/builtin/packages/hipcub/package.py | 1 + var/spack/repos/builtin/packages/hipfort/package.py | 1 + var/spack/repos/builtin/packages/rocalution/package.py | 1 + var/spack/repos/builtin/packages/rocprim/package.py | 1 + var/spack/repos/builtin/packages/rocrand/package.py | 1 + var/spack/repos/builtin/packages/rocsolver/package.py | 1 + var/spack/repos/builtin/packages/rocsparse/package.py | 1 + var/spack/repos/builtin/packages/rocthrust/package.py | 1 + 8 files changed, 8 insertions(+) diff --git a/var/spack/repos/builtin/packages/hipcub/package.py b/var/spack/repos/builtin/packages/hipcub/package.py index 2cfc352561..33c593b844 100644 --- a/var/spack/repos/builtin/packages/hipcub/package.py +++ b/var/spack/repos/builtin/packages/hipcub/package.py @@ -33,6 +33,7 @@ class Hipcub(CMakePackage): '4.2.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocprim@' + ver, when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) for ver in ['4.1.0', '4.2.0']: depends_on('hip-rocclr@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hipfort/package.py b/var/spack/repos/builtin/packages/hipfort/package.py index c1cbae5209..e5bfc2afc4 100644 --- a/var/spack/repos/builtin/packages/hipfort/package.py +++ b/var/spack/repos/builtin/packages/hipfort/package.py @@ -28,6 +28,7 @@ class Hipfort(CMakePackage): for ver in ['3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0']: depends_on('hip@' + ver, type='build', when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index c28e299feb..fa4a1251de 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -39,6 +39,7 @@ class Rocalution(CMakePackage): depends_on('rocsparse@' + ver, when='@' + ver) depends_on('comgr@' + ver, when='@' + ver) depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) for ver in ['3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0']: depends_on('rocrand@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index 29aa5bc4b1..55f8292d13 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -35,6 +35,7 @@ class Rocprim(CMakePackage): depends_on('comgr@' + ver, when='@' + ver) depends_on('hsa-rocr-dev@' + ver, when='@' + ver) depends_on('llvm-amdgpu@' + ver, when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) for ver in ['4.1.0', '4.2.0']: depends_on('hip-rocclr@' + ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index a9e8de0725..ff9bb8caa6 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -38,6 +38,7 @@ class Rocrand(CMakePackage): depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) depends_on('rocminfo@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) for ver in ['4.1.0', '4.2.0']: depends_on('hip-rocclr@' + ver, type='link', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index 084ed55d1c..d10e9518bf 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -41,6 +41,7 @@ class Rocsolver(CMakePackage): depends_on('hip@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('rocblas@' + ver, type='link', when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) def cmake_args(self): args = [ diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index 23813b234a..711673dee2 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -34,6 +34,7 @@ class Rocsparse(CMakePackage): '4.2.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocprim@' + ver, when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) for ver in ['4.1.0', '4.2.0']: depends_on('hip-rocclr@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index 499584f6d0..70e16ec8b6 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -37,6 +37,7 @@ class Rocthrust(CMakePackage): '4.2.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocprim@' + ver, when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) for ver in ['4.1.0', '4.2.0']: depends_on('hip-rocclr@' + ver, when='@' + ver)