Merge pull request #17971 from seiko2plus/issue_17969

mattip · web-flow · commit 91d9bbebc159 · 2020-12-09T22:54:41.000+02:00
BUG, SIMD: Fix direactive check for AVX512BW of intrinsics npyv_tobits_*
diff --git a/numpy/core/src/common/simd/avx512/conversion.h b/numpy/core/src/common/simd/avx512/conversion.h
@@ -56,7 +56,7 @@ NPY_FINLINE npy_uint64 npyv_tobits_b8(npyv_b8 a)
 {
 #ifdef NPY_HAVE_AVX512BW_MASK
     return (npy_uint64)_cvtmask64_u64(a);
-#elif NPY_HAVE_AVX512BW
+#elif defined(NPY_HAVE_AVX512BW)
     return (npy_uint64)a;
 #else
     int mask_lo = _mm256_movemask_epi8(npyv512_lower_si256(a));
@@ -68,7 +68,7 @@ NPY_FINLINE npy_uint64 npyv_tobits_b16(npyv_b16 a)
 {
 #ifdef NPY_HAVE_AVX512BW_MASK
     return (npy_uint32)_cvtmask32_u32(a);
-#elif NPY_HAVE_AVX512BW
+#elif defined(NPY_HAVE_AVX512BW)
     return (npy_uint32)a;
 #else
     __m256i pack = _mm256_packs_epi16(
