diff options
Diffstat (limited to 'dev-python/numpy-python2/files')
| -rw-r--r-- | dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch | 76 | ||||
| -rw-r--r-- | dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch | 23 |
2 files changed, 0 insertions, 99 deletions
diff --git a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch deleted file mode 100644 index 979b56bd6dc5..000000000000 --- a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index 65d7de316..a85640d30 100644 ---- a/numpy/distutils/system_info.py -+++ b/numpy/distutils/system_info.py -@@ -364,29 +364,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 -- 'openblas_clapack': openblas_clapack_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 -- 'accelerate': accelerate_info, # use blas_opt instead -- 'x11': x11_info, -+ cl = {'x11': x11_info, - 'fft_opt': fft_opt_info, - 'fftw': fftw_info, - 'fftw2': fftw2_info, -@@ -731,10 +709,7 @@ class system_info(object): - 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): - c = customized_ccompiler() -@@ -1685,7 +1660,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) - -@@ -1717,16 +1692,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: diff --git a/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch b/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch deleted file mode 100644 index aa141de27f48..000000000000 --- a/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b8e741c66f71071c3406e592e1537570731bcb35 Mon Sep 17 00:00:00 2001 -From: mattip <matti.picus@gmail.com> -Date: Sun, 26 May 2019 08:55:53 +0300 -Subject: [PATCH] BUG: setup.py install --skip-build fails - ---- - numpy/distutils/command/install_clib.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py -index 662aa00bda9..6a73f7e3308 100644 ---- a/numpy/distutils/command/install_clib.py -+++ b/numpy/distutils/command/install_clib.py -@@ -19,6 +19,9 @@ def finalize_options(self): - - def run (self): - build_clib_cmd = get_cmd("build_clib") -+ if not build_clib_cmd.build_clib: -+ # can happen if the user specified `--skip-build` -+ build_clib_cmd.finalize_options() - build_dir = build_clib_cmd.build_clib - - # We need the compiler to get the library name -> filename association |