hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix blas/lapack usage after PR 1875 (#3365)

Browse source
This commit is contained in:
Denis Davydov 2017-03-04 16:42:02 +01:00 committed by Adam J. Stewart
parent c3ac86310e
commit a36ed7fb9b
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
var/spack/repos/builtin/packages/elemental/package.py
View file

@ -27,7 +27,7 @@
class Elemental(CMakePackage): class Elemental(CMakePackage):
"""Elemental: Distributed-memory dense and sparse-direct linear algebra """Elemental: Distributed-memory dense and sparse-direct linear algebra
and optimization library.""" and optimization library."""
homepage = "http://libelemental.org" homepage = "http://libelemental.org"
@ -36,28 +36,28 @@ class Elemental(CMakePackage):
version('0.87.7', '6c1e7442021c59a36049e37ea69b8075') version('0.87.7', '6c1e7442021c59a36049e37ea69b8075')
version('0.87.6', '9fd29783d45b0a0e27c0df85f548abe9') version('0.87.6', '9fd29783d45b0a0e27c0df85f548abe9')
variant('debug', default=False, variant('debug', default=False,
description='Builds a debug version of the libraries') description='Builds a debug version of the libraries')
variant('shared', default=True, variant('shared', default=True,
description='Enables the build of shared libraries') description='Enables the build of shared libraries')
variant('hybrid', default=True, variant('hybrid', default=True,
description='Make use of OpenMP within MPI packing/unpacking') description='Make use of OpenMP within MPI packing/unpacking')
variant('openmp_blas', default=False, variant('openmp_blas', default=False,
description='Use OpenMP for threading in the BLAS library') description='Use OpenMP for threading in the BLAS library')
variant('c', default=False, variant('c', default=False,
description='Build C interface') description='Build C interface')
variant('python', default=False, variant('python', default=False,
description='Install Python interface') description='Install Python interface')
variant('parmetis', default=False, variant('parmetis', default=False,
description='Enable ParMETIS') description='Enable ParMETIS')
variant('quad', default=False, variant('quad', default=False,
description='Enable quad precision') description='Enable quad precision')
variant('int64', default=False, variant('int64', default=False,
description='Use 64bit integers') description='Use 64bit integers')
# When this variant is set remove the normal dependencies since # When this variant is set remove the normal dependencies since
# Elemental has to build BLAS and ScaLAPACK internally # Elemental has to build BLAS and ScaLAPACK internally
variant('int64_blas', default=False, variant('int64_blas', default=False,
description='Use 64bit integers for BLAS.' description='Use 64bit integers for BLAS.'
' Requires local build of BLAS library.') ' Requires local build of BLAS library.')
variant('scalapack', default=False, variant('scalapack', default=False,
description='Build with ScaLAPACK library') description='Build with ScaLAPACK library')
@ -127,11 +127,11 @@ def cmake_args(self):
'_64_' if '+int64_blas' in spec else '_')), '_64_' if '+int64_blas' in spec else '_')),
'-DCUSTOM_LAPACK_SUFFIX:BOOL=TRUE']), '-DCUSTOM_LAPACK_SUFFIX:BOOL=TRUE']),
else: else:
math_libs = (spec['lapack'].lapack_libs + math_libs = (spec['lapack'].libs +
spec['blas'].blas_libs) spec['blas'].libs)
if '+scalapack' in spec: if '+scalapack' in spec:
math_libs = spec['scalapack'].scalapack_libs + math_libs math_libs = spec['scalapack'].libs + math_libs
args.extend([ args.extend([
'-DMATH_LIBS:STRING={0}'.format(math_libs.search_flags), '-DMATH_LIBS:STRING={0}'.format(math_libs.search_flags),

4
var/spack/repos/builtin/packages/lammps/package.py
View file

@ -160,8 +160,8 @@ def build_user_atc(self):
make('lib', '-f', 'Makefile.icc') make('lib', '-f', 'Makefile.icc')
with open('Makefile.lammps', 'w') as fh: with open('Makefile.lammps', 'w') as fh:
lapack_blas = (self.spec['lapack'].lapack_libs + lapack_blas = (self.spec['lapack'].libs +
self.spec['blas'].blas_libs) self.spec['blas'].libs)
makefile = [ makefile = [
'user-atc_SYSINC =', 'user-atc_SYSINC =',
'user-atc_SYSLIB = {0}'.format(lapack_blas.ld_flags), 'user-atc_SYSLIB = {0}'.format(lapack_blas.ld_flags),

8
var/spack/repos/builtin/packages/magma/package.py
View file

@ -26,7 +26,7 @@
class Magma(CMakePackage): class Magma(CMakePackage):
"""The MAGMA project aims to develop a dense linear algebra library """The MAGMA project aims to develop a dense linear algebra library
similar to LAPACK but for heterogeneous/hybrid architectures, similar to LAPACK but for heterogeneous/hybrid architectures,
starting with current "Multicore+GPU" systems. starting with current "Multicore+GPU" systems.
""" """
@ -51,9 +51,9 @@ def cmake_args(self):
options.extend([ options.extend([
'-DCMAKE_INSTALL_PREFIX=%s' % prefix, '-DCMAKE_INSTALL_PREFIX=%s' % prefix,
'-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib' % prefix, '-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib' % prefix,
'-DLAPACK_LIBRARIES=%s;%s' % (spec['blas'].blas_libs, '-DLAPACK_LIBRARIES=%s;%s' % (spec['blas'].libs,
spec['lapack'].lapack_libs) spec['lapack'].libs)
]) ])
if '+fortran' in spec: if '+fortran' in spec:
options.extend([ options.extend([