mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-10-30 08:42:00 +00:00 
			
		
		
		
	ggml : fix redefinition of vaddvq_f32 for 32-bit ARM (#6906)
This commit is contained in:
		
							
								
								
									
										12
									
								
								ggml.c
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								ggml.c
									
									
									
									
									
								
							| @@ -858,18 +858,6 @@ ggml_type_traits_t ggml_internal_get_type_traits(enum ggml_type type) { | |||||||
| // simd mappings | // 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 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 | // we then implement the fundamental computation operations below using only these macros | ||||||
| // adding support for new architectures requires to define the corresponding SIMD macros | // adding support for new architectures requires to define the corresponding SIMD macros | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Georgi Gerganov
					Georgi Gerganov