Skip to content

Commit ca1884b

Browse files
committed
fix compile switch
1 parent 7558b3a commit ca1884b

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

ggml/src/ggml-cpu/arch/arm/quants.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,8 +2090,7 @@ void ggml_vec_dot_q4_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
20902090
const int vector_length = ggml_cpu_get_sve_cnt()*8;
20912091
#endif
20922092

2093-
#if defined(__ARM_FEATURE_MATMUL_INT8)
2094-
#ifdef __ARM_FEATURE_SVE
2093+
#if defined(__ARM_FEATURE_SVE) && defined(__ARM_FEATURE_MATMUL_INT8)
20952094
if (nrc==2) {
20962095
svbool_t pg32_2 = svptrue_pat_b32(SV_VL2);
20972096
const block_q4_K * GGML_RESTRICT vx0 = vx;
@@ -2294,7 +2293,7 @@ void ggml_vec_dot_q4_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
22942293
svst1_f32(pg32_2, s + bs, svreinterpret_f32_u8(svext_u8(svreinterpret_u8_f32(sumf1), svdup_n_u8(0), 8)));
22952294
return ;
22962295
}
2297-
#else
2296+
#elif defined(__ARM_FEATURE_MATMUL_INT8)
22982297
if (nrc == 2) {
22992298
const block_q4_K * GGML_RESTRICT x0 = x;
23002299
const block_q4_K * GGML_RESTRICT x1 = (const block_q4_K *) ((const uint8_t *)vx + bx);
@@ -2433,7 +2432,6 @@ void ggml_vec_dot_q4_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
24332432
return;
24342433
}
24352434
#endif
2436-
#endif
24372435

24382436
#ifdef __ARM_FEATURE_SVE
24392437
float sumf = 0;
@@ -2710,8 +2708,7 @@ void ggml_vec_dot_q6_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
27102708
#ifdef __ARM_FEATURE_SVE
27112709
const int vector_length = ggml_cpu_get_sve_cnt()*8;
27122710
#endif
2713-
#if defined(__ARM_FEATURE_MATMUL_INT8)
2714-
#ifdef __ARM_FEATURE_SVE
2711+
#if defined(__ARM_FEATURE_SVE) && defined(__ARM_FEATURE_MATMUL_INT8)
27152712
if (nrc==2) {
27162713
const svbool_t pg32_2 = svptrue_pat_b32(SV_VL2);
27172714
svfloat32_t sum = svdup_n_f32(0);
@@ -2897,7 +2894,7 @@ void ggml_vec_dot_q6_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
28972894
svst1_f32(pg32_2, s + bs, svreinterpret_f32_u8(svext_u8(svreinterpret_u8_f32(sum), svdup_n_u8(0), 8)));
28982895
return;
28992896
}
2900-
#else
2897+
#elif defined(__ARM_FEATURE_MATMUL_INT8)
29012898
if (nrc == 2) {
29022899
const block_q6_K * GGML_RESTRICT x0 = x;
29032900
const block_q6_K * GGML_RESTRICT x1 = (const block_q6_K *) ((const uint8_t *)vx + bx);
@@ -3065,7 +3062,6 @@ void ggml_vec_dot_q6_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
30653062
return;
30663063
}
30673064
#endif
3068-
#endif
30693065

30703066
#ifdef __ARM_FEATURE_SVE
30713067
float sum = 0;

0 commit comments

Comments
 (0)