Skip to content

Commit f7ce132

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

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
@@ -1041,7 +1041,7 @@ static const ggml_type_traits_t type_traits[GGML_TYPE_COUNT] = {
10411041
.is_quantized = true,
10421042
.to_float = (ggml_to_float_t) dequantize_row_q4_0_b16,
10431043
.from_float = quantize_row_q4_0_b16,
1044-
.from_float_reference = (ggml_from_float_t) quantize_row_q4_0_b16_ref,
1044+
.from_float_ref = (ggml_from_float_t) quantize_row_q4_0_b16_ref,
10451045
.vec_dot = ggml_vec_dot_q4_0_b16_q8_0_b16,
10461046
.vec_dot_type = GGML_TYPE_Q8_0_B16,
10471047
.nrows = 1,
@@ -1053,7 +1053,7 @@ static const ggml_type_traits_t type_traits[GGML_TYPE_COUNT] = {
10531053
.is_quantized = true,
10541054
.to_float = (ggml_to_float_t) dequantize_row_q8_0_b16,
10551055
.from_float = quantize_row_q8_0_b16,
1056-
.from_float_reference = (ggml_from_float_t) quantize_row_q8_0_b16_ref,
1056+
.from_float_ref = (ggml_from_float_t) quantize_row_q8_0_b16_ref,
10571057
.vec_dot = ggml_vec_dot_q8_0_b16_q8_0_b16,
10581058
.vec_dot_type = GGML_TYPE_Q8_0_B16,
10591059
.nrows = 1,
@@ -3334,15 +3334,16 @@ enum ggml_type ggml_ftype_to_ggml_type(enum ggml_ftype ftype) {
33343334
enum ggml_type wtype = GGML_TYPE_COUNT;
33353335

33363336
switch (ftype) {
3337-
<<<<<<< HEAD
33383337
case GGML_FTYPE_ALL_F32: wtype = GGML_TYPE_F32; break;
33393338
case GGML_FTYPE_MOSTLY_F16: wtype = GGML_TYPE_F16; break;
33403339
case GGML_FTYPE_MOSTLY_BF16: wtype = GGML_TYPE_BF16; break;
33413340
case GGML_FTYPE_MOSTLY_Q4_0: wtype = GGML_TYPE_Q4_0; break;
3341+
case GGML_FTYPE_MOSTLY_Q4_0_B16: wtype = GGML_TYPE_Q4_0_B16; break;
33423342
case GGML_FTYPE_MOSTLY_Q4_1: wtype = GGML_TYPE_Q4_1; break;
33433343
case GGML_FTYPE_MOSTLY_Q5_0: wtype = GGML_TYPE_Q5_0; break;
33443344
case GGML_FTYPE_MOSTLY_Q5_1: wtype = GGML_TYPE_Q5_1; break;
33453345
case GGML_FTYPE_MOSTLY_Q8_0: wtype = GGML_TYPE_Q8_0; break;
3346+
case GGML_FTYPE_MOSTLY_Q8_0_B16: wtype = GGML_TYPE_Q8_0_B16; break;
33463347
case GGML_FTYPE_MOSTLY_Q2_K: wtype = GGML_TYPE_Q2_K; break;
33473348
case GGML_FTYPE_MOSTLY_Q3_K: wtype = GGML_TYPE_Q3_K; break;
33483349
case GGML_FTYPE_MOSTLY_Q4_K: wtype = GGML_TYPE_Q4_K; break;
@@ -3362,34 +3363,6 @@ enum ggml_type ggml_ftype_to_ggml_type(enum ggml_ftype ftype) {
33623363
case GGML_FTYPE_MOSTLY_Q4_0_8_8: wtype = GGML_TYPE_Q4_0_8_8; break;
33633364
case GGML_FTYPE_UNKNOWN: wtype = GGML_TYPE_COUNT; break;
33643365
case GGML_FTYPE_MOSTLY_Q4_1_SOME_F16: wtype = GGML_TYPE_COUNT; break;
3365-
=======
3366-
case GGML_FTYPE_ALL_F32: wtype = GGML_TYPE_F32; break;
3367-
case GGML_FTYPE_MOSTLY_F16: wtype = GGML_TYPE_F16; break;
3368-
case GGML_FTYPE_MOSTLY_BF16: wtype = GGML_TYPE_BF16; break;
3369-
case GGML_FTYPE_MOSTLY_Q4_0: wtype = GGML_TYPE_Q4_0; break;
3370-
case GGML_FTYPE_MOSTLY_Q4_0_B16: wtype = GGML_TYPE_Q4_0_B16; break;
3371-
case GGML_FTYPE_MOSTLY_Q4_1: wtype = GGML_TYPE_Q4_1; break;
3372-
case GGML_FTYPE_MOSTLY_Q5_0: wtype = GGML_TYPE_Q5_0; break;
3373-
case GGML_FTYPE_MOSTLY_Q5_1: wtype = GGML_TYPE_Q5_1; break;
3374-
case GGML_FTYPE_MOSTLY_Q8_0: wtype = GGML_TYPE_Q8_0; break;
3375-
case GGML_FTYPE_MOSTLY_Q8_0_B16: wtype = GGML_TYPE_Q8_0_B16; break;
3376-
case GGML_FTYPE_MOSTLY_Q2_K: wtype = GGML_TYPE_Q2_K; break;
3377-
case GGML_FTYPE_MOSTLY_Q3_K: wtype = GGML_TYPE_Q3_K; break;
3378-
case GGML_FTYPE_MOSTLY_Q4_K: wtype = GGML_TYPE_Q4_K; break;
3379-
case GGML_FTYPE_MOSTLY_Q5_K: wtype = GGML_TYPE_Q5_K; break;
3380-
case GGML_FTYPE_MOSTLY_Q6_K: wtype = GGML_TYPE_Q6_K; break;
3381-
case GGML_FTYPE_MOSTLY_IQ2_XXS: wtype = GGML_TYPE_IQ2_XXS; break;
3382-
case GGML_FTYPE_MOSTLY_IQ2_XS: wtype = GGML_TYPE_IQ2_XS; break;
3383-
case GGML_FTYPE_MOSTLY_IQ3_XXS: wtype = GGML_TYPE_IQ3_XXS; break;
3384-
case GGML_FTYPE_MOSTLY_IQ1_S: wtype = GGML_TYPE_IQ1_S; break;
3385-
case GGML_FTYPE_MOSTLY_IQ1_M: wtype = GGML_TYPE_IQ1_M; break;
3386-
case GGML_FTYPE_MOSTLY_IQ4_NL: wtype = GGML_TYPE_IQ4_NL; break;
3387-
case GGML_FTYPE_MOSTLY_IQ4_XS: wtype = GGML_TYPE_IQ4_XS; break;
3388-
case GGML_FTYPE_MOSTLY_IQ3_S: wtype = GGML_TYPE_IQ3_S; break;
3389-
case GGML_FTYPE_MOSTLY_IQ2_S: wtype = GGML_TYPE_IQ2_S; break;
3390-
case GGML_FTYPE_UNKNOWN: wtype = GGML_TYPE_COUNT; break;
3391-
case GGML_FTYPE_MOSTLY_Q4_1_SOME_F16: wtype = GGML_TYPE_COUNT; break;
3392-
>>>>>>> ed837022 (Introduce Q4_0 and Q8_0 quantizations with BF16 delta values)
33933366
}
33943367

33953368
GGML_ASSERT(wtype != GGML_TYPE_COUNT);

0 commit comments

Comments
 (0)