From a4d64402ae2fb3e39c7aae3ba324d75a06fabfdb Mon Sep 17 00:00:00 2001 From: Marko Kabic Date: Sun, 17 May 2020 19:40:48 +0200 Subject: Add new version of COSMA: 2.2.0 (#16672) * Updated versions of COSMA. * Added an empty line for formatting. * Switched to sha256. * Renamed gpu variant to cuda. Extending the CudaPackage base class. --- var/spack/repos/builtin/packages/cosma/package.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cosma/package.py b/var/spack/repos/builtin/packages/cosma/package.py index efb81035da..18d69605ee 100644 --- a/var/spack/repos/builtin/packages/cosma/package.py +++ b/var/spack/repos/builtin/packages/cosma/package.py @@ -7,37 +7,30 @@ from spack import * -class Cosma(CMakePackage): +class Cosma(CMakePackage, CudaPackage): """ Distributed Communication-Optimal Matrix-Matrix Multiplication Library """ - maintainers = ['teonnik', 'kabicm'] + maintainers = ['haampie', 'kabicm', 'teonnik'] homepage = 'https://github.com/eth-cscs/COSMA' - url = 'https://github.com/eth-cscs/COSMA/releases/download/v2.0.2/cosma.tar.gz' + url = 'https://github.com/eth-cscs/COSMA/releases/download/v2.2.0/cosma.tar.gz' git = 'https://github.com/eth-cscs/COSMA.git' # note: The default archives produced with github do not have the archives # of the submodules. version('master', branch='master', submodules=True) + version('2.2.0', sha256='1eb92a98110df595070a12193b9221eecf9d103ced8836c960f6c79a2bd553ca') + version('2.0.7', sha256='8d70bfcbda6239b6a8fbeaca138790bbe58c0c3aa576879480d2632d4936cf7e') version('2.0.2', sha256='4f3354828bc718f3eef2f0098c3bdca3499297497a220da32db1acd57920c68d') - # note: this version fails to build at the moment - # version('1.0.0', - # url='https://github.com/eth-cscs/COSMA/releases/download/1.0/cosma.tar.gz', - # sha256='c142104258dcca4c17fa7faffc2990a08d2777235c7980006e93c5dca51061f6') - variant('cuda', default=False, - description='Build with the CUBLAS back end.') variant('scalapack', default=False, - description='Build with ScaLAPACK support.') + description='Build with ScaLAPACK API.') depends_on('cmake@3.12:', type='build') depends_on('mpi@3:') depends_on('blas', when='~cuda') depends_on('scalapack', when='+scalapack') - # COSMA is written entirely in C++, it may use cublasXt but a CUDA capable - # compiler is not needed. There is no need for CudaPackage in this recipe. - depends_on('cuda', when='+cuda') def setup_build_environment(self, env): if '+cuda' in self.spec: @@ -52,6 +45,8 @@ class Cosma(CMakePackage): if '^mkl' in spec: args += ['-DCOSMA_BLAS=MKL'] + elif '^cray-libsci' in spec: + args += ['-DCOSMA_BLAS=CRAY_LIBSCI'] elif '^netlib-lapack' in spec: args += ['-DCOSMA_BLAS=CUSTOM'] elif '^openblas' in spec: @@ -63,6 +58,8 @@ class Cosma(CMakePackage): if '+scalapack' and '^mkl' in spec: args += ['-DCOSMA_SCALAPACK=MKL'] + elif '+scalapack' and '^cray-libsci' in spec: + args += ['-DCOSMA_SCALAPACK=CRAY_LIBSCI'] elif '+scalapack' and '^netlib-scalapack' in spec: args += ['-DCOSMA_SCALAPACK=CUSTOM'] -- cgit v1.2.3-70-g09d2