Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[QNN EP] Update QNN SDK to 2.25 #21623

Merged
merged 2 commits into from
Aug 6, 2024
+16 −16
Merged

[QNN EP] Update QNN SDK to 2.25 #21623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63479c0
Modify ifdef condition to apply workaround to QNN LayerNorm validatio…
adrianlizarraga Aug 5, 2024
b010d6b
Update QNN SDK to 2.25 in pipelines
adrianlizarraga Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions onnxruntime/core/providers/qnn/builder/opbuilder/layer_norm_op_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/android-arm64-v8a-QNN-crosscompile-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/linux-qnn-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/qnn-ep-nuget-packaging-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/jobs/download_linux_qnn_sdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
- name: QnnSDKVersion
type: string
default: '2.24.0.240626'
default: '2.25.0.240728'

steps:
- script: |
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/jobs/download_win_qnn_sdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
- name: QnnSDKVersion
type: string
default: '2.24.0.240626'
default: '2.25.0.240728'

steps:
- powershell: |
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}:
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/py-win-arm64-qnn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/py-win-x64-qnn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/qnn-ep-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
QnnSdk: '2.24.0.240626'
QnnSdk: '2.25.0.240728'
build_config: 'RelWithDebInfo'
IsReleaseBuild: false
DoEsrp: false
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/win-qnn-arm64-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/win-qnn-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading