diff options
author | Justin Lecher <jlec@gentoo.org> | 2017-04-14 20:34:39 +0100 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2017-04-14 20:34:39 +0100 |
commit | 65d331f931f54d7c099446acf1eb1796e61ce990 (patch) | |
tree | 10e92bbe21c4548e2a9e87fc289e34ba1f3bcc9c /dev-python/numpy/files | |
parent | app-text/pdfgrep: Version Bump (diff) | |
download | gentoo-65d331f931f54d7c099446acf1eb1796e61ce990.tar.gz gentoo-65d331f931f54d7c099446acf1eb1796e61ce990.tar.bz2 gentoo-65d331f931f54d7c099446acf1eb1796e61ce990.zip |
dev-python/numpy: Version Bump
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=607914
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'dev-python/numpy/files')
-rw-r--r-- | dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch new file mode 100644 index 000000000000..81d6084be3d8 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch @@ -0,0 +1,72 @@ +--- numpy-1.11.1/numpy/distutils/system_info.py ++++ numpy-1.11.1/numpy/distutils/system_info.py +@@ -312,27 +312,7 @@ + 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 +- 'blis': blis_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, +@@ -669,10 +650,7 @@ + return [b for b in [a.strip() for a in libs.split(',')] if b] + + def get_libraries(self, key='libraries'): +- if hasattr(self, '_lib_names'): +- return self.get_libs(key, default=self._lib_names) +- else: +- return self.get_libs(key, '') ++ return self.get_libs(key, '') + + def library_extensions(self): + static_exts = ['.a'] +@@ -1685,7 +1663,7 @@ + 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) + +@@ -1718,16 +1696,16 @@ + # 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: |