From fc701cedd146152fb270482a7eef5aba23b20575 Mon Sep 17 00:00:00 2001 From: Kawrakow Date: Sun, 8 Dec 2024 09:34:42 +0100 Subject: Rename iq4_nl_x4 to iq4_nl_r4 (#126) Co-authored-by: Iwan Kawrakow --- ggml/src/ggml.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'ggml/src/ggml.c') diff --git a/ggml/src/ggml.c b/ggml/src/ggml.c index 12afec05..69bb6d88 100644 --- a/ggml/src/ggml.c +++ b/ggml/src/ggml.c @@ -1266,15 +1266,15 @@ static const ggml_type_traits_t type_traits[GGML_TYPE_COUNT] = { .nrows = 1, .row_meta_size = 0, }, - [GGML_TYPE_IQ4_NL_X4] = { - .type_name = "iq4_nl_x4", + [GGML_TYPE_IQ4_NL_R4] = { + .type_name = "iq4_nl_r4", .blck_size = QK4_NL, .type_size = sizeof(block_iq4_nl), .is_quantized = true, - .to_float = (ggml_to_float_t) dequantize_row_iq4_nl_x4, - .from_float = quantize_row_iq4_nl_x4, - .from_float_ref = (ggml_from_float_t)quantize_row_iq4_nl_x4_ref, - .vec_dot = vec_dot_iq4_nl_x4_q8_0, + .to_float = (ggml_to_float_t) dequantize_row_iq4_nl_r4, + .from_float = quantize_row_iq4_nl_r4, + .from_float_ref = (ggml_from_float_t)quantize_row_iq4_nl_r4_ref, + .vec_dot = vec_dot_iq4_nl_r4_q8_0, #if GGML_USE_IQK_MULMAT && defined __AVX2__ .vec_dot_type = GGML_TYPE_Q8_1, #else @@ -4023,7 +4023,7 @@ enum ggml_type ggml_ftype_to_ggml_type(enum ggml_ftype ftype) { case GGML_FTYPE_MOSTLY_IQ2_BN: wtype = GGML_TYPE_IQ2_BN; break; case GGML_FTYPE_MOSTLY_IQ2_BN_R4: wtype = GGML_TYPE_IQ2_BN_R4;break; case GGML_FTYPE_MOSTLY_IQ4_NL: wtype = GGML_TYPE_IQ4_NL; break; - case GGML_FTYPE_MOSTLY_IQ4_NL_X4: wtype = GGML_TYPE_IQ4_NL_X4;break; + case GGML_FTYPE_MOSTLY_IQ4_NL_R4: wtype = GGML_TYPE_IQ4_NL_R4;break; case GGML_FTYPE_MOSTLY_IQ4_XS_R4: wtype = GGML_TYPE_IQ4_XS_R4;break; case GGML_FTYPE_MOSTLY_Q4_0_R4: wtype = GGML_TYPE_Q4_0_R4; break; case GGML_FTYPE_MOSTLY_Q5_0_R4: wtype = GGML_TYPE_Q5_0_R4; break; @@ -10553,7 +10553,7 @@ static void ggml_compute_forward_add( case GGML_TYPE_IQ2_BN: case GGML_TYPE_IQ2_BN_R4: case GGML_TYPE_IQ4_NL: - case GGML_TYPE_IQ4_NL_X4: + case GGML_TYPE_IQ4_NL_R4: case GGML_TYPE_IQ4_XS_R4: case GGML_TYPE_Q4_0_R4: case GGML_TYPE_Q5_0_R4: @@ -11002,7 +11002,7 @@ static void ggml_compute_forward_add1( case GGML_TYPE_IQ2_BN: case GGML_TYPE_IQ2_BN_R4: case GGML_TYPE_IQ4_NL: - case GGML_TYPE_IQ4_NL_X4: + case GGML_TYPE_IQ4_NL_R4: case GGML_TYPE_IQ4_XS_R4: case GGML_TYPE_Q4_0_R4: case GGML_TYPE_Q5_0_R4: @@ -11148,7 +11148,7 @@ static void ggml_compute_forward_acc( case GGML_TYPE_IQ2_BN: case GGML_TYPE_IQ2_BN_R4: case GGML_TYPE_IQ4_NL: - case GGML_TYPE_IQ4_NL_X4: + case GGML_TYPE_IQ4_NL_R4: case GGML_TYPE_IQ4_XS_R4: case GGML_TYPE_Q4_0_R4: case GGML_TYPE_Q5_0_R4: @@ -14340,7 +14340,7 @@ static void ggml_compute_forward_out_prod( case GGML_TYPE_IQ2_BN: case GGML_TYPE_IQ2_BN_R4: case GGML_TYPE_IQ4_NL: - case GGML_TYPE_IQ4_NL_X4: + case GGML_TYPE_IQ4_NL_R4: case GGML_TYPE_IQ4_XS_R4: case GGML_TYPE_Q4_0_R4: case GGML_TYPE_Q5_0_R4: @@ -14726,7 +14726,7 @@ static void ggml_compute_forward_set( case GGML_TYPE_IQ2_BN: case GGML_TYPE_IQ2_BN_R4: case GGML_TYPE_IQ4_NL: - case GGML_TYPE_IQ4_NL_X4: + case GGML_TYPE_IQ4_NL_R4: case GGML_TYPE_IQ4_XS_R4: case GGML_TYPE_Q4_0_R4: case GGML_TYPE_Q5_0_R4: @@ -15006,7 +15006,7 @@ static void ggml_compute_forward_get_rows( case GGML_TYPE_IQ2_BN: case GGML_TYPE_IQ2_BN_R4: case GGML_TYPE_IQ4_NL: - case GGML_TYPE_IQ4_NL_X4: + case GGML_TYPE_IQ4_NL_R4: case GGML_TYPE_IQ4_XS_R4: case GGML_TYPE_Q4_0_R4: case GGML_TYPE_Q5_0_R4: @@ -15613,7 +15613,7 @@ static void ggml_compute_forward_clamp( case GGML_TYPE_IQ2_BN: case GGML_TYPE_IQ2_BN_R4: case GGML_TYPE_IQ4_NL: - case GGML_TYPE_IQ4_NL_X4: + case GGML_TYPE_IQ4_NL_R4: case GGML_TYPE_IQ4_XS_R4: case GGML_TYPE_Q4_0_R4: case GGML_TYPE_Q5_0_R4: @@ -22449,7 +22449,7 @@ size_t ggml_quantize_chunk( case GGML_TYPE_IQ2_BN: result = quantize_iq2_bn (src + start, (char *) dst + start_row * row_size, nrows, n_per_row, imatrix); break; case GGML_TYPE_IQ2_BN_R4:result = quantize_iq2_bn_r4(src + start, (char *) dst + start_row * row_size, nrows, n_per_row, imatrix); break; case GGML_TYPE_IQ4_NL: result = quantize_iq4_nl (src + start, (char *) dst + start_row * row_size, nrows, n_per_row, imatrix); break; - case GGML_TYPE_IQ4_NL_X4: result = quantize_iq4_nl_x4(src + start, (char *) dst + start_row * row_size, nrows, n_per_row, imatrix); break; + case GGML_TYPE_IQ4_NL_R4: result = quantize_iq4_nl_r4(src + start, (char *) dst + start_row * row_size, nrows, n_per_row, imatrix); break; case GGML_TYPE_IQ4_XS_R4: result = quantize_iq4_xs_r4(src + start, (char *) dst + start_row * row_size, nrows, n_per_row, imatrix); break; case GGML_TYPE_Q4_0_R4: result = quantize_q4_0_r4(src + start, (char *) dst + start_row * row_size, nrows, n_per_row, imatrix); break; case GGML_TYPE_Q5_0_R4: result = quantize_q5_0_r4(src + start, (char *) dst + start_row * row_size, nrows, n_per_row, imatrix); break; -- cgit v1.2.3