mirror of
https://github.com/ggml-org/llama.cpp.git
synced 2025-06-27 12:05:03 +00:00
test: non-cont. b in test-backend-ops -o MUL_MAT (#13187)
This commit is contained in:
@ -1981,7 +1981,7 @@ struct test_mul_mat : public test_case {
|
|||||||
const std::array<int64_t, 2> bs; // dims 3 and 4
|
const std::array<int64_t, 2> bs; // dims 3 and 4
|
||||||
const std::array<int64_t, 2> nr; // repeat in dims 3 and 4
|
const std::array<int64_t, 2> nr; // repeat in dims 3 and 4
|
||||||
const std::array<int64_t, 4> per; // permutation of dimensions
|
const std::array<int64_t, 4> per; // permutation of dimensions
|
||||||
const bool v; // whether a is a non-contiguous view
|
const bool v; // whether a and b are non-contiguous views
|
||||||
|
|
||||||
std::string vars() override {
|
std::string vars() override {
|
||||||
return VARS_TO_STR9(type_a, type_b, m, n, k, bs, nr, per, v);
|
return VARS_TO_STR9(type_a, type_b, m, n, k, bs, nr, per, v);
|
||||||
@ -2043,11 +2043,14 @@ struct test_mul_mat : public test_case {
|
|||||||
|
|
||||||
if (v) {
|
if (v) {
|
||||||
a = ggml_new_tensor_4d(ctx, type_a, k*2, m, bs[0], bs[1]);
|
a = ggml_new_tensor_4d(ctx, type_a, k*2, m, bs[0], bs[1]);
|
||||||
|
b = ggml_new_tensor_4d(ctx, type_b, k*2, n, bs[0]*nr[0], bs[1]*nr[1]);
|
||||||
|
|
||||||
a = ggml_view_4d(ctx, a, k, m, bs[0], bs[1], a->nb[1], a->nb[2], a->nb[3], 0);
|
a = ggml_view_4d(ctx, a, k, m, bs[0], bs[1], a->nb[1], a->nb[2], a->nb[3], 0);
|
||||||
|
b = ggml_view_4d(ctx, b, k, n, bs[0]*nr[0], bs[1]*nr[1], b->nb[1], b->nb[2], b->nb[3], 0);
|
||||||
} else {
|
} else {
|
||||||
a = ggml_new_tensor_4d(ctx, type_a, k, m, bs[0], bs[1]);
|
a = ggml_new_tensor_4d(ctx, type_a, k, m, bs[0], bs[1]);
|
||||||
}
|
|
||||||
b = ggml_new_tensor_4d(ctx, type_b, k, n, bs[0]*nr[0], bs[1]*nr[1]);
|
b = ggml_new_tensor_4d(ctx, type_b, k, n, bs[0]*nr[0], bs[1]*nr[1]);
|
||||||
|
}
|
||||||
if (!ggml_is_quantized(type_a)) {
|
if (!ggml_is_quantized(type_a)) {
|
||||||
if (bs[1] == 1 && nr[1] == 1) {
|
if (bs[1] == 1 && nr[1] == 1) {
|
||||||
ggml_set_param(ctx, a);
|
ggml_set_param(ctx, a);
|
||||||
|
Reference in New Issue
Block a user