diff options
| author | Sayed Adel <seiko@imavr.com> | 2020-06-07 20:43:48 +0200 |
|---|---|---|
| committer | Sayed Adel <seiko@imavr.com> | 2020-06-07 20:55:37 +0200 |
| commit | 56cc3b7c5c45af18d819b0a1884d02b0a4241238 (patch) | |
| tree | ac6e05df4bb68d4b605c7455011fc9c0851d0aec | |
| parent | 267621f07a902eceffc179fa01f984f3e2d4bdcd (diff) | |
| download | numpy-56cc3b7c5c45af18d819b0a1884d02b0a4241238.tar.gz | |
MAINT:ARMHF Fix detecting feature groups NEON_HALF and NEON_VFPV4
| -rw-r--r-- | numpy/core/src/common/npy_cpu_features.c.src | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/src/common/npy_cpu_features.c.src b/numpy/core/src/common/npy_cpu_features.c.src index bd4743905..e7faea51d 100644 --- a/numpy/core/src/common/npy_cpu_features.c.src +++ b/numpy/core/src/common/npy_cpu_features.c.src @@ -367,9 +367,10 @@ npy__cpu_init_features_linux(void) npy__cpu_init_features_arm8(); } else { npy__cpu_have[NPY_CPU_FEATURE_NEON] = (hwcap & NPY__HWCAP_NEON) != 0; - npy__cpu_have[NPY_CPU_FEATURE_NEON_FP16] = (hwcap & (NPY__HWCAP_NEON | NPY__HWCAP_VFPv3 | - NPY__HWCAP_HALF)) != 0; - npy__cpu_have[NPY_CPU_FEATURE_NEON_VFPV4] = (hwcap & (NPY__HWCAP_NEON | NPY__HWCAP_VFPv4)) != 0; + if (npy__cpu_have[NPY_CPU_FEATURE_NEON]) { + npy__cpu_have[NPY_CPU_FEATURE_NEON_FP16] = (hwcap & NPY__HWCAP_HALF) != 0; + npy__cpu_have[NPY_CPU_FEATURE_NEON_VFPV4] = (hwcap & NPY__HWCAP_VFPv4) != 0; + } } return 1; } |