Merge pull request #485 from epfl-scitas/packages/blas_lapack_providers

reworking package : netlib

var/spack/repos/builtin/packages/netlib-blas/package.py

@@ -1,46 +0,0 @@
-from spack import *
-import os
-
-
-class NetlibBlas(Package):
-    """Netlib reference BLAS"""
-    homepage = "http://www.netlib.org/lapack/"
-    url      = "http://www.netlib.org/lapack/lapack-3.5.0.tgz"
-
-    version('3.5.0', 'b1d3e3e425b2e44a06760ff173104bdf')
-
-    variant('fpic', default=False, description="Build with -fpic compiler option")
-
-    # virtual dependency
-    provides('blas')
-
-    # Doesn't always build correctly in parallel
-    parallel = False
-
-    def patch(self):
-        os.symlink('make.inc.example', 'make.inc')
-
-        mf = FileFilter('make.inc')
-        mf.filter('^FORTRAN.*', 'FORTRAN = f90')
-        mf.filter('^LOADER.*',  'LOADER = f90')
-        mf.filter('^CC =.*',  'CC = cc')
-
-        if '+fpic' in self.spec:
-            mf.filter('^OPTS.*=.*',  'OPTS = -O2 -frecursive -fpic')
-            mf.filter('^CFLAGS =.*',  'CFLAGS = -O3 -fpic')
-
-
-    def install(self, spec, prefix):
-        make('blaslib')
-
-        # Tests that blas builds correctly
-        make('blas_testing')
-
-        # No install provided
-        mkdirp(prefix.lib)
-        install('librefblas.a', prefix.lib)
-
-        # Blas virtual package should provide blas.a and libblas.a
-        with working_dir(prefix.lib):
-            symlink('librefblas.a', 'blas.a')
-            symlink('librefblas.a', 'libblas.a')

var/spack/repos/builtin/packages/netlib-lapack/package.py

@@ -1,16 +1,15 @@
 from spack import *
 
+
 class NetlibLapack(Package):
     """
-    LAPACK version 3.X is a comprehensive FORTRAN library that does
+    LAPACK version 3.X is a comprehensive FORTRAN library that does linear algebra operations including matrix
-    linear algebra operations including matrix inversions, least
+    inversions, least squared solutions to linear sets of equations, eigenvector analysis, singular value
-    squared solutions to linear sets of equations, eigenvector
+    decomposition, etc. It is a very comprehensive and reputable package that has found extensive use in the
-    analysis, singular value decomposition, etc. It is a very
+    scientific community.
-    comprehensive and reputable package that has found extensive
-    use in the scientific community.
     """
     homepage = "http://www.netlib.org/lapack/"
-    url      = "http://www.netlib.org/lapack/lapack-3.5.0.tgz"
+    url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz"
 
     version('3.6.0', 'f2f6c67134e851fe189bb3ca1fbb5101')
     version('3.5.0', 'b1d3e3e425b2e44a06760ff173104bdf')
@@ -19,41 +18,34 @@ class NetlibLapack(Package):
     version('3.4.0', '02d5706ec03ba885fc246e5fa10d8c70')
     version('3.3.1', 'd0d533ec9a5b74933c2a1e84eedc58b4')
 
-    variant('shared', default=False, description="Build shared library version")
+    variant('debug', default=False, description='Activates the Debug build type')
-    variant('fpic', default=False, description="Build with -fpic compiler option")
+    variant('shared', default=True, description="Build shared library version")
+    variant('external-blas', default=False, description='Build lapack with an external blas')
+
+    variant('lapacke', default=True, description='Activates the build of the LAPACKE C interface')
 
     # virtual dependency
+    provides('blas', when='~external-blas')
     provides('lapack')
 
-    # blas is a virtual dependency.
-    depends_on('blas')
     depends_on('cmake')
-
+    depends_on('blas', when='+external-blas')
-    # Doesn't always build correctly in parallel
-    parallel = False
-
-    @when('^netlib-blas')
-    def get_blas_libs(self):
-        blas = self.spec['netlib-blas']
-        return [join_path(blas.prefix.lib, 'blas.a')]
-
-    @when('^atlas')
-    def get_blas_libs(self):
-        blas = self.spec['atlas']
-        return [join_path(blas.prefix.lib, l)
-                for l in ('libf77blas.a', 'libatlas.a')]
 
     def install(self, spec, prefix):
-        blas_libs = ";".join(self.get_blas_libs())
+        cmake_args = ['-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if '+shared' in spec else 'OFF'),
-        cmake_args = [".", '-DBLAS_LIBRARIES=' + blas_libs]
+                      '-DCMAKE_BUILD_TYPE:STRING=%s' % ('Debug' if '+debug' in spec else 'Release'),
+                      '-DLAPACKE:BOOL=%s' % ('ON' if '+lapacke' in spec else 'OFF')]
+        if '+external-blas' in spec:
+            # TODO : the mechanism to specify the library should be more general,
+            # TODO : but this allows to have an hook to an external blas
+            cmake_args.extend([
+                '-DUSE_OPTIMIZED_BLAS:BOOL=ON',
+                '-DBLAS_LIBRARIES:PATH=%s' % join_path(spec['blas'].prefix.lib, 'libblas.a')
+            ])
 
-        if '+shared' in spec:
+        cmake_args.extend(std_cmake_args)
-            cmake_args.append('-DBUILD_SHARED_LIBS=ON')
-        if '+fpic' in spec:
-            cmake_args.append('-DCMAKE_POSITION_INDEPENDENT_CODE=ON')
 
-        cmake_args += std_cmake_args
+        with working_dir('spack-build', create=True):
-
+            cmake('..', *cmake_args)
-        cmake(*cmake_args)
+            make()
-        make()
+            make("install")
-        make("install")