Merge pull request #21748 from pradghos/s390x_numpy_fix

BUG: Fix for npyv_orc_b8 and npyv_xnor_b8 for s390x (z13)
numpy · Jun 14, 2022 · 78f8386 · 78f8386
2 parents abc26a3 + 463d133
commit 78f8386
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/numpy/core/src/common/simd/vec/operators.h b/numpy/core/src/common/simd/vec/operators.h
@@ -144,8 +144,13 @@ NPY_FINLINE npyv_f64 npyv_not_f64(npyv_f64 a)
 // ANDC, ORC and XNOR
 #define npyv_andc_u8 vec_andc
 #define npyv_andc_b8 vec_andc
-#define npyv_orc_b8 vec_orc
-#define npyv_xnor_b8 vec_eqv
+#if defined(NPY_HAVE_VXE) || defined(NPY_HAVE_VSX)
+    #define npyv_orc_b8 vec_orc
+    #define npyv_xnor_b8 vec_eqv
+#else
+    #define npyv_orc_b8(A, B) npyv_or_b8(npyv_not_b8(B), A)
+    #define npyv_xnor_b8(A, B) npyv_not_b8(npyv_xor_b8(B, A))
+#endif
 
 /***************************
  * Comparison