Skip to content

Commit 7fecf7f

Browse files
qnixsynapseNeoZhangJianyu
authored andcommitted
SYCL: Fix GGML_SYCL_DEBUG macro (ggml-org#11995)
1 parent 2c6f90d commit 7fecf7f

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

ggml/src/ggml-sycl/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
void ggml_sycl_host_free(void* ptr);
4040

41-
static int g_ggml_sycl_debug = 0;
41+
extern int g_ggml_sycl_debug;
4242
#define GGML_SYCL_DEBUG(...) \
4343
do { \
4444
if (g_ggml_sycl_debug) \

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242

4343
#include "ggml-sycl/gemm.hpp"
4444

45+
static bool g_sycl_loaded = false;
46+
int g_ggml_sycl_debug = 0;
47+
4548
void ggml_sycl_free_data(struct ggml_tensor * tensor);
4649
void ggml_sycl_copy_to_device(struct ggml_tensor * tensor);
4750
void ggml_sycl_set_main_device(int main_device);

ggml/src/ggml-sycl/softmax.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,16 @@ void ggml_sycl_op_soft_max(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
249249

250250
if (dst->src[1] && dst->src[1]->type == GGML_TYPE_F16) {
251251
const sycl::half * src1_dd = static_cast<sycl::half *>(dst->src[1]->data);
252+
GGML_SYCL_DEBUG("%s: F16 mask\n", __func__);
252253
soft_max_f32_sycl<sycl::half>(src0_dd, src1_dd, dst_dd, ne00, nrows_x, nrows_y, scale, max_bias,
253254
main_stream, ctx.device);
254255
} else if (dst->src[1] && dst->src[1]->type == GGML_TYPE_F32) {
255256
const float * src1_dd = static_cast<const float *>(dst->src[1]->data);
257+
GGML_SYCL_DEBUG("%s: F32 mask\n", __func__);
256258
soft_max_f32_sycl<float>(src0_dd, src1_dd, dst_dd, ne00, nrows_x, nrows_y, scale, max_bias, main_stream, ctx.device);
257259
} else {
258260
/* mask unavailable */
261+
GGML_SYCL_DEBUG("%s: No mask\n", __func__);
259262
soft_max_f32_sycl<float>(src0_dd, nullptr, dst_dd, ne00, nrows_x, nrows_y, scale, max_bias, main_stream, ctx.device);
260263
}
261264
}

0 commit comments

Comments
 (0)