Skip to content

Commit c039424

Browse files
authored
deduplicate checks
1 parent 9cbb916 commit c039424

File tree

1 file changed

+3
-25
lines changed

1 file changed

+3
-25
lines changed

ggml/src/ggml-cuda/ggml-cuda.cu

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3242,13 +3242,9 @@ static bool ggml_backend_cuda_device_supports_op(ggml_backend_dev_t dev, const g
32423242
{
32433243
ggml_type src0_type = op->src[0]->type;
32443244
ggml_type src1_type = op->src[1]->type;
3245-
if (src0_type == GGML_TYPE_F32 && src1_type == GGML_TYPE_F32) {
3246-
return true;
3247-
}
3248-
if (src0_type == GGML_TYPE_F32 && src1_type == GGML_TYPE_BF16) {
3249-
return true;
3250-
}
3251-
if (src0_type == GGML_TYPE_F32 && src1_type == GGML_TYPE_F16) {
3245+
if ((src0_type == GGML_TYPE_F32 || src0_type == GGML_TYPE_BF16 || src0_type == GGML_TYPE_F16) &&
3246+
(src1_type == GGML_TYPE_F32 || src1_type == GGML_TYPE_BF16 || src1_type == GGML_TYPE_F16)
3247+
) {
32523248
return true;
32533249
}
32543250
if (src0_type == GGML_TYPE_F32 && src1_type == GGML_TYPE_Q8_0) {
@@ -3284,24 +3280,6 @@ static bool ggml_backend_cuda_device_supports_op(ggml_backend_dev_t dev, const g
32843280
if (src0_type == GGML_TYPE_F32 && src1_type == GGML_TYPE_IQ4_NL) {
32853281
return true;
32863282
}
3287-
if (src0_type == GGML_TYPE_F16 && src1_type == GGML_TYPE_F16) {
3288-
return true;
3289-
}
3290-
if (src0_type == GGML_TYPE_F16 && src1_type == GGML_TYPE_BF16) {
3291-
return true;
3292-
}
3293-
if (src0_type == GGML_TYPE_F16 && src1_type == GGML_TYPE_F32) {
3294-
return true;
3295-
}
3296-
if (src0_type == GGML_TYPE_BF16 && src1_type == GGML_TYPE_BF16) {
3297-
return true;
3298-
}
3299-
if (src0_type == GGML_TYPE_BF16 && src1_type == GGML_TYPE_F16) {
3300-
return true;
3301-
}
3302-
if (src0_type == GGML_TYPE_BF16 && src1_type == GGML_TYPE_F32) {
3303-
return true;
3304-
}
33053283
if (src0_type == src1_type && ggml_is_contiguous(op->src[0]) && ggml_is_contiguous(op->src[1])) {
33063284
return true;
33073285
}

0 commit comments

Comments
 (0)