mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-04 23:59:56 +00:00
[QNN EP] Update QNN SDK to 2.8 (#14978)
### Description - Add QNN 2.8 SDK - Make QNN SDK version a pipeline template parameter for QNN pipelines. ### Motivation and Context Updates to latest QNN SDK version, and allows testing different QNN SDK versions without modifying yaml files.
This commit is contained in:
parent
bd142bfb04
commit
e2febe87f6
5 changed files with 62 additions and 35 deletions
|
|
@ -1,10 +1,24 @@
|
|||
parameters:
|
||||
|
||||
- name: QnnSdk
|
||||
displayName: QNN SDK version
|
||||
type: string
|
||||
default: qnn-v2.8.0.230223123141_52150
|
||||
values:
|
||||
- qnn-v2.6.0.221227110525_42395
|
||||
- qnn-v2.8.0.230223123141_52150
|
||||
|
||||
jobs:
|
||||
- job: Build_QNN_EP
|
||||
pool: Onnxruntime-QNNEP-Ubuntu-2004-CPU
|
||||
pool: onnxruntime-qnn-ubuntu-2004-cpu
|
||||
timeoutInMinutes: 30
|
||||
workspace:
|
||||
clean: all
|
||||
|
||||
variables:
|
||||
- name: QNN_SDK_ROOT
|
||||
value: /data/qnnsdk/${{parameters.QnnSdk}}
|
||||
|
||||
steps:
|
||||
- task: UsePythonVersion@0
|
||||
displayName: Use Python $(pythonVersion)
|
||||
|
|
@ -25,11 +39,6 @@ jobs:
|
|||
displayName: set Android ENVs
|
||||
|
||||
- script: |
|
||||
echo "##vso[task.setvariable variable=QNN_SDK_ROOT]/data/qnnsdk/qnn-v2.6.0.221227110525_42395"
|
||||
displayName: set QNN_SDK_ROOT
|
||||
|
||||
- script: |
|
||||
env | egrep -e ANDROID -e QNN
|
||||
python3 tools/ci_build/build.py \
|
||||
--config Release \
|
||||
--android \
|
||||
|
|
@ -40,12 +49,15 @@ jobs:
|
|||
--android_api=30 \
|
||||
--parallel \
|
||||
--use_qnn \
|
||||
--qnn_home $QNN_SDK_ROOT \
|
||||
--qnn_home $(QNN_SDK_ROOT) \
|
||||
--cmake_generator=Ninja \
|
||||
--skip_tests
|
||||
displayName: Build QNN EP
|
||||
|
||||
- script: |
|
||||
mkdir -p build_qnn/Release/testdata/QNN/node_tests
|
||||
cp -r cmake/external/onnx//onnx/backend/test/data/node/test_basic_conv_with_padding build_qnn/Release/testdata/QNN/node_tests
|
||||
displayName: QNN EP, Build
|
||||
displayName: Initialize test directories
|
||||
|
||||
- task: JavaToolInstaller@0
|
||||
displayName: Use jdk 8
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
parameters:
|
||||
|
||||
- name: QnnSdk
|
||||
displayName: QNN SDK version
|
||||
type: string
|
||||
default: qnn-v2.8.0.230223123141_52150
|
||||
values:
|
||||
- qnn-v2.6.0.221227110525_42395
|
||||
- qnn-v2.8.0.230223123141_52150
|
||||
|
||||
jobs:
|
||||
- job: Build_QNN_EP
|
||||
pool: onnxruntime-qnn-ubuntu-2004-cpu
|
||||
|
|
@ -5,6 +15,10 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
|
||||
variables:
|
||||
- name: QNN_SDK_ROOT
|
||||
value: /data/qnnsdk/${{parameters.QnnSdk}}
|
||||
|
||||
steps:
|
||||
- script: |
|
||||
ls /data/qnnsdk
|
||||
|
|
@ -19,17 +33,13 @@ jobs:
|
|||
- script: sudo apt-get update -y && sudo apt-get install -y coreutils ninja-build
|
||||
displayName: Install coreutils and ninja
|
||||
|
||||
- script: |
|
||||
echo "##vso[task.setvariable variable=QNN_SDK_ROOT]/data/qnnsdk/qnn-v2.6.0.221227110525_42395"
|
||||
displayName: set QNN_SDK_ROOT
|
||||
|
||||
- script: |
|
||||
python3 tools/ci_build/build.py \
|
||||
--build_dir build \
|
||||
--config Release \
|
||||
--parallel \
|
||||
--use_qnn \
|
||||
--qnn_home $QNN_SDK_ROOT \
|
||||
--qnn_home $(QNN_SDK_ROOT) \
|
||||
--cmake_generator=Ninja \
|
||||
--skip_tests
|
||||
displayName: Build QNN EP
|
||||
|
|
@ -39,7 +49,7 @@ jobs:
|
|||
--build_dir build \
|
||||
--config Release \
|
||||
--test \
|
||||
--qnn_home $QNN_SDK_ROOT \
|
||||
--qnn_home $(QNN_SDK_ROOT) \
|
||||
--cmake_generator=Ninja \
|
||||
--skip_submodule_sync \
|
||||
--ctest_path ""
|
||||
|
|
@ -50,7 +60,7 @@ jobs:
|
|||
inputs:
|
||||
script: |
|
||||
./build/Release/onnx_test_runner -e qnn \
|
||||
-v -j 1 -c 1 -i "backend_path|$QNN_SDK_ROOT/target/x86_64-linux-clang/lib/libQnnCpu.so" \
|
||||
-v -j 1 -c 1 -i "backend_path|$(QNN_SDK_ROOT)/target/x86_64-linux-clang/lib/libQnnCpu.so" \
|
||||
cmake/external/onnx/onnx/backend/test/data/node
|
||||
|
||||
- task: CmdLine@2
|
||||
|
|
@ -58,7 +68,7 @@ jobs:
|
|||
inputs:
|
||||
script: |
|
||||
./build/Release/onnx_test_runner -e qnn \
|
||||
-v -j 1 -c 1 -i "backend_path|$QNN_SDK_ROOT/target/x86_64-linux-clang/lib/libQnnCpu.so" \
|
||||
-v -j 1 -c 1 -i "backend_path|$(QNN_SDK_ROOT)/target/x86_64-linux-clang/lib/libQnnCpu.so" \
|
||||
/data/float32_models
|
||||
|
||||
- task: CmdLine@2
|
||||
|
|
@ -66,6 +76,6 @@ jobs:
|
|||
inputs:
|
||||
script: |
|
||||
./build/Release/onnx_test_runner -e qnn \
|
||||
-v -j 1 -c 1 -i "backend_path|$QNN_SDK_ROOT/target/x86_64-linux-clang/lib/libQnnHtp.so" \
|
||||
-v -j 1 -c 1 -i "backend_path|$(QNN_SDK_ROOT)/target/x86_64-linux-clang/lib/libQnnHtp.so" \
|
||||
/data/qdq_models
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
parameters:
|
||||
|
||||
- name: QnnSdk
|
||||
displayName: QNN SDK version
|
||||
type: string
|
||||
default: qnn-v2.8.0.230223123141_52150_win
|
||||
values:
|
||||
- qnn-v2.6.0.221227161714_42395_win
|
||||
- qnn-v2.8.0.230223123141_52150_win
|
||||
|
||||
jobs:
|
||||
- job: 'build'
|
||||
pool: 'Onnxruntime-QNNEP-Windows-2022-ARM64-CPU'
|
||||
|
|
@ -5,12 +15,12 @@ jobs:
|
|||
MsbuildArguments: '-detailedsummary -maxcpucount -consoleloggerparameters:PerformanceSummary'
|
||||
OnnxRuntimeBuildDirectory: '$(Build.BinariesDirectory)'
|
||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
||||
EnvSetupScript: setup_env_qnn.bat
|
||||
buildArch: arm64
|
||||
setVcvars: true
|
||||
BuildConfig: 'RelWithDebInfo'
|
||||
ALLOW_RELEASED_ONNX_OPSET_ONLY: '1'
|
||||
timeoutInMinutes: 200
|
||||
QNN_SDK_ROOT: 'C:\data\qnnsdk\${{parameters.QnnSdk}}'
|
||||
timeoutInMinutes: 240
|
||||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
|
|
@ -34,13 +44,6 @@ jobs:
|
|||
addToPath: true
|
||||
architecture: $(buildArch)
|
||||
|
||||
- task: BatchScript@1
|
||||
displayName: 'setup env'
|
||||
inputs:
|
||||
filename: '$(Build.SourcesDirectory)\tools\ci_build\github\windows\$(EnvSetupScript)'
|
||||
modifyEnvironment: true
|
||||
workingFolder: '$(Build.BinariesDirectory)'
|
||||
|
||||
- task: PythonScript@0
|
||||
displayName: 'Generate cmake config'
|
||||
inputs:
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
parameters:
|
||||
|
||||
- name: QnnSdk
|
||||
displayName: QNN SDK version
|
||||
type: string
|
||||
default: qnn-v2.8.0.230223123141_52150_win
|
||||
values:
|
||||
- qnn-v2.6.0.221227161714_42395_win
|
||||
- qnn-v2.8.0.230223123141_52150_win
|
||||
|
||||
jobs:
|
||||
- job: 'build'
|
||||
pool: 'Onnxruntime-QNNEP-Windows-2022-CPU'
|
||||
|
|
@ -5,11 +15,11 @@ jobs:
|
|||
MsbuildArguments: '-detailedsummary -maxcpucount -consoleloggerparameters:PerformanceSummary'
|
||||
OnnxRuntimeBuildDirectory: '$(Build.BinariesDirectory)'
|
||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
||||
EnvSetupScript: setup_env_qnn.bat
|
||||
buildArch: x64
|
||||
setVcvars: true
|
||||
BuildConfig: 'RelWithDebInfo'
|
||||
ALLOW_RELEASED_ONNX_OPSET_ONLY: '1'
|
||||
QNN_SDK_ROOT: 'C:\data\qnnsdk\${{parameters.QnnSdk}}'
|
||||
timeoutInMinutes: 150
|
||||
workspace:
|
||||
clean: all
|
||||
|
|
@ -21,13 +31,6 @@ jobs:
|
|||
addToPath: true
|
||||
architecture: $(buildArch)
|
||||
|
||||
- task: BatchScript@1
|
||||
displayName: 'setup env'
|
||||
inputs:
|
||||
filename: '$(Build.SourcesDirectory)\tools\ci_build\github\windows\$(EnvSetupScript)'
|
||||
modifyEnvironment: true
|
||||
workingFolder: '$(Build.BinariesDirectory)'
|
||||
|
||||
- task: PythonScript@0
|
||||
displayName: 'Generate cmake config'
|
||||
inputs:
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
set QNN_SDK_ROOT=C:\data\qnnsdk\qnn-v2.6.0.221227161714_42395_win
|
||||
Loading…
Reference in a new issue