From cfe9e921b5b178937b1a022c5ffe11532aacfe07 Mon Sep 17 00:00:00 2001 From: Timo Betcke Date: Mon, 5 Jan 2015 15:10:06 +0000 Subject: [PATCH 1/3] Fixed Numpy MKL Lookup for Anaconda Python 3.4 --- modules/numpy_mkl.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/numpy_mkl.py b/modules/numpy_mkl.py index 11b2bab..e58de55 100644 --- a/modules/numpy_mkl.py +++ b/modules/numpy_mkl.py @@ -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") From cb8efb9c34c699534211b1ae8c43f49b9cd7a20a Mon Sep 17 00:00:00 2001 From: Timo Betcke Date: Mon, 2 Feb 2015 14:05:24 +0000 Subject: [PATCH 2/3] Updated localbash.in.sh to DYLD_FALLBACK_LIBRARY_PATH --- scripts/localbash.in.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/localbash.in.sh b/scripts/localbash.in.sh index 709d04d..5c04ea1 100644 --- a/scripts/localbash.in.sh +++ b/scripts/localbash.in.sh @@ -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() { From c25a566c6c2d3a0882a19d4ea7f4dd54fd1f832b Mon Sep 17 00:00:00 2001 From: Timo Betcke Date: Thu, 12 Feb 2015 21:45:10 +0000 Subject: [PATCH 3/3] Added PATH export to localbash --- scripts/localbash.in.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/localbash.in.sh b/scripts/localbash.in.sh index 5c04ea1..3e5e66b 100644 --- a/scripts/localbash.in.sh +++ b/scripts/localbash.in.sh @@ -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