Skip to content

Commit

Permalink
Reverting change to openblas in commit below. The change broke py-sci…
Browse files Browse the repository at this point in the history
…py, and reverting it fixes py-scipy.

spack@1e10309
commit 1e10309
Author: Denis Davydov <davydden@gmail.com>
Date:   Mon Sep 26 19:37:23 2016 +0200

    some fixes to blas/lapack usage in packages (spack#1852)

    * openblas: remove symlinks; use lapack_libs.ld_flags in the test
  • Loading branch information
Elizabeth Fischer committed Oct 6, 2016
1 parent 83a074e commit c988925
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions var/spack/repos/builtin/packages/openblas/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,25 @@ def install(self, spec, prefix):
# no quotes around prefix (spack doesn't use a shell)
make('install', "PREFIX=%s" % prefix, *make_defs)

# TODO: the links below are mainly there because client
# TODO: packages are wrongly written. Check if they can be removed
# NOTE: py-scipy requires these symlinks. Please do not remove them
# without checking that py-scipy can build without.
# 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')
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')
if '+shared' in spec:
symlink('libopenblas.%s' % dso_suffix,
'liblapack.%s' % dso_suffix)

# Openblas may pass its own test but still fail to compile Lapack
# symbols. To make sure we get working Blas and Lapack, do a small
# test.
Expand Down

0 comments on commit c988925

Please sign in to comment.