Merge branch 'main' into thread-pool-size

Author: GregoryComer

backends/qualcomm/runtime/QnnBackendOptions.cpp

@@ -21,12 +21,28 @@ T get_option(T aot_option) {
   executorch::runtime::BackendOption backend_option;
 
   if constexpr (std::is_same_v<T, QnnExecuTorchLogLevel>) {
-    backend_option = {QNN_RUNTIME_LOG_LEVEL, -1};
+    std::strncpy(
+        backend_option.key,
+        QNN_RUNTIME_LOG_LEVEL,
+        runtime::kMaxOptionKeyLength);
+    backend_option.key[runtime::kMaxOptionKeyLength - 1] = '\0';
+    backend_option.value = -1;
   } else if constexpr (std::is_same_v<T, QnnExecuTorchHtpPerformanceMode>) {
-    backend_option = {QNN_RUNTIME_HTP_PERFORMANCE_MODE, -1};
+    std::strncpy(
+        backend_option.key,
+        QNN_RUNTIME_HTP_PERFORMANCE_MODE,
+        runtime::kMaxOptionKeyLength);
+    backend_option.key[runtime::kMaxOptionKeyLength - 1] = '\0';
+    backend_option.value = -1;
   } else if constexpr (std::is_same_v<T, QnnExecuTorchProfileLevel>) {
-    backend_option = {QNN_RUNTIME_PROFILE_LEVEL, -1};
+    std::strncpy(
+        backend_option.key,
+        QNN_RUNTIME_PROFILE_LEVEL,
+        runtime::kMaxOptionKeyLength);
+    backend_option.key[runtime::kMaxOptionKeyLength - 1] = '\0';
+    backend_option.value = -1;
   }
+
   // This will call get_option under runtime backend interface
   status = get_option(QNN_BACKEND, backend_option);
 

setup.py

@@ -478,15 +478,13 @@ def run(self):
                     tmp_path = Path(tmpdir)
                     sdk_path = _download_qnn_sdk(dst_folder=tmp_path)
 
-                    logging.info("sdk_path: ", sdk_path)
                     if not sdk_path:
                         raise RuntimeError(
                             "Qualcomm SDK not found, cannot build backend"
                         )
 
                     # Determine paths
                     prj_root = Path(__file__).parent.resolve()
-                    logging.info("prj_root: ", prj_root)
                     build_sh = prj_root / "backends/qualcomm/scripts/build.sh"
                     build_root = prj_root / "build-x86"