Skip to content

Commit a386408

Browse files
Srihari-mcwSrihari-mcw
committed
Add changes to fix compiler issues
1 parent e9ec21e commit a386408

File tree

2 files changed

+7
-34
lines changed

2 files changed

+7
-34
lines changed

‎ggml/src/ggml-quants.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15279,21 +15279,21 @@ static bool validate_bf16(ggml_half f, size_t i) {
1527915279
} \
1528015280
}
1528115281

15282-
<<<<<<< HEAD
1528315282
#define VALIDATE_ROW_DATA_DVEC_F16_IMPL(type, data, nb, nr) \
1528415283
const type * q = (const type *) (data); \
1528515284
for (size_t i = 0; i < (nb); ++i) { \
1528615285
for (size_t j = 0; j < (nr); ++j) { \
1528715286
if (!validate_fp16(q[i].d[j], i)) { \
1528815287
return false; \
1528915288
} \
15290-
=======
15289+
} \
15290+
}
15291+
1529115292
#define VALIDATE_ROW_DATA_D_B16_IMPL(type, data, nb) \
1529215293
const type * q = (const type *) (data); \
1529315294
for (size_t i = 0; i < (nb); ++i) { \
1529415295
if (!validate_bf16((q[i].d), i)) { \
1529515296
return false; \
15296-
>>>>>>> ed837022 (Introduce Q4_0 and Q8_0 quantizations with BF16 delta values)
1529715297
} \
1529815298
}
1529915299

