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 rebase

This commit is contained in:
Hongrui Chen 2025-12-26 18:50:42 +08:00
parent 8f71b39f9e
commit 15ec91f52c
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,7 @@ constexpr const bool kQnnSupportedOps[] = {
false, // GGML_OP_COS
false, // GGML_OP_SUM
false, // GGML_OP_SUM_ROWS
false, // GGML_OP_CUMSUM
false, // GGML_OP_MEAN
false, // GGML_OP_ARGMAX
false, // GGML_OP_COUNT_EQUAL
@ -129,7 +130,10 @@ constexpr const bool kQnnSupportedOps[] = {
false, // GGML_OP_ARANGE
false, // GGML_OP_TIMESTEP_EMBEDDING
false, // GGML_OP_ARGSORT
false, // GGML_OP_TOP_K
false, // GGML_OP_LEAKY_RELU
false, // GGML_OP_TRI
false, // GGML_OP_FILL
false, // GGML_OP_FLASH_ATTN_EXT
false, // GGML_OP_FLASH_ATTN_BACK
@ -142,6 +146,7 @@ constexpr const bool kQnnSupportedOps[] = {
false, // GGML_OP_RWKV_WKV6
false, // GGML_OP_GATED_LINEAR_ATTN
false, // GGML_OP_RWKV_WKV7
false, // GGML_OP_SOLVE_TRI
false, // GGML_OP_UNARY
@ -172,6 +177,8 @@ constexpr const bool kQnnSupportedOps[] = {
false, // GGML_UNARY_OP_HARDSWISH
false, // GGML_UNARY_OP_HARDSIGMOID
false, // GGML_UNARY_OP_EXP
false, // GGML_UNARY_OP_EXPM1
false, // GGML_UNARY_OP_SOFTPLUS
false, // GGML_UNARY_OP_GELU_ERF
false, // GGML_UNARY_OP_XIELU
false, // GGML_UNARY_OP_FLOOR

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

@ -116,6 +116,7 @@ constexpr const qnn_op_caps_t kOpCaps[] = {
{}, // GGML_OP_COS
{}, // GGML_OP_SUM
{}, // GGML_OP_SUM_ROWS
{}, // GGML_OP_CUMSUM
{}, // GGML_OP_MEAN
{}, // GGML_OP_ARGMAX
{}, // GGML_OP_COUNT_EQUAL
@ -180,7 +181,10 @@ constexpr const qnn_op_caps_t kOpCaps[] = {
{}, // GGML_OP_TIMESTEP_EMBEDDING
{}, // GGML_OP_ARGSORT
{}, // GGML_OP_TOP_K
{}, // GGML_OP_LEAKY_RELU
{}, // GGML_OP_TRI
{}, // GGML_OP_FILL
{}, // GGML_OP_FLASH_ATTN_EXT
{}, // GGML_OP_FLASH_ATTN_BACK
@ -193,6 +197,7 @@ constexpr const qnn_op_caps_t kOpCaps[] = {
{}, // GGML_OP_RWKV_WKV6
{}, // GGML_OP_GATED_LINEAR_ATTN
{}, // GGML_OP_RWKV_WKV7
{}, // GGML_OP_SOLVE_TRI
{}, // GGML_OP_UNARY
@ -226,6 +231,8 @@ constexpr const qnn_op_caps_t kOpCaps[] = {
{}, // GGML_UNARY_OP_HARDSWISH
{}, // GGML_UNARY_OP_HARDSIGMOID
{}, // GGML_UNARY_OP_EXP
{}, // GGML_UNARY_OP_EXPM1
{}, // GGML_UNARY_OP_SOFTPLUS
{}, // GGML_UNARY_OP_GELU_ERF
{}, // GGML_UNARY_OP_XIELU
{}, // GGML_UNARY_OP_FLOOR
@ -312,6 +319,7 @@ constexpr const op_constructor_t kOpConstructors[] = {
nullptr, // GGML_OP_COS
nullptr, // GGML_OP_SUM
nullptr, // GGML_OP_SUM_ROWS
nullptr, // GGML_OP_CUMSUM
nullptr, // GGML_OP_MEAN
nullptr, // GGML_OP_ARGMAX
nullptr, // GGML_OP_COUNT_EQUAL
@ -366,7 +374,10 @@ constexpr const op_constructor_t kOpConstructors[] = {
nullptr, // GGML_OP_ARANGE
nullptr, // GGML_OP_TIMESTEP_EMBEDDING
nullptr, // GGML_OP_ARGSORT
nullptr, // GGML_OP_TOP_K
nullptr, // GGML_OP_LEAKY_RELU
nullptr, // GGML_OP_TRI
nullptr, // GGML_OP_FILL
nullptr, // GGML_OP_FLASH_ATTN_EXT
nullptr, // GGML_OP_FLASH_ATTN_BACK
@ -379,6 +390,7 @@ constexpr const op_constructor_t kOpConstructors[] = {
nullptr, // GGML_OP_RWKV_WKV6
nullptr, // GGML_OP_GATED_LINEAR_ATTN
nullptr, // GGML_OP_RWKV_WKV7
nullptr, // GGML_OP_SOLVE_TRI
nullptr, // GGML_OP_UNARY
@ -409,6 +421,8 @@ constexpr const op_constructor_t kOpConstructors[] = {
nullptr, // GGML_UNARY_OP_HARDSWISH
nullptr, // GGML_UNARY_OP_HARDSIGMOID
nullptr, // GGML_UNARY_OP_EXP
nullptr, // GGML_UNARY_OP_EXPM1
nullptr, // GGML_UNARY_OP_SOFTPLUS
nullptr, // GGML_UNARY_OP_GELU_ERF
nullptr, // GGML_UNARY_OP_XIELU
nullptr, // GGML_UNARY_OP_FLOOR