From 1da8a3e67831edaf9ba5ad7a8fcfaf9a01d6090f Mon Sep 17 00:00:00 2001
From: hongruichen <chraac@gmail.com>
Date: Mon, 30 Sep 2024 10:37:23 +0800
Subject: [PATCH] fix compiling error after merge

---
 ggml/src/ggml-qnn.cpp             | 1 +
 ggml/src/ggml-qnn/backend-ops.cpp | 3 +++
 ggml/src/ggml-qnn/tensor.hpp      | 1 +
 3 files changed, 5 insertions(+)

diff --git a/ggml/src/ggml-qnn.cpp b/ggml/src/ggml-qnn.cpp
index b5b18e04aa..3e3fb5778c 100644
--- a/ggml/src/ggml-qnn.cpp
+++ b/ggml/src/ggml-qnn.cpp
@@ -180,6 +180,7 @@ static ggml_backend_buffer_i ggml_backend_qnn_buffer_interface = {
     /* .free_buffer     = */ ggml_backend_qnn_buffer_free_buffer,
     /* .get_base        = */ ggml_backend_qnn_buffer_get_base,
     /* .init_tensor     = */ ggml_backend_qnn_buffer_init_tensor,
+    /* .memset_tensor   = */ nullptr,
     /* .set_tensor      = */ ggml_backend_qnn_buffer_set_tensor,
     /* .get_tensor      = */ ggml_backend_qnn_buffer_get_tensor,
     /* .cpy_tensor      = */ ggml_backend_qnn_buffer_cpy_tensor,
diff --git a/ggml/src/ggml-qnn/backend-ops.cpp b/ggml/src/ggml-qnn/backend-ops.cpp
index 5829e0fadb..6a83f45618 100644
--- a/ggml/src/ggml-qnn/backend-ops.cpp
+++ b/ggml/src/ggml-qnn/backend-ops.cpp
@@ -231,6 +231,7 @@ constexpr const char *kGgmlOpToQnnOp[] = {
 
     nullptr, // GGML_OP_CROSS_ENTROPY_LOSS
     nullptr, // GGML_OP_CROSS_ENTROPY_LOSS_BACK
+    nullptr, // GGML_OP_OPT_STEP_ADAMW
 
     // ggml_unary_op
     nullptr,     // GGML_UNARY_OP_ABS
@@ -422,6 +423,7 @@ constexpr const ggml_qnn_unary_op_t kQnnUnaryOpsTable[] = {
 
     nullptr, // GGML_OP_CROSS_ENTROPY_LOSS
     nullptr, // GGML_OP_CROSS_ENTROPY_LOSS_BACK
+    nullptr, // GGML_OP_OPT_STEP_ADAMW
 
     // ggml_unary_op
     nullptr,                                                   // GGML_UNARY_OP_ABS
@@ -531,6 +533,7 @@ static constexpr const ggml_qnn_binary_op_t kQnnBinaryOpsTable[] = {
 
     nullptr, // GGML_OP_CROSS_ENTROPY_LOSS
     nullptr, // GGML_OP_CROSS_ENTROPY_LOSS_BACK
+    nullptr, // GGML_OP_OPT_STEP_ADAMW
 };
 
 static_assert(sizeof(kQnnBinaryOpsTable) / sizeof(kQnnBinaryOpsTable[0]) == GGML_OP_COUNT,
diff --git a/ggml/src/ggml-qnn/tensor.hpp b/ggml/src/ggml-qnn/tensor.hpp
index 0c724e2871..c465d17f25 100644
--- a/ggml/src/ggml-qnn/tensor.hpp
+++ b/ggml/src/ggml-qnn/tensor.hpp
@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include <array>
 #include <atomic>
 #include <cstdint>
 #include <memory>