diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/blaspp/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lapackpp/package.py | 38 |
2 files changed, 28 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/blaspp/package.py b/var/spack/repos/builtin/packages/blaspp/package.py index 71a287c7e2..8436e28940 100644 --- a/var/spack/repos/builtin/packages/blaspp/package.py +++ b/var/spack/repos/builtin/packages/blaspp/package.py @@ -18,6 +18,7 @@ class Blaspp(CMakePackage, CudaPackage): maintainers = ['teonnik', 'Sely85', 'G-Ragghianti', 'mgates3'] version('master', branch='master') + version('2020.10.01', sha256='1a05dbc46caf797d59a7c189216b876fdb1b2ff3e2eb48f1e6ca4b2756c59153') version('2020.10.00', sha256='ce148cfe397428d507c72d7d9eba5e9d3f55ad4cd842e6e873c670183dcb7795') version('2020.09.00', sha256='ee5d29171bbed515734007dd121ce2e733e2f83920c4d5ede046e657f4a513ef') diff --git a/var/spack/repos/builtin/packages/lapackpp/package.py b/var/spack/repos/builtin/packages/lapackpp/package.py index 008b9d3b40..d3d7830f0b 100644 --- a/var/spack/repos/builtin/packages/lapackpp/package.py +++ b/var/spack/repos/builtin/packages/lapackpp/package.py @@ -4,28 +4,44 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * +import os class Lapackpp(CMakePackage): - """LAPACK++: C++ API for the Basic Linear Algebra Subroutines (University - of Tennessee)""" + """LAPACK++: C++ API for the LAPACK Linear Algebra Package. Developed + by the Innovative Computing Laboratory at the University of Tennessee, + Knoxville.""" homepage = "https://bitbucket.org/icl/lapackpp" - git = "https://bitbucket.org/icl/lapackpp" - maintainers = ['teonnik', 'Sely85'] + git = homepage + url = 'https://bitbucket.org/icl/lapackpp/downloads/lapackpp-2020.09.00.tar.gz' + maintainers = ['teonnik', 'Sely85', 'G-Ragghianti', 'mgates3'] - version('develop', commit="f878fad") + version('master', branch='master') + version('2020.10.01', sha256='ecd659730b4c3cfb8d2595f9bbb6af65d96b79397db654f17fe045bdfea841c0') + version('2020.10.00', sha256='5f6ab3bd3794711818a3a50198efd29571520bf455e13ffa8ba50fa8376d7d1a') + version('2020.09.00', sha256='b5d4defa8eb314f21b3788563da9d264e2b084f2eb6535f6c6798ba798a29ee5') - variant('shared', default=True, - description='Build a shared version of the library') + variant('shared', default=True, description='Build shared library') + # Needs to compile against a matching blaspp version depends_on('blaspp') + for ver in ['master', '2020.10.01', '2020.10.00', '2020.09.00']: + depends_on('blaspp@' + ver, when='@' + ver) + depends_on('blas') + depends_on('lapack') def cmake_args(self): spec = self.spec return [ - '-DBUILD_SHARED_LIBS:BOOL={0}'.format( - 'ON' if '+shared' in spec else 'OFF'), - '-DBUILD_LAPACKPP_TESTS:BOOL={0}'.format( - 'ON' if self.run_tests else 'OFF') + '-DBUILD_SHARED_LIBS=%s' % ('+shared' in spec), + '-Dbuild_tests=%s' % self.run_tests, + '-DLAPACK_LIBRARIES=%s' % spec['lapack'].libs.joined(';') ] + + def check(self): + # If the tester fails to build, ensure that the check() fails. + if os.path.isfile(join_path(self.build_directory, 'test', 'tester')): + make('check') + else: + raise Exception('The tester was not built!') |