ggml-qnn:rebase to upstream

Author: zhouwg

ggml/src/ggml-qnn/ggml-qnn-ops.h

@@ -24,13 +24,8 @@
 #include "ggml-qnn-impl.h"
 void ggml_qnn_general_node(ggml_backend_qnn_context * ctx, ggml_tensor * dst);
 void ggml_qnn_mul_mat(ggml_backend_qnn_context * ctx, ggml_tensor * dst);
-<<<<<<< HEAD
 
 void ggml_qnn_repeat(ggml_backend_qnn_context * ctx, ggml_tensor * dst);
-=======
-void ggml_qnn_repeat(ggml_backend_qnn_context * ctx, ggml_tensor * dst);
-void ggml_qnn_add(ggml_backend_qnn_context * ctx, ggml_tensor * dst);
->>>>>>> ggml-qnn: refine source code structure to make code more clearly
 void ggml_qnn_div(ggml_backend_qnn_context * ctx, ggml_tensor * dst);
 void ggml_qnn_leaky_relu(ggml_backend_qnn_context * ctx, ggml_tensor * dst);
 void ggml_qnn_concat(ggml_backend_qnn_context * ctx, ggml_tensor * dst);

ggml/src/ggml-qnn/ggml-qnn.cpp

@@ -1170,22 +1170,6 @@ void ggmlqnn_get_graphkey_from_op(const ggml_tensor * op, std::string & output)
     }
 }
 
-bool ggmlqnn_is_valid_params(ggml_backend_qnn_context * ctx, const ggml_tensor * src0,
-                             const ggml_tensor * src1, ggml_tensor * dst) {
-    if ((nullptr == ctx) || (nullptr == src0) || (nullptr == src1) || (nullptr == dst)) {
-        GGMLQNN_LOG_WARN("invalid params\n");
-        return false;
-    }
-
-    qnn_instance * instance = ctx->instance;
-    if (nullptr == instance) {
-        GGMLQNN_LOG_WARN("invalid params\n");
-        return false;
-    }
-
-    return true;
-}
-
 template<typename Fn>
 Fn load_qnn_functionpointers(void * handle, const char * function_name) {
     return reinterpret_cast<Fn>(dlsym(handle, function_name));
@@ -2466,11 +2450,11 @@ static void * ggml_backend_qnn_buffer_get_base(ggml_backend_buffer_t buffer) {
     return ctx->buffer;
 }
 
-static void ggml_backend_qnn_buffer_init_tensor(ggml_backend_buffer_t buffer, ggml_tensor * tensor) {
+static enum ggml_status ggml_backend_qnn_buffer_init_tensor(ggml_backend_buffer_t buffer, ggml_tensor * tensor) {
     ggml_backend_qnn_buffer_context * ctx = (ggml_backend_qnn_buffer_context *)buffer->context;
     GGML_UNUSED(tensor);
     GGML_UNUSED(ctx);
-    return;
+    return GGML_STATUS_SUCCESS;
 }
 
 static void ggml_backend_qnn_buffer_set_tensor(ggml_backend_buffer_t buffer,