saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-28 20:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[QNN EP] Update QNN SDK to 2.25 (#21623)

Browse source 
### Description
- Update pipelines to use QNN SDK 2.25 by default
- Update ifdef condition to apply workaround for QNN LayerNorm
validation bug to QNN SDK 2.25 (as well as 2.24)



### Motivation and Context
Use the latest QNN SDK
This commit is contained in:
Adrian Lizarraga 2024-08-06 09:08:48 -07:00 committed by GitHub
parent 0d1da41ca8
commit 0acefc7988
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
onnxruntime/core/providers/qnn/builder/opbuilder/layer_norm_op_builder.cc
View file

@ -87,10 +87,10 @@ Status LayerNormOpBuilder::ProcessInputs(QnnModelWrapper& qnn_model_wrapper,
ORT_RETURN_IF_ERROR(ProcessInput(qnn_model_wrapper, inputs[BIAS_IDX], logger, input_names));
}
#if QNN_API_VERSION_MAJOR == 2 && QNN_API_VERSION_MINOR == 17
#if QNN_API_VERSION_MAJOR == 2 && (QNN_API_VERSION_MINOR == 17 || QNN_API_VERSION_MINOR == 18)
if (!has_bias_input && IsNpuBackend(qnn_model_wrapper.GetQnnBackendType())) {
// Bias is implicit. QNN SDK 2.24 (QNN API version 2.17) has a validation bug for implicit bias inputs, so provide
// an explicit bias of all 0 (quantized int32).
// Bias is implicit. QNN SDK 2.24/2.25 (QNN API version 2.17/2.18) has a validation bug for implicit bias inputs,
// so provide an explicit bias of all 0 (quantized int32).
TensorInfo x_input_info = {};
ORT_RETURN_IF_ERROR(qnn_model_wrapper.GetTensorInfo(inputs[X_IDX], x_input_info));

2
tools/ci_build/github/azure-pipelines/android-arm64-v8a-QNN-crosscompile-ci-pipeline.yml
View file

@ -31,7 +31,7 @@ parameters:
- name: QnnSdk
displayName: QNN SDK version
type: string
default: 2.24.0.240626
default: 2.25.0.240728
jobs:
- job: Build_QNN_EP

2
tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
View file

@ -62,7 +62,7 @@ parameters:
- name: QnnSdk
displayName: QNN SDK Version
type: string
default: 2.24.0.240626
default: 2.25.0.240728
resources:
repositories:

2
tools/ci_build/github/azure-pipelines/linux-qnn-ci-pipeline.yml
View file

@ -32,7 +32,7 @@ parameters:
- name: QnnSdk
displayName: QNN SDK version
type: string
default: 2.24.0.240626
default: 2.25.0.240728
jobs:
- job: Build_QNN_EP

2
tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml
View file

@ -59,7 +59,7 @@ parameters:
- name: qnn_sdk_version
type: string
displayName: 'QNN SDK version. Only for QNN packages.'
default: 2.24.0.240626
default: 2.25.0.240728
trigger: none

2
tools/ci_build/github/azure-pipelines/qnn-ep-nuget-packaging-pipeline.yml
View file

@ -2,7 +2,7 @@ parameters:
- name: QnnSdk
displayName: QNN SDK Version
type: string
default: 2.24.0.240626
default: 2.25.0.240728
- name: build_config
displayName: Build Configuration

2
tools/ci_build/github/azure-pipelines/templates/jobs/download_linux_qnn_sdk.yml
View file

@ -1,7 +1,7 @@
parameters:
- name: QnnSDKVersion
type: string
default: '2.24.0.240626'
default: '2.25.0.240728'
steps:
- script: |

2
tools/ci_build/github/azure-pipelines/templates/jobs/download_win_qnn_sdk.yml
View file

@ -1,7 +1,7 @@
parameters:
- name: QnnSDKVersion
type: string
default: '2.24.0.240626'
default: '2.25.0.240728'
steps:
- powershell: |

2
tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml
View file

@ -63,7 +63,7 @@ parameters:
- name: qnn_sdk_version
type: string
displayName: 'QNN SDK version. Only for QNN packages.'
default: 2.24.0.240626
default: 2.25.0.240728
stages:
- ${{ if eq(parameters.enable_windows_cpu, true) }}:

2
tools/ci_build/github/azure-pipelines/templates/py-win-arm64-qnn.yml
View file

@ -7,7 +7,7 @@ parameters:
- name: QNN_SDK
displayName: QNN SDK Version
type: string
default: 2.24.0.240626
default: 2.25.0.240728
- name: PYTHON_VERSION
type: string

2
tools/ci_build/github/azure-pipelines/templates/py-win-x64-qnn.yml
View file

@ -7,7 +7,7 @@ parameters:
- name: QNN_SDK
displayName: QNN SDK Version
type: string
default: 2.24.0.240626
default: 2.25.0.240728
- name: ENV_SETUP_SCRIPT
type: string

2
tools/ci_build/github/azure-pipelines/templates/qnn-ep-win.yml
View file

@ -1,5 +1,5 @@
parameters:
QnnSdk: '2.24.0.240626'
QnnSdk: '2.25.0.240728'
build_config: 'RelWithDebInfo'
IsReleaseBuild: false
DoEsrp: false

2
tools/ci_build/github/azure-pipelines/win-qnn-arm64-ci-pipeline.yml
View file

@ -32,7 +32,7 @@ parameters:
- name: QnnSdk
displayName: QNN SDK version
type: string
default: 2.24.0.240626
default: 2.25.0.240728
jobs:
- job: 'build'

2
tools/ci_build/github/azure-pipelines/win-qnn-ci-pipeline.yml
View file

@ -32,7 +32,7 @@ parameters:
- name: QnnSdk
displayName: QNN SDK version
type: string
default: 2.24.0.240626
default: 2.25.0.240728
jobs:
- job: 'build'