LLM inference in C/C++
C++ ggml
sycl : support new UT case for mul_mat_hadamard fp16 (#29218)
Neo Zhang384a534ce3ca
diff --git a/ggml/src/ggml-sycl/ggml-sycl.cpp b/ggml/src/ggml-sycl/ggml-sycl.cppindex 25029c60ab..d99c41e687 100644--- a/ggml/src/ggml-sycl/ggml-sycl.cpp+++ b/ggml/src/ggml-sycl/ggml-sycl.cpp@@ -3338,7 +3338,6 @@ static void ggml_sycl_op_mul_mat(ggml_backend_sycl_context & ctx, const ggml_tenGGML_ASSERT(!ggml_backend_buffer_is_sycl_split(dst->buffer));GGML_ASSERT(!ggml_backend_buffer_is_sycl_split(src1->buffer));- GGML_ASSERT(src1->type == GGML_TYPE_F32 || (src1->ne[2] == 1 && src1->ne[3] == 1));GGML_ASSERT(ne12 >= ne02 && ne12 % ne02 == 0);@@ -3506,7 +3505,8 @@ static void ggml_sycl_op_mul_mat(ggml_backend_sycl_context & ctx, const ggml_ten// for split tensors the data begins at i0 == i0_offset_lowchar * src0_dd_i = dev[i].src0_dd + (i0/i02_divisor) * (ne01*ne00*src0_ts)/src0_bs;- float * src1_ddf_i = dev[i].src1_ddf + (i0*ne11 + src1_col_0) * ne10;+ float * src1_ddf_i = (float *) ((char *) dev[i].src1_ddf ++ (i0*ne11 + src1_col_0) * ne10 * ggml_type_size(src1->type));char * src1_ddq_i = dev[i].src1_ddq + src1_ddq_i_offset;float * dst_dd_i = dev[i].dst_dd + (i0*ne1 + src1_col_0) * (dst_on_device ? ne0 : row_diff);@@ -3527,12 +3527,12 @@ static void ggml_sycl_op_mul_mat(ggml_backend_sycl_context & ctx, const ggml_tensrc1_ncols * src1_padded_col_size * q8_1_ts / q8_1_bs).wait()));} else {- float * src1_ddf_i_source = (float *) src1_extra->data_device[ctx.device];- src1_ddf_i_source += (i0 * ne11 + src1_col_0) * ne10;+ const char * src1_ddf_i_source = (const char *) src1_extra->data_device[ctx.device] ++ (i0 * ne11 + src1_col_0) * ne10 * ggml_type_size(src1->type);SYCL_CHECK(CHECK_TRY_ERROR(dev2dev_memcpy(i, *stream, ctx.device, *main_stream, src1_ddf_i, src1_ddf_i_source,- src1_ncols * ne10 * sizeof(float))));+ src1_ncols * ne10 * ggml_type_size(src1->type))));}}} else {