Skip to content

Commit 8cc7145

Browse files
committed
ggml : disable tests involving i-matrix quantization
1 parent b0597b1 commit 8cc7145

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

ggml/src/ggml-cpu/ggml-cpu.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,12 +2968,8 @@ static void ggml_compute_forward_dup_f16(
29682968
id += ne00 * (ne01 - ir1);
29692969
}
29702970
}
2971-
} else if (ggml_get_type_traits_cpu(dst->type)->from_float || ggml_get_type_traits(dst->type)->from_float_ref) {
2972-
ggml_from_float_t quantize_row_q = ggml_get_type_traits_cpu(dst->type)->from_float;
2973-
if (!quantize_row_q) {
2974-
quantize_row_q = ggml_get_type_traits(dst->type)->from_float_ref;
2975-
}
2976-
2971+
} else if (ggml_get_type_traits_cpu(dst->type)->from_float) {
2972+
ggml_from_float_t const quantize_row_q = ggml_get_type_traits_cpu(dst->type)->from_float;
29772973
float * src0_f32 = (float *) params->wdata + (ne00 + CACHE_LINE_SIZE_F32) * ith;
29782974

29792975
size_t id = 0;
@@ -3569,11 +3565,8 @@ static void ggml_compute_forward_dup_f32(
35693565
id += rs * (ne01 - ir1);
35703566
}
35713567
}
3572-
} else if (ggml_get_type_traits_cpu(dst->type)->from_float || ggml_get_type_traits(dst->type)->from_float_ref) {
3573-
ggml_from_float_t quantize_row_q = ggml_get_type_traits_cpu(dst->type)->from_float;
3574-
if (!quantize_row_q) {
3575-
quantize_row_q = ggml_get_type_traits(dst->type)->from_float_ref;
3576-
}
3568+
} else if (ggml_get_type_traits_cpu(dst->type)->from_float) {
3569+
ggml_from_float_t const quantize_row_q = ggml_get_type_traits_cpu(dst->type)->from_float;
35773570

35783571
size_t id = 0;
35793572
size_t rs = nb0 * (ne00 / ggml_blck_size(dst->type));

tests/test-backend-ops.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3549,9 +3549,9 @@ static std::vector<std::unique_ptr<test_case>> make_test_cases_eval() {
35493549

35503550
for (ggml_type type_src : {GGML_TYPE_F16, GGML_TYPE_F32}) {
35513551
for (ggml_type type_dst : all_types) {
3552-
//if (type_dst == GGML_TYPE_IQ2_S || type_dst == GGML_TYPE_IQ3_XXS || type_dst == GGML_TYPE_IQ3_S) {
3553-
// continue;
3554-
//}
3552+
if (type_dst == GGML_TYPE_IQ2_S || type_dst == GGML_TYPE_IQ3_XXS || type_dst == GGML_TYPE_IQ3_S) {
3553+
continue;
3554+
}
35553555
test_cases.emplace_back(new test_cpy(type_src, type_dst, {256, 4, 4, 4}));
35563556
test_cases.emplace_back(new test_cpy(type_src, type_dst, {256, 2, 3, 4}, {0, 2, 1, 3})); // cpy by rows
35573557
}

0 commit comments

Comments
 (0)