From 1c7aa1261534533ef789ed9a9d4a96f802aae0f6 Mon Sep 17 00:00:00 2001 From: Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:08:25 -0700 Subject: cleanup opt-rocm references when using spack (#25264) Co-authored-by: Harmen Stoppels --- var/spack/repos/builtin/packages/hipblas/package.py | 3 +++ var/spack/repos/builtin/packages/hipfft/package.py | 2 ++ var/spack/repos/builtin/packages/hipsparse/package.py | 2 ++ 3 files changed, 7 insertions(+) diff --git a/var/spack/repos/builtin/packages/hipblas/package.py b/var/spack/repos/builtin/packages/hipblas/package.py index 86aee29b8c..4836e47699 100644 --- a/var/spack/repos/builtin/packages/hipblas/package.py +++ b/var/spack/repos/builtin/packages/hipblas/package.py @@ -32,9 +32,12 @@ class Hipblas(CMakePackage): depends_on('rocsolver@' + ver, when='@' + ver) depends_on('rocblas@' + ver, type='link', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) def cmake_args(self): args = [ + # Make sure find_package(HIP) finds the module. + self.define('CMAKE_MODULE_PATH', self.spec['hip'].prefix.cmake), self.define('BUILD_CLIENTS_SAMPLES', 'OFF'), self.define('BUILD_CLIENTS_TESTS', 'OFF') ] diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index 3359af11d4..69f9514edc 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -38,6 +38,8 @@ class Hipfft(CMakePackage): def cmake_args(self): args = [ + # Make sure find_package(HIP) finds the module. + self.define('CMAKE_MODULE_PATH', self.spec['hip'].prefix.cmake), self.define('BUILD_CLIENTS_SAMPLES', 'OFF') ] diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index afc1c0fe39..c939b686ed 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -43,6 +43,8 @@ class Hipsparse(CMakePackage): def cmake_args(self): args = [ + # Make sure find_package(HIP) finds the module. + self.define('CMAKE_MODULE_PATH', self.spec['hip'].prefix.cmake), self.define('CMAKE_CXX_STANDARD', '14'), self.define('BUILD_CLIENTS_SAMPLES', 'OFF'), self.define('BUILD_CLIENTS_TESTS', 'OFF'), -- cgit v1.2.3-70-g09d2