diff options
Diffstat (limited to 'dev-python/numpy/files')
3 files changed, 39 insertions, 51 deletions
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 deleted file mode 100644 index bc3fbda4bf29..000000000000 --- a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index 82e864a5c..1d77e5854 100644 ---- a/numpy/distutils/system_info.py -+++ b/numpy/distutils/system_info.py -@@ -501,33 +501,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 -- '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, -+ cl = {'flame': flame_info, # use lapack_opt instead - 'x11': x11_info, - 'fft_opt': fft_opt_info, - 'fftw': fftw_info, -@@ -947,10 +921,7 @@ def get_libs(self, key, default): - 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() diff --git a/dev-python/numpy/files/numpy-1.26.1-more-arches.patch b/dev-python/numpy/files/numpy-1.26.1-more-arches.patch new file mode 100644 index 000000000000..a6f622517521 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.26.1-more-arches.patch @@ -0,0 +1,16 @@ +https://github.com/numpy/numpy/pull/25078 +https://github.com/numpy/numpy/pull/25254 + +diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py +index f352bbaa2..d17b052f9 100755 +--- a/numpy/f2py/crackfortran.py ++++ b/numpy/f2py/crackfortran.py +@@ -2452,7 +2452,7 @@ def _selected_real_kind_func(p, r=0, radix=0): + if p < 16: + return 8 + machine = platform.machine().lower() +- if machine.startswith(('aarch64', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')): ++ if machine.startswith(('aarch64', 'alpha', 'arm64', 'loongarch', 'mips', 'power', 'ppc', 'riscv', 's390x', 'sparc')): + if p <= 33: + return 16 + else: diff --git a/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch b/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch new file mode 100644 index 000000000000..f3ed3727520d --- /dev/null +++ b/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch @@ -0,0 +1,23 @@ +From f3bc38235bf39a630035920e29f2f883cae5fffe Mon Sep 17 00:00:00 2001 +From: Matti Picus <matti.picus@gmail.com> +Date: Sun, 26 May 2024 11:25:43 +0300 +Subject: [PATCH 1/3] BUG: cast missing in PyPy-specific f2py code + +--- + numpy/f2py/cb_rules.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py +index 721e075b6c73..faf8dd401301 100644 +--- a/numpy/f2py/cb_rules.py ++++ b/numpy/f2py/cb_rules.py +@@ -122,7 +122,7 @@ + #setdims# + #ifdef PYPY_VERSION + #define CAPI_ARGLIST_SETITEM(idx, value) PyList_SetItem((PyObject *)capi_arglist_list, idx, value) +- capi_arglist_list = PySequence_List(capi_arglist); ++ capi_arglist_list = PySequence_List((PyObject *)capi_arglist); + if (capi_arglist_list == NULL) goto capi_fail; + #else + #define CAPI_ARGLIST_SETITEM(idx, value) PyTuple_SetItem((PyObject *)capi_arglist, idx, value) + |