summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3-numpy
diff options
context:
space:
mode:
authorTrevor Gamblin <tgamblin@baylibre.com>2024-11-21 10:38:59 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-22 16:58:40 +0000
commitea8594d4a0bf2e6f52372689b80fc00ce9cc7243 (patch)
tree62ead115e350cfcf8275db5c3f90b8138429b857 /meta/recipes-devtools/python/python3-numpy
parentedfab1a3cebc454e4d63caae0134e02d169260c6 (diff)
downloadpoky-ea8594d4a0bf2e6f52372689b80fc00ce9cc7243.tar.gz
python3-numpy: upgrade 1.26.4 -> 2.1.3
- This release contains numerous API changes and bug fixes. Changelog: https://github.com/numpy/numpy/releases - Notably, the build backend has switched to mesonpy since 1.26.4. - Patch 0001-numpy-core-Define-RISCV-32-support.patch had to be updated to change the paths for the target files. It has now been merged upstream, but isn't included in any release yet. PR for reference: https://github.com/numpy/numpy/pull/17780 - Builds OK and seems to be compatible with current piglit and pandas (meta-python), which was not the case for the previous upgrade attempt to numpy 2.0.1. - For numpy, add 'pkgconfig' to inherit to avoid errors like this at do_compile: | Found Pkg-config: NO | Run-time dependency python found: YES 3.12 | Has header "Python.h" with dependency python: NO | | ../numpy-2.0.0/meson.build:44:2: ERROR: Problem encountered: Cannot compile `Python.h`. Perhaps you need to install python-dev|python-devel | | A full log can be found at /home/tgamblin/workspace/yocto/poky/build/tmp/work/core2-64-poky-linux/python3-numpy/2.0.0/build/meson-logs/meson-log.txt - Mmodify the FILES:${PN}-staticdev line to fix a QA issue. - This is now reproducible as of oe-core commit: 917df5ed022f License-Update: Change copyright year to 2024 buildall-qemu log: BUILDALL-QEMU LOG FOR python3-numpy START TIME: 2024-11-20_14:02:08 HOSTNAME: megalith HOST OS: Debian GNU/Linux 12 (bookworm) HOST KERNEL: 6.1.0-27-amd64 =============== BUILD RESULTS: [glibc] FAIL: qemuloongarch64 PASS: qemuriscv32 PASS: qemuarmv5 PASS: qemuppc PASS: qemumips64 PASS: qemuriscv64 PASS: qemuarm64 PASS: qemuarm PASS: qemux86-64 PASS: qemuppc64 PASS: qemux86 PASS: qemumips [musl] FAIL: qemuloongarch64 FAIL: qemuriscv32 PASS: qemuarmv5 PASS: qemuppc PASS: qemumips64 PASS: qemuriscv64 PASS: qemuarm64 PASS: qemuarm PASS: qemux86-64 PASS: qemuppc64 PASS: qemux86 PASS: qemumips =============== PASSED: 21 FAILED: 3 (From OE-Core rev: fd656aaf7fbed3115e3b4251ff76257ee8f19c82) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3-numpy')
-rw-r--r--meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch52
1 files changed, 30 insertions, 22 deletions
diff --git a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch
index 676bdbb3af..6da9047ec5 100644
--- a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch
+++ b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch
@@ -1,42 +1,50 @@
1From eb6d6579150bf4684603ce377c51e90ad3bb8109 Mon Sep 17 00:00:00 2001 1From 0e2b652a0eff85798584116c905a2d6ad8f25d5f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Nov 2020 15:32:39 -0800 3Date: Sun, 15 Nov 2020 15:32:39 -0800
4Subject: [PATCH] numpy/core: Define RISCV-32 support 4Subject: [PATCH] numpy/core: Define RISCV-32 support
5 5
6Helps compile on riscv32 6Helps compile on riscv32
7 7
8Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/17780] 8Upstream-Status: Backport
9(https://github.com/numpy/numpy/pull/17780/commits/0e2b652a0eff85798584116c905a2d6ad8f25d5f)
10
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 12---
11 numpy/core/include/numpy/npy_cpu.h | 3 +++ 13 numpy/_core/include/numpy/npy_cpu.h | 9 +++++++--
12 numpy/core/include/numpy/npy_endian.h | 1 + 14 numpy/_core/include/numpy/npy_endian.h | 1 +
13 2 files changed, 4 insertions(+) 15 2 files changed, 8 insertions(+), 2 deletions(-)
14 16
15diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h 17diff --git a/numpy/_core/include/numpy/npy_cpu.h b/numpy/_core/include/numpy/npy_cpu.h
16index 78d229e..04be511 100644 18index a19f8e6bbd..15f9f12931 100644
17--- a/numpy/core/include/numpy/npy_cpu.h 19--- a/numpy/_core/include/numpy/npy_cpu.h
18+++ b/numpy/core/include/numpy/npy_cpu.h 20+++ b/numpy/_core/include/numpy/npy_cpu.h
19@@ -19,6 +19,7 @@ 21@@ -18,6 +18,7 @@
22 * NPY_CPU_ARCEL
20 * NPY_CPU_ARCEB 23 * NPY_CPU_ARCEB
21 * NPY_CPU_RISCV64 24 * NPY_CPU_RISCV64
22 * NPY_CPU_LOONGARCH
23+ * NPY_CPU_RISCV32 25+ * NPY_CPU_RISCV32
26 * NPY_CPU_LOONGARCH
24 * NPY_CPU_WASM 27 * NPY_CPU_WASM
25 */ 28 */
26 #ifndef NUMPY_CORE_INCLUDE_NUMPY_NPY_CPU_H_ 29@@ -102,8 +103,12 @@
27@@ -104,6 +105,8 @@ 30 #define NPY_CPU_ARCEL
31 #elif defined(__arc__) && defined(__BIG_ENDIAN__)
28 #define NPY_CPU_ARCEB 32 #define NPY_CPU_ARCEB
29 #elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 33-#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
30 #define NPY_CPU_RISCV64 34- #define NPY_CPU_RISCV64
31+#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 32 35+#elif defined(__riscv)
32+ #define NPY_CPU_RISCV32 36+ #if __riscv_xlen == 64
37+ #define NPY_CPU_RISCV64
38+ #elif __riscv_xlen == 32
39+ #define NPY_CPU_RISCV32
40+ #endif
33 #elif defined(__loongarch__) 41 #elif defined(__loongarch__)
34 #define NPY_CPU_LOONGARCH 42 #define NPY_CPU_LOONGARCH
35 #elif defined(__EMSCRIPTEN__) 43 #elif defined(__EMSCRIPTEN__)
36diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h 44diff --git a/numpy/_core/include/numpy/npy_endian.h b/numpy/_core/include/numpy/npy_endian.h
37index 5e58a7f..0926212 100644 45index 5e58a7f52c..09262120bf 100644
38--- a/numpy/core/include/numpy/npy_endian.h 46--- a/numpy/_core/include/numpy/npy_endian.h
39+++ b/numpy/core/include/numpy/npy_endian.h 47+++ b/numpy/_core/include/numpy/npy_endian.h
40@@ -49,6 +49,7 @@ 48@@ -49,6 +49,7 @@
41 || defined(NPY_CPU_PPC64LE) \ 49 || defined(NPY_CPU_PPC64LE) \
42 || defined(NPY_CPU_ARCEL) \ 50 || defined(NPY_CPU_ARCEL) \
@@ -46,5 +54,5 @@ index 5e58a7f..0926212 100644
46 || defined(NPY_CPU_WASM) 54 || defined(NPY_CPU_WASM)
47 #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN 55 #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
48-- 56--
492.20.1 572.39.5
50 58