happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compiling error after merge

This commit is contained in:
chraac 2025-10-20 13:29:05 +08:00
parent 3eaeb91e2c
commit a021171909
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ggml/src/ggml-qnn/qnn/backend-ops.cpp
View File

@ -174,6 +174,10 @@ constexpr const bool kQnnSupportedOps[] = {
false, // GGML_UNARY_OP_EXP
false, // GGML_UNARY_OP_GELU_ERF
false, // GGML_UNARY_OP_XIELU
false, // GGML_UNARY_OP_FLOOR
false, // GGML_UNARY_OP_CEIL
false, // GGML_UNARY_OP_ROUND
false, // GGML_UNARY_OP_TRUNC
};
static_assert(kQnnSupportedOps[GGML_OP_NONE], "GGML_OP_NONE is not true");

8
ggml/src/ggml-qnn/qnn/op-config-caps.cpp
View File

@ -228,6 +228,10 @@ constexpr const qnn_op_caps_t kOpCaps[] = {
{}, // GGML_UNARY_OP_EXP
{}, // GGML_UNARY_OP_GELU_ERF
{}, // GGML_UNARY_OP_XIELU
{}, // GGML_UNARY_OP_FLOOR
{}, // GGML_UNARY_OP_CEIL
{}, // GGML_UNARY_OP_ROUND
{}, // GGML_UNARY_OP_TRUNC
};
static_assert(kOpCaps[GGML_OP_NONE].get_desc == nullptr, "GGML_OP_NONE should not have get_desc function");
@ -407,6 +411,10 @@ constexpr const op_constructor_t kOpConstructors[] = {
nullptr, // GGML_UNARY_OP_EXP
nullptr, // GGML_UNARY_OP_GELU_ERF
nullptr, // GGML_UNARY_OP_XIELU
nullptr, // GGML_UNARY_OP_FLOOR
nullptr, // GGML_UNARY_OP_CEIL
nullptr, // GGML_UNARY_OP_ROUND
nullptr, // GGML_UNARY_OP_TRUNC
};
static_assert(kOpConstructors[GGML_OP_NONE] == nullptr, "GGML_OP_NONE does not match the nullptr function");