mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-05 16:28:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

python3-numpy: upgrade 2.1.3 -> 2.2.1

Browse Source 
Add a svml option, disabled by default
(it's avx-512 only, and uses randomly generated
intermediate .o file names, which makes the installed
library non-reproducible).

(From OE-Core rev: a3ce94f1fa79502d8b41de93f9a27d8af2cdc787)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2025-01-08 09:42:24 +01:00
committed by Richard Purdie
parent e8db9d1eae
commit 991cbf2336
4 changed files with 20 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
View File

@@ -1,4 +1,4 @@
From 46eea664cf89d0602e7ff16d587c37c045b125b7 Mon Sep 17 00:00:00 2001
From 16a973c118989674afeeda2c2ccc24c9c366210e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 10 Dec 2015 13:20:30 +0200
Subject: [PATCH] Don't search /usr and so on for libraries by default to
@@ -8,16 +8,15 @@ Subject: [PATCH] Don't search /usr and so on for libraries by default to
Upstream-Status: Inappropriate (As the code stands, this is a hack)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
numpy/distutils/system_info.py | 42 +++++-----------------------------
1 file changed, 6 insertions(+), 36 deletions(-)
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index feb28f6..a48d6d1 100644
index 6478548..c0620e7 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -327,44 +327,14 @@ def add_system_root(library_root):
@@ -326,44 +326,14 @@ def add_system_root(library_root):
add_system_root(os.path.join(conda_dir, 'Library'))
else:

58
meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch
View File

@@ -1,58 +0,0 @@
From 0e2b652a0eff85798584116c905a2d6ad8f25d5f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 15 Nov 2020 15:32:39 -0800
Subject: [PATCH] numpy/core: Define RISCV-32 support
Helps compile on riscv32
Upstream-Status: Backport
(https://github.com/numpy/numpy/pull/17780/commits/0e2b652a0eff85798584116c905a2d6ad8f25d5f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
numpy/_core/include/numpy/npy_cpu.h | 9 +++++++--
numpy/_core/include/numpy/npy_endian.h | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/numpy/_core/include/numpy/npy_cpu.h b/numpy/_core/include/numpy/npy_cpu.h
index a19f8e6bbd..15f9f12931 100644
--- a/numpy/_core/include/numpy/npy_cpu.h
+++ b/numpy/_core/include/numpy/npy_cpu.h
@@ -18,6 +18,7 @@
* NPY_CPU_ARCEL
* NPY_CPU_ARCEB
* NPY_CPU_RISCV64
+ * NPY_CPU_RISCV32
* NPY_CPU_LOONGARCH
* NPY_CPU_WASM
*/
@@ -102,8 +103,12 @@
#define NPY_CPU_ARCEL
#elif defined(__arc__) && defined(__BIG_ENDIAN__)
#define NPY_CPU_ARCEB
-#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
- #define NPY_CPU_RISCV64
+#elif defined(__riscv)
+ #if __riscv_xlen == 64
+ #define NPY_CPU_RISCV64
+ #elif __riscv_xlen == 32
+ #define NPY_CPU_RISCV32
+ #endif
#elif defined(__loongarch__)
#define NPY_CPU_LOONGARCH
#elif defined(__EMSCRIPTEN__)
diff --git a/numpy/_core/include/numpy/npy_endian.h b/numpy/_core/include/numpy/npy_endian.h
index 5e58a7f52c..09262120bf 100644
--- a/numpy/_core/include/numpy/npy_endian.h
+++ b/numpy/_core/include/numpy/npy_endian.h
@@ -49,6 +49,7 @@
|| defined(NPY_CPU_PPC64LE) \
|| defined(NPY_CPU_ARCEL) \
|| defined(NPY_CPU_RISCV64) \
+ || defined(NPY_CPU_RISCV32) \
|| defined(NPY_CPU_LOONGARCH) \
|| defined(NPY_CPU_WASM)
#define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
--
2.39.5

21
meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch
View File

@@ -1,7 +1,11 @@
This regex decides whether to use O3 opimisation on numpy or not.
From cde931f4380745b9818b55d7b06a43d347518967 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 29 Sep 2023 22:53:24 +0100
Subject: [PATCH] This regex decides whether to use O3 opimisation on numpy or
not.
It includes "od", which happens to be a substring of "reproducible"
but not "qemux86-world".
but not "qemux86-world".
The regex will run against all compiler options including things like:
@@ -17,12 +21,15 @@ reproducible target ran first and won the race to populate sstate.
Upstream-Status: Inappropriate [upstream have dropped distutils and switched to meson]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
numpy/distutils/ccompiler_opt.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: numpy-1.26.0/numpy/distutils/ccompiler_opt.py
===================================================================
--- numpy-1.26.0.orig/numpy/distutils/ccompiler_opt.py
+++ numpy-1.26.0/numpy/distutils/ccompiler_opt.py
@@ -990,7 +990,7 @@ class _CCompiler:
diff --git a/numpy/distutils/ccompiler_opt.py b/numpy/distutils/ccompiler_opt.py
index b1a6fa3..7b0302b 100644
--- a/numpy/distutils/ccompiler_opt.py
+++ b/numpy/distutils/ccompiler_opt.py
@@ -991,7 +991,7 @@ def __init__(self):
("cc_is_nocc", "", ""),
)
detect_args = (