summaryrefslogtreecommitdiff
path: root/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch')
-rw-r--r--dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
new file mode 100644
index 000000000000..db4a47d4d67c
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
@@ -0,0 +1,64 @@
+ numpy/distutils/system_info.py | 29 +++++------------------------
+ 1 file changed, 5 insertions(+), 24 deletions(-)
+
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index d7eb49e..aa62b09 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0):
+ 1 - display warning message
+ 2 - raise error
+ """
+- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead
+- 'atlas_threads': atlas_threads_info, # ditto
+- 'atlas_blas': atlas_blas_info,
+- 'atlas_blas_threads': atlas_blas_threads_info,
+- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead
+- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto
+- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead
+- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto
+- 'atlas_3_10_blas': atlas_3_10_blas_info,
+- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead
+- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto
+- 'mkl': mkl_info,
+- # openblas which may or may not have embedded lapack
+- 'openblas': openblas_info, # use blas_opt instead
+- # openblas with embedded lapack
+- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
+- 'blas_mkl': blas_mkl_info, # use blas_opt instead
+- 'x11': x11_info,
++ cl = {'x11': x11_info,
+ 'fft_opt': fft_opt_info,
+ 'fftw': fftw_info,
+ 'fftw2': fftw2_info,
+@@ -1690,7 +1671,7 @@ class blas_info(system_info):
+ lib = self.has_cblas(info)
+ if lib is not None:
+ info['language'] = 'c'
+- info['libraries'] = [lib]
++ info['libraries'] = lib
+ info['define_macros'] = [('HAVE_CBLAS', None)]
+ self.set_info(**info)
+
+@@ -1722,16 +1703,16 @@ class blas_info(system_info):
+ # check for cblas lib, and if not present check for blas lib.
+ try:
+ c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+- libraries=["cblas"],
++ libraries=info["libraries"],
+ library_dirs=info['library_dirs'],
+ extra_postargs=info.get('extra_link_args', []))
+- res = "cblas"
++ res = info["libraries"]
+ except distutils.ccompiler.LinkError:
+ c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+ libraries=["blas"],
+ library_dirs=info['library_dirs'],
+ extra_postargs=info.get('extra_link_args', []))
+- res = "blas"
++ res = ["blas"]
+ except distutils.ccompiler.CompileError:
+ res = None
+ finally: