[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/files/

[Justin Lecher]

commit:     825d57bd12b8538ad1f42b26348966c81776a622
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 17:14:49 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 17:14:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=825d57bd

dev-python/numpy: Revert accidental change to patch

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=568454

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../numpy/files/numpy-1.9.2-no-hardcode-blas.patch | 37 +++-------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
index db4a47d..674dbfa 100644
--- a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
+++ b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
@@ -1,11 +1,11 @@
- numpy/distutils/system_info.py | 29 +++++------------------------
- 1 file changed, 5 insertions(+), 24 deletions(-)
+ numpy/distutils/system_info.py | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
 
 diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index d7eb49e..aa62b09 100644
+index a050430..d0878a5 100644
 --- a/numpy/distutils/system_info.py
 +++ b/numpy/distutils/system_info.py
-@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0):
+@@ -303,26 +303,7 @@ def get_info(name, notfound_action=0):
        1 - display warning message
        2 - raise error
      """
@@ -33,32 +33,3 @@ index d7eb49e..aa62b09 100644
            '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:

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/files/

[David Seifert]

commit:     4b84ba18783dd035c8ce782ef3cfcc98022acf9c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec 28 19:49:28 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 19:49:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b84ba18

dev-python/numpy: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/14153
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../numpy/files/numpy-1.8.0-no-hardcode-blas.patch | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch
deleted file mode 100644
index eaf30dd8e13..00000000000
--- a/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-patch to allow any blas (c or f77) to simulate the
-special treatment atlas libs have in numpy.
-2013: numpy.distutils still horrendous code
-
---- numpy/distutils/system_info.py.orig	2013-11-25 19:54:45.760217851 -0800
-+++ numpy/distutils/system_info.py	2013-11-25 20:00:26.575310888 -0800
-@@ -293,17 +293,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
--          'mkl': mkl_info,
--          'openblas': openblas_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,

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/files/

[Sam James]

commit:     436ff7486cf12a15d908ee2067c00e1bd4eb64c5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 22:11:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 22:48:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436ff748

dev-python/numpy: add context to blas patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
index bc3fbda4bf29..73c5cae90d00 100644
--- a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
+++ b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
@@ -1,3 +1,5 @@
+Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python/numpy/files?id=e5ce90a04e79f6413604e96e4803cb95ada7c859
+https://bugs.gentoo.org/567938
 diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
 index 82e864a5c..1d77e5854 100644
 --- a/numpy/distutils/system_info.py