From 633ebd149c9365a2d8262b6a7615e217f0bf7bbc Mon Sep 17 00:00:00 2001 From: Maciej Wójcik Date: Tue, 14 Jun 2022 15:08:13 +0200 Subject: dbcsr: add versions up to v2.2.0 (#30891) Co-authored-by: Massimiliano Culpo --- var/spack/repos/builtin/packages/dbcsr/package.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dbcsr/package.py b/var/spack/repos/builtin/packages/dbcsr/package.py index a0c6716558..f2b2ea4bf4 100644 --- a/var/spack/repos/builtin/packages/dbcsr/package.py +++ b/var/spack/repos/builtin/packages/dbcsr/package.py @@ -9,12 +9,17 @@ from spack.package import * class Dbcsr(CMakePackage, CudaPackage, ROCmPackage): """Distributed Block Compressed Sparse Row matrix library.""" - homepage = "https://github.com/cp2k/dbcsr" - git = "https://github.com/cp2k/dbcsr.git" + homepage = 'https://github.com/cp2k/dbcsr' + git = 'https://github.com/cp2k/dbcsr.git' + url = 'https://github.com/cp2k/dbcsr/releases/download/v2.2.0/dbcsr-2.2.0.tar.gz' + list_url = 'https://github.com/cp2k/dbcsr/releases' maintainers = ['dev-zero'] version('develop', branch='develop') + version('2.2.0', sha256='245b0382ddc7b80f85af8288f75bd03d56ec51cdfb6968acb4931529b35173ec') + version('2.1.0', sha256='9e58fd998f224632f356e479d18b5032570d00d87b86736b6a6ac2d03f8d4b3c') + version('2.0.1', sha256='61d5531b661e1dab043353a1d67939ddcde3893d3dc7b0ab3d05074d448b485c') variant('mpi', default=True, description='Compile with MPI') variant('openmp', default=False, description='Build with OpenMP support') @@ -33,7 +38,8 @@ class Dbcsr(CMakePackage, CudaPackage, ROCmPackage): depends_on('mpi', when='+mpi') depends_on('libxsmm@1.11:~header-only', when='smm=libxsmm') - depends_on('cmake@3.12:', type='build') + depends_on('cmake@3.17:', type='build', when='@2.1:') + depends_on('cmake@3.10:', type='build') depends_on('py-fypp', type='build') depends_on('pkgconfig', type='build') depends_on('python@3.6:', type='build', when='+cuda') @@ -79,10 +85,10 @@ class Dbcsr(CMakePackage, CudaPackage, ROCmPackage): def cmake_args(self): spec = self.spec - if len(spec.variants['cuda_arch'].value) > 1: + if '+cuda' in spec and len(spec.variants['cuda_arch'].value) > 1: raise InstallError("dbcsr supports only one cuda_arch at a time") - if len(spec.variants['amdgpu_target'].value) > 1: + if '+rocm' in spec and len(spec.variants['amdgpu_target'].value) > 1: raise InstallError("DBCSR supports only one amdgpu_arch at a time") args = [ @@ -95,10 +101,15 @@ class Dbcsr(CMakePackage, CudaPackage, ROCmPackage): '-DBLAS_LIBRARIES=%s' % (spec['blas'].libs.joined(';')), '-DLAPACK_FOUND=true', '-DLAPACK_LIBRARIES=%s' % (spec['lapack'].libs.joined(';')), - '-DWITH_EXAMPLES=ON', self.define_from_variant('BUILD_SHARED_LIBS', 'shared'), ] + # Switch necessary as a result of a bug. + # In version 2.0, this switch doesn't exist yet. + # The issue should be already fixed in 2.3 (not released yet). + if '@2.1:2.2' in spec: + args += ['-DBUILD_TESTING=ON'] + if self.spec.satisfies('+cuda'): cuda_arch = self.spec.variants['cuda_arch'].value[0] -- cgit v1.2.3-60-g2f50