saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-29 20:14:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace onnxruntime-Win-CPU-2019 with onnxruntime-Win-CPU-2022 (#16844)

Browse source 
### Description
<!-- Describe your changes. -->



### Motivation and Context
upgrade to VS2022
This commit is contained in:
Yi Zhang 2023-07-25 23:05:34 +08:00 committed by GitHub
parent feeb0b50f9
commit 38db5eca65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml
View file

@ -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 :

2
tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
View file

@ -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:

5
tools/ci_build/github/azure-pipelines/templates/compliance.yml
View file

@ -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'

2
tools/ci_build/github/azure-pipelines/templates/ondevice-training-cpu-packaging-pipeline.yml
View file

@ -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:

2
tools/ci_build/github/azure-pipelines/templates/win-ci.yml
View file

@ -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'