From 82d5c0dd80054d07cdb56bead168024cb5f38dd0 Mon Sep 17 00:00:00 2001 From: Akarshan Biswas Date: Mon, 20 Jan 2025 17:41:55 +0530 Subject: [PATCH] Remove changes not related to softmax --- ggml/src/ggml-sycl/common.cpp | 2 +- ggml/src/ggml-sycl/dmmv.cpp | 4 +--- ggml/src/ggml-sycl/wkv6.cpp | 6 ++++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ggml/src/ggml-sycl/common.cpp b/ggml/src/ggml-sycl/common.cpp index e663c9c11..022e7b763 100644 --- a/ggml/src/ggml-sycl/common.cpp +++ b/ggml/src/ggml-sycl/common.cpp @@ -79,7 +79,7 @@ void ggml_sycl_op_flatten(ggml_backend_sycl_context & ctx, const ggml_tensor *sr float * src0_ddf = (float *) src0->data; float * src1_ddf = use_src1 ? (float *) src1->data : nullptr; float * dst_ddf = (float *) dst->data; - /* These are never used */ + ggml_sycl_pool_alloc src0_f(ctx.pool()); ggml_sycl_pool_alloc src1_f(ctx.pool()); ggml_sycl_pool_alloc dst_f(ctx.pool()); diff --git a/ggml/src/ggml-sycl/dmmv.cpp b/ggml/src/ggml-sycl/dmmv.cpp index 6a1c1ea5c..0d097357c 100644 --- a/ggml/src/ggml-sycl/dmmv.cpp +++ b/ggml/src/ggml-sycl/dmmv.cpp @@ -2,7 +2,6 @@ #include "dmmv.hpp" #include "dequantize.hpp" #include "presets.hpp" -#include "ggml-impl.h" static void convert_f16(const void * vx, const int64_t ib, const int iqs, dfloat2 & v){ @@ -974,7 +973,6 @@ void ggml_sycl_op_dequantize_mul_mat_vec( } #else const dfloat * src1_dfloat = (const dfloat *) src1_ddf_i; // dfloat == float, no conversion - GGML_UNUSED(ctx); #endif // GGML_SYCL_F16 switch (src0->type) { @@ -1012,7 +1010,7 @@ void ggml_sycl_op_dequantize_mul_mat_vec( convert_mul_mat_vec_f16_sycl(src0_dd_i, src1_dfloat, dst_dd_i, ne00, row_diff, stream); break; default: - GGML_LOG_ERROR("ggml_sycl_op_dequantize_mul_mat_vec unsupported GGML_TYPE %d\n", src0->type); + printf("ggml_sycl_op_dequantize_mul_mat_vec unsupported GGML_TYPE %d\n", src0->type); GGML_ABORT("fatal error"); break; } diff --git a/ggml/src/ggml-sycl/wkv6.cpp b/ggml/src/ggml-sycl/wkv6.cpp index 756437bcf..b54c20964 100644 --- a/ggml/src/ggml-sycl/wkv6.cpp +++ b/ggml/src/ggml-sycl/wkv6.cpp @@ -97,6 +97,9 @@ static void rwkv_wkv_f32_kernel( void ggml_sycl_op_rwkv_wkv6(ggml_backend_sycl_context& ctx, ggml_tensor* dst) { + const ggml_tensor *src0 = dst->src[0]; + const ggml_tensor *src1 = dst->src[1]; + const float* k_d = (const float*)dst->src[0]->data; const float* v_d = (const float*)dst->src[1]->data; const float* r_d = (const float*)dst->src[2]->data; @@ -134,4 +137,7 @@ void ggml_sycl_op_rwkv_wkv6(ggml_backend_sycl_context& ctx, ggml_tensor* dst) { ); }); }); + + GGML_UNUSED(src0); + GGML_UNUSED(src1); }