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

Revert "tried fix the add node error 6005"

Browse source 
This reverts commit ce3d09e5f2.
This commit is contained in:
hongruichen 2024-07-19 12:59:38 +08:00
parent ce3d09e5f2
commit f45fbec8f4
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ggml/src/ggml-qnn.cpp
View file

@ -319,6 +319,10 @@ GGML_CALL static ggml_status ggml_backend_qnn_graph_compute(ggml_backend_t backe
GGML_CALL static bool ggml_backend_qnn_supports_op(ggml_backend_t backend, const ggml_tensor *op) {
GGML_UNUSED(backend);
if (op->op == GGML_OP_NONE) {
return true;
}
if (op->op == GGML_OP_UNARY) {
if (!qnn::ggml_qnn_unary_op_array()[qnn::kGgmlUnaryOpStart + ggml_get_unary_op(op)]) {
QNN_LOG_DEBUG("unsupported unary op %d", ggml_get_unary_op(op));
@ -329,7 +333,7 @@ GGML_CALL static bool ggml_backend_qnn_supports_op(ggml_backend_t backend, const
QNN_LOG_DEBUG("src0 is nullptr");
return false;
}
} else if (op->op != GGML_OP_NONE) {
} else {
if (!qnn::ggml_qnn_unary_op_array()[op->op] && !qnn::ggml_qnn_binary_op_array()[op->op]) {
QNN_LOG_DEBUG("unsupported op %d", op->op);
return false;

6
ggml/src/ggml-qnn/graph.hpp
View file

@ -102,9 +102,8 @@ public:
_tensor_outputs = tensor_outputs;
Qnn_OpConfig_t op_config = { /*.version = */ QNN_OPCONFIG_VERSION_1,
/*.v1 = */ { _graph_name.c_str(), QNN_OP_PACKAGE_NAME_QTI_AISW, op_name.c_str(),
(uint32_t)_param_types.size(), _param_types.data(),
(uint32_t)_tensor_inputs.size(), _tensor_inputs.data(),
/*.v1 = */ { _graph_name.c_str(), QNN_OP_PACKAGE_NAME_QTI_AISW, op_name.c_str(), 0,
nullptr, (uint32_t)_tensor_inputs.size(), _tensor_inputs.data(),
(uint32_t)_tensor_outputs.size(), _tensor_outputs.data() } };
auto error = _qnn_interface->qnn_graph_add_node(_graph_handle, op_config);
if (error != QNN_SUCCESS) {
@ -155,7 +154,6 @@ private:
Qnn_GraphHandle_t _graph_handle = nullptr;
std::array<Qnn_Tensor_t, _InputSize> _tensor_inputs;
std::array<Qnn_Tensor_t, _OutputSize> _tensor_outputs;
std::vector<Qnn_Param_t> _param_types;
ggml_qnn_graph(const ggml_qnn_graph &) = delete;
void operator=(const ggml_qnn_graph &) = delete;