Check for both __ARM_NEON and __ARM_FEATURE_FMA so that the project can be compiled for armv7a.

Android armeabi-v7a's NEON support doesn't support FMA unless configured with `-mfpu=neon-fp-armv8`, which would need runtime checks.
* Also removed ABI filter from Android project.
This commit is contained in:
Kevin Brothaler
2022-12-20 13:33:33 -05:00
committed by Georgi Gerganov
parent 22193cbfe8
commit e1432dd91a
5 changed files with 15 additions and 8 deletions

View File

@ -2555,6 +2555,7 @@ const char * whisper_print_system_info(void) {
s += "AVX2 = " + std::to_string(ggml_cpu_has_avx2()) + " | ";
s += "AVX512 = " + std::to_string(ggml_cpu_has_avx512()) + " | ";
s += "NEON = " + std::to_string(ggml_cpu_has_neon()) + " | ";
s += "ARM FMA = " + std::to_string(ggml_cpu_has_arm_fma()) + " | ";
s += "F16C = " + std::to_string(ggml_cpu_has_f16c()) + " | ";
s += "FP16_VA = " + std::to_string(ggml_cpu_has_fp16_va()) + " | ";
s += "WASM_SIMD = " + std::to_string(ggml_cpu_has_wasm_simd()) + " | ";