mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-07-30 20:18:08 +00:00
Update Win-CPU-2021 to onnxruntime-Win-CPU-2022 (#15967)
### Description After this PR there are following pool need to be updated. old|new|note ---|---|--- onnxruntime-Win2019-GPU-dml-A10|tbd| onnxruntime-Win2019-GPU-T4|onnxruntime-Win2022-GPU-T4| onnxruntime-Win2019-GPU-training-T4|onnxruntime-Win2022-GPU-T4|ame as the above because we do not have many T4 GPUs onnxruntime-tensorrt8-winbuild-T4|tbd| aiinfra-dml-winbuild|tbd| ### 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. -->
This commit is contained in:
Jian Chen
GitHub
parent
084d0d0d2d
commit
2881d849d4
11 changed files with 26 additions and 31 deletions
|
|
@ -229,7 +229,7 @@ stages:
|
|||
- job:
|
||||
workspace:
|
||||
clean: all
|
||||
pool: 'Win-CPU-2021'
|
||||
pool: 'onnxruntime-Win-CPU-2022'
|
||||
|
||||
|
||||
steps:
|
||||
|
|
@ -790,7 +790,7 @@ stages:
|
|||
SpecificArtifact: ${{ parameters.specificArtifact }}
|
||||
BuildId: ${{ parameters.BuildId }}
|
||||
|
||||
- template: nuget/templates/dml-vs-2019.yml
|
||||
- template: nuget/templates/dml-vs-2022.yml
|
||||
parameters:
|
||||
AgentPool : 'aiinfra-dml-winbuild'
|
||||
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
|
||||
|
|
@ -813,7 +813,7 @@ stages:
|
|||
mkdir $(Build.ArtifactStagingDirectory)\testdata
|
||||
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
|
||||
|
||||
- template: nuget/templates/dml-vs-2019.yml
|
||||
- template: nuget/templates/dml-vs-2022.yml
|
||||
parameters:
|
||||
AgentPool : 'aiinfra-dml-winbuild'
|
||||
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
|
||||
|
|
@ -836,9 +836,9 @@ stages:
|
|||
mkdir $(Build.ArtifactStagingDirectory)\testdata
|
||||
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
|
||||
|
||||
- template: nuget/templates/dml-vs-2019.yml
|
||||
- template: nuget/templates/dml-vs-2022.yml
|
||||
parameters:
|
||||
AgentPool : 'Win-CPU-2021'
|
||||
AgentPool : 'onnxruntime-Win-CPU-2022'
|
||||
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
|
||||
ArtifactName: 'drop-win-dml-arm64-zip'
|
||||
StageName: 'Windows_CI_GPU_DML_Dev_arm64'
|
||||
|
|
@ -859,9 +859,9 @@ stages:
|
|||
mkdir $(Build.ArtifactStagingDirectory)\testdata
|
||||
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
|
||||
|
||||
- template: nuget/templates/dml-vs-2019.yml
|
||||
- template: nuget/templates/dml-vs-2022.yml
|
||||
parameters:
|
||||
AgentPool : 'Win-CPU-2021'
|
||||
AgentPool : 'onnxruntime-Win-CPU-2022'
|
||||
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
|
||||
ArtifactName: 'drop-win-dml-arm-zip'
|
||||
StageName: 'Windows_CI_GPU_DML_Dev_arm'
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ parameters:
|
|||
BuildArch: 'x64' # Optional. Options: x86, x64
|
||||
sln_platform: 'x64' # Options: Win32, x64, arm, arm64
|
||||
EnvSetupScript: 'setup_env.bat'
|
||||
AgentPool: 'Win-CPU-2021'
|
||||
AgentPool: 'onnxruntime-Win-CPU-2022'
|
||||
AgentDemands: []
|
||||
OrtPackageId: Microsoft.ML.OnnxRuntime
|
||||
BuildConfigurations: ['RelWithDebInfo'] # Options: Debug, RelWithDebInfo
|
||||
|
|
@ -185,9 +185,9 @@ stages:
|
|||
# Nuget packaging if needed
|
||||
- ${{ if eq(parameters['DoNugetPack'], 'true') }}:
|
||||
- task: BatchScript@1
|
||||
displayName: 'Setup VS2019 env vars'
|
||||
displayName: 'Setup VS2022 env vars'
|
||||
inputs:
|
||||
filename: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
|
||||
filename: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
|
||||
arguments: ${{ parameters.BuildArch }}
|
||||
modifyEnvironment: true
|
||||
# Esrp signing
|
||||
|
|
@ -227,9 +227,9 @@ stages:
|
|||
# Node.js Publish
|
||||
- ${{ if eq(parameters['DoNodejsPack'], 'true') }}:
|
||||
- task: BatchScript@1
|
||||
displayName: 'Setup VS2019 env vars'
|
||||
displayName: 'Setup VS2022 env vars'
|
||||
inputs:
|
||||
filename: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
|
||||
filename: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
|
||||
arguments: ${{ parameters.BuildArch }}
|
||||
modifyEnvironment: true
|
||||
- template: ../../templates/win-esrp-dll.yml
|
||||
|
|
@ -1,11 +1,6 @@
|
|||
variables:
|
||||
- name: WIN_CPU_BUILD_MACHINE_POOL_NAME # name of a variable
|
||||
# The public ADO project
|
||||
${{ if startsWith(variables['System.CollectionUri'], 'https://dev.azure.com/onnxruntime/') }}:
|
||||
value: 'onnxruntime-Win-CPU-2022'
|
||||
# The private ADO project
|
||||
${{ if or(startsWith(variables['System.CollectionUri'], 'https://dev.azure.com/aiinfra/'),startsWith(variables['System.CollectionUri'], 'https://aiinfra.visualstudio.com/')) }}:
|
||||
value: 'Win-CPU-2021'
|
||||
- name: WIN_CPU_BUILD_MACHINE_POOL_NAME
|
||||
value: 'onnxruntime-Win-CPU-2022'
|
||||
- name: LINUX_CPU_BUILD_MACHINE_POOL_NAME # name of a variable
|
||||
# The public ADO project
|
||||
${{ if startsWith(variables['System.CollectionUri'], 'https://dev.azure.com/onnxruntime/') }}:
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ stages:
|
|||
- job:
|
||||
workspace:
|
||||
clean: all
|
||||
pool: 'Win-CPU-2021'
|
||||
pool: 'onnxruntime-Win-CPU-2022'
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
|
|
@ -533,7 +533,7 @@ stages:
|
|||
- job:
|
||||
workspace:
|
||||
clean: all
|
||||
pool: 'Win-CPU-2021'
|
||||
pool: 'onnxruntime-Win-CPU-2022'
|
||||
variables:
|
||||
${{ if eq(parameters.IsReleaseBuild, true) }}:
|
||||
NpmPackagingMode: 'release'
|
||||
|
|
@ -772,7 +772,7 @@ stages:
|
|||
|
||||
- template: ../nuget/templates/test_win.yml
|
||||
parameters:
|
||||
AgentPool : 'Win-CPU-2021'
|
||||
AgentPool : 'onnxruntime-Win-CPU-2022'
|
||||
Skipx86Tests : false
|
||||
NugetPackageName : 'Microsoft.ML.OnnxRuntime'
|
||||
ArtifactSuffix: 'CPU'
|
||||
|
|
@ -792,7 +792,7 @@ stages:
|
|||
|
||||
- template: ../nodejs/templates/test_win.yml
|
||||
parameters:
|
||||
AgentPool : 'Win-CPU-2021'
|
||||
AgentPool : 'onnxruntime-Win-CPU-2022'
|
||||
StageSuffix : 'Win_CPU_x64'
|
||||
|
||||
- template: ../nodejs/templates/test_linux.yml
|
||||
|
|
@ -810,7 +810,7 @@ stages:
|
|||
- job:
|
||||
workspace:
|
||||
clean: all
|
||||
pool: 'Win-CPU-2021'
|
||||
pool: 'onnxruntime-Win-CPU-2022'
|
||||
timeoutInMinutes: 60
|
||||
variables:
|
||||
- name: runCodesignValidationInjection
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ stages:
|
|||
|
||||
- template: ../nuget/templates/test_win.yml
|
||||
parameters:
|
||||
AgentPool : 'Win-CPU-2021'
|
||||
AgentPool : 'onnxruntime-Win-CPU-2022'
|
||||
Skipx86Tests : false
|
||||
NugetPackageName : 'Microsoft.ML.OnnxRuntime.Training'
|
||||
ArtifactSuffix: 'Training-CPU'
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stages:
|
|||
variables:
|
||||
- name: GDN_CODESIGN_TARGETDIRECTORY
|
||||
value: '$(Build.BinariesDirectory)/nuget-artifact/final-package'
|
||||
pool: 'Win-CPU-2021'
|
||||
pool: 'onnxruntime-Win-CPU-2022'
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ stages:
|
|||
jobs:
|
||||
- ${{ if eq(parameters.enable_windows_cpu, true) }}:
|
||||
- job: Windows_py_Wheels
|
||||
pool: 'Win-CPU-2021'
|
||||
pool: 'onnxruntime-Win-CPU-2022'
|
||||
strategy:
|
||||
matrix:
|
||||
Python38_x64:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ jobs:
|
|||
- job: Upload
|
||||
workspace:
|
||||
clean: all
|
||||
pool: 'Win-CPU-2021'
|
||||
pool: 'onnxruntime-Win-CPU-2022'
|
||||
variables:
|
||||
- name: runCodesignValidationInjection
|
||||
value: false
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ parameters:
|
|||
|
||||
- name: ort_build_pool_name
|
||||
type: string
|
||||
default: 'Win-CPU-2021'
|
||||
default: 'onnxruntime-Win-CPU-2022'
|
||||
|
||||
#'onnxruntime' or 'onnxruntime_gpu'
|
||||
- name: java_artifact_id
|
||||
|
|
|
|||
|
|
@ -28,4 +28,4 @@ stages:
|
|||
parameters:
|
||||
NpmPackagingMode: ${{ variables.NpmPackagingMode }}
|
||||
IsReleasePipeline: true
|
||||
PoolName: 'Win-CPU-2021'
|
||||
PoolName: 'onnxruntime-Win-CPU-2022'
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
jobs:
|
||||
- job: 'build'
|
||||
pool: 'Win-CPU-2021'
|
||||
pool: 'onnxruntime-Win-CPU-2022'
|
||||
strategy:
|
||||
maxParallel: 2
|
||||
matrix:
|
||||
|
|
|
|||
Loading…
Reference in a new issue