From 290b77fe43a85188e174e4bd01b19c295ac60c64 Mon Sep 17 00:00:00 2001 From: Simon Frasch Date: Wed, 9 Sep 2020 14:22:53 +0200 Subject: spla: Add version 1.1.0 and ROCm support (#18561) --- var/spack/repos/builtin/packages/spla/package.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/spla/package.py b/var/spack/repos/builtin/packages/spla/package.py index 2c84d14524..d1f45959fe 100644 --- a/var/spack/repos/builtin/packages/spla/package.py +++ b/var/spack/repos/builtin/packages/spla/package.py @@ -15,18 +15,28 @@ class Spla(CMakePackage): url = "https://github.com/eth-cscs/spla/archive/v1.0.0.tar.gz" git = 'https://github.com/eth-cscs/spla.git' + version('1.1.0', sha256='b0c4ebe4988abc2b3434e6c50e7eb0612f3f401bc1aa79ad58a6a92dc87fa65b') version('1.0.0', sha256='a0eb269b84d7525b223dc650de12170bba30fbb3ae4f93eb2b5cbdce335e4da1') + version('develop', branch='develop') version('master', branch='master') variant('openmp', default=True, description="Build with OpenMP support") variant('static', default=False, description="Build as static library") - variant('cuda', default=False, description="CUDA") + variant('cuda', default=False, description="CUDA backend") + variant('rocm', default=False, description="ROCm backend") + + conflicts("+cuda", when="+rocm", msg="+cuda and +rocm are mutually exclusive") depends_on('mpi') depends_on('blas') - depends_on('cuda', when='+cuda') depends_on('cmake@3.10:', type='build') + depends_on('cuda', when='+cuda') + depends_on('rocblas', when='+rocm') + depends_on('hip', when='+rocm') + depends_on('hsakmt-roct', when='+rocm', type='link') + depends_on('hsa-rocr-dev', when='+rocm', type='link') + def cmake_args(self): args = [] @@ -40,6 +50,11 @@ class Spla(CMakePackage): else: args += ["-DSPLA_GPU_BACKEND=OFF"] + if '+rocm' in self.spec: + args += ["-DSPLA_GPU_BACKEND=ROCM"] + else: + args += ["-DSPLA_GPU_BACKEND=OFF"] + if '+static' in self.spec: args += ["-DSPLA_STATIC=ON"] else: -- cgit v1.2.3-60-g2f50