From 69133e58388dd2bdfc2bae55a138f70885fc35ec Mon Sep 17 00:00:00 2001 From: Tiago Koji Castro Shibata Date: Fri, 30 Oct 2020 11:46:32 -0700 Subject: [PATCH] Add Store static --- .../nuget/templates/windowsai.yml | 136 ++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/windowsai.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/windowsai.yml index b51e12ebab..6b503abcea 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/windowsai.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/windowsai.yml @@ -151,6 +151,62 @@ jobs: BuildArch: 'arm' BuildForStore: 'true' +- job: WindowsAI_CPU_X64_Store_StaticRuntime + timeoutInMinutes: 120 + workspace: + clean: all + pool: + name: 'Win-CPU-2019' + demands: [] + steps: + - template: ../../templates/windowsai-nuget-build.yml + parameters: + BuildArch: 'x64' + BuildForStore: 'true' + Runtime: 'static' + +- job: WindowsAI_CPU_X86_Store_StaticRuntime + timeoutInMinutes: 120 + workspace: + clean: all + pool: + name: 'Win-CPU-2019' + demands: [] + steps: + - template: ../../templates/windowsai-nuget-build.yml + parameters: + BuildArch: 'x86' + BuildForStore: 'true' + Runtime: 'static' + +- job: WindowsAI_CPU_ARM64_Store_StaticRuntime + timeoutInMinutes: 120 + workspace: + clean: all + pool: + name: 'Win-CPU-2019' + demands: [] + steps: + - template: ../../templates/windowsai-nuget-build.yml + parameters: + BuildArch: 'arm64' + BuildForStore: 'true' + Runtime: 'static' + +- job: WindowsAI_CPU_ARM_Store_StaticRuntime + timeoutInMinutes: 120 + workspace: + clean: all + pool: + name: 'Win-CPU-2019' + demands: [] + steps: + - template: ../../templates/windowsai-nuget-build.yml + parameters: + BuildArch: 'arm' + BuildForStore: 'true' + Runtime: 'static' + - job: NuGet_Packaging workspace: clean: all @@ -168,6 +224,10 @@ jobs: - WindowsAI_DirectML_X86_StaticRuntime - WindowsAI_CPU_ARM64_StaticRuntime - WindowsAI_CPU_ARM_StaticRuntime + - WindowsAI_CPU_X64_Store_StaticRuntime + - WindowsAI_CPU_X86_Store_StaticRuntime + - WindowsAI_CPU_ARM64_Store_StaticRuntime + - WindowsAI_CPU_ARM_Store_StaticRuntime condition: succeeded() steps: - task: DownloadPipelineArtifact@0 @@ -242,6 +302,30 @@ jobs: artifactName: 'Microsoft.AI.MachineLearning.arm.StaticRuntime' targetPath: '$(Build.BinariesDirectory)/nuget-artifact-arm-static-runtime' + - task: DownloadPipelineArtifact@0 + displayName: 'Download Pipeline Artifact - NuGet CPU x64 Store' + inputs: + artifactName: 'Microsoft.AI.MachineLearning.x64.Store.StaticRuntime' + targetPath: '$(Build.BinariesDirectory)/nuget-artifact-x64-store-static-runtime' + + - task: DownloadPipelineArtifact@0 + displayName: 'Download Pipeline Artifact - NuGet CPU x86 Store' + inputs: + artifactName: 'Microsoft.AI.MachineLearning.x86.Store.StaticRuntime' + targetPath: '$(Build.BinariesDirectory)/nuget-artifact-x86-store-static-runtime' + + - task: DownloadPipelineArtifact@0 + displayName: 'Download Pipeline Artifact - NuGet CPU ARM64 Store' + inputs: + artifactName: 'Microsoft.AI.MachineLearning.arm64.Store.StaticRuntime' + targetPath: '$(Build.BinariesDirectory)/nuget-artifact-arm64-store-static-runtime' + + - task: DownloadPipelineArtifact@0 + displayName: 'Download Pipeline Artifact - NuGet CPU ARM Store' + inputs: + artifactName: 'Microsoft.AI.MachineLearning.arm.Store.StaticRuntime' + targetPath: '$(Build.BinariesDirectory)/nuget-artifact-arm-store-static-runtime' + - task: PowerShell@2 displayName: 'Bundle NuGet and other binaries' inputs: @@ -268,6 +352,12 @@ jobs: $x64_static_runtime_nupkg_unzipped_directory = [System.IO.Path]::Combine($x64_static_runtime_nupkg_unzipped_directory_root, 'binaries', [System.IO.Path]::GetFileNameWithoutExtension($x64_static_runtime_nuget_package)) [System.IO.Compression.ZipFile]::ExtractToDirectory($x64_static_runtime_nuget_package, $x64_static_runtime_nupkg_unzipped_directory) + $nupkgs = (Get-ChildItem ..\nuget-artifact-x64-store-static-runtime -Filter Microsoft.AI.MachineLearning*.nupkg -Recurse) + $x64_store_static_runtime_nuget_package = $nupkgs[0].FullName + $x64_store_static_runtime_nupkg_unzipped_directory_root = $nupkgs[0].Directory.FullName + $x64_store_static_runtime_nupkg_unzipped_directory = [System.IO.Path]::Combine($x64_store_static_runtime_nupkg_unzipped_directory_root, 'binaries', [System.IO.Path]::GetFileNameWithoutExtension($x64_store_static_runtime_nuget_package)) + [System.IO.Compression.ZipFile]::ExtractToDirectory($x64_store_static_runtime_nuget_package, $x64_store_static_runtime_nupkg_unzipped_directory) + $nupkgs = (Get-ChildItem ..\nuget-artifact-x86 -Filter Microsoft.AI.MachineLearning*.nupkg -Recurse) $x86_nuget_package = $nupkgs[0].FullName $x86_nupkg_unzipped_directory_root = $nupkgs[0].Directory.FullName @@ -286,6 +376,12 @@ jobs: $x86_static_runtime_nupkg_unzipped_directory = [System.IO.Path]::Combine($x86_static_runtime_nupkg_unzipped_directory_root, 'binaries', [System.IO.Path]::GetFileNameWithoutExtension($x86_static_runtime_nuget_package)) [System.IO.Compression.ZipFile]::ExtractToDirectory($x86_static_runtime_nuget_package, $x86_static_runtime_nupkg_unzipped_directory) + $nupkgs = (Get-ChildItem ..\nuget-artifact-x86-store-static-runtime -Filter Microsoft.AI.MachineLearning*.nupkg -Recurse) + $x86_store_static_runtime_nuget_package = $nupkgs[0].FullName + $x86_store_static_runtime_nupkg_unzipped_directory_root = $nupkgs[0].Directory.FullName + $x86_store_static_runtime_nupkg_unzipped_directory = [System.IO.Path]::Combine($x86_store_static_runtime_nupkg_unzipped_directory_root, 'binaries', [System.IO.Path]::GetFileNameWithoutExtension($x86_store_static_runtime_nuget_package)) + [System.IO.Compression.ZipFile]::ExtractToDirectory($x86_store_static_runtime_nuget_package, $x86_store_static_runtime_nupkg_unzipped_directory) + $nupkgs = (Get-ChildItem ..\nuget-artifact-arm64 -Filter Microsoft.AI.MachineLearning*.nupkg -Recurse) $arm64_nuget_package = $nupkgs[0].FullName $arm64_nupkg_unzipped_directory_root = $nupkgs[0].Directory.FullName @@ -304,6 +400,12 @@ jobs: $arm64_static_runtime_nupkg_unzipped_directory = [System.IO.Path]::Combine($arm64_static_runtime_nupkg_unzipped_directory_root, 'binaries', [System.IO.Path]::GetFileNameWithoutExtension($arm64_static_runtime_nuget_package)) [System.IO.Compression.ZipFile]::ExtractToDirectory($arm64_static_runtime_nuget_package, $arm64_static_runtime_nupkg_unzipped_directory) + $nupkgs = (Get-ChildItem ..\nuget-artifact-arm64-store-static-runtime -Filter Microsoft.AI.MachineLearning*.nupkg -Recurse) + $arm64_store_static_runtime_nuget_package = $nupkgs[0].FullName + $arm64_store_static_runtime_nupkg_unzipped_directory_root = $nupkgs[0].Directory.FullName + $arm64_store_static_runtime_nupkg_unzipped_directory = [System.IO.Path]::Combine($arm64_store_static_runtime_nupkg_unzipped_directory_root, 'binaries', [System.IO.Path]::GetFileNameWithoutExtension($arm64_store_static_runtime_nuget_package)) + [System.IO.Compression.ZipFile]::ExtractToDirectory($arm64_store_static_runtime_nuget_package, $arm64_store_static_runtime_nupkg_unzipped_directory) + $nupkgs = (Get-ChildItem ..\nuget-artifact-arm -Filter Microsoft.AI.MachineLearning*.nupkg -Recurse) $arm_nuget_package = $nupkgs[0].FullName $arm_nupkg_unzipped_directory_root = $nupkgs[0].Directory.FullName @@ -322,28 +424,42 @@ jobs: $arm_static_runtime_nupkg_unzipped_directory = [System.IO.Path]::Combine($arm_static_runtime_nupkg_unzipped_directory_root, 'binaries', [System.IO.Path]::GetFileNameWithoutExtension($arm_static_runtime_nuget_package)) [System.IO.Compression.ZipFile]::ExtractToDirectory($arm_static_runtime_nuget_package, $arm_static_runtime_nupkg_unzipped_directory) + $nupkgs = (Get-ChildItem ..\nuget-artifact-arm-store-static-runtime -Filter Microsoft.AI.MachineLearning*.nupkg -Recurse) + $arm_store_static_runtime_nuget_package = $nupkgs[0].FullName + $arm_store_static_runtime_nupkg_unzipped_directory_root = $nupkgs[0].Directory.FullName + $arm_store_static_runtime_nupkg_unzipped_directory = [System.IO.Path]::Combine($arm_store_static_runtime_nupkg_unzipped_directory_root, 'binaries', [System.IO.Path]::GetFileNameWithoutExtension($arm_store_static_runtime_nuget_package)) + [System.IO.Compression.ZipFile]::ExtractToDirectory($arm_store_static_runtime_nuget_package, $arm_store_static_runtime_nupkg_unzipped_directory) + $x64_store_runtime_path_old = [System.IO.Path]::Combine($x64_store_nupkg_unzipped_directory, 'runtimes', 'win-x64', 'uap') $x64_store_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-x64', 'uap') $x64_static_runtime_path_old = [System.IO.Path]::Combine($x64_static_runtime_nupkg_unzipped_directory, 'runtimes', 'win-x64', 'native') $x64_static_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-x64', 'native') + $x64_store_static_runtime_path_old = [System.IO.Path]::Combine($x64_store_static_runtime_nupkg_unzipped_directory, 'runtimes', 'win-x64', 'native') + $x64_store_static_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-x64', 'uap') $x86_runtime_path_old = [System.IO.Path]::Combine($x86_nupkg_unzipped_directory, 'runtimes', 'win-x86', 'native') $x86_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-x86', 'native') $x86_store_runtime_path_old = [System.IO.Path]::Combine($x86_store_nupkg_unzipped_directory, 'runtimes', 'win-x86', 'uap') $x86_store_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-x86', 'uap') $x86_static_runtime_path_old = [System.IO.Path]::Combine($x86_static_runtime_nupkg_unzipped_directory, 'runtimes', 'win-x86', 'native') $x86_static_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-x86', 'native') + $x86_store_static_runtime_path_old = [System.IO.Path]::Combine($x86_store_static_runtime_nupkg_unzipped_directory, 'runtimes', 'win-x86', 'native') + $x86_store_static_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-x86', 'uap') $arm64_runtime_path_old = [System.IO.Path]::Combine($arm64_nupkg_unzipped_directory, 'runtimes', 'win-arm64', 'native') $arm64_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-arm64', 'native') $arm64_store_runtime_path_old = [System.IO.Path]::Combine($arm64_store_nupkg_unzipped_directory, 'runtimes', 'win-arm64', 'uap') $arm64_store_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-arm64', 'uap') $arm64_static_runtime_path_old = [System.IO.Path]::Combine($arm64_static_runtime_nupkg_unzipped_directory, 'runtimes', 'win-arm64', 'native') $arm64_static_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-arm64', 'native') + $arm64_store_static_runtime_path_old = [System.IO.Path]::Combine($arm64_store_static_runtime_nupkg_unzipped_directory, 'runtimes', 'win-arm64', 'native') + $arm64_store_static_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-arm64', 'uap') $arm_runtime_path_old = [System.IO.Path]::Combine($arm_nupkg_unzipped_directory, 'runtimes', 'win-arm', 'native') $arm_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-arm', 'native') $arm_store_runtime_path_old = [System.IO.Path]::Combine($arm_store_nupkg_unzipped_directory, 'runtimes', 'win-arm', 'uap') $arm_store_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-arm', 'uap') $arm_static_runtime_path_old = [System.IO.Path]::Combine($arm_static_runtime_nupkg_unzipped_directory, 'runtimes', 'win-arm', 'native') $arm_static_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-arm', 'native') + $arm_store_static_runtime_path_old = [System.IO.Path]::Combine($arm_store_static_runtime_nupkg_unzipped_directory, 'runtimes', 'win-arm', 'native') + $arm_store_static_runtime_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'runtimes', 'win-arm', 'uap') $uap_build_path_old = [System.IO.Path]::Combine($x64_store_nupkg_unzipped_directory, 'build', 'uap') $uap_build_path_new = [System.IO.Path]::Combine($x64_nupkg_unzipped_directory, 'build', 'uap') @@ -411,6 +527,26 @@ jobs: Copy-Item ([System.IO.Path]::Combine($arm_static_runtime_path_old, 'microsoft.ai.machinelearning.dll')) ([System.IO.Path]::Combine($arm_static_runtime_path_new, 'microsoft.ai.machinelearning.static.dll')) Copy-Item ([System.IO.Path]::Combine($arm_static_runtime_path_old, 'microsoft.ai.machinelearning.lib')) ([System.IO.Path]::Combine($arm_static_runtime_path_new, 'microsoft.ai.machinelearning.static.lib')) + Copy-Item ([System.IO.Path]::Combine($x64_store_static_runtime_path_old, 'onnxruntime.dll')) ([System.IO.Path]::Combine($x64_store_static_runtime_path_new, 'onnxruntime.static.dll')) + Copy-Item ([System.IO.Path]::Combine($x64_store_static_runtime_path_old, 'onnxruntime.lib')) ([System.IO.Path]::Combine($x64_store_static_runtime_path_new, 'onnxruntime.static.lib')) + Copy-Item ([System.IO.Path]::Combine($x64_store_static_runtime_path_old, 'microsoft.ai.machinelearning.dll')) ([System.IO.Path]::Combine($x64_store_static_runtime_path_new, 'microsoft.ai.machinelearning.static.dll')) + Copy-Item ([System.IO.Path]::Combine($x64_store_static_runtime_path_old, 'microsoft.ai.machinelearning.lib')) ([System.IO.Path]::Combine($x64_store_static_runtime_path_new, 'microsoft.ai.machinelearning.static.lib')) + + Copy-Item ([System.IO.Path]::Combine($x86_store_static_runtime_path_old, 'onnxruntime.dll')) ([System.IO.Path]::Combine($x86_store_static_runtime_path_new, 'onnxruntime.static.dll')) + Copy-Item ([System.IO.Path]::Combine($x86_store_static_runtime_path_old, 'onnxruntime.lib')) ([System.IO.Path]::Combine($x86_store_static_runtime_path_new, 'onnxruntime.static.lib')) + Copy-Item ([System.IO.Path]::Combine($x86_store_static_runtime_path_old, 'microsoft.ai.machinelearning.dll')) ([System.IO.Path]::Combine($x86_store_static_runtime_path_new, 'microsoft.ai.machinelearning.static.dll')) + Copy-Item ([System.IO.Path]::Combine($x86_store_static_runtime_path_old, 'microsoft.ai.machinelearning.lib')) ([System.IO.Path]::Combine($x86_store_static_runtime_path_new, 'microsoft.ai.machinelearning.static.lib')) + + Copy-Item ([System.IO.Path]::Combine($arm64_store_static_runtime_path_old, 'onnxruntime.dll')) ([System.IO.Path]::Combine($arm6store_4_static_runtime_path_new, 'onnxruntime.static.dll')) + Copy-Item ([System.IO.Path]::Combine($arm64_store_static_runtime_path_old, 'onnxruntime.lib')) ([System.IO.Path]::Combine($arm6store_4_static_runtime_path_new, 'onnxruntime.static.lib')) + Copy-Item ([System.IO.Path]::Combine($arm64_store_static_runtime_path_old, 'microsoft.ai.machinelearning.dll')) ([System.IO.Path]::Combine($arm6store_4_static_runtime_path_new, 'microsoft.ai.machinelearning.static.dll')) + Copy-Item ([System.IO.Path]::Combine($arm64_store_static_runtime_path_old, 'microsoft.ai.machinelearning.lib')) ([System.IO.Path]::Combine($arm6store_4_static_runtime_path_new, 'microsoft.ai.machinelearning.static.lib')) + + Copy-Item ([System.IO.Path]::Combine($arm_store_static_runtime_path_old, 'onnxruntime.dll')) ([System.IO.Path]::Combine($arm_store_static_runtime_path_new, 'onnxruntime.static.dll')) + Copy-Item ([System.IO.Path]::Combine($arm_store_static_runtime_path_old, 'onnxruntime.lib')) ([System.IO.Path]::Combine($arm_store_static_runtime_path_new, 'onnxruntime.static.lib')) + Copy-Item ([System.IO.Path]::Combine($arm_store_static_runtime_path_old, 'microsoft.ai.machinelearning.dll')) ([System.IO.Path]::Combine($arm_store_static_runtime_path_new, 'microsoft.ai.machinelearning.static.dll')) + Copy-Item ([System.IO.Path]::Combine($arm_store_static_runtime_path_old, 'microsoft.ai.machinelearning.lib')) ([System.IO.Path]::Combine($arm_store_static_runtime_path_new, 'microsoft.ai.machinelearning.static.lib')) + Copy-Item -Recurse $uap_build_path_old $uap_build_path_new $merged_nuget_path = [System.IO.Path]::Combine($Env:BUILD_ARTIFACTSTAGINGDIRECTORY, 'merged')