From 26db396b4bd8691f4bc2377fb5a379f6e4ea13be Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 18 Nov 2020 20:41:30 -0800 Subject: [PATCH] Reduce the number of CI build variants (#5856) --- .../azure-pipelines/linux-gpu-ci-pipeline.yml | 2 +- .../azure-pipelines/win-ci-pipeline.yml | 24 +++---------------- .../azure-pipelines/win-gpu-ci-pipeline.yml | 8 +------ .../win-gpu-tensorrt-ci-pipeline.yml | 8 +------ tools/ci_build/github/linux/run_build.sh | 4 ++-- 5 files changed, 8 insertions(+), 38 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml index a45aeddbd7..6bd46764ae 100644 --- a/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml @@ -31,7 +31,7 @@ jobs: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntimecentosgpubuild:ch4 \ python3 /onnxruntime_src/tools/ci_build/build.py \ --build_dir /build --cmake_generator Ninja \ - --config Debug Release \ + --config Release \ --skip_submodule_sync \ --build_shared_lib \ --parallel \ diff --git a/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml index 39d4e5a684..26b1864f80 100644 --- a/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml @@ -153,13 +153,6 @@ jobs: - job: 'x86_build' pool: 'Win-CPU-2019' - strategy: - maxParallel: 2 - matrix: - debug: - BuildConfig: 'Debug' - release: - BuildConfig: 'RelWithDebInfo' variables: OrtPackageId: 'Microsoft.ML.OnnxRuntime' MsbuildArguments: '-detailedsummary -maxcpucount -consoleloggerparameters:PerformanceSummary' @@ -168,6 +161,7 @@ jobs: EnvSetupScript: setup_env_x86.bat buildArch: x86 setVcvars: true + BuildConfig: 'RelWithDebInfo' ALLOW_RELEASED_ONNX_OPSET_ONLY: '0' timeoutInMinutes: 120 workspace: @@ -292,13 +286,6 @@ jobs: - job: 'x86_no_contrib_ops' pool: 'Win-CPU-2019' - strategy: - maxParallel: 2 - matrix: - debug: - BuildConfig: 'Debug' - release: - BuildConfig: 'RelWithDebInfo' variables: OrtPackageId: 'Microsoft.ML.OnnxRuntime' MsbuildArguments: '-detailedsummary -maxcpucount -consoleloggerparameters:PerformanceSummary' @@ -307,6 +294,7 @@ jobs: EnvSetupScript: setup_env_x86.bat buildArch: x86 setVcvars: true + BuildConfig: 'RelWithDebInfo' ALLOW_RELEASED_ONNX_OPSET_ONLY: '0' timeoutInMinutes: 120 workspace: @@ -420,13 +408,6 @@ jobs: - job: 'build_x64_no_contrib_ops' pool: 'Win-CPU-2019' - strategy: - maxParallel: 2 - matrix: - debug: - BuildConfig: 'Debug' - release: - BuildConfig: 'RelWithDebInfo' variables: OrtPackageId: 'Microsoft.ML.OnnxRuntime' MsbuildArguments: '-detailedsummary -maxcpucount -consoleloggerparameters:PerformanceSummary' @@ -435,6 +416,7 @@ jobs: EnvSetupScript: setup_env.bat buildArch: x64 setVcvars: true + BuildConfig: 'RelWithDebInfo' ALLOW_RELEASED_ONNX_OPSET_ONLY: '0' timeoutInMinutes: 120 workspace: diff --git a/tools/ci_build/github/azure-pipelines/win-gpu-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-gpu-ci-pipeline.yml index d410a08ef4..6276435654 100644 --- a/tools/ci_build/github/azure-pipelines/win-gpu-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/win-gpu-ci-pipeline.yml @@ -1,13 +1,6 @@ jobs: - job: 'build' pool: 'Win-GPU-2019' - strategy: - maxParallel: 2 - matrix: - debug: - BuildConfig: 'Debug' - release: - BuildConfig: 'RelWithDebInfo' variables: OrtPackageId: 'Microsoft.ML.OnnxRuntime' MsbuildArguments: '-detailedsummary -maxcpucount -consoleloggerparameters:PerformanceSummary' @@ -16,6 +9,7 @@ jobs: EnvSetupScript: setup_env_cuda.bat buildArch: x64 setVcvars: true + BuildConfig: 'RelWithDebInfo' ALLOW_RELEASED_ONNX_OPSET_ONLY: '0' timeoutInMinutes: 120 workspace: diff --git a/tools/ci_build/github/azure-pipelines/win-gpu-tensorrt-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-gpu-tensorrt-ci-pipeline.yml index 7da06f6c1e..23a897d012 100644 --- a/tools/ci_build/github/azure-pipelines/win-gpu-tensorrt-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/win-gpu-tensorrt-ci-pipeline.yml @@ -1,13 +1,6 @@ jobs: - job: 'build' pool: 'Win-GPU-2019' - strategy: - maxParallel: 2 - matrix: - debug: - BuildConfig: 'Debug' - release: - BuildConfig: 'RelWithDebInfo' variables: OrtPackageId: 'Microsoft.ML.OnnxRuntime' MsbuildArguments: '-detailedsummary -maxcpucount -consoleloggerparameters:PerformanceSummary' @@ -16,6 +9,7 @@ jobs: EnvSetupScript: setup_env_trt.bat buildArch: x64 setVcvars: true + BuildConfig: 'RelWithDebInfo' ALLOW_RELEASED_ONNX_OPSET_ONLY: '1' timeoutInMinutes: 120 workspace: diff --git a/tools/ci_build/github/linux/run_build.sh b/tools/ci_build/github/linux/run_build.sh index 2c0ba57c10..15a43ea222 100755 --- a/tools/ci_build/github/linux/run_build.sh +++ b/tools/ci_build/github/linux/run_build.sh @@ -62,14 +62,14 @@ else if [ $BUILD_DEVICE = "gpu" ]; then if [ $BUILD_OS = "manylinux2010" ]; then python3 $SCRIPT_DIR/../../build.py --build_dir /build \ - --config Debug Release $COMMON_BUILD_ARGS \ + --config Release $COMMON_BUILD_ARGS \ --use_cuda \ --cuda_home /usr/local/cuda \ --cudnn_home /usr/local/cuda $BUILD_EXTR_PAR else _CUDNN_VERSION=$(echo $CUDNN_VERSION | cut -d. -f1-2) python3 $SCRIPT_DIR/../../build.py --build_dir /build \ - --config Debug Release $COMMON_BUILD_ARGS \ + --config Release $COMMON_BUILD_ARGS \ --use_cuda \ --cuda_home /usr/local/cuda \ --cudnn_home /usr/local/cudnn-$_CUDNN_VERSION/cuda $BUILD_EXTR_PAR