| 1 |
commit: 23970fddef65b3360224902f232eaa6d54357ed2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 6 16:31:17 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 16:31:39 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23970fdd |
| 7 |
|
| 8 |
dev-python/numpy: fix blas patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/830630 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/numpy-1.22.0-no-hardcode-blasv2.patch | 40 ++++------------------ |
| 14 |
...{numpy-1.22.0.ebuild => numpy-1.22.0-r1.ebuild} | 2 +- |
| 15 |
2 files changed, 7 insertions(+), 35 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index 7c9d7768607f..d87a16a4b6c9 100644 |
| 19 |
--- a/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch |
| 20 |
+++ b/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch |
| 21 |
@@ -2,12 +2,9 @@ Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python |
| 22 |
https://bugs.gentoo.org/567938 |
| 23 |
--- a/numpy/distutils/system_info.py |
| 24 |
+++ b/numpy/distutils/system_info.py |
| 25 |
-@@ -502,36 +502,7 @@ def get_info(name, notfound_action=0): |
| 26 |
- 2 - raise error |
| 27 |
- """ |
| 28 |
- cl = {'armpl': armpl_info, |
| 29 |
-- 'blas_armpl': blas_armpl_info, |
| 30 |
-- 'lapack_armpl': lapack_armpl_info, |
| 31 |
+@@ -505,33 +505,7 @@ def get_info(name, notfound_action=0): |
| 32 |
+ 'blas_armpl': blas_armpl_info, |
| 33 |
+ 'lapack_armpl': lapack_armpl_info, |
| 34 |
'fftw3_armpl': fftw3_armpl_info, |
| 35 |
- 'atlas': atlas_info, # use lapack_opt or blas_opt instead |
| 36 |
- 'atlas_threads': atlas_threads_info, # ditto |
| 37 |
@@ -31,7 +28,7 @@ https://bugs.gentoo.org/567938 |
| 38 |
- 'blis': blis_info, # use blas_opt instead |
| 39 |
- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead |
| 40 |
- 'blas_mkl': blas_mkl_info, # use blas_opt instead |
| 41 |
-- 'accelerate': accelerate_info, # use blas_opt instead |
| 42 |
+ 'accelerate': accelerate_info, # use blas_opt instead |
| 43 |
- 'openblas64_': openblas64__info, |
| 44 |
- 'openblas64__lapack': openblas64__lapack_info, |
| 45 |
- 'openblas_ilp64': openblas_ilp64_info, |
| 46 |
@@ -39,32 +36,7 @@ https://bugs.gentoo.org/567938 |
| 47 |
'x11': x11_info, |
| 48 |
'fft_opt': fft_opt_info, |
| 49 |
'fftw': fftw_info, |
| 50 |
-@@ -543,24 +514,12 @@ def get_info(name, notfound_action=0): |
| 51 |
- 'dfftw_threads': dfftw_threads_info, |
| 52 |
- 'sfftw_threads': sfftw_threads_info, |
| 53 |
- 'djbfft': djbfft_info, |
| 54 |
-- 'blas': blas_info, # use blas_opt instead |
| 55 |
-- 'lapack': lapack_info, # use lapack_opt instead |
| 56 |
-- 'lapack_src': lapack_src_info, |
| 57 |
-- 'blas_src': blas_src_info, |
| 58 |
- 'numpy': numpy_info, |
| 59 |
- 'f2py': f2py_info, |
| 60 |
- 'Numeric': Numeric_info, |
| 61 |
- 'numeric': Numeric_info, |
| 62 |
- 'numarray': numarray_info, |
| 63 |
- 'numerix': numerix_info, |
| 64 |
-- 'lapack_opt': lapack_opt_info, |
| 65 |
-- 'lapack_ilp64_opt': lapack_ilp64_opt_info, |
| 66 |
-- 'lapack_ilp64_plain_opt': lapack_ilp64_plain_opt_info, |
| 67 |
-- 'lapack64__opt': lapack64__opt_info, |
| 68 |
-- 'blas_opt': blas_opt_info, |
| 69 |
-- 'blas_ilp64_opt': blas_ilp64_opt_info, |
| 70 |
-- 'blas_ilp64_plain_opt': blas_ilp64_plain_opt_info, |
| 71 |
-- 'blas64__opt': blas64__opt_info, |
| 72 |
- 'boost_python': boost_python_info, |
| 73 |
- 'agg2': agg2_info, |
| 74 |
- 'wx': wx_info, |
| 75 |
-@@ -951,10 +910,7 @@ class system_info: |
| 76 |
+@@ -951,10 +925,7 @@ class system_info: |
| 77 |
return [b for b in [a.strip() for a in libs.split(',')] if b] |
| 78 |
|
| 79 |
def get_libraries(self, key='libraries'): |
| 80 |
@@ -72,7 +44,7 @@ https://bugs.gentoo.org/567938 |
| 81 |
- return self.get_libs(key, default=self._lib_names) |
| 82 |
- else: |
| 83 |
- return self.get_libs(key, '') |
| 84 |
-+ return self.get_libs(key, '') |
| 85 |
++ return self.get_libs(key, '') |
| 86 |
|
| 87 |
def library_extensions(self): |
| 88 |
c = customized_ccompiler() |
| 89 |
|
| 90 |
diff --git a/dev-python/numpy/numpy-1.22.0.ebuild b/dev-python/numpy/numpy-1.22.0-r1.ebuild |
| 91 |
similarity index 99% |
| 92 |
rename from dev-python/numpy/numpy-1.22.0.ebuild |
| 93 |
rename to dev-python/numpy/numpy-1.22.0-r1.ebuild |
| 94 |
index 886b232fc2f1..6037152ed67b 100644 |
| 95 |
--- a/dev-python/numpy/numpy-1.22.0.ebuild |
| 96 |
+++ b/dev-python/numpy/numpy-1.22.0-r1.ebuild |
| 97 |
@@ -1,4 +1,4 @@ |
| 98 |
-# Copyright 1999-2021 Gentoo Authors |
| 99 |
+# Copyright 1999-2022 Gentoo Authors |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
|
| 102 |
EAPI=7 |
Archives