diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2022-08-11 16:57:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 16:57:22 -0500 |
| commit | 27c8fd276ee209e83bcabe9576749f49c78f3d64 (patch) | |
| tree | 16f87cc04a7691f18ec36ee6f7a7328ff441eb9d /numpy/core | |
| parent | 668c9953821e5ca396c3eba23a6b411e2ee08bb5 (diff) | |
| parent | eb2e09ff961559d0044dc9a90b82e35147b30f94 (diff) | |
| download | numpy-27c8fd276ee209e83bcabe9576749f49c78f3d64.tar.gz | |
Merge pull request #22111 from Developer-Ecosystem-Engineering/improve_tobits_pack_apple_silicon
BUG: Missed a case in the diff merge for #22110
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/src/common/simd/neon/conversion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/common/simd/neon/conversion.h b/numpy/core/src/common/simd/neon/conversion.h index 92d015f2e..03a5259f5 100644 --- a/numpy/core/src/common/simd/neon/conversion.h +++ b/numpy/core/src/common/simd/neon/conversion.h @@ -90,7 +90,7 @@ NPY_FINLINE npyv_u32x2 npyv_expand_u32_u16(npyv_u16 data) { // pack two 16-bit boolean into one 8-bit boolean vector NPY_FINLINE npyv_b8 npyv_pack_b8_b16(npyv_b16 a, npyv_b16 b) { #if defined(__aarch64__) - return vuzp1q_u8(a, b); + return vuzp1q_u8((uint8x16_t)a, (uint8x16_t)b); #else return vcombine_u8(vmovn_u16(a), vmovn_u16(b)); #endif |