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:
hongruichen 2025-03-22 12:51:01 +08:00
parent c2887f0377
commit 1caca627ea
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,7 @@ constexpr const bool kQnnSupportedOps[] = {
false, // GGML_OP_RMS_NORM
false, // GGML_OP_RMS_NORM_BACK
false, // GGML_OP_GROUP_NORM
false, // GGML_OP_L2_NORM
true, // GGML_OP_MUL_MAT
false, // GGML_OP_MUL_MAT_ID
@ -133,6 +134,7 @@ constexpr const bool kQnnSupportedOps[] = {
false, // GGML_OP_ADD_REL_POS
false, // GGML_OP_RWKV_WKV6
false, // GGML_OP_GATED_LINEAR_ATTN
false, // GGML_OP_RWKV_WKV7
false, // GGML_OP_UNARY

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

@ -126,6 +126,7 @@ constexpr const qnn_op_caps_t kOpCaps[] = {
},
{}, // GGML_OP_RMS_NORM_BACK
{}, // GGML_OP_GROUP_NORM
{}, // GGML_OP_L2_NORM
{
// GGML_OP_MUL_MAT
QNN_OP_MAT_MUL, // qnn_op_name
@ -179,6 +180,7 @@ constexpr const qnn_op_caps_t kOpCaps[] = {
{}, // GGML_OP_ADD_REL_POS
{}, // GGML_OP_RWKV_WKV6
{}, // GGML_OP_GATED_LINEAR_ATTN
{}, // GGML_OP_RWKV_WKV7
{}, // GGML_OP_UNARY
@ -222,6 +224,8 @@ static_assert(kOpCaps[GGML_OP_ADD].qnn_op_name, "GGML_OP_ADD does not have qnn_o
static_assert(kOpCaps[GGML_OP_MUL_MAT].qnn_op_name, "GGML_OP_MUL_MAT does not have qnn_op_name in the kOpCaps table");
static_assert(kOpCaps[GGML_OP_MUL].qnn_op_name, "GGML_OP_MUL does not have qnn_op_name in the kOpCaps table");
static_assert(kOpCaps[GGML_OP_LOG].qnn_op_name, "GGML_OP_LOG does not have qnn_op_name in the kOpCaps table");
static_assert(kOpCaps[GGML_OP_COUNT + GGML_UNARY_OP_GELU].qnn_op_name,
"GGML_UNARY_OP_GELU does not have qnn_op_name in the kOpCaps table");
static_assert(std::size(kOpCaps) == (GGML_OP_COUNT + GGML_UNARY_OP_COUNT),
"GGML_OP_COUNT does not match the size of the kOpCaps table");
@ -297,6 +301,7 @@ constexpr const op_constructor_t kOpConstructors[] = {
op_constructor_with_type_param<GGML_OP_RMS_NORM, float, qnn::ggml_qnn_rmsnorm_op_config>, // GGML_OP_RMS_NORM
nullptr, // GGML_OP_RMS_NORM_BACK
nullptr, // GGML_OP_GROUP_NORM
nullptr, // GGML_OP_L2_NORM
mat_mul_op_constructor, // GGML_OP_MUL_MAT
nullptr, // GGML_OP_MUL_MAT_ID
@ -345,6 +350,7 @@ constexpr const op_constructor_t kOpConstructors[] = {
nullptr, // GGML_OP_ADD_REL_POS
nullptr, // GGML_OP_RWKV_WKV6
nullptr, // GGML_OP_GATED_LINEAR_ATTN
nullptr, // GGML_OP_RWKV_WKV7
nullptr, // GGML_OP_UNARY