From 38db5eca65393acf4be464b9b1c3b96c78faa576 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Tue, 25 Jul 2023 23:05:34 +0800 Subject: [PATCH] replace onnxruntime-Win-CPU-2019 with onnxruntime-Win-CPU-2022 (#16844) ### Description ### Motivation and Context upgrade to VS2022 --- .../nuget/templates/dml-vs-2022.yml | 14 ++------------ .../github/azure-pipelines/templates/c-api-cpu.yml | 2 +- .../azure-pipelines/templates/compliance.yml | 5 ----- .../ondevice-training-cpu-packaging-pipeline.yml | 2 +- .../github/azure-pipelines/templates/win-ci.yml | 2 +- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml index 0b8a7f642b..8335b5e8c6 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml @@ -48,8 +48,6 @@ stages: ALLOW_RELEASED_ONNX_OPSET_ONLY: ${{ parameters.AllowReleasedOpsetOnly }} ${{ if eq(parameters.EnableLto, true) }}: build_py_lto_flag: --enable_lto - ${{ if or(eq(parameters.AgentPool, 'onnxruntime-Win2019-GPU-dml-A10'), eq(parameters.AgentPool, 'onnxruntime-Win-CPU-2019')) }}: - vsVersion: '2019' steps: # Windows_CI_GPU_DML_Dev_arm64 build job still needs protobuf submodule @@ -195,10 +193,7 @@ stages: - task: BatchScript@1 displayName: 'Setup VS2022 env vars' inputs: - ${{ if eq(variables.vsVersion, '2019') }}: - 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: ${{ parameters.BuildArch }} modifyEnvironment: true # Esrp signing @@ -240,10 +235,7 @@ stages: - task: BatchScript@1 displayName: 'Setup VS env vars' inputs: - ${{ if eq(variables.vsVersion, '2019') }}: - 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: ${{ parameters.BuildArch }} modifyEnvironment: true - template: ../../templates/win-esrp-dll.yml @@ -278,8 +270,6 @@ stages: - template: ../../templates/compliance.yml parameters : msbuildPlatform: ${{ parameters.sln_platform }} - ${{ if eq(variables.vsVersion, '2019') }}: - vs2022: false - template: ../../templates/component-governance-component-detection-steps.yml parameters : diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml index 88e98b2ead..06c3e4627b 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -173,7 +173,7 @@ stages: runTests: false buildJava: false buildNodejs: false - ort_build_pool_name: onnxruntime-Win-CPU-2019 + ort_build_pool_name: onnxruntime-Win-CPU-2022 - template: win-ci.yml parameters: diff --git a/tools/ci_build/github/azure-pipelines/templates/compliance.yml b/tools/ci_build/github/azure-pipelines/templates/compliance.yml index 6f312db634..4c2c9cf8dd 100644 --- a/tools/ci_build/github/azure-pipelines/templates/compliance.yml +++ b/tools/ci_build/github/azure-pipelines/templates/compliance.yml @@ -4,11 +4,6 @@ parameters: type: string default: x64 -- name: vs2022 - displayName: If the Visual Studio version is 2022 - type: boolean - default: true - steps: - task: CredScan@2 displayName: 'Run CredScan' diff --git a/tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml index caa80787dd..792e828c9a 100644 --- a/tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml @@ -76,7 +76,7 @@ stages: runTests: false buildJava: false buildNodejs: false - ort_build_pool_name: onnxruntime-Win-CPU-2019 + ort_build_pool_name: onnxruntime-Win-CPU-2022 - template: win-ci.yml parameters: diff --git a/tools/ci_build/github/azure-pipelines/templates/win-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-ci.yml index e30a8761e6..746b3b6e09 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-ci.yml @@ -67,7 +67,7 @@ stages: - stage: Windows_Packaging_${{ parameters.stage_name_suffix }} dependsOn: [] variables: - ${{if or(eq(parameters.ort_build_pool_name, 'onnxruntime-Win-CPU-2019'), eq(parameters.ort_build_pool_name, 'onnxruntime-gpu-winbuild-T4'), eq(parameters.ort_build_pool_name, 'onnxruntime-gpu-tensorrt8-winbuild-t4'))}}: + ${{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'