From 1f4190de3c4a5f4f85df76bf6df097e72dbaf1e2 Mon Sep 17 00:00:00 2001 From: Pranav Sharma Date: Mon, 23 Sep 2019 00:26:23 -0700 Subject: [PATCH] Disable Linux x86 builds as they're not required any more. (#1887) * Mention OrtCreateSessionFromArray in C API doc * Disable Linux x86 builds as they're not required any more. * more ... --- .../c-api-packaging-pipelines.yml | 16 ----------- .../nuget/templates/bundle_dlls.yml | 4 --- .../templates/cpu-nocontribops-arm64.yml | 28 ------------------- .../nuget/templates/cpu-nocontribops.yml | 24 ---------------- .../azure-pipelines/nuget/templates/cpu.yml | 24 ---------------- ...upload-binary-sizes-from-nuget-package.yml | 1 - 6 files changed, 97 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml index dff813e0de..07d12b08b5 100644 --- a/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml +++ b/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml @@ -16,22 +16,6 @@ jobs: commitId: $(OnnxRuntimeGitCommitHash) - template: templates/clean-agent-build-directory-step.yml -- job: Linux_C_API_Packaging_CPU_x86 - pool: Linux-CPU - steps: - - template: templates/linux-set-variables-and-download.yml - - template: templates/set-version-number-variables-step.yml - - - script: 'tools/ci_build/github/linux/run_dockerbuild.sh -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -a x86 -x "--x86"' - displayName: 'Build and Test Linux on Docker' - - template: templates/c-api-artifacts-package-and-publish-steps-posix.yml - parameters: - buildConfig: 'Release' - artifactName: 'onnxruntime-linux-x86-$(OnnxRuntimeVersion)' - libraryName: 'libonnxruntime.so.$(OnnxRuntimeVersion)' - commitId: $(OnnxRuntimeGitCommitHash) - - template: templates/clean-agent-build-directory-step.yml - - job: Linux_C_API_Packaging_GPU_x64 pool: Linux-GPU steps: diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/bundle_dlls.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/bundle_dlls.yml index cc8e0fc1c8..329bf91f06 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/bundle_dlls.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/bundle_dlls.yml @@ -12,18 +12,14 @@ steps: del /Q %%~ni.zip unzip win-x86.zip -d win-x86 unzip linux-x64.zip -d linux-x64 - unzip linux-x86.zip -d linux-x86 mkdir %%~ni\runtimes\win-x86 mkdir %%~ni\runtimes\linux-x64 - mkdir %%~ni\runtimes\linux-x86 mkdir %%~ni\runtimes\win-x86\native mkdir %%~ni\runtimes\linux-x64\native - mkdir %%~ni\runtimes\linux-x86\native move win-x86\runtimes\win-x86\native\onnxruntime.dll %%~ni\runtimes\win-x86\native\onnxruntime.dll move win-x86\runtimes\win-x86\native\onnxruntime.lib %%~ni\runtimes\win-x86\native\onnxruntime.lib move win-x86\runtimes\win-x86\native\onnxruntime.pdb %%~ni\runtimes\win-x86\native\onnxruntime.pdb move linux-x64\linux-x64\libonnxruntime.so %%~ni\runtimes\linux-x64\native\libonnxruntime.so - move linux-x86\linux-x86\libonnxruntime.so %%~ni\runtimes\linux-x86\native\libonnxruntime.so unzip osx-x64.zip -d osx-x64 dir osx-x64 /s mkdir %%~ni\runtimes\osx-x64 diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops-arm64.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops-arm64.yml index 8cdcbadece..088ebe42ce 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops-arm64.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops-arm64.yml @@ -74,22 +74,6 @@ jobs: cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) -- template: ../../templates/linux-ci.yml - parameters: - AgentPool : $(AgentPoolLinux) - JobName: 'Linux_CI_Dev_x86' - BuildCommand : 'tools/ci_build/github/linux/run_dockerbuild.sh -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -a x86 -x "--x86 --disable_contrib_ops"' - DoNugetPack : 'true' - ArtifactName: 'drop-linux-x86' - NuPackScript: | - set -e -x - mkdir $(Build.BinariesDirectory)/linux-x86 - cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x86 - cd $(Build.BinariesDirectory) - zip -r linux-x86.zip linux-x86 - cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) - ls -al $(Build.ArtifactStagingDirectory) - - template: ../../templates/mac-ci.yml parameters: AgentPool : $(AgentPoolMacOS) @@ -117,7 +101,6 @@ jobs: - Windows_CI_Dev_x86 - Windows_Arm64_Dev - Linux_CI_Dev - - Linux_CI_Dev_x86 - MacOS_CI_Dev condition: succeeded() steps: @@ -149,13 +132,6 @@ jobs: targetPath: '$(Build.BinariesDirectory)/nuget-artifact' continueOnError: true - - task: DownloadPipelineArtifact@0 - displayName: 'Download Pipeline Artifact - Linux-x86' - inputs: - artifactName: 'drop-linux-x86' - targetPath: '$(Build.BinariesDirectory)/nuget-artifact' - continueOnError: true - - task: DownloadPipelineArtifact@0 displayName: 'Download Pipeline Artifact - MacOS' inputs: @@ -176,15 +152,12 @@ jobs: unzip win-x86.zip -d win-x86 unzip win10-arm.zip -d win10-arm unzip linux-x64.zip -d linux-x64 - unzip linux-x86.zip -d linux-x86 mkdir %%~ni\runtimes\win-x86 mkdir %%~ni\runtimes\win10-arm mkdir %%~ni\runtimes\linux-x64 - mkdir %%~ni\runtimes\linux-x86 mkdir %%~ni\runtimes\win-x86\native mkdir %%~ni\runtimes\win10-arm\native mkdir %%~ni\runtimes\linux-x64\native - mkdir %%~ni\runtimes\linux-x86\native move win-x86\runtimes\win-x86\native\onnxruntime.dll %%~ni\runtimes\win-x86\native\onnxruntime.dll move win-x86\runtimes\win-x86\native\onnxruntime.lib %%~ni\runtimes\win-x86\native\onnxruntime.lib move win-x86\runtimes\win-x86\native\onnxruntime.pdb %%~ni\runtimes\win-x86\native\onnxruntime.pdb @@ -192,7 +165,6 @@ jobs: move win10-arm\runtimes\win10-arm\native\onnxruntime.dll %%~ni\runtimes\win10-arm\native\onnxruntime.dll move win10-arm\runtimes\win10-arm\native\onnxruntime.pdb %%~ni\runtimes\win10-arm\native\onnxruntime.pdb move linux-x64\linux-x64\libonnxruntime.so %%~ni\runtimes\linux-x64\native\libonnxruntime.so - move linux-x86\linux-x86\libonnxruntime.so %%~ni\runtimes\linux-x86\native\libonnxruntime.so unzip osx-x64.zip -d osx-x64 dir osx-x64 /s mkdir %%~ni\runtimes\osx-x64 diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops.yml index 659b5dad12..a2e825f361 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops.yml @@ -53,22 +53,6 @@ jobs: cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) -- template: ../../templates/linux-ci.yml - parameters: - AgentPool : $(AgentPoolLinux) - JobName: 'Linux_CI_Dev_x86' - BuildCommand : 'tools/ci_build/github/linux/run_dockerbuild.sh -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -a x86 -x "--x86 --disable_contrib_ops"' - DoNugetPack : 'true' - ArtifactName: 'drop-linux-x86' - NuPackScript: | - set -e -x - mkdir $(Build.BinariesDirectory)/linux-x86 - cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x86 - cd $(Build.BinariesDirectory) - zip -r linux-x86.zip linux-x86 - cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) - ls -al $(Build.ArtifactStagingDirectory) - - template: ../../templates/mac-ci.yml parameters: AgentPool : $(AgentPoolMacOS) @@ -95,7 +79,6 @@ jobs: - Windows_CI_Dev - Windows_CI_Dev_x86 - Linux_CI_Dev - - Linux_CI_Dev_x86 - MacOS_CI_Dev condition: succeeded() steps: @@ -120,13 +103,6 @@ jobs: targetPath: '$(Build.BinariesDirectory)/nuget-artifact' continueOnError: true - - task: DownloadPipelineArtifact@0 - displayName: 'Download Pipeline Artifact - Linux-x86' - inputs: - artifactName: 'drop-linux-x86' - targetPath: '$(Build.BinariesDirectory)/nuget-artifact' - continueOnError: true - - task: DownloadPipelineArtifact@0 displayName: 'Download Pipeline Artifact - MacOS' inputs: diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml index b711ac02fd..df3d55f37d 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml @@ -54,22 +54,6 @@ jobs: cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) -- template: ../../templates/linux-ci.yml - parameters: - AgentPool : $(AgentPoolLinux) - JobName: 'Linux_CI_Dev_x86' - BuildCommand : 'tools/ci_build/github/linux/run_dockerbuild.sh -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -a x86 -x "--x86"' - DoNugetPack : 'true' - ArtifactName: 'drop-linux-x86' - NuPackScript: | - set -e -x - mkdir $(Build.BinariesDirectory)/linux-x86 - cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x86 - cd $(Build.BinariesDirectory) - zip -r linux-x86.zip linux-x86 - cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) - ls -al $(Build.ArtifactStagingDirectory) - - template: ../../templates/mac-ci.yml parameters: AgentPool : $(AgentPoolMacOS) @@ -96,7 +80,6 @@ jobs: - Windows_CI_Dev - Windows_CI_Dev_x86 - Linux_CI_Dev - - Linux_CI_Dev_x86 - MacOS_CI_Dev condition: succeeded() steps: @@ -123,13 +106,6 @@ jobs: targetPath: '$(Build.BinariesDirectory)/nuget-artifact' continueOnError: true - - task: DownloadPipelineArtifact@0 - displayName: 'Download Pipeline Artifact - Linux-x86' - inputs: - artifactName: 'drop-linux-x86' - targetPath: '$(Build.BinariesDirectory)/nuget-artifact' - continueOnError: true - - task: DownloadPipelineArtifact@0 displayName: 'Download Pipeline Artifact - MacOS' inputs: diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/upload-binary-sizes-from-nuget-package.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/upload-binary-sizes-from-nuget-package.yml index 2b1e0aca9a..6f89951fa1 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/upload-binary-sizes-from-nuget-package.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/upload-binary-sizes-from-nuget-package.yml @@ -37,7 +37,6 @@ steps: REM use a single .csv file to put the data echo os,arch,build_config,size > binary_size_data.txt 7z.exe l -slt %%~ni.zip runtimes\linux-x64\native\libonnxruntime.so | findstr /R /C:"^Size = [0-9]*" | for /F "tokens=3" %%a in ('more') do if not "%%a" == "" echo linux,x64,openmp,%%a >> binary_size_data.txt - 7z.exe l -slt %%~ni.zip runtimes\linux-x86\native\libonnxruntime.so | findstr /R /C:"^Size = [0-9]*" | for /F "tokens=3" %%a in ('more') do if not "%%a" == "" echo linux,x86,openmp,%%a >> binary_size_data.txt 7z.exe l -slt %%~ni.zip runtimes\osx-x64\native\libonnxruntime.dylib | findstr /R /C:"^Size = [0-9]*" | for /F "tokens=3" %%a in ('more') do if not "%%a" == "" echo osx,x64,openmp,%%a >> binary_size_data.txt 7z.exe l -slt %%~ni.zip runtimes\win-x64\native\onnxruntime.dll | findstr /R /C:"^Size = [0-9]*" | for /F "tokens=3" %%a in ('more') do if not "%%a" == "" echo win,x64,openmp,%%a >> binary_size_data.txt 7z.exe l -slt %%~ni.zip runtimes\win-x86\native\onnxruntime.dll | findstr /R /C:"^Size = [0-9]*" | for /F "tokens=3" %%a in ('more') do if not "%%a" == "" echo win,x86,openmp,%%a >> binary_size_data.txt