Skip to content

Commit 82ce602

Browse files
committed
SYCL: Use GGML_SYCL_DEBUG after reverting
1 parent eeb0475 commit 82ce602

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ ggml_backend_buffer_type_t ggml_backend_sycl_buffer_type(int device) {
537537
auto dev_count = ggml_backend_sycl_get_device_count();
538538

539539
if (device>=dev_count or device<0) {
540-
printf("ggml_backend_sycl_buffer_type error: device_index:%d is out of range [0, %d], miss to call ggml_backend_sycl_set_single_device()\n",
540+
GGML_LOG_ERROR("ggml_backend_sycl_buffer_type error: device_index:%d is out of range [0, %d], miss to call ggml_backend_sycl_set_single_device()\n",
541541
device, dev_count-1);
542542
GGML_ASSERT(device<dev_count);
543543
}
@@ -565,7 +565,7 @@ ggml_backend_buffer_type_t ggml_backend_sycl_buffer_type(ggml_backend_sycl_conte
565565

566566
int device = ctx->device;
567567
if (device>=ggml_sycl_info().device_count or device<0) {
568-
printf("ggml_backend_sycl_buffer_type error: device_index:%d is out of range [0, %d], miss to call ggml_backend_sycl_set_single_device()\n",
568+
GGML_LOG_ERROR("ggml_backend_sycl_buffer_type error: device_index:%d is out of range [0, %d], miss to call ggml_backend_sycl_set_single_device()\n",
569569
device, ggml_sycl_info().device_count-1);
570570
GGML_ASSERT(device<ggml_sycl_info().device_count);
571571
}
@@ -2348,30 +2348,21 @@ static dpct::err0 ggml_sycl_cpy_tensor_2d(void *dst,
23482348
char * src_ptr;
23492349
if (ggml_backend_buffer_is_host(src->buffer)) {
23502350
kind = dpct::host_to_device;
2351+
GGML_SYCL_DEBUG("%s: Host buffer type src tensor\n");
23512352
src_ptr = (char *) src->data;
23522353
// GGML_SYCL_DEBUG("ggml_sycl_cpy_tensor_2d GGML_BACKEND_TYPE_CPU src_ptr %p\n", src_ptr);
23532354
} else if (ggml_backend_buffer_is_sycl(src->buffer) || ggml_backend_buffer_is_sycl_split(src->buffer)) {
23542355
if (!ggml_backend_buffer_is_sycl_split(src->buffer)){
2355-
// If buffer is not a SYCL split buffer
2356-
/*
2357-
What memcpy_direction kind we need here?
2358-
Refer: dpct/helper.hpp:
2359-
enum memcpy_direction
2360-
{
2361-
host_to_host,
2362-
host_to_device,
2363-
device_to_host,
2364-
device_to_device,
2365-
automatic
2366-
};
2367-
*/
2368-
kind = dpct::device_to_device;
2356+
// If buffer is a SYCL buffer
2357+
GGML_SYCL_DEBUG("%s: SYCL buffer type src tensor\n", __func__);
2358+
kind = dpct::device_to_device;
23692359
src_ptr = (char *) src->data;
23702360
}
23712361
else {
23722362
/*
23732363
If buffer is a SYCL split buffer
23742364
*/
2365+
GGML_SYCL_DEBUG("%s: Split buffer type src tensor\n", __func__);
23752366
GGML_ASSERT(i1_low == 0 && i1_high == src->ne[1]);
23762367
kind = dpct::device_to_device;
23772368
ggml_tensor_extra_gpu * extra = (ggml_tensor_extra_gpu *) src->extra;

0 commit comments

Comments
 (0)