zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

recipes changes for hipblas, rocprim, rocfft, rocsolver for rocm3.7.0 (#18495)

Browse Source 
* recipes changes for rocprim,rocfft,rocsolver for rocm3.7.0

* changes to hipcub recipe for rocm-3.7.0

* changes to address review comments
This commit is contained in:
srekolam 2020-09-10 15:32:41 -07:00 committed by GitHub
parent 29645ceba5
commit 4a474d9d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/hipblas/package.py
View File

@ -14,14 +14,15 @@ class Hipblas(CMakePackage):
git = "https://github.com/ROCmSoftwarePlatform/hipBLAS.git" git = "https://github.com/ROCmSoftwarePlatform/hipBLAS.git"
url = "https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-3.5.0.tar.gz" url = "https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-3.5.0.tar.gz"
maintainers = ['haampie'] maintainers = ['srekolam', 'arjun-raj-kuppala']
for ver in ['3.5.0', '3.7.0']:
depends_on('hip') depends_on('hip@' + ver, when='@' + ver)
depends_on('rocsolver') depends_on('rocsolver@' + ver, type='build', when='@' + ver)
depends_on('rocblas') depends_on('rocblas@' + ver, type='link', when='@' + ver)
depends_on('rocm-device-libs', type='build') depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver)
depends_on('comgr', type='build') depends_on('comgr@' + ver, type='build', when='@' + ver)
version('3.7.0', sha256='9840a493ab4838c86696ceb33ce07c34b5f59f62db4f88cb3af62b69d84f8729')
version('3.5.0', sha256='d451da80beb048767da71a090afceed2e111d01b3e95a7044deada5054d6e7b1') version('3.5.0', sha256='d451da80beb048767da71a090afceed2e111d01b3e95a7044deada5054d6e7b1')
def cmake_args(self): def cmake_args(self):

4
var/spack/repos/builtin/packages/hipcub/package.py
View File

@ -14,12 +14,14 @@ class Hipcub(CMakePackage):
maintainers = ['srekolam', 'arjun-raj-kuppala'] maintainers = ['srekolam', 'arjun-raj-kuppala']
version('3.7.0', sha256='a2438632ea1606e83a8c0e1a8777aa5fdca66d77d90862642eb0ec2314b4978d')
version('3.5.0', sha256='1eb2cb5f6e90ed1b7a9ac6dd86f09ec2ea27bceb5a92eeffa9c2123950c53b9d') version('3.5.0', sha256='1eb2cb5f6e90ed1b7a9ac6dd86f09ec2ea27bceb5a92eeffa9c2123950c53b9d')
variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
depends_on('cmake@3:', type='build') 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('hip@' + ver, type='build', when='@' + ver)
depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver)
depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver)

2
var/spack/repos/builtin/packages/rocfft/package.py
View File

@ -33,7 +33,7 @@ class Rocfft(CMakePackage):
depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver)
depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver)
depends_on('hip@' + ver, when='@' + ver) depends_on('hip@' + ver, when='@' + ver)
depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type=('build', 'link'), when='@' + ver)
def setup_build_environment(self, env): def setup_build_environment(self, env):
env.set('CXX', self.spec['hip'].hipcc) env.set('CXX', self.spec['hip'].hipcc)

4
var/spack/repos/builtin/packages/rocprim/package.py
View File

@ -14,12 +14,14 @@ class Rocprim(CMakePackage):
maintainers = ['srekolam', 'arjun-raj-kuppala'] maintainers = ['srekolam', 'arjun-raj-kuppala']
version('3.7.0', sha256='225209a0cbd003c241821c8a9192cec5c07c7f1a6ab7da296305fc69f5f6d365')
version('3.5.0', sha256='29302dbeb27ae88632aa1be43a721f03e7e597c329602f9ca9c9c530c1def40d') version('3.5.0', sha256='29302dbeb27ae88632aa1be43a721f03e7e597c329602f9ca9c9c530c1def40d')
variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
depends_on('cmake@3:', type='build') 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('hip@' + ver, type='build', when='@' + ver)
depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver)
depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver)

18
var/spack/repos/builtin/packages/rocsolver/package.py
View File

@ -14,15 +14,21 @@ class Rocsolver(CMakePackage):
git = "https://github.com/ROCmSoftwarePlatform/rocSOLVER.git" git = "https://github.com/ROCmSoftwarePlatform/rocSOLVER.git"
url = "https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-3.5.0.tar.gz" url = "https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-3.5.0.tar.gz"
maintainers = ['haampie'] maintainers = ['srekolam', 'arjun-raj-kuppala']
depends_on('hip')
depends_on('rocblas')
depends_on('rocm-device-libs', type='build')
depends_on('comgr', type='build')
version('3.7.0', sha256='8c1c630595952806e658c539fd0f3056bd45bafc22b57f0dd10141abefbe4595')
version('3.5.0', sha256='d655e8c762fb9e123b9fd7200b4258512ceef69973de4d0588c815bc666cb358') version('3.5.0', sha256='d655e8c762fb9e123b9fd7200b4258512ceef69973de4d0588c815bc666cb358')
depends_on('cmake@3:', type='build')
depends_on('numactl', when='@3.7.0')
depends_on('hsa-rocr-dev@3.7.0', type='build', 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)
depends_on('rocblas@' + ver, type='link', when='@' + ver)
def cmake_args(self): def cmake_args(self):
args = [ args = [
'-DBUILD_CLIENTS_SAMPLES=OFF', '-DBUILD_CLIENTS_SAMPLES=OFF',