Skip to content

Commit 51f5a45

Browse files
authored
opencl: fix concat crash on win arm64 with Adreno (#15944)
1 parent c4510dc commit 51f5a45

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6108,12 +6108,12 @@ static void ggml_cl_concat(ggml_backend_t backend, const ggml_tensor * src0, con
61086108
} else {
61096109
cl_kernel kernel = backend_ctx->kernel_concat_f32_non_contiguous;
61106110

6111-
long ne00 = src0->ne[0], ne01 = src0->ne[1], ne02 = src0->ne[2], ne03 = src0->ne[3];
6111+
cl_long ne00 = src0->ne[0], ne01 = src0->ne[1], ne02 = src0->ne[2], ne03 = src0->ne[3];
61126112
cl_ulong nb00 = src0->nb[0], nb01 = src0->nb[1], nb02 = src0->nb[2], nb03 = src0->nb[3];
61136113

61146114
cl_ulong nb10 = src1->nb[0], nb11 = src1->nb[1], nb12 = src1->nb[2], nb13 = src1->nb[3];
61156115

6116-
long d_ne0 = dst->ne[0], d_ne1 = dst->ne[1], d_ne2 = dst->ne[2], d_ne3 = dst->ne[3];
6116+
cl_long d_ne0 = dst->ne[0], d_ne1 = dst->ne[1], d_ne2 = dst->ne[2], d_ne3 = dst->ne[3];
61176117
cl_ulong d_nb0 = dst->nb[0], d_nb1 = dst->nb[1], d_nb2 = dst->nb[2], d_nb3 = dst->nb[3];
61186118

61196119

@@ -6124,10 +6124,10 @@ static void ggml_cl_concat(ggml_backend_t backend, const ggml_tensor * src0, con
61246124
CL_CHECK(clSetKernelArg(kernel, 4, sizeof(cl_mem), &extrad_cl->data_device));
61256125
CL_CHECK(clSetKernelArg(kernel, 5, sizeof(cl_ulong), &off_dst));
61266126

6127-
CL_CHECK(clSetKernelArg(kernel, 6, sizeof(long), &ne00));
6128-
CL_CHECK(clSetKernelArg(kernel, 7, sizeof(long), &ne01));
6129-
CL_CHECK(clSetKernelArg(kernel, 8, sizeof(long), &ne02));
6130-
CL_CHECK(clSetKernelArg(kernel, 9, sizeof(long), &ne03));
6127+
CL_CHECK(clSetKernelArg(kernel, 6, sizeof(cl_long), &ne00));
6128+
CL_CHECK(clSetKernelArg(kernel, 7, sizeof(cl_long), &ne01));
6129+
CL_CHECK(clSetKernelArg(kernel, 8, sizeof(cl_long), &ne02));
6130+
CL_CHECK(clSetKernelArg(kernel, 9, sizeof(cl_long), &ne03));
61316131
CL_CHECK(clSetKernelArg(kernel, 10, sizeof(cl_ulong), &nb00));
61326132
CL_CHECK(clSetKernelArg(kernel, 11, sizeof(cl_ulong), &nb01));
61336133
CL_CHECK(clSetKernelArg(kernel, 12, sizeof(cl_ulong), &nb02));
@@ -6138,10 +6138,10 @@ static void ggml_cl_concat(ggml_backend_t backend, const ggml_tensor * src0, con
61386138
CL_CHECK(clSetKernelArg(kernel, 16, sizeof(cl_ulong), &nb12));
61396139
CL_CHECK(clSetKernelArg(kernel, 17, sizeof(cl_ulong), &nb13));
61406140

6141-
CL_CHECK(clSetKernelArg(kernel, 18, sizeof(long), &d_ne0));
6142-
CL_CHECK(clSetKernelArg(kernel, 19, sizeof(long), &d_ne1));
6143-
CL_CHECK(clSetKernelArg(kernel, 20, sizeof(long), &d_ne2));
6144-
CL_CHECK(clSetKernelArg(kernel, 21, sizeof(long), &d_ne3));
6141+
CL_CHECK(clSetKernelArg(kernel, 18, sizeof(cl_long), &d_ne0));
6142+
CL_CHECK(clSetKernelArg(kernel, 19, sizeof(cl_long), &d_ne1));
6143+
CL_CHECK(clSetKernelArg(kernel, 20, sizeof(cl_long), &d_ne2));
6144+
CL_CHECK(clSetKernelArg(kernel, 21, sizeof(cl_long), &d_ne3));
61456145
CL_CHECK(clSetKernelArg(kernel, 22, sizeof(cl_ulong), &d_nb0));
61466146
CL_CHECK(clSetKernelArg(kernel, 23, sizeof(cl_ulong), &d_nb1));
61476147
CL_CHECK(clSetKernelArg(kernel, 24, sizeof(cl_ulong), &d_nb2));

0 commit comments

Comments
 (0)