vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rope: add try catch sycl exception and debug log

Browse source
This commit is contained in:
Akarshan Biswas 2025-02-02 11:21:36 +05:30
parent 8e86732cf2
commit 7f2d24fdca
No known key found for this signature in database
GPG key ID: 52A578A14B32134D
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ggml/src/ggml-sycl/ggml-sycl.cpp
View file

@ -2906,11 +2906,6 @@ static void ggml_sycl_dup(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
ggml_sycl_cpy(ctx, dst->src[0], dst);
}
static void ggml_sycl_rope(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
GGML_ASSERT(ggml_is_contiguous(dst->src[0])); // TODO: this restriction is temporary until non-cont support is implemented
ggml_sycl_op_rope(ctx, dst);
}
static void ggml_sycl_pool2d(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
ggml_sycl_op_pool2d(ctx, dst);
}

13
ggml/src/ggml-sycl/rope.cpp
View file

@ -192,7 +192,7 @@ static void rope_neox_sycl(
}
}
void ggml_sycl_op_rope(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
static void ggml_sycl_op_rope(ggml_backend_sycl_context & ctx, ggml_tensor * dst) try {
GGML_ASSERT(dst->src[0]->type == GGML_TYPE_F32 || dst->src[0]->type == GGML_TYPE_F16);
GGML_ASSERT(dst->type == GGML_TYPE_F32 || dst->type == GGML_TYPE_F16);
@ -272,4 +272,15 @@ void ggml_sycl_op_rope(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
GGML_ABORT("fatal error");
}
}
} catch (const sycl::exception & exc) {
std::cerr << exc.what() << "Exception caught at file:" << __FILE__ << ", line:" << __LINE__ << std::endl;
std::exit(1);
}
void ggml_sycl_rope(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
GGML_ASSERT(
ggml_is_contiguous(dst->src[0])); // TODO: this restriction is temporary until non-cont support is implemented
GGML_SYCL_DEBUG("call %s\n", __func__);
ggml_sycl_op_rope(ctx, dst);
GGML_SYCL_DEBUG("call %s done\n", __func__);
}

2
ggml/src/ggml-sycl/rope.hpp
View file

@ -15,6 +15,6 @@
#include "common.hpp"
void ggml_sycl_op_rope(ggml_backend_sycl_context & ctx, ggml_tensor * dst);
void ggml_sycl_rope(ggml_backend_sycl_context & ctx, ggml_tensor * dst);
#endif // GGML_SYCL_ROPE_HPP