summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-12-31 22:47:49 +0000
committerSam James <sam@gentoo.org>2021-12-31 22:48:17 +0000
commit4060d4e419a67622448089fce86ba256ce3338ef (patch)
treefe04b6ff8876b19bba32d0097b85decd92750f31 /dev-python/numpy/files
parentapp-arch/zstd: disable asm (exec'able stack) on !amd64 (diff)
downloadgentoo-4060d4e419a67622448089fce86ba256ce3338ef.tar.gz
gentoo-4060d4e419a67622448089fce86ba256ce3338ef.tar.bz2
gentoo-4060d4e419a67622448089fce86ba256ce3338ef.zip
dev-python/numpy: add 1.22.0
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-python/numpy/files')
-rw-r--r--dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch78
1 files changed, 78 insertions, 0 deletions
diff --git a/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch
new file mode 100644
index 000000000000..7c9d7768607f
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch
@@ -0,0 +1,78 @@
+Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python/numpy/files?id=e5ce90a04e79f6413604e96e4803cb95ada7c859
+https://bugs.gentoo.org/567938
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -502,36 +502,7 @@ def get_info(name, notfound_action=0):
+ 2 - raise error
+ """
+ cl = {'armpl': armpl_info,
+- 'blas_armpl': blas_armpl_info,
+- 'lapack_armpl': lapack_armpl_info,
+ 'fftw3_armpl': fftw3_armpl_info,
+- '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
+- 'flame': flame_info, # use lapack_opt instead
+- '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
+- 'openblas64_': openblas64__info,
+- 'openblas64__lapack': openblas64__lapack_info,
+- 'openblas_ilp64': openblas_ilp64_info,
+- 'openblas_ilp64_lapack': openblas_ilp64_lapack_info,
+ 'x11': x11_info,
+ 'fft_opt': fft_opt_info,
+ 'fftw': fftw_info,
+@@ -543,24 +514,12 @@ def get_info(name, notfound_action=0):
+ 'dfftw_threads': dfftw_threads_info,
+ 'sfftw_threads': sfftw_threads_info,
+ 'djbfft': djbfft_info,
+- 'blas': blas_info, # use blas_opt instead
+- 'lapack': lapack_info, # use lapack_opt instead
+- 'lapack_src': lapack_src_info,
+- 'blas_src': blas_src_info,
+ 'numpy': numpy_info,
+ 'f2py': f2py_info,
+ 'Numeric': Numeric_info,
+ 'numeric': Numeric_info,
+ 'numarray': numarray_info,
+ 'numerix': numerix_info,
+- 'lapack_opt': lapack_opt_info,
+- 'lapack_ilp64_opt': lapack_ilp64_opt_info,
+- 'lapack_ilp64_plain_opt': lapack_ilp64_plain_opt_info,
+- 'lapack64__opt': lapack64__opt_info,
+- 'blas_opt': blas_opt_info,
+- 'blas_ilp64_opt': blas_ilp64_opt_info,
+- 'blas_ilp64_plain_opt': blas_ilp64_plain_opt_info,
+- 'blas64__opt': blas64__opt_info,
+ 'boost_python': boost_python_info,
+ 'agg2': agg2_info,
+ 'wx': wx_info,
+@@ -951,10 +910,7 @@ class system_info:
+ 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()