diff mbox series

[mickledore] fixup! python3-numpy: remove NPY_INLINE, use inline instead

Message ID 20230908041302.3117228-1-mingli.yu@windriver.com
State New
Headers show
Series [mickledore] fixup! python3-numpy: remove NPY_INLINE, use inline instead | expand

Commit Message

Yu, Mingli Sept. 8, 2023, 4:13 a.m. UTC 
From: Mingli Yu <mingli.yu@windriver.com>

 Fixes:
   /usr/lib/gcc/x86_64-redhat-linux/13/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)
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
  numpy/core/src/umath/simd.inc.src:976:27: note: called from here
   976 |     @mask@ load_mask = avx512_get_full_load_mask_@vsuffix@();
       |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 .../0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-numpy/0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch b/meta/recipes-devtools/python/python3-numpy/0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch
index d733dda333..73c9c79bdd 100644
--- a/meta/recipes-devtools/python/python3-numpy/0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch
+++ b/meta/recipes-devtools/python/python3-numpy/0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch
@@ -117,7 +117,7 @@  index d6c9a7e..39aec9a 100644
  
  #if defined HAVE_ATTRIBUTE_TARGET_AVX512F_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS
 -static NPY_GCC_OPT_3 NPY_INLINE NPY_GCC_TARGET_AVX512F void
-+static NPY_GCC_OPT_3 inline NPY_GCC_TARGET_AVX512F void
++static inline NPY_GCC_TARGET_AVX512F void
  AVX512F_@func@_@TYPE@(@type@ * op,
                        @type@ * ip,
                        const npy_intp array_size,
@@ -126,7 +126,7 @@  index d6c9a7e..39aec9a 100644
  
  #if defined HAVE_ATTRIBUTE_TARGET_AVX512F_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS
 -static NPY_GCC_OPT_3 NPY_INLINE NPY_GCC_TARGET_AVX512F void
-+static NPY_GCC_OPT_3 inline NPY_GCC_TARGET_AVX512F void
++static inline NPY_GCC_TARGET_AVX512F void
  AVX512F_absolute_@TYPE@(@type@ * op,
                          @type@ * ip,
                          const npy_intp array_size,