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

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

@ -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),

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

@ -51,8 +51,8 @@ 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: