From dedadf2a20a30dfc0a8b4d195a21a13c53c3ce00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BF=E3=82=83=E3=82=93?= <nagasawa.masato.w@gmail.com>
Date: Tue, 20 Aug 2024 11:20:23 +0900
Subject: [PATCH] =?UTF-8?q?Fixed=20a=20bug=20where=20debug=20code=20was=20?=
 =?UTF-8?q?included=20in=20the=20release,=20resulting=20i=E2=80=A6=20(#1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixed a bug where debug code was included in the release, resulting in an undefined function error.

* Change the path of the QNN library when building in termux environment

* Revert "Change the path of the QNN library when building in termux environment"

This reverts commit c6e26a3679da2608940e2163e090adf75d667400.

* Changed so that GGML_QNN_DEFAULT_LIB_SEARCH_PATH can be set from command line arguments
---
 ggml/src/CMakeLists.txt           | 5 +++--
 ggml/src/ggml-qnn/backend-ops.cpp | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
index b3c287b78..0252499e3 100644
--- a/ggml/src/CMakeLists.txt
+++ b/ggml/src/CMakeLists.txt
@@ -885,12 +885,13 @@ if (GGML_QNN)
         find_library(LOG_LIB log)
         find_library(ANDROID_LIB android)
         set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${LOG_LIB} ${ANDROID_LIB})
-        set(GGML_QNN_DEFAULT_LIB_SEARCH_PATH "\"/data/local/tmp/\"")
+        set(GGML_QNN_DEFAULT_LIB_SEARCH_PATH "/data/local/tmp/" CACHE STRING "customized library search path for QNN backend")
     else()
         message(FATAL_ERROR "QNN now only available on Android")
     endif()
 
-    add_compile_definitions(GGML_QNN_DEFAULT_LIB_SEARCH_PATH=${GGML_QNN_DEFAULT_LIB_SEARCH_PATH})
+    string(REGEX REPLACE "/$" "" GGML_QNN_DEFAULT_LIB_SEARCH_PATH "${GGML_QNN_DEFAULT_LIB_SEARCH_PATH}")
+    add_compile_definitions(GGML_QNN_DEFAULT_LIB_SEARCH_PATH="${GGML_QNN_DEFAULT_LIB_SEARCH_PATH}/")
     if (NOT DEFINED GGML_QNN_SDK_PATH)
         # try read from environment variable
         if (DEFINED ENV{QNN_SDK_PATH})
diff --git a/ggml/src/ggml-qnn/backend-ops.cpp b/ggml/src/ggml-qnn/backend-ops.cpp
index 52f078a96..d6d6dddf8 100644
--- a/ggml/src/ggml-qnn/backend-ops.cpp
+++ b/ggml/src/ggml-qnn/backend-ops.cpp
@@ -296,11 +296,13 @@ bool qnn_binary_op_impl(ggml_backend_qnn_context *ctx, ggml_tensor *src0, ggml_t
         succeed = execute_graph<2, 1>(graph_ptr, { src0, src1 }, { dst });
     }
 
+#ifndef NDEBUG
     if (!succeed) {
         print_ggml_tensor(src0);
         print_ggml_tensor(src1);
         print_ggml_tensor(dst);
     }
+#endif
 
     return succeed;
 }
@@ -317,10 +319,12 @@ bool qnn_unary_op_impl(ggml_backend_qnn_context *ctx, ggml_tensor *src, ggml_ten
         succeed = execute_graph<1, 1>(graph_ptr, { src }, { dst });
     }
 
+#ifndef NDEBUG
     if (!succeed) {
         print_ggml_tensor(src);
         print_ggml_tensor(dst);
     }
+#endif
 
     return succeed;
 }
@@ -541,10 +545,12 @@ bool ggml_qnn_supports_op(const ggml_tensor *op) {
             return false;
         }
 
+#ifndef NDEBUG
         if (op->op == GGML_OP_ADD && !is_tensor_dimensions_equal(op->src[0], op->src[1])) {
             QNN_LOG_DEBUG("src0 and src1 dimensions are not equal");
             return false;
         }
+#endif
     }
 
     switch (op->type) {