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

rename

Browse source
This commit is contained in:
hongruichen 2024-06-19 17:36:50 +08:00
parent 3fe07eb907
commit 37a1585ead
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ggml-qnn.cpp
View file

@ -205,7 +205,7 @@ static bool qnn_is_valid_params(ggml_backend_qnn_context * ctx, const ggml_tenso
return false; return false;
} }
qnn_internal::qnn_instance *instance = nullptr; qnn::qnn_instance *instance = nullptr;
Qnn_Tensor_t *tensor_0 = nullptr; Qnn_Tensor_t *tensor_0 = nullptr;
Qnn_Tensor_t *tensor_1 = nullptr; Qnn_Tensor_t *tensor_1 = nullptr;
Qnn_Tensor_t *tensor_2 = nullptr; Qnn_Tensor_t *tensor_2 = nullptr;
@ -605,7 +605,7 @@ static void ggml_qnn_add(ggml_backend_qnn_context * ctx, const ggml_tensor * src
const ggml_tensor * src1, ggml_tensor * dst) { const ggml_tensor * src1, ggml_tensor * dst) {
Qnn_ErrorHandle_t error = QNN_SUCCESS; Qnn_ErrorHandle_t error = QNN_SUCCESS;
bool graph_initialized = false; bool graph_initialized = false;
qnn_internal::qnn_instance *instance = nullptr; qnn::qnn_instance *instance = nullptr;
std::string graph_name = "ggml_op_qnn_add"; std::string graph_name = "ggml_op_qnn_add";
Qnn_GraphHandle_t graph_handle = nullptr; Qnn_GraphHandle_t graph_handle = nullptr;
Qnn_Param_t qnn_params[] = {}; Qnn_Param_t qnn_params[] = {};
@ -799,7 +799,7 @@ static void ggml_qnn_mul_mat(ggml_backend_qnn_context * ctx,
ggml_tensor * dst) { ggml_tensor * dst) {
Qnn_ErrorHandle_t error = QNN_SUCCESS; Qnn_ErrorHandle_t error = QNN_SUCCESS;
bool graph_initialized = false; bool graph_initialized = false;
qnn_internal::qnn_instance *instance = nullptr; qnn::qnn_instance *instance = nullptr;
std::string graph_name = "ggml_op_qnn_mul_mat"; std::string graph_name = "ggml_op_qnn_mul_mat";
Qnn_GraphHandle_t graph_handle = nullptr; Qnn_GraphHandle_t graph_handle = nullptr;
Qnn_Param_t qnn_params[] = {}; Qnn_Param_t qnn_params[] = {};
@ -1702,7 +1702,7 @@ ggml_backend_t ggml_backend_qnn_init(size_t device, const char * qnn_lib_path) {
} }
} }
auto *instance = new qnn_internal::qnn_instance(qnn_lib_path, g_qnn_mgr[device].lib, ""); auto *instance = new qnn::qnn_instance(qnn_lib_path, g_qnn_mgr[device].lib, "");
result = instance->qnn_init(nullptr); result = instance->qnn_init(nullptr);
if (0 != result) { if (0 != result) {
QNN_LOG_WARN( QNN_LOG_WARN(

2
ggml-qnn/backend.hpp
View file

@ -16,7 +16,7 @@ struct ggml_backend_qnn_context {
int threads; int threads;
char name[GGML_MAX_NAME]; char name[GGML_MAX_NAME];
char lib[GGML_MAX_NAME]; char lib[GGML_MAX_NAME];
qnn_internal::qnn_instance* instance; qnn::qnn_instance* instance;
struct ggml_backend* backend; struct ggml_backend* backend;
QNN_INTERFACE_VER_TYPE raw_interface; QNN_INTERFACE_VER_TYPE raw_interface;
QNN_SYSTEM_INTERFACE_VER_TYPE raw_system_interface; QNN_SYSTEM_INTERFACE_VER_TYPE raw_system_interface;

2
ggml-qnn/qnn.hpp
View file

@ -17,7 +17,7 @@
#include "utils.hpp" #include "utils.hpp"
#include "logger.hpp" #include "logger.hpp"
namespace qnn_internal { namespace qnn {
// ================================================================================================= // =================================================================================================
// //