Skip to content

Commit 1928967

Browse files
committed
resolve test-backend-ops conflicts
1 parent 40f4787 commit 1928967

File tree

1 file changed

+2
-62
lines changed

1 file changed

+2
-62
lines changed

tests/test-backend-ops.cpp

Lines changed: 2 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,8 @@ struct test_case {
474474

475475
if (memcmp(t1_data.data(), t2_data.data(), ggml_nbytes(t1)) != 0) {
476476
printf("sentinel mismatch: %s ", t1->name);
477-
// ud->ok = false;
478-
// return true;
477+
ud->ok = false;
478+
return true;
479479
}
480480
}
481481

@@ -1694,64 +1694,6 @@ struct test_leaky_relu : public test_case {
16941694
}
16951695
};
16961696

1697-
// GGML_OP_SSM_CONV
1698-
struct test_ssm_conv : public test_case {
1699-
const ggml_type type;
1700-
const int64_t d_conv;
1701-
const int64_t d_inner;
1702-
const int64_t n_seq_tokens;
1703-
const int64_t n_seqs;
1704-
1705-
std::string vars() override {
1706-
return VARS_TO_STR5(type, d_conv, d_inner, n_seq_tokens, n_seqs);
1707-
}
1708-
1709-
test_ssm_conv(ggml_type type = GGML_TYPE_F32,
1710-
int64_t d_conv = 4,
1711-
int64_t d_inner = 1536,
1712-
int64_t n_seq_tokens = 7,
1713-
int64_t n_seqs = 2)
1714-
: type(type), d_conv(d_conv), d_inner(d_inner), n_seq_tokens(n_seq_tokens), n_seqs(n_seqs) {}
1715-
1716-
ggml_tensor * build_graph(ggml_context * ctx) override {
1717-
ggml_tensor * sx = ggml_new_tensor_3d(ctx, type, d_conv - 1 + n_seq_tokens, d_inner, n_seqs);
1718-
ggml_tensor * c = ggml_new_tensor_2d(ctx, type, d_conv, d_inner);
1719-
ggml_tensor * out = ggml_ssm_conv(ctx, sx, c);
1720-
return out;
1721-
}
1722-
};
1723-
1724-
// GGML_OP_SSM_SCAN
1725-
struct test_ssm_scan : public test_case {
1726-
const ggml_type type;
1727-
const int64_t d_state;
1728-
const int64_t d_inner;
1729-
const int64_t n_seq_tokens;
1730-
const int64_t n_seqs;
1731-
1732-
std::string vars() override {
1733-
return VARS_TO_STR5(type, d_state, d_inner, n_seq_tokens, n_seqs);
1734-
}
1735-
1736-
test_ssm_scan(ggml_type type = GGML_TYPE_F32,
1737-
int64_t d_state = 16,
1738-
int64_t d_inner = 1536,
1739-
int64_t n_seq_tokens = 7,
1740-
int64_t n_seqs = 2)
1741-
: type(type), d_state(d_state), d_inner(d_inner), n_seq_tokens(n_seq_tokens), n_seqs(n_seqs) {}
1742-
1743-
ggml_tensor * build_graph(ggml_context * ctx) override {
1744-
ggml_tensor * s = ggml_new_tensor_3d(ctx, type, d_state, d_inner, n_seqs);
1745-
ggml_tensor * x = ggml_new_tensor_3d(ctx, type, d_inner, n_seq_tokens, n_seqs);
1746-
ggml_tensor * dt = ggml_new_tensor_3d(ctx, type, d_inner, n_seq_tokens, n_seqs);
1747-
ggml_tensor * A = ggml_new_tensor_2d(ctx, type, d_state, d_inner);
1748-
ggml_tensor * B = ggml_new_tensor_3d(ctx, type, d_state, n_seq_tokens, n_seqs);
1749-
ggml_tensor * C = ggml_new_tensor_3d(ctx, type, d_state, n_seq_tokens, n_seqs);
1750-
ggml_tensor * out = ggml_ssm_scan(ctx, s, x, dt, A, B, C);
1751-
return out;
1752-
}
1753-
};
1754-
17551697
// GGML_OP_FLASH_ATTN_EXT
17561698
struct test_flash_attn_ext : public test_case {
17571699
const int64_t hs; // head size
@@ -2549,8 +2491,6 @@ static bool test_backend(ggml_backend_t backend, test_mode mode, const char * op
25492491
test_cases.emplace_back(new test_arange());
25502492
test_cases.emplace_back(new test_timestep_embedding());
25512493
test_cases.emplace_back(new test_leaky_relu());
2552-
test_cases.emplace_back(new test_ssm_conv());
2553-
test_cases.emplace_back(new test_ssm_scan());
25542494

25552495
for (int hs : { 64, 80, 128, 256, }) {
25562496
for (bool mask : { true, false } ) {

0 commit comments

Comments
 (0)