cp2k and dependecies : fixed blas-lapack related statements in packag…

…e.py
spack · Sep 21, 2016 · be14686 · be14686
1 parent ff8fb7b
commit be14686
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/var/spack/repos/builtin/packages/atlas/package.py b/var/spack/repos/builtin/packages/atlas/package.py
@@ -110,6 +110,9 @@ def install(self, spec, prefix):
 
     @property
     def blas_libs(self):
+        # libsatlas.[so,dylib,dll ] contains all serial APIs (serial lapack,
+        # serial BLAS), and all ATLAS symbols needed to support them. Whereas
+        # libtatlas.[so,dylib,dll ] is parallel (multithreaded) version.
         is_threaded = '+pthread' in self.spec
         if '+shared' in self.spec:
             to_find = ['libtatlas'] if is_threaded else ['libsatlas']

diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
@@ -74,6 +74,7 @@ def install(self, spec, prefix):
         ]
 
         # Make sure we use Spack's Lapack:
+        blas = spec['blas'].blas_libs
         lapack = spec['lapack'].lapack_libs
         options.extend([
             '-DLAPACK_FOUND=true',

diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py
@@ -67,8 +67,8 @@ def install(self, spec, prefix):
             '@PARMETIS_PREFIX': self.spec['parmetis'].prefix,
             '@LAPACK_PREFIX': self.spec['lapack'].prefix,
             '@BLAS_PREFIX': self.spec['blas'].prefix,
-            '@LAPACK_LIBS': self.spec['lapack'].lapack_shared_lib,
-            '@BLAS_LIBS': self.spec['lapack'].blas_shared_lib,
+            '@LAPACK_LIBS': self.spec['lapack'].lapack_libs.joined(),
+            '@BLAS_LIBS': self.spec['lapack'].blas_libs.joined(),
             '@STDCXX_LIB': ' '.join(self.compiler.stdcxx_libs)
         }
 

diff --git a/var/spack/repos/builtin/packages/wannier90/package.py b/var/spack/repos/builtin/packages/wannier90/package.py
@@ -47,13 +47,12 @@ class Wannier90(Package):
 
     def install(self, spec, prefix):
 
+        lapack = self.spec['lapack'].lapack_libs
+        blas = self.spec['blas'].blas_libs
         substitutions = {
             '@F90': spack_fc,
             '@MPIF90': self.spec['mpi'].mpifc,
-            '@LIBS': ' '.join([
-                self.spec['lapack'].lapack_shared_lib,
-                self.spec['lapack'].blas_shared_lib
-            ])
+            '@LIBS': (lapack + blas).joined()
         }
         #######
         # TODO : this part is replicated in PEXSI