From: Georgi Gerganov <redacted>
Date: Thu, 25 Apr 2024 12:48:25 +0000 (+0300)
Subject: ggml : fix redefinition of vaddvq_f32 for 32-bit ARM (llama/6906)
X-Git-Tag: upstream/1.7.4~805
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=05b17112cfd9bd9077fae52499fb9a972a7c3df9;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

ggml : fix redefinition of vaddvq_f32 for 32-bit ARM (llama/6906)
---

diff --git a/ggml.c b/ggml.c
index b9e2150f..307947d2 100644
--- a/ggml.c
+++ b/ggml.c
@@ -858,18 +858,6 @@ ggml_type_traits_t ggml_internal_get_type_traits(enum ggml_type type) {
 // simd mappings
 //
 
-#if defined(__ARM_NEON)
-#if !defined(__aarch64__)
-
-// 64-bit compatibility
-
-inline static float vaddvq_f32(float32x4_t v) {
-    return vgetq_lane_f32(v, 0) + vgetq_lane_f32(v, 1) + vgetq_lane_f32(v, 2) + vgetq_lane_f32(v, 3);
-}
-
-#endif
-#endif
-
 // we define a common set of C macros which map to specific intrinsics based on the current architecture
 // we then implement the fundamental computation operations below using only these macros
 // adding support for new architectures requires to define the corresponding SIMD macros