Skip to content

Commit eb1116a

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

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
@@ -15429,21 +15429,21 @@ static bool validate_bf16(ggml_half f, size_t i) {
1542915429
} \
1543015430
}
1543115431

15432-
<<<<<<< HEAD
1543315432
#define VALIDATE_ROW_DATA_DVEC_F16_IMPL(type, data, nb, nr) \
1543415433
const type * q = (const type *) (data); \
1543515434
for (size_t i = 0; i < (nb); ++i) { \
1543615435
for (size_t j = 0; j < (nr); ++j) { \
1543715436
if (!validate_fp16(q[i].d[j], i)) { \
1543815437
return false; \
1543915438
} \
15440-
=======
15439+
} \
15440+
}
15441+
1544115442
#define VALIDATE_ROW_DATA_D_B16_IMPL(type, data, nb) \
1544215443
const type * q = (const type *) (data); \
1544315444
for (size_t i = 0; i < (nb); ++i) { \
1544415445
if (!validate_bf16((q[i].d), i)) { \
1544515446
return false; \
15446-
>>>>>>> ed837022 (Introduce Q4_0 and Q8_0 quantizations with BF16 delta values)
1544715447
} \
1544815448
}
1544915449

‎ggml/src/ggml.c

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ static const ggml_type_traits_t type_traits[GGML_TYPE_COUNT] = {
952952
.is_quantized = true,
953953
.to_float = (ggml_to_float_t) dequantize_row_q4_0_b16,
954954
.from_float = quantize_row_q4_0_b16,
955-
.from_float_reference = (ggml_from_float_t) quantize_row_q4_0_b16_ref,
955+
.from_float_ref = (ggml_from_float_t) quantize_row_q4_0_b16_ref,
956956
.vec_dot = ggml_vec_dot_q4_0_b16_q8_0_b16,
957957
.vec_dot_type = GGML_TYPE_Q8_0_B16,
958958
.nrows = 1,
@@ -964,7 +964,7 @@ static const ggml_type_traits_t type_traits[GGML_TYPE_COUNT] = {
964964
.is_quantized = true,
965965
.to_float = (ggml_to_float_t) dequantize_row_q8_0_b16,
966966
.from_float = quantize_row_q8_0_b16,
967-
.from_float_reference = (ggml_from_float_t) quantize_row_q8_0_b16_ref,
967+
.from_float_ref = (ggml_from_float_t) quantize_row_q8_0_b16_ref,
968968
.vec_dot = ggml_vec_dot_q8_0_b16_q8_0_b16,
969969
.vec_dot_type = GGML_TYPE_Q8_0_B16,
970970
.nrows = 1,
@@ -3245,15 +3245,16 @@ enum ggml_type ggml_ftype_to_ggml_type(enum ggml_ftype ftype) {
32453245
enum ggml_type wtype = GGML_TYPE_COUNT;
32463246

32473247
switch (ftype) {
3248-
<<<<<<< HEAD
32493248
case GGML_FTYPE_ALL_F32: wtype = GGML_TYPE_F32; break;
32503249
case GGML_FTYPE_MOSTLY_F16: wtype = GGML_TYPE_F16; break;
32513250
case GGML_FTYPE_MOSTLY_BF16: wtype = GGML_TYPE_BF16; break;
32523251
case GGML_FTYPE_MOSTLY_Q4_0: wtype = GGML_TYPE_Q4_0; break;
3252+
case GGML_FTYPE_MOSTLY_Q4_0_B16: wtype = GGML_TYPE_Q4_0_B16; break;
32533253
case GGML_FTYPE_MOSTLY_Q4_1: wtype = GGML_TYPE_Q4_1; break;
32543254
case GGML_FTYPE_MOSTLY_Q5_0: wtype = GGML_TYPE_Q5_0; break;
32553255
case GGML_FTYPE_MOSTLY_Q5_1: wtype = GGML_TYPE_Q5_1; break;
32563256
case GGML_FTYPE_MOSTLY_Q8_0: wtype = GGML_TYPE_Q8_0; break;
3257+
case GGML_FTYPE_MOSTLY_Q8_0_B16: wtype = GGML_TYPE_Q8_0_B16; break;
32573258
case GGML_FTYPE_MOSTLY_Q2_K: wtype = GGML_TYPE_Q2_K; break;
32583259
case GGML_FTYPE_MOSTLY_Q3_K: wtype = GGML_TYPE_Q3_K; break;
32593260
case GGML_FTYPE_MOSTLY_Q4_K: wtype = GGML_TYPE_Q4_K; break;
@@ -3273,34 +3274,6 @@ enum ggml_type ggml_ftype_to_ggml_type(enum ggml_ftype ftype) {
32733274
case GGML_FTYPE_MOSTLY_Q4_0_8_8: wtype = GGML_TYPE_Q4_0_8_8; break;
32743275
case GGML_FTYPE_UNKNOWN: wtype = GGML_TYPE_COUNT; break;
32753276
case GGML_FTYPE_MOSTLY_Q4_1_SOME_F16: wtype = GGML_TYPE_COUNT; break;
3276-
=======
3277-
case GGML_FTYPE_ALL_F32: wtype = GGML_TYPE_F32; break;
3278-
case GGML_FTYPE_MOSTLY_F16: wtype = GGML_TYPE_F16; break;
3279-
case GGML_FTYPE_MOSTLY_BF16: wtype = GGML_TYPE_BF16; break;
3280-
case GGML_FTYPE_MOSTLY_Q4_0: wtype = GGML_TYPE_Q4_0; break;
3281-
case GGML_FTYPE_MOSTLY_Q4_0_B16: wtype = GGML_TYPE_Q4_0_B16; break;
3282-
case GGML_FTYPE_MOSTLY_Q4_1: wtype = GGML_TYPE_Q4_1; break;
3283-
case GGML_FTYPE_MOSTLY_Q5_0: wtype = GGML_TYPE_Q5_0; break;
3284-
case GGML_FTYPE_MOSTLY_Q5_1: wtype = GGML_TYPE_Q5_1; break;
3285-
case GGML_FTYPE_MOSTLY_Q8_0: wtype = GGML_TYPE_Q8_0; break;
3286-
case GGML_FTYPE_MOSTLY_Q8_0_B16: wtype = GGML_TYPE_Q8_0_B16; break;
3287-
case GGML_FTYPE_MOSTLY_Q2_K: wtype = GGML_TYPE_Q2_K; break;
3288-
case GGML_FTYPE_MOSTLY_Q3_K: wtype = GGML_TYPE_Q3_K; break;
3289-
case GGML_FTYPE_MOSTLY_Q4_K: wtype = GGML_TYPE_Q4_K; break;
3290-
case GGML_FTYPE_MOSTLY_Q5_K: wtype = GGML_TYPE_Q5_K; break;
3291-
case GGML_FTYPE_MOSTLY_Q6_K: wtype = GGML_TYPE_Q6_K; break;
3292-
case GGML_FTYPE_MOSTLY_IQ2_XXS: wtype = GGML_TYPE_IQ2_XXS; break;
3293-
case GGML_FTYPE_MOSTLY_IQ2_XS: wtype = GGML_TYPE_IQ2_XS; break;
3294-
case GGML_FTYPE_MOSTLY_IQ3_XXS: wtype = GGML_TYPE_IQ3_XXS; break;
3295-
case GGML_FTYPE_MOSTLY_IQ1_S: wtype = GGML_TYPE_IQ1_S; break;
3296-
case GGML_FTYPE_MOSTLY_IQ1_M: wtype = GGML_TYPE_IQ1_M; break;
3297-
case GGML_FTYPE_MOSTLY_IQ4_NL: wtype = GGML_TYPE_IQ4_NL; break;
3298-
case GGML_FTYPE_MOSTLY_IQ4_XS: wtype = GGML_TYPE_IQ4_XS; break;
3299-
case GGML_FTYPE_MOSTLY_IQ3_S: wtype = GGML_TYPE_IQ3_S; break;
3300-
case GGML_FTYPE_MOSTLY_IQ2_S: wtype = GGML_TYPE_IQ2_S; break;
3301-
case GGML_FTYPE_UNKNOWN: wtype = GGML_TYPE_COUNT; break;
3302-
case GGML_FTYPE_MOSTLY_Q4_1_SOME_F16: wtype = GGML_TYPE_COUNT; break;
3303-
>>>>>>> ed837022 (Introduce Q4_0 and Q8_0 quantizations with BF16 delta values)
33043277
}
33053278

33063279
GGML_ASSERT(wtype != GGML_TYPE_COUNT);

0 commit comments

Comments
 (0)