Merge branch 'features/blas-lapack-hardening' into develop
This commit is contained in:
Todd Gamblin
commit
220c72d67f
6 changed files with 116 additions and 20 deletions
|
|
@ -27,7 +27,8 @@
|
|||
'force_remove', 'join_path', 'ancestor', 'can_access', 'filter_file',
|
||||
'FileFilter', 'change_sed_delimiter', 'is_exe', 'force_symlink',
|
||||
'set_executable', 'copy_mode', 'unset_executable_mode',
|
||||
'remove_dead_links', 'remove_linked_tree', 'fix_darwin_install_name']
|
||||
'remove_dead_links', 'remove_linked_tree', 'find_library_path',
|
||||
'fix_darwin_install_name']
|
||||
|
||||
import os
|
||||
import glob
|
||||
|
|
@ -395,6 +396,7 @@ def remove_linked_tree(path):
|
|||
else:
|
||||
shutil.rmtree(path, True)
|
||||
|
||||
|
||||
def fix_darwin_install_name(path):
|
||||
"""
|
||||
Fix install name of dynamic libraries on Darwin to have full path.
|
||||
|
|
@ -420,3 +422,17 @@ def fix_darwin_install_name(path):
|
|||
if dep == os.path.basename(loc):
|
||||
subprocess.Popen(["install_name_tool", "-change",dep,loc,lib], stdout=subprocess.PIPE).communicate()[0]
|
||||
break
|
||||
|
||||
|
||||
def find_library_path(libname, *paths):
|
||||
"""Searches for a file called <libname> in each path.
|
||||
|
||||
Return:
|
||||
directory where the library was found, if found. None otherwise.
|
||||
|
||||
"""
|
||||
for path in paths:
|
||||
library = join_path(path, libname)
|
||||
if os.path.exists(library):
|
||||
return path
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -59,6 +59,11 @@
|
|||
SPACK_DEBUG_LOG_DIR = 'SPACK_DEBUG_LOG_DIR'
|
||||
|
||||
|
||||
# Platform-specific library suffix.
|
||||
dso_suffix = 'dylib' if sys.platform == 'darwin' else 'so'
|
||||
|
||||
|
||||
|
||||
class MakeExecutable(Executable):
|
||||
"""Special callable executable object for make so the user can
|
||||
specify parallel or not on a per-invocation basis. Using
|
||||
|
|
@ -246,6 +251,9 @@ def set_module_variables_for_package(pkg, module):
|
|||
# a Prefix object.
|
||||
m.prefix = pkg.prefix
|
||||
|
||||
# Platform-specific library suffix.
|
||||
m.dso_suffix = dso_suffix
|
||||
|
||||
|
||||
def get_rpaths(pkg):
|
||||
"""Get a list of all the rpaths for a package."""
|
||||
|
|
|
|||
|
|
@ -929,6 +929,9 @@ def build_process():
|
|||
install(env_path, env_install_path)
|
||||
dump_packages(self.spec, packages_dir)
|
||||
|
||||
# Run post install hooks before build stage is removed.
|
||||
spack.hooks.post_install(self)
|
||||
|
||||
# Stop timer.
|
||||
self._total_time = time.time() - start_time
|
||||
build_time = self._total_time - self._fetch_time
|
||||
|
|
@ -957,9 +960,6 @@ def build_process():
|
|||
# the database, so that we don't need to re-read from file.
|
||||
spack.installed_db.add(self.spec, self.prefix)
|
||||
|
||||
# Once everything else is done, run post install hooks
|
||||
spack.hooks.post_install(self)
|
||||
|
||||
|
||||
def sanity_check_prefix(self):
|
||||
"""This function checks whether install succeeded."""
|
||||
|
|
|
|||
|
|
@ -31,8 +31,16 @@ class NetlibLapack(Package):
|
|||
depends_on('cmake')
|
||||
depends_on('blas', when='+external-blas')
|
||||
|
||||
def install(self, spec, prefix):
|
||||
cmake_args = ['-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if '+shared' in spec else 'OFF'),
|
||||
|
||||
def patch(self):
|
||||
# Fix cblas CMakeLists.txt -- has wrong case for subdirectory name.
|
||||
filter_file('${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/',
|
||||
'${CMAKE_CURRENT_SOURCE_DIR}/cmake/', 'CBLAS/CMakeLists.txt', string=True)
|
||||
|
||||
|
||||
def install_one(self, spec, prefix, shared):
|
||||
cmake_args = ['-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'),
|
||||
'-DCBLAS=ON', # always build CBLAS
|
||||
'-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:
|
||||
|
|
@ -45,7 +53,33 @@ def install(self, spec, prefix):
|
|||
|
||||
cmake_args.extend(std_cmake_args)
|
||||
|
||||
with working_dir('spack-build', create=True):
|
||||
build_dir = 'spack-build' + ('-shared' if shared else '-static')
|
||||
with working_dir(build_dir, create=True):
|
||||
cmake('..', *cmake_args)
|
||||
make()
|
||||
make("install")
|
||||
|
||||
|
||||
def install(self, spec, prefix):
|
||||
# Always build static libraries.
|
||||
self.install_one(spec, prefix, False)
|
||||
|
||||
# Build shared libraries if requested.
|
||||
if '+shared' in spec:
|
||||
self.install_one(spec, prefix, True)
|
||||
|
||||
|
||||
def setup_dependent_package(self, module, dspec):
|
||||
# This is WIP for a prototype interface for virtual packages.
|
||||
# We can update this as more builds start depending on BLAS/LAPACK.
|
||||
libdir = find_library_path('libblas.a', self.prefix.lib64, self.prefix.lib)
|
||||
|
||||
self.spec.blas_static_lib = join_path(libdir, 'libblas.a')
|
||||
self.spec.lapack_static_lib = join_path(libdir, 'liblapack.a')
|
||||
|
||||
if '+shared' in self.spec:
|
||||
self.spec.blas_shared_lib = join_path(libdir, 'libblas.%s' % dso_suffix)
|
||||
self.spec.lapack_shared_lib = join_path(libdir, 'liblapack.%s' % dso_suffix)
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
from spack import *
|
||||
import sys
|
||||
import os
|
||||
|
||||
class Openblas(Package):
|
||||
"""OpenBLAS: An optimized BLAS library"""
|
||||
|
|
@ -10,29 +11,60 @@ class Openblas(Package):
|
|||
version('0.2.16', 'fef46ab92463bdbb1479dcec594ef6dc')
|
||||
version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9')
|
||||
|
||||
variant('shared', default=True, description="Build shared libraries as well as static libs.")
|
||||
|
||||
# virtual dependency
|
||||
provides('blas')
|
||||
provides('lapack')
|
||||
|
||||
|
||||
def install(self, spec, prefix):
|
||||
extra=[]
|
||||
make_defs = ['CC=%s' % spack_cc,
|
||||
'FC=%s' % spack_fc]
|
||||
|
||||
make_targets = ['libs', 'netlib']
|
||||
|
||||
# Build shared if variant is set.
|
||||
if '+shared' in spec:
|
||||
make_targets += ['shared']
|
||||
else:
|
||||
make_defs += ['NO_SHARED=1']
|
||||
|
||||
# fix missing _dggsvd_ and _sggsvd_
|
||||
if spec.satisfies('@0.2.16'):
|
||||
extra.extend([
|
||||
'BUILD_LAPACK_DEPRECATED=1' # fix missing _dggsvd_ and _sggsvd_
|
||||
])
|
||||
make_defs += ['BUILD_LAPACK_DEPRECATED=1']
|
||||
|
||||
make('libs', 'netlib', 'shared', 'CC=cc', 'FC=f77',*extra)
|
||||
make("tests")
|
||||
make('install', "PREFIX='%s'" % prefix)
|
||||
make_args = make_defs + make_targets
|
||||
make(*make_args)
|
||||
|
||||
make("tests", *make_defs)
|
||||
|
||||
# no quotes around prefix (spack doesn't use a shell)
|
||||
make('install', "PREFIX=%s" % prefix, *make_defs)
|
||||
|
||||
lib_dsuffix = 'dylib' if sys.platform == 'darwin' else 'so'
|
||||
# Blas virtual package should provide blas.a and libblas.a
|
||||
with working_dir(prefix.lib):
|
||||
symlink('libopenblas.a', 'blas.a')
|
||||
symlink('libopenblas.a', 'libblas.a')
|
||||
symlink('libopenblas.%s' % lib_dsuffix, 'libblas.%s' % lib_dsuffix)
|
||||
if '+shared' in spec:
|
||||
symlink('libopenblas.%s' % dso_suffix, 'libblas.%s' % dso_suffix)
|
||||
|
||||
# Lapack virtual package should provide liblapack.a
|
||||
with working_dir(prefix.lib):
|
||||
symlink('libopenblas.a', 'liblapack.a')
|
||||
symlink('libopenblas.%s' % lib_dsuffix, 'liblapack.%s' % lib_dsuffix)
|
||||
if '+shared' in spec:
|
||||
symlink('libopenblas.%s' % dso_suffix, 'liblapack.%s' % dso_suffix)
|
||||
|
||||
|
||||
def setup_dependent_package(self, module, dspec):
|
||||
# This is WIP for a prototype interface for virtual packages.
|
||||
# We can update this as more builds start depending on BLAS/LAPACK.
|
||||
libdir = find_library_path('libopenblas.a', self.prefix.lib64, self.prefix.lib)
|
||||
|
||||
self.spec.blas_static_lib = join_path(libdir, 'libopenblas.a')
|
||||
self.spec.lapack_static_lib = self.spec.blas_static_lib
|
||||
|
||||
if '+shared' in self.spec:
|
||||
self.spec.blas_shared_lib = join_path(libdir, 'libopenblas.%s' % dso_suffix)
|
||||
self.spec.lapack_shared_lib = self.spec.blas_shared_lib
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,15 @@ class PyScipy(Package):
|
|||
|
||||
extends('python')
|
||||
depends_on('py-nose')
|
||||
depends_on('py-numpy')
|
||||
depends_on('blas')
|
||||
depends_on('lapack')
|
||||
depends_on('py-numpy+blas+lapack')
|
||||
|
||||
def install(self, spec, prefix):
|
||||
if 'atlas' in spec:
|
||||
# libatlas.so actually isn't always installed, but this
|
||||
# seems to make the build autodetect things correctly.
|
||||
env['ATLAS'] = join_path(spec['atlas'].prefix.lib, 'libatlas.' + dso_suffix)
|
||||
else:
|
||||
env['BLAS'] = spec['blas'].blas_shared_lib
|
||||
env['LAPACK'] = spec['lapack'].lapack_shared_lib
|
||||
|
||||
python('setup.py', 'install', '--prefix=%s' % prefix)
|
||||
|
|
|
|||
Loading…
Reference in a new issue