From a878502f43747dcd870b3972ee0c9e983813a43a Mon Sep 17 00:00:00 2001 From: Zhiyuan Li Date: Tue, 5 Nov 2024 01:07:33 +1100 Subject: [PATCH] fix define error --- ggml/src/ggml-cpu.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ggml/src/ggml-cpu.c b/ggml/src/ggml-cpu.c index c66e90a9f..ed0563261 100644 --- a/ggml/src/ggml-cpu.c +++ b/ggml/src/ggml-cpu.c @@ -11679,17 +11679,16 @@ static void ggml_compute_forward_rwkv_wkv6_f32( } ggml_barrier(params->threadpool); - - - #ifdef __AVX2__ + + #if defined(__AVX__) && !defined(__AVX512F__) #define GGML_F32X GGML_F32x8 #define GGML_F32X_SET1 GGML_F32x8_SET1 #define GGML_F32X_LOAD GGML_F32x8_LOAD #define GGML_F32X_STORE GGML_F32x8_STORE #define GGML_F32X_MUL GGML_F32x8_MUL #define GGML_F32X_FMA GGML_F32x8_FMA - #define VECTOR_SIZE 8 - #elif __AVX512F__ + #define WKV_VECTOR_SIZE 8 + #elif defined(__AVX512F__) #define GGML_F32X GGML_F32x16 #define GGML_F32X_SET1 GGML_F32x16_SET1 #define GGML_F32X_LOAD GGML_F32x16_LOAD @@ -11763,7 +11762,7 @@ static void ggml_compute_forward_rwkv_wkv6_f32( } // Handle remaining elements, this will not be used. - for (int64_t j = vec_count * VECTOR_SIZE; j < head_size; j++) { + for (int64_t j = vec_count * WKV_VECTOR_SIZE; j < head_size; j++) { size_t t_h_j_offset = t_h_offset + j; size_t h_2d_i_j_offset = h_2d_i_offset + j; float v_val = v[t_h_j_offset];