Skip to content

Commit 1618844

Browse files
committed
metal/opencl/sycl/vulkan: fix GGML_OP_PAD check in supports_op
1 parent 457f186 commit 1618844

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

ggml/src/ggml-metal/ggml-metal.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,10 +1888,8 @@ static bool ggml_metal_supports_op(const struct ggml_backend_metal_device_contex
18881888
case GGML_OP_POOL_2D:
18891889
return op->src[0]->type == GGML_TYPE_F32;
18901890
case GGML_OP_PAD:
1891-
return (ggml_get_op_params_i32(op, 0) == 0) && (ggml_get_op_params_i32(op, 1) == 0) &&
1892-
(ggml_get_op_params_i32(op, 2) == 0) && (ggml_get_op_params_i32(op, 3) == 0) &&
1893-
(ggml_get_op_params_i32(op, 4) == 0) && (ggml_get_op_params_i32(op, 5) == 0) &&
1894-
(ggml_get_op_params_i32(op, 6) == 0) && (ggml_get_op_params_i32(op, 7) == 0);
1891+
return (ggml_get_op_params_i32(op, 0) == 0) && (ggml_get_op_params_i32(op, 2) == 0) &&
1892+
(ggml_get_op_params_i32(op, 4) == 0) && (ggml_get_op_params_i32(op, 6) == 0);
18951893
case GGML_OP_PAD_REFLECT_1D:
18961894
case GGML_OP_TIMESTEP_EMBEDDING:
18971895
case GGML_OP_ARGSORT:

ggml/src/ggml-opencl/ggml-opencl.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2702,10 +2702,8 @@ static bool ggml_opencl_supports_op(ggml_backend_dev_t dev, const struct ggml_te
27022702
case GGML_OP_PAD:
27032703
return op->src[0]->type == GGML_TYPE_F32 && op->type == GGML_TYPE_F32 &&
27042704
op->src[0]->ne[3] == 1 && op->ne[3] == 1 &&
2705-
(ggml_get_op_params_i32(op, 0) == 0) && (ggml_get_op_params_i32(op, 1) == 0) &&
2706-
(ggml_get_op_params_i32(op, 2) == 0) && (ggml_get_op_params_i32(op, 3) == 0) &&
2707-
(ggml_get_op_params_i32(op, 4) == 0) && (ggml_get_op_params_i32(op, 5) == 0) &&
2708-
(ggml_get_op_params_i32(op, 6) == 0) && (ggml_get_op_params_i32(op, 7) == 0);
2705+
(ggml_get_op_params_i32(op, 0) == 0) && (ggml_get_op_params_i32(op, 2) == 0) &&
2706+
(ggml_get_op_params_i32(op, 4) == 0) && (ggml_get_op_params_i32(op, 6) == 0);
27092707
case GGML_OP_UPSCALE:
27102708
return op->src[0]->type == GGML_TYPE_F32 && op->type == GGML_TYPE_F32;
27112709
case GGML_OP_CONV_2D:

ggml/src/ggml-sycl/ggml-sycl.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4400,10 +4400,8 @@ static bool ggml_backend_sycl_device_supports_op(ggml_backend_dev_t dev, const g
44004400
case GGML_OP_ACC:
44014401
return true;
44024402
case GGML_OP_PAD:
4403-
return (ggml_get_op_params_i32(op, 0) == 0) && (ggml_get_op_params_i32(op, 1) == 0) &&
4404-
(ggml_get_op_params_i32(op, 2) == 0) && (ggml_get_op_params_i32(op, 3) == 0) &&
4405-
(ggml_get_op_params_i32(op, 4) == 0) && (ggml_get_op_params_i32(op, 5) == 0) &&
4406-
(ggml_get_op_params_i32(op, 6) == 0) && (ggml_get_op_params_i32(op, 7) == 0);
4403+
return (ggml_get_op_params_i32(op, 0) == 0) && (ggml_get_op_params_i32(op, 2) == 0) &&
4404+
(ggml_get_op_params_i32(op, 4) == 0) && (ggml_get_op_params_i32(op, 6) == 0);
44074405
case GGML_OP_LEAKY_RELU:
44084406
case GGML_OP_TIMESTEP_EMBEDDING:
44094407
case GGML_OP_RWKV_WKV6:

ggml/src/ggml-vulkan/ggml-vulkan.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12056,10 +12056,8 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
1205612056
case GGML_OP_SCALE:
1205712057
return true;
1205812058
case GGML_OP_PAD:
12059-
return (ggml_get_op_params_i32(op, 0) == 0) && (ggml_get_op_params_i32(op, 1) == 0) &&
12060-
(ggml_get_op_params_i32(op, 2) == 0) && (ggml_get_op_params_i32(op, 3) == 0) &&
12061-
(ggml_get_op_params_i32(op, 4) == 0) && (ggml_get_op_params_i32(op, 5) == 0) &&
12062-
(ggml_get_op_params_i32(op, 6) == 0) && (ggml_get_op_params_i32(op, 7) == 0);
12059+
return (ggml_get_op_params_i32(op, 0) == 0) && (ggml_get_op_params_i32(op, 2) == 0) &&
12060+
(ggml_get_op_params_i32(op, 4) == 0) && (ggml_get_op_params_i32(op, 6) == 0);
1206312061
case GGML_OP_ROLL:
1206412062
case GGML_OP_DIAG_MASK_INF:
1206512063
case GGML_OP_SOFT_MAX:

0 commit comments

Comments
 (0)