‎ggml/src/ggml.c

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ static const ggml_type_traits_t type_traits[GGML_TYPE_COUNT] = {
10281028
.is_quantized = true,
10291029
.to_float = (ggml_to_float_t) dequantize_row_q4_0_b16,
10301030
.from_float = quantize_row_q4_0_b16,
1031-
.from_float_reference = (ggml_from_float_t) quantize_row_q4_0_b16_ref,
1031+
.from_float_ref = (ggml_from_float_t) quantize_row_q4_0_b16_ref,
10321032
.vec_dot = ggml_vec_dot_q4_0_b16_q8_0_b16,
10331033
.vec_dot_type = GGML_TYPE_Q8_0_B16,
10341034
.nrows = 1,
@@ -1040,7 +1040,7 @@ static const ggml_type_traits_t type_traits[GGML_TYPE_COUNT] = {
10401040
.is_quantized = true,
10411041
.to_float = (ggml_to_float_t) dequantize_row_q8_0_b16,
10421042
.from_float = quantize_row_q8_0_b16,
1043-
.from_float_reference = (ggml_from_float_t) quantize_row_q8_0_b16_ref,
1043+
.from_float_ref = (ggml_from_float_t) quantize_row_q8_0_b16_ref,
10441044
.vec_dot = ggml_vec_dot_q8_0_b16_q8_0_b16,
10451045
.vec_dot_type = GGML_TYPE_Q8_0_B16,
10461046
.nrows = 1,
@@ -3321,15 +3321,16 @@ enum ggml_type ggml_ftype_to_ggml_type(enum ggml_ftype ftype) {
33213321
enum ggml_type wtype = GGML_TYPE_COUNT;
33223322

33233323
switch (ftype) {
3324-
<<<<<<< HEAD
33253324
case GGML_FTYPE_ALL_F32: wtype = GGML_TYPE_F32; break;
33263325
case GGML_FTYPE_MOSTLY_F16: wtype = GGML_TYPE_F16; break;
33273326
case GGML_FTYPE_MOSTLY_BF16: wtype = GGML_TYPE_BF16; break;
33283327
case GGML_FTYPE_MOSTLY_Q4_0: wtype = GGML_TYPE_Q4_0; break;
3328+
case GGML_FTYPE_MOSTLY_Q4_0_B16: wtype = GGML_TYPE_Q4_0_B16; break;
33293329
case GGML_FTYPE_MOSTLY_Q4_1: wtype = GGML_TYPE_Q4_1; break;
33303330
case GGML_FTYPE_MOSTLY_Q5_0: wtype = GGML_TYPE_Q5_0; break;
33313331
case GGML_FTYPE_MOSTLY_Q5_1: wtype = GGML_TYPE_Q5_1; break;
33323332
case GGML_FTYPE_MOSTLY_Q8_0: wtype = GGML_TYPE_Q8_0; break;
3333+
case GGML_FTYPE_MOSTLY_Q8_0_B16: wtype = GGML_TYPE_Q8_0_B16; break;
33333334
case GGML_FTYPE_MOSTLY_Q2_K: wtype = GGML_TYPE_Q2_K; break;
33343335
case GGML_FTYPE_MOSTLY_Q3_K: wtype = GGML_TYPE_Q3_K; break;
33353336
case GGML_FTYPE_MOSTLY_Q4_K: wtype = GGML_TYPE_Q4_K; break;
@@ -3349,34 +3350,6 @@ enum ggml_type ggml_ftype_to_ggml_type(enum ggml_ftype ftype) {
33493350
case GGML_FTYPE_MOSTLY_Q4_0_8_8: wtype = GGML_TYPE_Q4_0_8_8; break;
33503351
case GGML_FTYPE_UNKNOWN: wtype = GGML_TYPE_COUNT; break;
33513352
case GGML_FTYPE_MOSTLY_Q4_1_SOME_F16: wtype = GGML_TYPE_COUNT; break;
3352-
=======
3353-
case GGML_FTYPE_ALL_F32: wtype = GGML_TYPE_F32; break;
3354-
case GGML_FTYPE_MOSTLY_F16: wtype = GGML_TYPE_F16; break;
3355-
case GGML_FTYPE_MOSTLY_BF16: wtype = GGML_TYPE_BF16; break;
3356-
case GGML_FTYPE_MOSTLY_Q4_0: wtype = GGML_TYPE_Q4_0; break;
3357-
case GGML_FTYPE_MOSTLY_Q4_0_B16: wtype = GGML_TYPE_Q4_0_B16; break;
3358-
case GGML_FTYPE_MOSTLY_Q4_1: wtype = GGML_TYPE_Q4_1; break;
3359-
case GGML_FTYPE_MOSTLY_Q5_0: wtype = GGML_TYPE_Q5_0; break;
3360-
case GGML_FTYPE_MOSTLY_Q5_1: wtype = GGML_TYPE_Q5_1; break;
3361-
case GGML_FTYPE_MOSTLY_Q8_0: wtype = GGML_TYPE_Q8_0; break;
3362-
case GGML_FTYPE_MOSTLY_Q8_0_B16: wtype = GGML_TYPE_Q8_0_B16; break;
3363-
case GGML_FTYPE_MOSTLY_Q2_K: wtype = GGML_TYPE_Q2_K; break;
3364-
case GGML_FTYPE_MOSTLY_Q3_K: wtype = GGML_TYPE_Q3_K; break;
3365-
case GGML_FTYPE_MOSTLY_Q4_K: wtype = GGML_TYPE_Q4_K; break;
3366-
case GGML_FTYPE_MOSTLY_Q5_K: wtype = GGML_TYPE_Q5_K; break;
3367-
case GGML_FTYPE_MOSTLY_Q6_K: wtype = GGML_TYPE_Q6_K; break;
3368-
case GGML_FTYPE_MOSTLY_IQ2_XXS: wtype = GGML_TYPE_IQ2_XXS; break;
3369-
case GGML_FTYPE_MOSTLY_IQ2_XS: wtype = GGML_TYPE_IQ2_XS; break;
3370-
case GGML_FTYPE_MOSTLY_IQ3_XXS: wtype = GGML_TYPE_IQ3_XXS; break;
3371-
case GGML_FTYPE_MOSTLY_IQ1_S: wtype = GGML_TYPE_IQ1_S; break;
3372-
case GGML_FTYPE_MOSTLY_IQ1_M: wtype = GGML_TYPE_IQ1_M; break;
3373-
case GGML_FTYPE_MOSTLY_IQ4_NL: wtype = GGML_TYPE_IQ4_NL; break;
3374-
case GGML_FTYPE_MOSTLY_IQ4_XS: wtype = GGML_TYPE_IQ4_XS; break;
3375-
case GGML_FTYPE_MOSTLY_IQ3_S: wtype = GGML_TYPE_IQ3_S; break;
3376-
case GGML_FTYPE_MOSTLY_IQ2_S: wtype = GGML_TYPE_IQ2_S; break;
3377-
case GGML_FTYPE_UNKNOWN: wtype = GGML_TYPE_COUNT; break;
3378-
case GGML_FTYPE_MOSTLY_Q4_1_SOME_F16: wtype = GGML_TYPE_COUNT; break;
3379-
>>>>>>> ed837022 (Introduce Q4_0 and Q8_0 quantizations with BF16 delta values)
33803353
}
33813354

33823355
GGML_ASSERT(wtype != GGML_TYPE_COUNT);

0 commit comments

Comments
 (0)