From 34c454c99aa9e2c07a631e649c6b749d77412c7e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 15 Feb 2023 00:05:03 +0100 Subject: python3-numpy: upgrade to 1.24.2 * remove patch applied upstream * FWIW: this version still fails to build with DEBUG_BUILD AND gcc-13 as shown in: http://errors.yoctoproject.org/Errors/Details/689841/ In file included from TOPDIR/tmp-glibc/work/core2-64-oe-linux/python3-numpy/1.24.1-r0/recipe-sysroot-native/usr/lib/x86_64-oe-linux/gcc/x86_64-oe-linux/13.0.1/include/immintrin.h:57, from TOPDIR/tmp-glibc/work/core2-64-oe-linux/python3-numpy/1.24.1-r0/numpy-1.24.1/numpy/distutils/checks/cpu_avx512_knl.c:14: In function '_mm512_mask_prefetch_i64scatter_pd', inlined from 'main' at TOPDIR/tmp-glibc/work/core2-64-oe-linux/python3-numpy/1.24.1-r0/numpy-1.24.1/numpy/distutils/checks/cpu_avx512_knl.c:23:5: TOPDIR/tmp-glibc/work/core2-64-oe-linux/python3-numpy/1.24.1-r0/recipe-sysroot-native/usr/lib/x86_64-oe-linux/gcc/x86_64-oe-linux/13.0.1/include/avx512pfintrin.h:180:3: error: 'base' may be used uninitialized [-Werror=maybe-uninitialized] 180 | __builtin_ia32_scatterpfqpd (__mask, (__v8di) __index, __addr, __scale, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 181 | __hint); | ~~~~~~~ : In function 'main': : note: by argument 3 of type 'const void *' to '__builtin_ia32_scatterpfqpd' declared here TOPDIR/tmp-glibc/work/core2-64-oe-linux/python3-numpy/1.24.1-r0/numpy-1.24.1/numpy/distutils/checks/cpu_avx512_knl.c:18:9: note: 'base' declared here 18 | int base[128]; | ^~~~ In file included from TOPDIR/tmp-glibc/work/core2-64-oe-linux/python3-numpy/1.24.1-r0/recipe-sysroot-native/usr/lib/x86_64-oe-linux/gcc/x86_64-oe-linux/13.0.1/include/immintrin.h:53, from numpy/core/src/umath/simd.inc.src:25: TOPDIR/tmp-glibc/work/core2-64-oe-linux/python3-numpy/1.24.1-r0/recipe-sysroot-native/usr/lib/x86_64-oe-linux/gcc/x86_64-oe-linux/13.0.1/include/avx512fintrin.h: In function 'AVX512F_square_CFLOAT': TOPDIR/tmp-glibc/work/core2-64-oe-linux/python3-numpy/1.24.1-r0/recipe-sysroot-native/usr/lib/x86_64-oe-linux/gcc/x86_64-oe-linux/13.0.1/include/avx512fintrin.h:314:1: error: inlining failed in call to 'always_inline' '_mm512_setzero_ps': target specific option mismatch 314 | _mm512_setzero_ps (void) | ^~~~~~~~~~~~~~~~~ numpy/core/src/umath/simd.inc.src:977:20: note: called from here 977 | @vtype@ zeros = _mm512_setzero_@vsuffix@(); | ^~~~~~~~~~~~~~~~~~~ numpy/core/src/umath/simd.inc.src:596:1: error: inlining failed in call to 'always_inline' 'avx512_get_full_load_mask_ps': target specific option mismatch 596 | avx512_get_full_load_mask_ps(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ It will be probably resolved in next release from 1.25 as whole simd.inc.src was removed in: https://github.com/numpy/numpy/commit/640e85017aa8eac3e9be68b475acf27d623b16b7 but this PR https://github.com/numpy/numpy/pull/21056 wasn't backported to maintenance/1.24.x and probably isn't worth backporting now as neither DEBUG_BUILD is enabled by default nor gcc-13 merged in oe-core, and the changes don't backport cleanly. (From OE-Core rev: 8596678667797971559aed962b1c204266032186) Signed-off-by: Martin Jansa Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...GN-using-_Alignof-when-using-C11-or-newer.patch | 77 ---------------------- 1 file changed, 77 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-numpy/0001-Define-_ALIGN-using-_Alignof-when-using-C11-or-newer.patch (limited to 'meta/recipes-devtools/python/python3-numpy') diff --git a/meta/recipes-devtools/python/python3-numpy/0001-Define-_ALIGN-using-_Alignof-when-using-C11-or-newer.patch b/meta/recipes-devtools/python/python3-numpy/0001-Define-_ALIGN-using-_Alignof-when-using-C11-or-newer.patch deleted file mode 100644 index 97391e2c12..0000000000 --- a/meta/recipes-devtools/python/python3-numpy/0001-Define-_ALIGN-using-_Alignof-when-using-C11-or-newer.patch +++ /dev/null @@ -1,77 +0,0 @@ -From f9ac08a0fea543d68b2dba540093bd079e50be47 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Jan 2023 15:49:09 -0800 -Subject: [PATCH] Define _ALIGN using _Alignof when using C11 or newer - -WG14 N2350 made very clear that it is an UB having type definitions -within "offsetof" [1]. This patch enhances the implementation of macro -_ALIGN to use builtin "_Alignof" to avoid undefined behavior on -when using std=c11 or newer - -clang 16+ has started to flag this [2] - -Fixes build when using -std >= gnu11 and using clang16+ - -Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it -may support C11, exclude those compilers too - -[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm -[2] https://reviews.llvm.org/D133574 - -Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/23016] -Signed-off-by: Khem Raj ---- - numpy/core/src/multiarray/arraytypes.c.src | 13 +++++++++++-- - numpy/core/src/multiarray/common.h | 12 +++++++++++- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src -index c03d09784..683917220 100644 ---- a/numpy/core/src/multiarray/arraytypes.c.src -+++ b/numpy/core/src/multiarray/arraytypes.c.src -@@ -224,8 +224,17 @@ MyPyLong_AsUnsigned@Type@(PyObject *obj) - ** GETITEM AND SETITEM ** - ***************************************************************************** - */ -- --#define _ALIGN(type) offsetof(struct {char c; type v;}, v) -+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 -+ . -+ clang versions < 8.0.0 have the same bug. */ -+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ -+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ -+ && !defined __clang__) \ -+ || (defined __clang__ && __clang_major__ < 8)) -+# define _ALIGN(type) offsetof(struct {char c; type v;}, v) -+#else -+# define _ALIGN(type) _Alignof(type) -+#endif - /* - * Disable harmless compiler warning "4116: unnamed type definition in - * parentheses" which is caused by the _ALIGN macro. -diff --git a/numpy/core/src/multiarray/common.h b/numpy/core/src/multiarray/common.h -index 3de8c842d..d01074c45 100644 ---- a/numpy/core/src/multiarray/common.h -+++ b/numpy/core/src/multiarray/common.h -@@ -178,7 +178,17 @@ check_and_adjust_axis(int *axis, int ndim) - } - - /* used for some alignment checks */ --#define _ALIGN(type) offsetof(struct {char c; type v;}, v) -+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 -+ . -+ clang versions < 8.0.0 have the same bug. */ -+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ -+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ -+ && !defined __clang__) \ -+ || (defined __clang__ && __clang_major__ < 8)) -+# define _ALIGN(type) offsetof(struct {char c; type v;}, v) -+#else -+# define _ALIGN(type) _Alignof(type) -+#endif - #define _UINT_ALIGN(type) npy_uint_alignment(sizeof(type)) - /* - * Disable harmless compiler warning "4116: unnamed type definition in --- -2.39.0 - -- cgit v1.2.3-54-g00ecf