File tree Expand file tree Collapse file tree 9 files changed +29
-15
lines changed
backends/qualcomm/scripts
shim_et/xplat/executorch/backends/qualcomm Expand file tree Collapse file tree 9 files changed +29
-15
lines changed Original file line number Diff line number Diff line change @@ -11,8 +11,10 @@ set -o xtrace
11
11
12
12
build_qnn_backend () {
13
13
echo " Start building qnn backend."
14
- export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT:-/ opt/ ndk}
15
- export QNN_SDK_ROOT=${QNN_SDK_ROOT:-/ tmp/ qnn/ 2.28.0.241029}
14
+ # Source QNN configuration
15
+ source " $( dirname " ${BASH_SOURCE[0]} " ) /../../backends/qualcomm/scripts/install_qnn_sdk.sh"
16
+ setup_android_ndk
17
+ install_qnn
16
18
export EXECUTORCH_ROOT=" $( cd -- " $( dirname -- " ${BASH_SOURCE[0]} " ) /../.." && pwd) "
17
19
18
20
parallelism=$(( $(nproc) - 1 ))
Original file line number Diff line number Diff line change @@ -10,4 +10,5 @@ set -ex
10
10
source " $( dirname " ${BASH_SOURCE[0]} " ) /../../backends/qualcomm/scripts/install_qnn_sdk.sh"
11
11
12
12
setup_libcpp 12
13
+ setup_android_ndk
13
14
install_qnn
Original file line number Diff line number Diff line change @@ -119,8 +119,12 @@ echo "COREML option ${COREML}"
119
119
120
120
if [[ " ${MODE} " =~ .* qnn.* ]]; then
121
121
QNN=ON
122
+
123
+ # Download QNN_SDK. If already downloaded, export environment path
124
+ source " $( dirname " ${BASH_SOURCE[0]} " ) /../../backends/qualcomm/scripts/install_qnn_sdk.sh"
125
+ install_qnn
126
+
122
127
export EXECUTORCH_ROOT=" $( cd -- " $( dirname -- " ${BASH_SOURCE[0]} " ) /.." && pwd) "
123
- export QNN_SDK_ROOT=/tmp/qnn/2.28.0.241029
124
128
export LD_LIBRARY_PATH=" ${QNN_SDK_ROOT} /lib/x86_64-linux-clang"
125
129
export PYTHONPATH=" .."
126
130
cp schema/program.fbs exir/_serialize/program.fbs
Original file line number Diff line number Diff line change @@ -9,8 +9,13 @@ set -euxo pipefail
9
9
10
10
source " $( dirname " ${BASH_SOURCE[0]} " ) /utils.sh"
11
11
12
+ # Source QNN configuration
13
+ source " $( dirname " ${BASH_SOURCE[0]} " ) /../../backends/qualcomm/scripts/qnn_config.sh"
14
+ # Download QNN_SDK. If already downloaded, export environment path
15
+ source " $( dirname " ${BASH_SOURCE[0]} " ) /../../backends/qualcomm/scripts/install_qnn_sdk.sh"
16
+ install_qnn
17
+
12
18
export EXECUTORCH_ROOT=" $( cd -- " $( dirname -- " ${BASH_SOURCE[0]} " ) /.." && pwd) "
13
- export QNN_SDK_ROOT=/tmp/qnn/2.28.0.241029
14
19
export LD_LIBRARY_PATH=" ${QNN_SDK_ROOT} /lib/x86_64-linux-clang"
15
20
export PYTHONPATH=" .."
16
21
cp schema/program.fbs exir/_serialize/program.fbs
Original file line number Diff line number Diff line change @@ -292,7 +292,7 @@ jobs:
292
292
export.output_name="${OUT_ET_MODEL_NAME}.pte"
293
293
ls -lh "${OUT_ET_MODEL_NAME}.pte"
294
294
elif [[ ${{ matrix.config }} == "llama3_qnn_htp" ]]; then
295
- export QNN_SDK_ROOT=/tmp/qnn/2.28 .0.241029
295
+ export QNN_SDK_ROOT=/tmp/qnn/2.37 .0.25072
296
296
export LD_LIBRARY_PATH=$QNN_SDK_ROOT/lib/x86_64-linux-clang/
297
297
export PYTHONPATH=$(pwd)/..
298
298
@@ -432,7 +432,7 @@ jobs:
432
432
PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
433
433
434
434
mkdir -p aar-out
435
- PYTHON_EXECUTABLE=python ANDROID_ABIS="arm64-v8a" BUILD_AAR_DIR=aar-out EXECUTORCH_BUILD_QNN=ON QNN_SDK_ROOT=/tmp/qnn/2.28 .0.241029 EXECUTORCH_ANDROID_PROFILING=ON bash scripts/build_android_library.sh
435
+ PYTHON_EXECUTABLE=python ANDROID_ABIS="arm64-v8a" BUILD_AAR_DIR=aar-out EXECUTORCH_BUILD_QNN=ON QNN_SDK_ROOT=/tmp/qnn/2.37 .0.25072 EXECUTORCH_ANDROID_PROFILING=ON bash scripts/build_android_library.sh
436
436
mkdir -p extension/benchmark/android/benchmark/app/libs
437
437
cp aar-out/executorch.aar extension/benchmark/android/benchmark/app/libs
438
438
pushd extension/benchmark/android/benchmark
Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ jobs:
104
104
source backends/qualcomm/scripts/qnn_config.sh
105
105
export QNN_SDK_ROOT="/tmp/qnn/${QNN_VERSION}"
106
106
export ANDROID_ABIS=arm64-v8a
107
- GRADLE_ARGS+=" -DqnnVersion=2.28 .0"
107
+ GRADLE_ARGS+=" -DqnnVersion=2.37 .0"
108
108
fi
109
109
110
110
# Build AAR Package
Original file line number Diff line number Diff line change @@ -48,6 +48,12 @@ install_qnn() {
48
48
49
49
echo " Start installing qnn v${QNN_VERSION} "
50
50
QNN_INSTALLATION_DIR=" /tmp/qnn"
51
+
52
+ if [ -d " ${QNN_INSTALLATION_DIR} /${QNN_VERSION} " ]; then
53
+ echo " QNN SDK already installed at ${QNN_INSTALLATION_DIR} /${QNN_VERSION} "
54
+ export QNN_SDK_ROOT=" ${QNN_INSTALLATION_DIR} /${QNN_VERSION} "
55
+ return
56
+ fi
51
57
52
58
# Clean up any previous installation
53
59
if [ -d " ${QNN_INSTALLATION_DIR} " ]; then
@@ -79,7 +85,7 @@ install_qnn() {
79
85
ls -lah " ${QNN_INSTALLATION_DIR} "
80
86
81
87
# Set QNN_SDK_ROOT environment variable
82
- export QNN_SDK_ROOT=" ${QNN_INSTALLATION_DIR} "
88
+ export QNN_SDK_ROOT=" ${QNN_INSTALLATION_DIR} / ${QNN_VERSION} "
83
89
echo " Set QNN_SDK_ROOT=${QNN_SDK_ROOT} "
84
90
}
85
91
@@ -147,7 +153,3 @@ setup_libcpp() {
147
153
148
154
echo " libc++ installed to ${INSTALL_DIR} "
149
155
}
150
-
151
- setup_libcpp 12
152
- setup_android_ndk
153
- install_qnn
Original file line number Diff line number Diff line change 6
6
# LICENSE file in the root directory of this source tree.
7
7
8
8
# QNN SDK Configuration
9
- QNN_VERSION=" 2.28 .0.241029 "
10
- QNN_ZIP_URL=" https://softwarecenter.qualcomm.com/api/download/software/qualcomm_neural_processing_sdk /v${QNN_VERSION} .zip"
9
+ QNN_VERSION=" 2.37 .0.250724 "
10
+ QNN_ZIP_URL=" https://softwarecenter.qualcomm.com/api/download/software/sdks/Qualcomm_AI_Runtime_Community/All/ ${QNN_VERSION} /v${QNN_VERSION} .zip"
Original file line number Diff line number Diff line change 1
1
def get_qnn_library_version ():
2
- return "2.28 "
2
+ return "2.37 "
You can’t perform that action at this time.
0 commit comments