Skip to content

Updated localbash.in.sh to DYLD_FALLBACK_LIBRARY_PATH #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdavezac merged 5 commits into from
May 13, 2015
Merged

Updated localbash.in.sh to DYLD_FALLBACK_LIBRARY_PATH #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfe9e92
Fixed Numpy MKL Lookup for Anaconda Python 3.4
tbetcke Jan 5, 2015
cb8efb9
Updated localbash.in.sh to DYLD_FALLBACK_LIBRARY_PATH
tbetcke Feb 2, 2015
4b786f1
Merge remote-tracking branch 'upstream/master'
tbetcke Feb 2, 2015
8c7c498
Merge branch 'numpy_mkl_lookup'
tbetcke Feb 11, 2015
c25a566
Added PATH export to localbash
tbetcke Feb 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/numpy_mkl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,14 @@ def get_mkl_dirs_and_libs_like_numpy():
from sys import platform
from os import environ
from subprocess import check_output
from glob import glob
try:
import numpy
except ImportError:
raise Exception("MKL autodetection failed: NumPy could not "
"be imported. Specify MKL location manually")
lapack_lite_path = join(dirname(numpy.__file__), 'linalg', 'lapack_lite.so')

lapack_lite_path = glob(join(dirname(numpy.__file__), 'linalg', 'lapack_lite*.so'))[0]
if not isfile(lapack_lite_path):
raise Exception("MKL autodetection failed: '"+lapack_lite_path+
"' is not a file. Specify MKL location manually")
Expand Down
8 changes: 4 additions & 4 deletions scripts/localbash.in.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ if [ -e @PROJECT_BINARY_DIR@/paths/ldpaths ]; then
if [ -d "$1" ] && [[ ":$LD_LIBRARY_PATH:" != *":$1:"* ]]; then
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+"$LD_LIBRARY_PATH:"}$1"
fi
if [ -d "$1" ] && [[ ":$DYLD_LIBRARY_PATH:" != *":$1:"* ]]; then
DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:+"$DYLD_LIBRARY_PATH:"}$1"
if [ -d "$1" ] && [[ ":$DYLD_FALLBACK_LIBRARY_PATH:" != *":$1:"* ]]; then
DYLD_FALLBACK_LIBRARY_PATH="${DYLD_FALLBACK_LIBRARY_PATH:+"$DYLD_FALLBACK_LIBRARY_PATH:"}$1"
fi
}
while read -r line; do
add_to_ld $line
done < @PROJECT_BINARY_DIR@/paths/ldpaths
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
export DYLD_FALLBACK_LIBRARY_PATH=$DYLD_FALLBACK_LIBRARY_PATH
fi
if [ -e @PROJECT_BINARY_DIR@/paths/pypaths.pth ] && [ -n "@env_PYTHON@" ]; then
add_to_py() {
Expand All @@ -25,7 +25,7 @@ if [ -e @PROJECT_BINARY_DIR@/paths/pypaths.pth ] && [ -n "@env_PYTHON@" ]; then
done < @PROJECT_BINARY_DIR@/paths/pypaths.pth
export PYTHONPATH=$PYTHONPATH
fi

export PATH=@PROJECT_BINARY_DIR@/external/bin:$PATH
if [ -n "@env_WORKING_DIRECTORY@" ]; then
cd @env_WORKING_DIRECTORY@
fi
Expand Down