Skip to content

Commit cad982a

Browse files
committed
opencl: fix concat crash on win arm64 with Adreno
1 parent 07808eb commit cad982a

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
@@ -5669,12 +5669,12 @@ static void ggml_cl_concat(ggml_backend_t backend, const ggml_tensor * src0, con
56695669
} else {
56705670
cl_kernel kernel = backend_ctx->kernel_concat_f32_non_contiguous;
56715671

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

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

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

56805680

@@ -5685,10 +5685,10 @@ static void ggml_cl_concat(ggml_backend_t backend, const ggml_tensor * src0, con
56855685
CL_CHECK(clSetKernelArg(kernel, 4, sizeof(cl_mem), &extrad_cl->data_device));
56865686
CL_CHECK(clSetKernelArg(kernel, 5, sizeof(cl_ulong), &off_dst));
56875687

5688-
CL_CHECK(clSetKernelArg(kernel, 6, sizeof(long), &ne00));
5689-
CL_CHECK(clSetKernelArg(kernel, 7, sizeof(long), &ne01));
5690-
CL_CHECK(clSetKernelArg(kernel, 8, sizeof(long), &ne02));
5691-
CL_CHECK(clSetKernelArg(kernel, 9, sizeof(long), &ne03));
5688+
CL_CHECK(clSetKernelArg(kernel, 6, sizeof(cl_long), &ne00));
5689+
CL_CHECK(clSetKernelArg(kernel, 7, sizeof(cl_long), &ne01));
5690+
CL_CHECK(clSetKernelArg(kernel, 8, sizeof(cl_long), &ne02));
5691+
CL_CHECK(clSetKernelArg(kernel, 9, sizeof(cl_long), &ne03));
56925692
CL_CHECK(clSetKernelArg(kernel, 10, sizeof(cl_ulong), &nb00));
56935693
CL_CHECK(clSetKernelArg(kernel, 11, sizeof(cl_ulong), &nb01));
56945694
CL_CHECK(clSetKernelArg(kernel, 12, sizeof(cl_ulong), &nb02));
@@ -5699,10 +5699,10 @@ static void ggml_cl_concat(ggml_backend_t backend, const ggml_tensor * src0, con
56995699
CL_CHECK(clSetKernelArg(kernel, 16, sizeof(cl_ulong), &nb12));
57005700
CL_CHECK(clSetKernelArg(kernel, 17, sizeof(cl_ulong), &nb13));
57015701

5702-
CL_CHECK(clSetKernelArg(kernel, 18, sizeof(long), &d_ne0));
5703-
CL_CHECK(clSetKernelArg(kernel, 19, sizeof(long), &d_ne1));
5704-
CL_CHECK(clSetKernelArg(kernel, 20, sizeof(long), &d_ne2));
5705-
CL_CHECK(clSetKernelArg(kernel, 21, sizeof(long), &d_ne3));
5702+
CL_CHECK(clSetKernelArg(kernel, 18, sizeof(cl_long), &d_ne0));
5703+
CL_CHECK(clSetKernelArg(kernel, 19, sizeof(cl_long), &d_ne1));
5704+
CL_CHECK(clSetKernelArg(kernel, 20, sizeof(cl_long), &d_ne2));
5705+
CL_CHECK(clSetKernelArg(kernel, 21, sizeof(cl_long), &d_ne3));
57065706
CL_CHECK(clSetKernelArg(kernel, 22, sizeof(cl_ulong), &d_nb0));
57075707
CL_CHECK(clSetKernelArg(kernel, 23, sizeof(cl_ulong), &d_nb1));
57085708
CL_CHECK(clSetKernelArg(kernel, 24, sizeof(cl_ulong), &d_nb2));

0 commit comments

Comments
 (0)