debug

Author: cccclai

.ci/scripts/test_wheel_package_qnn.sh

@@ -17,6 +17,7 @@ cat > "$REPO_ROOT/script.py" << 'EOF'
 import argparse
 
 import torch
+from executorch.backends.qualcomm import install_qnn_sdk
 from executorch.backends.qualcomm.quantizer.quantizer import QnnQuantizer
 from executorch.backends.qualcomm.utils.utils import (
     generate_htp_compiler_spec,
@@ -30,6 +31,7 @@ from executorch.extension.export_util.utils import save_pte_program
 from torchao.quantization.pt2e.quantize_pt2e import convert_pt2e, prepare_pt2e, prepare_qat_pt2e
 
 def main() -> None:
+    install_qnn_sdk()
     parser = argparse.ArgumentParser()
     parser.add_argument("-f", "--output_folder", type=str, default="", help="The folder to store the exported program")
     parser.add_argument("--soc", type=str, default="SM8650", help="Specify the SoC model.")

backends/qualcomm/__init__.py

@@ -2,48 +2,4 @@
 import os
 import pathlib
 
-from .scripts.download_qnn_sdk import (
-    _download_qnn_sdk,
-    _get_libcxx_dir,
-    _load_libcxx_libs,
-    _stage_libcxx,
-)
-
-# Path to executorch/backends/qualcomm/
-PKG_ROOT = pathlib.Path(__file__).parent.parent / "qualcomm"
-
-print(
-    "EXECUTORCH_BUILDING_WHEEL: ", os.environ.get("EXECUTORCH_BUILDING_WHEEL", "False")
-)
-if not os.environ.get("EXECUTORCH_BUILDING_WHEEL"):
-    # --- Qualcomm SDK handling ---
-    qnn_root = os.environ.get("QNN_SDK_ROOT")
-    if qnn_root:
-        QNN_SDK_DIR = pathlib.Path(qnn_root)
-    else:
-        QNN_SDK_DIR = PKG_ROOT / "sdk" / "qnn"
-        if not QNN_SDK_DIR.exists():
-            print("Qualcomm SDK not found. Downloading...")
-            _download_qnn_sdk()
-
-    os.environ["QNN_SDK_ROOT"] = str(QNN_SDK_DIR)
-
-    # Load QNN library
-    qnn_lib = QNN_SDK_DIR / "lib" / "x86_64-linux-clang" / "libQnnHtp.so"
-    try:
-        ctypes.CDLL(str(qnn_lib), mode=ctypes.RTLD_GLOBAL)
-        print(f"Loaded QNN library from {qnn_lib}")
-    except OSError as e:
-        print(f"[ERROR] Failed to load QNN library at {qnn_lib}: {e}")
-        raise
-
-    # --- libc++ handling ---
-    # Path to executorch/backends/
-    # _libcxx_dir = _get_libcxx_dir(PKG_ROOT)
-
-    # Stage (download if missing) and load
-    try:
-        _stage_libcxx(_libcxx_dir)
-        _load_libcxx_libs(_libcxx_dir)
-    except Exception as e:
-        print(f"[libcxx] Warning: failed to stage/load libc++: {e}")
+from .scripts.download_qnn_sdk import install_qnn_sdk

backends/qualcomm/scripts/download_qnn_sdk.py

@@ -264,3 +264,45 @@ def _load_libcxx_libs(lib_path):
             print(f"Loaded {sofile.name}")
         except OSError as e:
             print(f"[WARN] Failed to load {sofile.name}: {e}")
+
+
+def install_qnn_sdk(force_download: bool = True) -> bool:
+    """
+    Initialize Qualcomm backend:
+      - Ensure SDK is available (env or packaged/downloaded copy)
+      - Load QNN libraries
+      - Stage and load libc++
+
+    Returns:
+        bool: True if QNN was successfully loaded, False otherwise.
+    """
+
+    # --- Qualcomm SDK handling ---
+    qnn_sdk_dir = PKG_ROOT / "sdk" / "qnn"
+    print(f"[INIT] qnn_sdk_dir: {qnn_sdk_dir}")
+    if not qnn_sdk_dir.exists():
+        print("[INIT] Qualcomm SDK not found. Downloading...")
+        _download_qnn_sdk()
+
+    os.environ["QNN_SDK_ROOT"] = str(qnn_sdk_dir)
+
+    # Load QNN library
+    qnn_lib = qnn_sdk_dir / "lib" / "x86_64-linux-clang" / "libQnnHtp.so"
+    print(f"[INIT] qnn_lib: {qnn_lib}")
+    try:
+        ctypes.CDLL(str(qnn_lib), mode=ctypes.RTLD_GLOBAL)
+        print(f"[INIT] Loaded QNN library from {qnn_lib}")
+    except OSError as e:
+        print(f"[ERROR] Failed to load QNN library at {qnn_lib}: {e}")
+        return False
+
+    # --- libc++ handling ---
+    try:
+        libcxx_dir = _get_libcxx_dir(PKG_ROOT / "sdk")
+        _stage_libcxx(libcxx_dir)
+        _load_libcxx_libs(libcxx_dir)
+        print(f"[INIT] Loaded libc++ from {libcxx_dir}")
+    except Exception as e:
+        print(f"[libcxx] Warning: failed to stage/load libc++: {e}")
+
+    return True