From 1aceb38b89e6386f41eeceb1010c6ca5ccb2b3e0 Mon Sep 17 00:00:00 2001 From: srekolam <67086238+srekolam@users.noreply.github.com> Date: Thu, 10 Sep 2020 15:33:21 -0700 Subject: Changes for hipsparse, rocthrust recipes for rocm_3.7.0 (#18497) * changes for hipsparse,rocthrust recipes for rocm_3.7.0 * changes to rocrand for 3.7.0 * version changes --- .../repos/builtin/packages/hipsparse/package.py | 23 +++++++++++++--------- .../repos/builtin/packages/rocrand/package.py | 7 ++++--- .../repos/builtin/packages/rocthrust/package.py | 6 ++++-- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index 1123291e79..08c5ca9b40 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -12,21 +12,26 @@ class Hipsparse(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE" git = "https://github.com/ROCmSoftwarePlatform/hipSPARSE.git" - url = "https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-3.5.0.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-3.7.0.tar.gz" - maintainers = ['haampie'] + maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.7.0', sha256='a2f02d8fc6ad9a561f06dacde54ecafd30563c5c95f93819a5694e5b650dad7f') version('3.5.0', sha256='fa16b2a307a5d9716066c2876febcbc1cef855bf0c96d235d2d8f2206a0fb69d') - depends_on('hip') - depends_on('rocsparse') - depends_on('rocm-device-libs', type='build') - depends_on('hsa-rocr-dev') - depends_on('comgr', type='build') + depends_on('cmake@3:', type='build') depends_on('git', type='build') - patch('e79985dccde22d826aceb3badfc643a3227979d2.patch') - patch('530047af4a0f437dafc02f76b3a17e3b1536c7ec.patch') + for ver in ['3.5.0', '3.7.0']: + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) + depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) + depends_on('rocsparse@' + ver, type='build', when='@' + ver) + depends_on('hip@' + ver, when='@' + ver) + depends_on('comgr@' + ver, type='build', when='@' + ver) + depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) + + patch('e79985dccde22d826aceb3badfc643a3227979d2.patch', when='@3.5.0') + patch('530047af4a0f437dafc02f76b3a17e3b1536c7ec.patch', when='@3.5.0') def cmake_args(self): args = [ diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index b4cb4c81e1..1430eca38f 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -12,15 +12,16 @@ class Rocrand(CMakePackage): pseudo-random and quasi-random numbers.""" homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND" - url = "https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-3.5.0.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-3.7.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.7.0', sha256='5e43fe07afe2c7327a692b3b580875bae6e6ee790e044c053fffafbfcbc14860') version('3.5.0', sha256='592865a45e7ef55ad9d7eddc8082df69eacfd2c1f3e9c57810eb336b15cd5732') depends_on('cmake@3.5.1:', type='build') - - for ver in ['3.5.0']: + depends_on('numactl', when='@3.7.0') + for ver in ['3.5.0', '3.7.0']: depends_on('hip@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index a5ea393d56..7c1246c048 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -13,17 +13,19 @@ class Rocthrust(CMakePackage): library works on HIP/ROCm platforms""" homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust" - url = "https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-3.5.0.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-3.7.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.7.0', sha256='4cb923dde5eec150a566cb10d23ee5c7ce3aa892c4dea94886a89d95b90f3bdd') version('3.5.0', sha256='0d1bac1129d17bb1259fd06f5c9cb4c1620d1790b5c295b866fb3442d18923cb') variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') depends_on('cmake@3:', type='build') - for ver in ['3.5.0']: + depends_on('numactl', when='@3.7.0') + for ver in ['3.5.0', '3.7.0']: depends_on('hip@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) -- cgit v1.2.3-70-g09d2