Code Review

Author: winskuo-quic

.ci/scripts/setup-qnn-deps.sh

@@ -11,4 +11,5 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../backends/qualcomm/scripts/install_q
 
 setup_libcpp 12
 setup_android_ndk
-install_qnn
+install_qnn
+pip install -r backends/qualcomm/requirements.txt

backends/qualcomm/__init__.py

@@ -1,10 +1,20 @@
 import os
 
-import cpuinfo
 import torch
 
 from .scripts.download_qnn_sdk import install_qnn_sdk, is_linux_x86, QNN_ZIP_URL
 
+try:
+    import cpuinfo
+
+    info = cpuinfo.get_cpu_info()
+    vendor = info.get("vendor_id_raw", "").lower()
+    if "amd" in vendor:
+        torch.backends.mkldnn.enabled = False
+except ImportError:
+    raise ImportError("Please install the cpuinfo with pip install py-cpuinfo.")
+
+
 env_flag = os.getenv("EXECUTORCH_BUILDING_WHEEL", "0").lower()
 # If users have preinstalled QNN_SDK_ROOT, we will use it.
 qnn_sdk_root_flag = os.getenv("QNN_SDK_ROOT", None)
@@ -29,8 +39,3 @@
                 "       export LD_LIBRARY_PATH="
                 "$QNN_SDK_ROOT/lib/x86_64-linux-clang/:$LD_LIBRARY_PATH"
             )
-
-info = cpuinfo.get_cpu_info()
-vendor = info.get("vendor_id_raw", "").lower()
-if "amd" in vendor:
-    torch.backends.mkldnn.enabled = False

backends/qualcomm/requirements.txt

@@ -0,0 +1,5 @@
+graphviz
+pydot
+py-cpuinfo
+requests
+tabulate

backends/qualcomm/scripts/build.sh

@@ -6,8 +6,7 @@
 # LICENSE file in the root directory of this source tree.
 set -e
 
-pip install pydot
-pip install py-cpuinfo
+pip install -r backends/qualcomm/requirements.txt
 
 # Check if running on macOS/Darwin
 if [[ "$(uname -s)" == "Darwin" ]]; then