diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-07-27 17:05:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 17:05:15 -0600 |
| commit | b26ef675e51570047f5305e4aa45c993b76f4e11 (patch) | |
| tree | 5c5ca5026c1913710180322f2a24c696d6cc6b35 | |
| parent | e8d32d84780b28dc4f1e1a8f33dc35c9f43b2ce5 (diff) | |
| parent | 9495f365b76058a5900f8fbba733806d6e57c044 (diff) | |
| download | numpy-b26ef675e51570047f5305e4aa45c993b76f4e11.tar.gz | |
Merge pull request #16957 from charris/fix-arm64-warning
MAINT: Use arm64 instead of aarch64 on travisCI.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/arraytypes.c.src | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index cbe2a8043..c0a0cfae3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -111,7 +111,7 @@ jobs: - python: 3.7 os: linux - arch: aarch64 + arch: arm64 env: # use OpenBLAS build, not system ATLAS - DOWNLOAD_OPENBLAS=1 diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src index 54fd092b0..9508fb5ad 100644 --- a/numpy/core/src/multiarray/arraytypes.c.src +++ b/numpy/core/src/multiarray/arraytypes.c.src @@ -3138,8 +3138,8 @@ BOOL_argmax(npy_bool *ip, npy_intp n, npy_intp *max_ind, #if defined(__ARM_NEON__) || defined (__ARM_NEON) uint8x16_t zero = vdupq_n_u8(0); for(; i < n - (n % 32); i+=32) { - uint8x16_t d1 = vld1q_u8((char *)&ip[i]); - uint8x16_t d2 = vld1q_u8((char *)&ip[i + 16]); + uint8x16_t d1 = vld1q_u8((uint8_t *)&ip[i]); + uint8x16_t d2 = vld1q_u8((uint8_t *)&ip[i + 16]); d1 = vceqq_u8(d1, zero); d2 = vceqq_u8(d2, zero); if(_mm_movemask_epi8_neon(vminq_u8(d1, d2)) != 0xFFFF) { |