From b1ca2a43467e45779e04055c0d7df00f518d049f Mon Sep 17 00:00:00 2001 From: Ganesh Kumar <46193450+gkathirv@users.noreply.github.com> Date: Wed, 11 Nov 2020 21:54:25 +0530 Subject: ROCm3.9 recipe for rocblas, hipblas & rocsolver (#19841) * ROCm3.9 recipe for rocblas, hipblas & rocsolver * review comments * review comments Co-authored-by: root --- var/spack/repos/builtin/packages/hipblas/package.py | 3 ++- var/spack/repos/builtin/packages/rocblas/package.py | 12 +++++++++--- var/spack/repos/builtin/packages/rocsolver/package.py | 5 +++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/hipblas/package.py b/var/spack/repos/builtin/packages/hipblas/package.py index 29e4dea0c0..6262681ea3 100644 --- a/var/spack/repos/builtin/packages/hipblas/package.py +++ b/var/spack/repos/builtin/packages/hipblas/package.py @@ -14,13 +14,14 @@ class Hipblas(CMakePackage): git = "https://github.com/ROCmSoftwarePlatform/hipBLAS.git" url = "https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-3.8.0.tar.gz" + version('3.9.0', sha256='82ddd57fd905a5d4060665349ec017ff757a7c121cb9310574be3c3630b3545f') version('3.8.0', sha256='33cb82e8b2658ae2096f39e41492ba8b6852ac37c26a730612b8642d9d29abe3') version('3.7.0', sha256='9840a493ab4838c86696ceb33ce07c34b5f59f62db4f88cb3af62b69d84f8729') version('3.5.0', sha256='d451da80beb048767da71a090afceed2e111d01b3e95a7044deada5054d6e7b1') maintainers = ['srekolam', 'arjun-raj-kuppala'] - for ver in ['3.5.0', '3.7.0', '3.8.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocsolver@' + ver, type='build', when='@' + ver) depends_on('rocblas@' + ver, type='link', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index 4daabcd103..2c6127317a 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -13,8 +13,9 @@ class Rocblas(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS/" url = "https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-3.5.0.tar.gz" - maintainers = ['haampie'] + maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.9.0', sha256='3ecd2d9fd2be0e1697a191d143a2d447b53a91ae01afb50231d591136ad5e2fe') version('3.8.0', sha256='568a9da0360349b1b134d74cc67cbb69b43c06eeca7c33b50072cd26cd3d8900') version('3.7.0', sha256='9425db5f8e8b6f7fb172d09e2a360025b63a4e54414607709efc5acb28819642') version('3.5.0', sha256='8560fabef7f13e8d67da997de2295399f6ec595edfd77e452978c140d5f936f0') @@ -25,7 +26,7 @@ class Rocblas(CMakePackage): depends_on('cmake@3:', type='build') - for ver in ['3.5.0', '3.7.0', '3.8.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0']: depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) @@ -59,9 +60,14 @@ class Rocblas(CMakePackage): commit='9123205f9b5f95c96ff955695e942d2c3b321cbf', when='@3.8.0') + resource(name='Tensile', + git='https://github.com/ROCmSoftwarePlatform/Tensile.git', + commit='b68edc65aaeed08c71b2b8622f69f83498b57d7a', + when='@3.9.0') + # Status: https://github.com/ROCmSoftwarePlatform/Tensile/commit/a488f7dadba34f84b9658ba92ce9ec5a0615a087 # Not yet landed in 3.7.0, nor 3.8.0. - patch('0001-Fix-compilation-error-with-StringRef-to-basic-string.patch') + patch('0001-Fix-compilation-error-with-StringRef-to-basic-string.patch', when='@:3.8') def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index cb708bfa47..33a95a4253 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -16,6 +16,7 @@ class Rocsolver(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.9.0', sha256='85fd77fe5acf5af518d11e90e2c03ee0c5abd61071cea86ef5df09f944879648') version('3.8.0', sha256='72aa74284944d8b454088e8c8d74cf05464a4e2e46d33a57017ddd009113025e') version('3.7.0', sha256='8c1c630595952806e658c539fd0f3056bd45bafc22b57f0dd10141abefbe4595') version('3.5.0', sha256='d655e8c762fb9e123b9fd7200b4258512ceef69973de4d0588c815bc666cb358') @@ -23,10 +24,10 @@ class Rocsolver(CMakePackage): depends_on('cmake@3:', type='build') depends_on('numactl', type='link', when='@3.7.0:') - for ver in ['3.7.0', '3.8.0']: + for ver in ['3.7.0', '3.8.0', '3.9.0']: depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) - for ver in ['3.5.0', '3.7.0', '3.8.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.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-60-g2f50