Reworking of lapack_shared_libs
and similar properties (#1682)
* Turned <provider>_libs into an iterable Modifications : - added class LibraryList + unit tests - added convenience functions `find_libraries` and `dedupe` - modifed non Intel blas/lapack providers - modified packages using blas_shared_libs and similar functions * atlas : added pthread variant * intel packages : added lapack_libs and blas_libs * find_library_path : removed unused function * PR review : fixed last issues * LibraryList : added test on __add__ return type * LibraryList : added __radd__ fixed unit tests fix : failing unit tests due to missing `self` * cp2k and dependecies : fixed blas-lapack related statements in package.py
This commit is contained in:

committed by
Todd Gamblin

parent
6b6f868f2a
commit
d848559f70
@@ -32,7 +32,7 @@ class Psi4(Package):
|
||||
a variety of molecular properties."""
|
||||
|
||||
homepage = "http://www.psicode.org/"
|
||||
url = "https://github.com/psi4/psi4/archive/0.5.tar.gz"
|
||||
url = "https://github.com/psi4/psi4/archive/0.5.tar.gz"
|
||||
|
||||
version('0.5', '53041b8a9be3958384171d0d22f9fdd0')
|
||||
|
||||
@@ -62,9 +62,10 @@ class Psi4(Package):
|
||||
def install(self, spec, prefix):
|
||||
cmake_args = [
|
||||
'-DBLAS_TYPE={0}'.format(spec['blas'].name.upper()),
|
||||
'-DBLAS_LIBRARIES={0}'.format(spec['blas'].blas_shared_lib),
|
||||
'-DBLAS_LIBRARIES={0}'.format(spec['blas'].blas_libs.joined()),
|
||||
'-DLAPACK_TYPE={0}'.format(spec['lapack'].name.upper()),
|
||||
'-DLAPACK_LIBRARIES={0}'.format(spec['lapack'].lapack_shared_lib),
|
||||
'-DLAPACK_LIBRARIES={0}'.format(
|
||||
spec['lapack'].lapack_libs.joined()),
|
||||
'-DBOOST_INCLUDEDIR={0}'.format(spec['boost'].prefix.include),
|
||||
'-DBOOST_LIBRARYDIR={0}'.format(spec['boost'].prefix.lib),
|
||||
'-DENABLE_CHEMPS2=OFF'
|
||||
@@ -90,9 +91,9 @@ def filter_compilers(self, spec, prefix):
|
||||
|
||||
kwargs = {'ignore_absent': True, 'backup': False, 'string': True}
|
||||
|
||||
cc_files = ['bin/psi4-config']
|
||||
cc_files = ['bin/psi4-config']
|
||||
cxx_files = ['bin/psi4-config', 'include/psi4/psiconfig.h']
|
||||
template = 'share/psi4/plugin/Makefile.template'
|
||||
template = 'share/psi4/plugin/Makefile.template'
|
||||
|
||||
for filename in cc_files:
|
||||
filter_file(os.environ['CC'], self.compiler.cc,
|
||||
|
Reference in New Issue
Block a user