Skip to content

Commit 4c6d4c8

Browse files
committed
DUP: move to cpy.cpp, set debug logs and adjust include
1 parent 5a31917 commit 4c6d4c8

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

ggml/src/ggml-sycl/cpy.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "cpy.hpp"
22

3+
#include <float.h>
4+
35
static void cpy_1_f32_f32(const char * cxi, char * cdsti) {
46
const float * xi = (const float *) cxi;
57
float * dsti = (float *) cdsti;
@@ -350,6 +352,8 @@ void ggml_sycl_cpy(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, co
350352

351353
char * src0_ddc = (char *) src0->data;
352354
char * src1_ddc = (char *) src1->data;
355+
GGML_SYCL_DEBUG("%s: type combination supplied: %s to %s\n", __func__, ggml_type_name(src0->type),
356+
ggml_type_name(src1->type));
353357

354358
if (src0->type == GGML_TYPE_F32 && src1->type == GGML_TYPE_F32) {
355359
ggml_cpy_f32_f32_sycl(src0_ddc, src1_ddc, ne, ne00, ne01, ne02, nb00, nb01, nb02, nb03, ne10, ne11, ne12, nb10,
@@ -387,3 +391,10 @@ void ggml_sycl_cpy(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, co
387391
std::cerr << exc.what() << "Exception caught at file:" << __FILE__ << ", line:" << __LINE__ << std::endl;
388392
std::exit(1);
389393
}
394+
395+
void ggml_sycl_dup(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
396+
// TODO: why do we pass dst as src1 here?
397+
GGML_SYCL_DEBUG("call %s\n", __func__);
398+
ggml_sycl_cpy(ctx, dst->src[0], dst);
399+
GGML_SYCL_DEBUG("call %s done\n", __func__);
400+
}

ggml/src/ggml-sycl/cpy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
#define GGML_SYCL_CPY_HPP
33

44
#include "common.hpp"
5-
#include <float.h>
65

76
typedef void (*cpy_kernel_t)(const char * cx, char * cdst);
87

98
void ggml_sycl_cpy(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1);
9+
void ggml_sycl_dup(ggml_backend_sycl_context & ctx, ggml_tensor * dst);
1010

1111
#endif // GGML_SYCL_CPY_HPP

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2852,11 +2852,6 @@ static void ggml_sycl_clamp(ggml_backend_sycl_context & ctx, ggml_tensor * dst)
28522852
ggml_sycl_op_clamp(ctx, dst);
28532853
}
28542854

2855-
static void ggml_sycl_dup(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
2856-
// TODO: why do we pass dst as src1 here?
2857-
ggml_sycl_cpy(ctx, dst->src[0], dst);
2858-
}
2859-
28602855
static void ggml_sycl_pool2d(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
28612856
ggml_sycl_op_pool2d(ctx, dst);
28622857
}

0 commit comments

Comments
 (0)