mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-06 00:03:22 +00:00
Remove EnvSetupScript parameter from win-ci.yml (#18662)
### Description To make the code more consistent. Now some TRT pipelines download TRT binaries on-the-fly, while other TRT pipelines use a preinstalled version. This PR make them the same.
This commit is contained in:
parent
9c45fe4957
commit
eaaf27015e
6 changed files with 2 additions and 26 deletions
|
|
@ -235,7 +235,6 @@ stages:
|
|||
DoCompliance: ${{ parameters.DoCompliance }}
|
||||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: gpu
|
||||
EnvSetupScript: setup_env_cuda.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: x64
|
||||
packageName: x64-cuda
|
||||
|
|
@ -251,11 +250,10 @@ stages:
|
|||
DoCompliance: ${{ parameters.DoCompliance }}
|
||||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: tensorrt
|
||||
EnvSetupScript: setup_env_gpu.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: x64
|
||||
packageName: x64-tensorrt
|
||||
buildparameter: --use_tensorrt --tensorrt_home="C:\local\TensorRT-8.6.1.6.Windows10.x86_64.cuda-11.8" --cuda_home="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.8" --enable_onnx_tests --enable_wcos --build_java --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=60;61;70;75;80"
|
||||
buildparameter: --use_tensorrt --tensorrt_home="$(Agent.TempDirectory)\TensorRT-8.6.1.6.Windows10.x86_64.cuda-11.8" --cuda_home="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.8" --enable_onnx_tests --enable_wcos --build_java --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=60;61;70;75;80"
|
||||
runTests: ${{ parameters.RunOnnxRuntimeTests }}
|
||||
buildJava: true
|
||||
java_artifact_id: onnxruntime_gpu
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ stages:
|
|||
DoCompliance: false
|
||||
DoEsrp: false
|
||||
stage_name_suffix: CPU_x86_default
|
||||
EnvSetupScript: setup_env_x86.bat
|
||||
buildArch: x86
|
||||
msbuildPlatform: Win32
|
||||
packageName: x86
|
||||
|
|
@ -36,7 +35,6 @@ stages:
|
|||
DoCompliance: false
|
||||
DoEsrp: false
|
||||
stage_name_suffix: CPU_arm64_default
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: arm64
|
||||
packageName: arm64
|
||||
|
|
@ -51,7 +49,6 @@ stages:
|
|||
DoCompliance: false
|
||||
DoEsrp: false
|
||||
stage_name_suffix: CPU_x64_default
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: x64
|
||||
packageName: x64
|
||||
|
|
|
|||
|
|
@ -153,7 +153,6 @@ stages:
|
|||
DoCompliance: ${{ parameters.DoCompliance }}
|
||||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: CPU_x86_${{ parameters.BuildVariant }}
|
||||
EnvSetupScript: setup_env_x86.bat
|
||||
buildArch: x86
|
||||
msbuildPlatform: Win32
|
||||
packageName: x86
|
||||
|
|
@ -167,7 +166,6 @@ stages:
|
|||
DoCompliance: ${{ parameters.DoCompliance }}
|
||||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: CPU_arm_${{ parameters.BuildVariant }}
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: arm
|
||||
packageName: arm
|
||||
|
|
@ -182,7 +180,6 @@ stages:
|
|||
DoCompliance: ${{ parameters.DoCompliance }}
|
||||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: CPU_arm64_${{ parameters.BuildVariant }}
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: arm64
|
||||
packageName: arm64
|
||||
|
|
@ -196,7 +193,6 @@ stages:
|
|||
DoCompliance: ${{ parameters.DoCompliance }}
|
||||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: CPU_x64_${{ parameters.BuildVariant }}
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: x64
|
||||
packageName: x64
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ jobs:
|
|||
pool:
|
||||
name: ${{ parameters.PoolName }}
|
||||
variables:
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
CommonBuildArgs: '--parallel --config ${{ parameters.BuildConfig }} --skip_submodule_sync --build_wasm ${{ parameters.ExtraBuildArgs }}'
|
||||
runCodesignValidationInjection: false
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@ stages:
|
|||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: Training_CPU_x86_${{ parameters.BuildVariant }}
|
||||
artifact_name_suffix: -training
|
||||
EnvSetupScript: setup_env_x86.bat
|
||||
buildArch: x86
|
||||
msbuildPlatform: Win32
|
||||
packageName: x86
|
||||
|
|
@ -68,7 +67,6 @@ stages:
|
|||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: Training_CPU_arm_${{ parameters.BuildVariant }}
|
||||
artifact_name_suffix: -training
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: arm
|
||||
packageName: arm
|
||||
|
|
@ -84,7 +82,6 @@ stages:
|
|||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: Training_CPU_arm64_${{ parameters.BuildVariant }}
|
||||
artifact_name_suffix: -training
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: arm64
|
||||
packageName: arm64
|
||||
|
|
@ -99,7 +96,6 @@ stages:
|
|||
DoEsrp: ${{ parameters.DoEsrp }}
|
||||
stage_name_suffix: Training_CPU_x64_${{ parameters.BuildVariant }}
|
||||
artifact_name_suffix: -training
|
||||
EnvSetupScript: setup_env.bat
|
||||
buildArch: x64
|
||||
msbuildPlatform: x64
|
||||
packageName: x64
|
||||
|
|
|
|||
|
|
@ -9,10 +9,6 @@ parameters:
|
|||
type: boolean
|
||||
default: false
|
||||
|
||||
- name: EnvSetupScript
|
||||
type: string
|
||||
default: ''
|
||||
|
||||
- name: buildArch
|
||||
type: string
|
||||
|
||||
|
|
@ -116,14 +112,8 @@ stages:
|
|||
condition: and(succeeded(), eq('${{ parameters.buildNodejs}}', true))
|
||||
inputs:
|
||||
versionSpec: '18.x'
|
||||
- ${{ if ne(parameters.EnvSetupScript, '') }}:
|
||||
- template: jobs/set-winenv.yml
|
||||
parameters:
|
||||
EnvSetupScript: ${{ parameters.EnvSetupScript }}
|
||||
${{ if contains(parameters.buildparameter, 'use_cuda') }}:
|
||||
DownloadCUDA: true
|
||||
|
||||
- ${{ if eq(parameters.EnvSetupScript, '') }}:
|
||||
- ${{ if ne(parameters.CudaVersion, '') }}:
|
||||
- template: jobs/download_win_gpu_library.yml
|
||||
parameters:
|
||||
CudaVersion: ${{ parameters.CudaVersion }}
|
||||
|
|
|
|||
Loading…
Reference in a new issue