Skip to content

Commit 26250ae

Browse files
prathikrjywu-msftliqunfuskottmckaymszhanyi
authored
ORT 1.19.0 Release: Cherry-Pick Round 2 (#21726)
### Description <!-- Describe your changes. --> PRs marked for cherry-pick & bug fixes. ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> ORT 1.19.0 Release Preparation --------- Signed-off-by: Liqun Fu <[email protected]> Co-authored-by: George Wu <[email protected]> Co-authored-by: liqun Fu <[email protected]> Co-authored-by: Scott McKay <[email protected]> Co-authored-by: Yi Zhang <[email protected]>
1 parent ccf6a28 commit 26250ae

File tree

10 files changed

+177
-14
lines changed

10 files changed

+177
-14
lines changed

js/react_native/android/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import java.nio.file.Paths
33
buildscript {
44
repositories {
55
google()
6-
jcenter()
6+
mavenCentral()
77
}
88

99
dependencies {
@@ -145,7 +145,6 @@ android {
145145

146146
repositories {
147147
mavenCentral()
148-
jcenter()
149148
google()
150149

151150
def found = false

js/react_native/e2e/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111
repositories {
1212
google()
13-
jcenter()
13+
mavenCentral()
1414
}
1515
dependencies {
1616
classpath('com.android.tools.build:gradle:7.1.1')
@@ -31,13 +31,13 @@ allprojects {
3131
// Android JSC is installed from npm
3232
url("$rootDir/../node_modules/jsc-android/dist")
3333
}
34-
maven {
34+
maven {
3535
// Add Detox as a precompiled native dependency
3636
url("$rootDir/../node_modules/detox/Detox-android")
3737
}
3838

3939
google()
40-
jcenter()
40+
mavenCentral()
4141
maven { url 'https://www.jitpack.io' }
4242
}
4343
}

onnxruntime/contrib_ops/cpu/quantization/matmul_nbits.cc

+2-4
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,15 @@ class MatMulNBits final : public OpKernel {
105105
ORT_ENFORCE(nbits_ == 4,
106106
"Only 4b quantization is supported for MatMulNBits op, additional bits support is planned.");
107107
const Tensor* tensor_zero_point = nullptr;
108-
has_zp_input_ = info.TryGetConstantInput(3, &tensor_zero_point);
108+
has_zp_input_ = info.TryGetConstantInput(InputIndex::zero_points, &tensor_zero_point);
109109
#ifdef ORT_NEURAL_SPEED
110110
const Tensor* tensor_B = nullptr;
111111
const Tensor* tensor_scale = nullptr;
112-
const Tensor* tensor_zero_point = nullptr;
113112
bool B_constant = info.TryGetConstantInput(InputIndex::B, &tensor_B);
114113
bool scale_constant = info.TryGetConstantInput(InputIndex::scales, &tensor_scale);
115-
bool zero_point_constant = info.TryGetConstantInput(InputIndex::zero_points, &tensor_zero_point);
116114
is_asym_ = zero_point_arg != nullptr;
117115
all_constant_ = B_constant && scale_constant;
118-
all_constant_ = is_asym_ ? all_constant_ && zero_point_constant : all_constant_;
116+
all_constant_ = is_asym_ ? all_constant_ && has_zp_input_ : all_constant_;
119117
#endif
120118
}
121119

tools/ci_build/github/azure-pipelines/bigmodels-ci-pipeline.yml

+1
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ stages:
282282
- stage: Llama2_7B_ONNX
283283
dependsOn:
284284
- Build_Onnxruntime_Cuda
285+
condition: and (succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/rel-')))
285286
jobs:
286287
- job: Llama2_7B_ONNX
287288
timeoutInMinutes: 120

tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ci-pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
RunInjectedPipeline: 'true'
4949
InjectedPipeline: 'orttraining-linux-gpu-test-ci-pipeline.yml'
5050
DockerImageTag: 'onnxruntime_orttraining_ortmodule_tests_image'
51-
TimeoutInMinutes: 140
51+
TimeoutInMinutes: 150
5252
# Enable unreleased onnx opsets in CI builds
5353
# This facilitates testing the implementation for the new opsets
5454
AllowReleasedOpsetOnly: '0'

tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ stages:
1818
torch_version: '2.0.0'
1919
opset_version: '17'
2020
cuda_version: '11.8'
21-
cmake_cuda_architectures: 60;61;70;75;80;86
21+
cmake_cuda_architectures: 70;75;80;86
2222
docker_file: Dockerfile.manylinux2_28_training_cuda11_8
2323
agent_pool: Onnxruntime-Linux-GPU
2424
upload_wheel: 'yes'

tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stages:
88
torch_version: '2.1.0'
99
opset_version: '17'
1010
cuda_version: '12.2'
11-
cmake_cuda_architectures: 70;75;80;86;90
11+
cmake_cuda_architectures: 80;86;90
1212
docker_file: Dockerfile.manylinux2_28_training_cuda12_2
1313
agent_pool: Onnxruntime-Linux-GPU
1414
upload_wheel: 'yes'

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ stages:
516516
- stage: Python_Packaging_Windows_x64_QNN
517517
dependsOn: []
518518
jobs:
519-
- template: py-win-x64-qnn.yml
519+
- template: py-win-arm64ec-qnn.yml
520520
parameters:
521521
MACHINE_POOL: 'Onnxruntime-QNNEP-Windows-2022-CPU'
522522
QNN_SDK: ${{ parameters.qnn_sdk_version }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
parameters:
2+
3+
- name: MACHINE_POOL
4+
type: string
5+
default: 'Onnxruntime-QNNEP-Windows-2022-CPU'
6+
7+
- name: QNN_SDK
8+
displayName: QNN SDK Version
9+
type: string
10+
default: 2.24.0.240626
11+
12+
- name: ENV_SETUP_SCRIPT
13+
type: string
14+
default: ''
15+
16+
- name: BUILD_PY_PARAMETERS
17+
displayName: >
18+
Extra parameters to pass to build.py. Don't put newlines in here.
19+
type: string
20+
default: ''
21+
22+
jobs:
23+
- job: Win_py_x64_qnn_Wheels
24+
timeoutInMinutes: 210
25+
workspace:
26+
clean: all
27+
pool:
28+
name: ${{ parameters.MACHINE_POOL }}
29+
strategy:
30+
matrix:
31+
Python38_x64:
32+
PythonVersion: '3.8'
33+
Python39_x64:
34+
PythonVersion: '3.9'
35+
Python310_x64:
36+
PythonVersion: '3.10'
37+
Python311_x64:
38+
PythonVersion: '3.11'
39+
Python312_x64:
40+
PythonVersion: '3.12'
41+
variables:
42+
GRADLE_OPTS: '-Dorg.gradle.daemon=false'
43+
VSGenerator: 'Visual Studio 17 2022'
44+
steps:
45+
- checkout: self
46+
clean: true
47+
submodules: recursive
48+
49+
- template: telemetry-steps.yml
50+
51+
- task: UsePythonVersion@0
52+
inputs:
53+
versionSpec: $(PythonVersion)
54+
addToPath: true
55+
architecture: 'x64'
56+
57+
- task: onebranch.pipeline.tsaoptions@1
58+
displayName: 'OneBranch TSAOptions'
59+
inputs:
60+
tsaConfigFilePath: '$(Build.SourcesDirectory)\.config\tsaoptions.json'
61+
appendSourceBranchName: false
62+
63+
- template: download-deps.yml
64+
65+
- task: PythonScript@0
66+
displayName: 'Update deps.txt'
67+
inputs:
68+
scriptPath: $(Build.SourcesDirectory)/tools/ci_build/replace_urls_in_deps.py
69+
arguments: --new_dir $(Build.BinariesDirectory)/deps
70+
workingDirectory: $(Build.BinariesDirectory)
71+
72+
- task: PowerShell@2
73+
displayName: 'Install ONNX'
74+
inputs:
75+
filePath: '$(Build.SourcesDirectory)/tools/ci_build/github/windows/install_third_party_deps.ps1'
76+
workingDirectory: '$(Build.BinariesDirectory)'
77+
arguments: -cpu_arch x64 -install_prefix $(Build.BinariesDirectory)\RelWithDebInfo\installed -build_config RelWithDebInfo
78+
79+
- template: set-nightly-build-option-variable-step.yml
80+
81+
- template: jobs/download_win_qnn_sdk.yml
82+
parameters:
83+
QnnSDKVersion: ${{ parameters.QNN_SDK }}
84+
85+
- task: PythonScript@0
86+
displayName: 'Generate cmake config'
87+
inputs:
88+
scriptPath: '$(Build.SourcesDirectory)\tools\ci_build\build.py'
89+
arguments: >
90+
--config RelWithDebInfo
91+
--build_dir $(Build.BinariesDirectory)
92+
--skip_submodule_sync
93+
--cmake_generator "$(VSGenerator)"
94+
--use_qnn
95+
--qnn_home $(QnnSDKRootDir)
96+
--enable_pybind
97+
--parallel --update --arm64ec
98+
$(TelemetryOption) ${{ parameters.BUILD_PY_PARAMETERS }}
99+
workingDirectory: '$(Build.BinariesDirectory)'
100+
101+
- task: VSBuild@1
102+
displayName: 'Build'
103+
inputs:
104+
solution: '$(Build.BinariesDirectory)\RelWithDebInfo\onnxruntime.sln'
105+
platform: 'arm64ec'
106+
configuration: RelWithDebInfo
107+
msbuildArchitecture: 'x64'
108+
maximumCpuCount: true
109+
logProjectEvents: true
110+
workingFolder: '$(Build.BinariesDirectory)\RelWithDebInfo'
111+
createLogFile: true
112+
113+
# Esrp signing
114+
- template: win-esrp-dll.yml
115+
parameters:
116+
FolderPath: '$(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\onnxruntime\capi'
117+
DisplayName: 'ESRP - Sign Native dlls'
118+
DoEsrp: true
119+
Pattern: '*.pyd'
120+
121+
- task: PythonScript@0
122+
displayName: 'Build wheel'
123+
inputs:
124+
scriptPath: '$(Build.SourcesDirectory)\setup.py'
125+
arguments: 'bdist_wheel $(NightlyBuildOption) --wheel_name_suffix=qnn'
126+
workingDirectory: '$(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo'
127+
128+
- task: CopyFiles@2
129+
displayName: 'Copy Python Wheel to: $(Build.ArtifactStagingDirectory)'
130+
inputs:
131+
SourceFolder: '$(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\dist'
132+
Contents: '*.whl'
133+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
134+
135+
- task: PublishBuildArtifacts@1
136+
displayName: 'Publish Artifact: ONNXRuntime python wheel'
137+
inputs:
138+
ArtifactName: onnxruntime_qnn
139+
140+
- script: |
141+
7z x *.whl
142+
workingDirectory: '$(Build.ArtifactStagingDirectory)'
143+
displayName: 'unzip the package'
144+
145+
- task: CredScan@3
146+
displayName: 'Run CredScan'
147+
inputs:
148+
debugMode: false
149+
continueOnError: true
150+
151+
- task: BinSkim@4
152+
displayName: 'Run BinSkim'
153+
inputs:
154+
AnalyzeTargetGlob: '+:file|$(Build.ArtifactStagingDirectory)\**\*.dll'
155+
156+
- task: TSAUpload@2
157+
displayName: 'TSA upload'
158+
condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
159+
inputs:
160+
GdnPublishTsaOnboard: false
161+
GdnPublishTsaConfigFile: '$(Build.sourcesDirectory)\.gdn\.gdntsa'
162+
163+
- template: component-governance-component-detection-steps.yml
164+
parameters:
165+
condition: 'succeeded'

tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage2/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ rsa==4.9
88
tensorboard==2.13.0
99
h5py
1010
wget
11-
pytorch-lightning
11+
pytorch-lightning==2.3.3
1212
deepspeed==0.9.0
1313
fairscale==0.4.6
1414
parameterized>=0.8.1

0 commit comments

Comments
 (0)