From a8e9e1878e94eb42d2895bcc984d16d8760c7bf7 Mon Sep 17 00:00:00 2001 From: jignparm Date: Tue, 23 Jul 2019 22:23:51 -0700 Subject: [PATCH] Reduce artifacts size (#1477) * Update wildcard pattern to match only relevant archives * Update TensorRT build to add CUDA VS extensions --- .../azure-pipelines/nuget/templates/cpu-mklml.yml | 2 +- .../nuget/templates/cpu-nocontribops-arm64.yml | 4 ++-- .../nuget/templates/cpu-nocontribops.yml | 4 ++-- .../github/azure-pipelines/nuget/templates/cpu.yml | 4 ++-- .../github/azure-pipelines/nuget/templates/gpu.yml | 2 +- .../win-gpu-tensorrt-ci-pipeline.yml | 14 ++++++++++++++ 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-mklml.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-mklml.yml index 6282e9b4a8..f456351fa8 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-mklml.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-mklml.yml @@ -38,7 +38,7 @@ jobs: ldd $(Build.BinariesDirectory)/linux-x64/libonnxruntime.so cd $(Build.BinariesDirectory) zip -r linux-x64.zip linux-x64 - cp $(Build.BinariesDirectory)/*.zip $(Build.ArtifactStagingDirectory) + cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) - template: ../../templates/mac-ci.yml 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 f30d8c12b8..c69c292936 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 @@ -69,7 +69,7 @@ jobs: cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x64 cd $(Build.BinariesDirectory) zip -r linux-x64.zip linux-x64 - cp $(Build.BinariesDirectory)/*.zip $(Build.ArtifactStagingDirectory) + cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) - template: ../../templates/linux-ci.yml @@ -85,7 +85,7 @@ jobs: cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x86 cd $(Build.BinariesDirectory) zip -r linux-x86.zip linux-x86 - cp $(Build.BinariesDirectory)/*.zip $(Build.ArtifactStagingDirectory) + cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) - template: ../../templates/mac-ci.yml 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 114e632221..ee6f7415ad 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 @@ -50,7 +50,7 @@ jobs: cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x64 cd $(Build.BinariesDirectory) zip -r linux-x64.zip linux-x64 - cp $(Build.BinariesDirectory)/*.zip $(Build.ArtifactStagingDirectory) + cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) - template: ../../templates/linux-ci.yml @@ -66,7 +66,7 @@ jobs: cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x86 cd $(Build.BinariesDirectory) zip -r linux-x86.zip linux-x86 - cp $(Build.BinariesDirectory)/*.zip $(Build.ArtifactStagingDirectory) + cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) - template: ../../templates/mac-ci.yml 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 6dde926468..db41450b99 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml @@ -51,7 +51,7 @@ jobs: cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x64 cd $(Build.BinariesDirectory) zip -r linux-x64.zip linux-x64 - cp $(Build.BinariesDirectory)/*.zip $(Build.ArtifactStagingDirectory) + cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) - template: ../../templates/linux-ci.yml @@ -67,7 +67,7 @@ jobs: cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x86 cd $(Build.BinariesDirectory) zip -r linux-x86.zip linux-x86 - cp $(Build.BinariesDirectory)/*.zip $(Build.ArtifactStagingDirectory) + cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) - template: ../../templates/mac-ci.yml diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml index f9d6f994b5..e7012bc1e4 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml @@ -41,7 +41,7 @@ jobs: cp $(Build.BinariesDirectory)/Release/libonnxruntime.so $(Build.BinariesDirectory)/linux-x64 cd $(Build.BinariesDirectory) zip -r linux-x64.zip linux-x64 - cp $(Build.BinariesDirectory)/*.zip $(Build.ArtifactStagingDirectory) + cp $(Build.BinariesDirectory)/linux*.zip $(Build.ArtifactStagingDirectory) ls -al $(Build.ArtifactStagingDirectory) 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 4a4b87f7dd..1711ce9c0a 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 @@ -17,6 +17,13 @@ jobs: buildArch: 'amd64' setVcvars: true + # Copy CUDA 10.0 props files + - task: PowerShell@1 + displayName: 'Set CUDA path' + inputs: + scriptName: 'tools/ci_build/github/windows/set_cuda_path.ps1' + arguments: '-CudaMsbuildPath C:\local\cudaMsbuildIntegration-10.0.130-win10 -CudaVersion 10.0' + - task: CmdLine@1 displayName: 'Download test data and generate cmake config' inputs: @@ -104,6 +111,13 @@ jobs: testRunTitle: 'Unit Test Run' condition: succeededOrFailed() + # Remove CUDA 10.0 props files after build + - task: PowerShell@1 + displayName: 'Clean up CUDA props files' + inputs: + scriptName: 'tools/ci_build/github/windows/clean_up_cuda_prop_files.ps1' + arguments: '-CudaVersion 10.0' + - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Detection' condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))