Skip to content

Commit 1f6b9b0

Browse files
ggerganovpwilkin
authored andcommitted
cont : ggml_tri minor
1 parent 37acf9e commit 1f6b9b0

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

ggml/src/ggml-cpu/ops.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2222,10 +2222,9 @@ void ggml_compute_forward_fill(const ggml_compute_params * params, ggml_tensor *
22222222
static void ggml_compute_forward_tri_f32(const ggml_compute_params * params, ggml_tensor * dst) {
22232223
const ggml_tensor * src0 = dst->src[0];
22242224

2225-
ggml_tri_type ttype = (ggml_tri_type) dst->op_params[0];
2225+
const ggml_tri_type ttype = (ggml_tri_type) ggml_get_op_params_i32(dst, 0);
22262226

22272227
GGML_ASSERT(ggml_is_contiguous(src0));
2228-
GGML_ASSERT(src0->ne[0] == src0->ne[1]);
22292228

22302229
GGML_TENSOR_UNARY_OP_LOCALS
22312230

@@ -2237,8 +2236,8 @@ static void ggml_compute_forward_tri_f32(const ggml_compute_params * params, ggm
22372236
case GGML_TRI_TYPE_LOWER: bipred = [](int i, int r) { return i < r; }; break;
22382237
case GGML_TRI_TYPE_LOWER_DIAG: bipred = [](int i, int r) { return i <= r; }; break;
22392238
case GGML_TRI_TYPE_UPPER: bipred = [](int i, int r) { return i > r; }; break;
2240-
case GGML_TRI_TYPE_UPPER_DIAG:
2241-
default: bipred = [](int i, int r) { return i >= r; }; break;
2239+
case GGML_TRI_TYPE_UPPER_DIAG: bipred = [](int i, int r) { return i >= r; }; break;
2240+
default: GGML_ABORT("invalid tri type");
22422241
}
22432242

22442243
for (int64_t ir = ir0; ir < ir1; ++ir) {

0 commit comments

Comments
 (0)