From 8813b3fbd383717e8ac4e11a2f67af00c958cb94 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Sat, 6 Jan 2018 11:01:06 -0700 Subject: Updating OpenFAST to use explicit lapack and blas libraries from Spack. (#6824) * Updating OpenFAST to use explicit lapack and blas libraries from Spack. * Simplifying openfast blas lib logic and fixes flake8 errors. * Changing order of blas and lapack libs in openfast package. --- var/spack/repos/builtin/packages/openfast/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index cf37e24a81..687ca8c3b7 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -56,7 +56,7 @@ class Openfast(CMakePackage): # Additional dependencies when compiling C++ library depends_on('mpi', when='+cxx') depends_on('yaml-cpp', when='+cxx') - depends_on('hdf5+mpi+cxx', when='+cxx') + depends_on('hdf5+mpi+cxx+hl', when='+cxx') depends_on('zlib', when='+cxx') depends_on('libxml2', when='+cxx') @@ -79,6 +79,13 @@ class Openfast(CMakePackage): 'ON' if '+cxx' in spec else 'OFF'), ]) + # Make sure we use Spack's blas/lapack: + blas_libs = spec['lapack'].libs + spec['blas'].libs + options.extend([ + '-DBLAS_LIBRARIES=%s' % blas_libs.joined(';'), + '-DLAPACK_LIBRARIES=%s' % blas_libs.joined(';') + ]) + if '+cxx' in spec: options.extend([ '-DMPI_CXX_COMPILER:PATH=%s' % spec['mpi'].mpicxx, -- cgit v1.2.3-70-g09d2