diff options
author | Developer-Ecosystem-Engineering <65677710+Developer-Ecosystem-Engineering@users.noreply.github.com> | 2022-08-11 10:18:44 -0700 |
---|---|---|
committer | Developer-Ecosystem-Engineering <65677710+Developer-Ecosystem-Engineering@users.noreply.github.com> | 2022-08-11 10:18:44 -0700 |
commit | ae8bf91a74a5db0cd883c9ad003104d07430e5cf (patch) | |
tree | a7d20f286789a77372d51a416329cae42e4457d4 | |
parent | eeba168c30dcb0a79906f293e85305150d965810 (diff) | |
download | numpy-ae8bf91a74a5db0cd883c9ad003104d07430e5cf.tar.gz |
Address failures in gcc
-rw-r--r-- | numpy/core/src/common/simd/neon/conversion.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/core/src/common/simd/neon/conversion.h b/numpy/core/src/common/simd/neon/conversion.h index ef0e25171..92d015f2e 100644 --- a/numpy/core/src/common/simd/neon/conversion.h +++ b/numpy/core/src/common/simd/neon/conversion.h @@ -100,8 +100,8 @@ NPY_FINLINE npyv_b8 npyv_pack_b8_b16(npyv_b16 a, npyv_b16 b) { NPY_FINLINE npyv_b8 npyv_pack_b8_b32(npyv_b32 a, npyv_b32 b, npyv_b32 c, npyv_b32 d) { #if defined(__aarch64__) - npyv_b16 ab = vuzp1q_u16(a, b); - npyv_b16 cd = vuzp1q_u16(c, d); + npyv_b16 ab = vuzp1q_u16((uint16x8_t)a, (uint16x8_t)b); + npyv_b16 cd = vuzp1q_u16((uint16x8_t)c, (uint16x8_t)d); #else npyv_b16 ab = vcombine_u16(vmovn_u32(a), vmovn_u32(b)); npyv_b16 cd = vcombine_u16(vmovn_u32(c), vmovn_u32(d)); @@ -114,10 +114,10 @@ NPY_FINLINE npyv_b8 npyv_pack_b8_b64(npyv_b64 a, npyv_b64 b, npyv_b64 c, npyv_b64 d, npyv_b64 e, npyv_b64 f, npyv_b64 g, npyv_b64 h) { #if defined(__aarch64__) - npyv_b32 ab = vuzp1q_u32(a, b); - npyv_b32 cd = vuzp1q_u32(c, d); - npyv_b32 ef = vuzp1q_u32(e, f); - npyv_u32 gh = vuzp1q_u32(g, h); + npyv_b32 ab = vuzp1q_u32((uint32x4_t)a, (uint32x4_t)b); + npyv_b32 cd = vuzp1q_u32((uint32x4_t)c, (uint32x4_t)d); + npyv_b32 ef = vuzp1q_u32((uint32x4_t)e, (uint32x4_t)f); + npyv_u32 gh = vuzp1q_u32((uint32x4_t)g, (uint32x4_t)h); #else npyv_b32 ab = vcombine_u32(vmovn_u64(a), vmovn_u64(b)); npyv_b32 cd = vcombine_u32(vmovn_u64(c), vmovn_u64(d)); |