update onnxruntime-gpu-winbuild-T4 to onnxruntime-Win2022-GPU-T4 (#16838)

### Description


### Motivation and Context
It's also used to upgrade visual studio to VS2022.
onnxruntime-gpu-winbuild-T4 and onnxruntime-gpu-tensorrt8-winbuild-t4
are using the image based on one dev branch and VS2019

To avoid breaking the current CIs, we move jobs running on
onnxruntime-gpu-winbuild-T4/onnxruntime-gpu-tensorrt8-winbuild-t4 to
onnxruntime-Win2022-GPU-T4.
This commit is contained in:
Yi Zhang 2023-07-27 23:38:20 +08:00 committed by GitHub
parent 340f4ded73
commit bd95a8ea77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 26 deletions

View file

@ -190,7 +190,7 @@ stages:
#CUDA without tensorrt
- template: templates/win-ci.yml
parameters:
ort_build_pool_name: 'onnxruntime-gpu-winbuild-T4'
ort_build_pool_name: 'onnxruntime-Win2022-GPU-T4'
DoCompliance: ${{ parameters.DoCompliance }}
DoEsrp: ${{ parameters.DoEsrp }}
stage_name_suffix: gpu
@ -206,7 +206,7 @@ stages:
# CUDA with Tensorrt
- template: templates/win-ci.yml
parameters:
ort_build_pool_name: 'onnxruntime-gpu-tensorrt8-winbuild-t4'
ort_build_pool_name: 'onnxruntime-Win2022-GPU-T4'
DoCompliance: ${{ parameters.DoCompliance }}
DoEsrp: ${{ parameters.DoEsrp }}
stage_name_suffix: tensorrt
@ -299,7 +299,7 @@ stages:
- job:
workspace:
clean: all
pool: 'onnxruntime-gpu-winbuild-t4'
pool: 'onnxruntime-Win2022-GPU-T4'
timeoutInMinutes: 60
variables:
- name: runCodesignValidationInjection
@ -777,7 +777,7 @@ stages:
- template: nuget/templates/test_win.yml
parameters:
AgentPool : 'onnxruntime-gpu-tensorrt8-winbuild-t4'
AgentPool : 'onnxruntime-Win2022-GPU-T4'
NugetPackageName : 'Microsoft.ML.OnnxRuntime.Gpu'
ArtifactSuffix: 'GPU'
StageSuffix: 'GPU'
@ -895,7 +895,7 @@ stages:
- job:
workspace:
clean: all
pool: 'onnxruntime-gpu-winbuild-t4'
pool: 'onnxruntime-Win2022-GPU-T4'
steps:

View file

@ -50,10 +50,7 @@ stages:
- task: BatchScript@1
displayName: 'Setup Visual Studio env vars'
inputs:
${{ if eq(parameters.AgentPool, 'onnxruntime-gpu-tensorrt8-winbuild-t4') }}:
filename: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
${{ else }}:
filename: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
filename: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
arguments: 'amd64'
modifyEnvironment: true

View file

@ -3,8 +3,8 @@ jobs:
workspace:
clean: all
timeoutInMinutes: 15
pool: 'onnxruntime-gpu-winbuild-t4'
pool: 'onnxruntime-Win2022-GPU-T4'
steps:
- task: DownloadSecureFile@1
name: onnxruntimeDlls # The name with which to reference the secure file's path on the agent, like $(mySecureFile.secureFilePath)
@ -24,10 +24,10 @@ jobs:
FolderPath: '$(Build.SourcesDirectory)\Artifact'
DoEsrp: 'true'
Pattern: 'onnxruntime*.dll'
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: '$(Build.SourcesDirectory)\Artifact'
artifactName: 'Signed Dlls'
- template: templates/clean-agent-build-directory-step.yml

View file

@ -387,7 +387,7 @@ stages:
- job: Windows_py_GPU_Wheels
workspace:
clean: all
pool: 'onnxruntime-gpu-winbuild-t4'
pool: 'onnxruntime-Win2022-GPU-T4'
timeoutInMinutes: 300
variables:
CUDA_VERSION: '11.8'
@ -395,10 +395,7 @@ stages:
EpBuildFlags: --use_tensorrt --tensorrt_home="C:\local\TensorRT-8.6.1.6.Windows10.x86_64.cuda-11.8" --cuda_version=$(CUDA_VERSION) --cuda_home="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v$(CUDA_VERSION)" --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=37;50;52;60;61;70;75;80"
EnvSetupScript: setup_env_gpu.bat
EP_NAME: gpu
${{if contains(Agent.Name, 'onnxruntime-gpu-winbuild-t4')}}:
VSGenerator: 'Visual Studio 16 2019'
${{else}}:
VSGenerator: 'Visual Studio 17 2022'
VSGenerator: 'Visual Studio 17 2022'
strategy:
matrix:
${{ each PythonVersion in parameters.python_version }}:

View file

@ -28,10 +28,7 @@ jobs:
clean: all
pool: ${{ parameters.MACHINE_POOL }}
variables:
${{if or(eq(parameters.MACHINE_POOL, 'onnxruntime-gpu-winbuild-T4'), eq(parameters.MACHINE_POOL, 'onnxruntime-Win2019-GPU-dml-A10'))}}:
VSGenerator: 'Visual Studio 16 2019'
${{else}}:
VSGenerator: 'Visual Studio 17 2022'
VSGenerator: 'Visual Studio 17 2022'
steps:
- checkout: self
clean: true

View file

@ -67,10 +67,7 @@ stages:
- stage: Windows_Packaging_${{ parameters.stage_name_suffix }}
dependsOn: []
variables:
${{if or(eq(parameters.ort_build_pool_name, 'onnxruntime-gpu-winbuild-T4'), eq(parameters.ort_build_pool_name, 'onnxruntime-gpu-tensorrt8-winbuild-t4'))}}:
VSGenerator: 'Visual Studio 16 2019'
${{else}}:
VSGenerator: 'Visual Studio 17 2022'
VSGenerator: 'Visual Studio 17 2022'
jobs:
- job:
workspace: