From a7b1a8969c08d5f812945aec08eaee1fe81857e1 Mon Sep 17 00:00:00 2001 From: Yufeng Li Date: Wed, 17 Jul 2019 13:43:40 -0700 Subject: [PATCH] simply nocontribops-ci and fix build break (#1422) simply nocontribops-ci and fix build break --- .../win-nocontribops-ci-pipeline.yml | 115 ++---------------- .../win-x86-nocontribops-ci-pipeline.yml | 114 ++--------------- 2 files changed, 19 insertions(+), 210 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/win-nocontribops-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-nocontribops-ci-pipeline.yml index c893bcc02f..7339ecab00 100644 --- a/tools/ci_build/github/azure-pipelines/win-nocontribops-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/win-nocontribops-ci-pipeline.yml @@ -3,108 +3,13 @@ variables: TestDataUrlNoContribOps : https://onnxruntimetestdata.blob.core.windows.net/models/20181210.zip jobs: -- job: Windows_CI_Dev - timeoutInMinutes: 120 - variables: - buildDirectory: '$(Build.BinariesDirectory)' - steps: - - template: templates/set-test-data-variables-step.yml - - template: templates/windows-build-tools-setup-steps.yml - parameters: - EnvSetupScript: 'setup_env.bat' - buildArch: 'x64' - setVcvars: false - - task: CmdLine@1 - displayName: 'Download test data and generate cmake config' - inputs: - filename: '$(Build.BinariesDirectory)\packages\python\python.exe' - arguments: '$(Build.SourcesDirectory)\tools\ci_build\build.py --config Debug Release --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --disable_contrib_ops --enable_msvc_static_runtime --build_shared_lib --build_csharp --enable_onnx_tests --test_data_url $(TestDataUrlNoContribOps) --test_data_checksum $(TestDataChecksum) --update' - workingDirectory: "$(Build.BinariesDirectory)" - - - task: VSBuild@1 - displayName: 'Build Debug' - inputs: - solution: '$(Build.BinariesDirectory)\Debug\onnxruntime.sln' - platform: 'x64' - configuration: 'Debug' - msbuildArgs: '/m' - msbuildArchitecture: 'x64' - logProjectEvents: true - workingFolder: '$(Build.BinariesDirectory)\Debug' - - - task: BatchScript@1 - displayName: 'Test Debug' - inputs: - filename: '$(Build.BinariesDirectory)\packages\python\python.exe' - arguments: '$(Build.SourcesDirectory)\tools\ci_build\build.py --config Debug --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --disable_contrib_ops --enable_msvc_static_runtime --build_shared_lib --build_csharp --enable_onnx_tests --test_data_url $(TestDataUrlNoContribOps) --test_data_checksum $(TestDataChecksum) --test' - workingFolder: '$(Build.BinariesDirectory)' - - - task: VSBuild@1 - displayName: 'Build C# Debug' - inputs: - solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.sln' - platform: 'any cpu' - configuration: 'Debug' - restoreNugetPackages: false - msbuildArchitecture: 'x64' - workingFolder: '$(Build.SourcesDirectory)\csharp' - msbuildArgs: '/m /p:OnnxRuntimeBuildDirectory=$(Build.BinariesDirectory)' - - - task: VSTest@2 - displayName: 'VsTest - C# Debug' - inputs: - testAssemblyVer2: '**\bin\Debug\**\*Tests.dll' - searchFolder: '$(Build.SourcesDirectory)\csharp\test' - runInParallel: true - configuration: Debug - - - task: VSBuild@1 - displayName: 'Build Release' - inputs: - solution: '$(Build.BinariesDirectory)\Release\onnxruntime.sln' - platform: 'x64' - configuration: 'Release' - msbuildArgs: '/m' - msbuildArchitecture: 'x64' - logProjectEvents: true - workingFolder: '$(Build.BinariesDirectory)\Release' - - - task: BatchScript@1 - displayName: 'Test Release' - inputs: - filename: '$(Build.BinariesDirectory)\packages\python\python.exe' - arguments: '$(Build.SourcesDirectory)\tools\ci_build\build.py --config Release --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --disable_contrib_ops --enable_msvc_static_runtime --build_shared_lib --build_csharp --enable_onnx_tests --test_data_url $(TestDataUrlNoContribOps) --test_data_checksum $(TestDataChecksum) --test' - workingFolder: "$(Build.BinariesDirectory)" - - - task: VSBuild@1 - displayName: 'Build c# Release' - inputs: - solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.sln' - platform: 'any cpu' - configuration: 'Release' - msbuildArchitecture: 'x64' - restoreNugetPackages: false - workingFolder: '$(Build.SourcesDirectory)\csharp' - msbuildArgs: '/m /p:OnnxRuntimeBuildDirectory=$(Build.BinariesDirectory)' - - - task: VSTest@2 - displayName: 'VsTest - C# Release' - inputs: - testAssemblyVer2: '**\bin\Release\**\*Tests.dll' - searchFolder: '$(Build.SourcesDirectory)\csharp\test' - runInParallel: true - configuration: Release - - - task: PublishTestResults@2 - displayName: 'Publish unit test results' - inputs: - testResultsFiles: '**\*.results.xml' - searchFolder: '$(Build.BinariesDirectory)' - testRunTitle: 'Unit Test Run' - condition: succeededOrFailed() - - - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) - - - template: templates/clean-agent-build-directory-step.yml +- template: templates/win-ci.yml + parameters: + AgentPool : 'Win-CPU' + DoDebugBuild: 'true' + DoCompliance: 'false' + BuildCommand: '$(Build.SourcesDirectory)\tools\ci_build\build.py --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --disable_contrib_ops --enable_msvc_static_runtime --build_shared_lib --build_csharp --enable_onnx_tests --test_data_url $(TestDataUrlNoContribOps) --test_data_checksum $(TestDataChecksum)' + JobName: 'Windows_CI_Dev' + DoNugetPack: 'false' + NuPackScript : '' + DoTestCoverage: 'false' \ No newline at end of file diff --git a/tools/ci_build/github/azure-pipelines/win-x86-nocontribops-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-x86-nocontribops-ci-pipeline.yml index e8f8229c38..b309f33a50 100644 --- a/tools/ci_build/github/azure-pipelines/win-x86-nocontribops-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/win-x86-nocontribops-ci-pipeline.yml @@ -4,108 +4,12 @@ variables: TestDataUrlNoContribOps : https://onnxruntimetestdata.blob.core.windows.net/models/20181210.zip jobs: -- job: Windows_CI_Dev - variables: - buildDirectory: '$(Build.BinariesDirectory)' - steps: - - template: templates/set-test-data-variables-step.yml - - template: templates/windows-build-tools-setup-steps.yml - parameters: - EnvSetupScript: 'setup_env.bat' - buildArch: 'x86' - setVcvars: false - - - task: CmdLine@1 - displayName: 'Download test data and generate cmake config' - inputs: - filename: '$(Build.BinariesDirectory)\packages\python\python.exe' - arguments: '$(Build.SourcesDirectory)\tools\ci_build\build.py --config Debug Release --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --use_openmp --build_shared_lib --enable_onnx_tests --test_data_url $(TestDataUrlNoContribOps) --test_data_checksum $(TestDataChecksum) --update --x86' - workingDirectory: "$(Build.BinariesDirectory)" - - - task: VSBuild@1 - displayName: 'Build Debug' - inputs: - solution: '$(Build.BinariesDirectory)\Debug\onnxruntime.sln' - platform: Win32 - msbuildArguments: '/m /p:PlatformTarget=x86' - configuration: 'Debug' - msbuildArchitecture: 'x86' - logProjectEvents: true - workingFolder: '$(Build.BinariesDirectory)\Debug' - - - task: BatchScript@1 - displayName: 'Test Debug' - inputs: - filename: '$(Build.BinariesDirectory)\packages\python\python.exe' - arguments: '$(Build.SourcesDirectory)\tools\ci_build\build.py --config Debug --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --use_openmp --build_shared_lib --enable_onnx_tests --test_data_url $(TestDataUrlNoContribOps) --test_data_checksum $(TestDataChecksum) --test --x86 --disable_contrib_ops --enable_msvc_static_runtime' - workingFolder: '$(Build.BinariesDirectory)' - - - task: VSBuild@1 - displayName: 'Build C# Debug' - inputs: - solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.sln' - platform: 'any cpu' - configuration: 'Debug' - restoreNugetPackages: false - msbuildArchitecture: 'x86' - workingFolder: '$(Build.SourcesDirectory)\csharp' - msbuildArgs: '/m /p:OnnxRuntimeBuildDirectory=$(Build.BinariesDirectory)' - - - task: VSTest@2 - displayName: 'VsTest - C# Debug' - inputs: - testAssemblyVer2: '**\bin\Debug\**\*Tests.dll' - searchFolder: '$(Build.SourcesDirectory)\csharp\test' - runInParallel: true - configuration: Debug - - - task: VSBuild@1 - displayName: 'Build Release' - inputs: - solution: '$(Build.BinariesDirectory)\Release\onnxruntime.sln' - platform: Win32 - msbuildArguments: '/m /p:PlatformTarget=x86' - configuration: 'Release' - msbuildArchitecture: 'x86' - logProjectEvents: true - workingFolder: '$(Build.BinariesDirectory)\Release' - - - task: BatchScript@1 - displayName: 'Test Release' - inputs: - filename: '$(Build.BinariesDirectory)\packages\python\python.exe' - arguments: '$(Build.SourcesDirectory)\tools\ci_build\build.py --config Release --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --use_openmp --build_shared_lib --enable_onnx_tests --test_data_url $(TestDataUrlNoContribOps) --test_data_checksum $(TestDataChecksum) --test --x86 --disable_contrib_ops --enable_msvc_static_runtime' - workingFolder: "$(Build.BinariesDirectory)" - - - task: VSBuild@1 - displayName: 'Build C# Release' - inputs: - solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.sln' - platform: 'any cpu' - configuration: 'Release' - msbuildArchitecture: 'x86' - restoreNugetPackages: false - workingFolder: '$(Build.SourcesDirectory)\csharp' - msbuildArgs: '/m /p:OnnxRuntimeBuildDirectory=$(Build.BinariesDirectory)' - - - task: VSTest@2 - displayName: 'VsTest - C# Release' - inputs: - testAssemblyVer2: '**\bin\Release\**\*Tests.dll' - searchFolder: '$(Build.SourcesDirectory)\csharp\test' - runInParallel: true - configuration: Release - - - task: PublishTestResults@2 - displayName: 'Publish unit test results' - inputs: - testResultsFiles: '**\*.results.xml' - searchFolder: '$(Build.BinariesDirectory)' - testRunTitle: 'Unit Test Run' - condition: succeededOrFailed() - - - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) - - - template: templates/clean-agent-build-directory-step.yml +- template: templates/win-x86-ci.yml + parameters: + AgentPool : 'Win-CPU' + DoDebugBuild: 'true' + DoCompliance: 'false' + BuildCommand: '$(Build.SourcesDirectory)\tools\ci_build\build.py --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --use_openmp --build_shared_lib --build_csharp --enable_onnx_tests --test_data_url $(TestDataUrlNoContribOps) --test_data_checksum $(TestDataChecksum) --disable_contrib_ops --enable_msvc_static_runtime --x86' + JobName: 'Windows_CI_Dev_x86' + DoNugetPack: 'false' + NuPackScript : '' \ No newline at end of file