Skip to content

Commit 8303e8b

Browse files
authored
SYCL: Fix GGML_SYCL_DEBUG macro (#11995)
1 parent 7ad0779 commit 8303e8b

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

ggml/src/ggml-sycl/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
void* ggml_sycl_host_malloc(size_t size);
3636
void ggml_sycl_host_free(void* ptr);
3737

38-
static int g_ggml_sycl_debug = 0;
38+
extern int g_ggml_sycl_debug;
3939
#define GGML_SYCL_DEBUG(...) \
4040
do { \
4141
if (g_ggml_sycl_debug) \

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include "ggml-sycl/gemm.hpp"
4242

4343
static bool g_sycl_loaded = false;
44+
int g_ggml_sycl_debug = 0;
4445

4546
static ggml_sycl_device_info ggml_sycl_init() {
4647
ggml_sycl_device_info info = {};
@@ -157,8 +158,8 @@ static void ggml_check_sycl() try {
157158
static bool initialized = false;
158159

159160
if (!initialized) {
160-
GGML_SYCL_DEBUG("[SYCL] call ggml_check_sycl\n");
161161
g_ggml_sycl_debug = get_sycl_env("GGML_SYCL_DEBUG", 0);
162+
GGML_SYCL_DEBUG("[SYCL] call ggml_check_sycl\n");
162163
GGML_LOG_INFO("GGML_SYCL_DEBUG: %d\n", g_ggml_sycl_debug);
163164
#if defined(GGML_SYCL_FORCE_MMQ)
164165
GGML_LOG_INFO("GGML_SYCL_FORCE_MMQ: yes\n");

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)