From c1e2442cf9f7ec8ee6405ebcbd5ddc271dc4cedb Mon Sep 17 00:00:00 2001
From: Tiago Koji Castro Shibata <tiago.shibata@gmail.com>
Date: Wed, 21 Oct 2020 20:29:55 -0700
Subject: [PATCH] Add to WAI Nuget build matrix

---
 .../nuget/templates/windowsai.yml             | 52 +++++++++++++++++++
 .../templates/windowsai-nuget-build.yml       | 14 +++--
 2 files changed, 61 insertions(+), 5 deletions(-)

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 c90c8f4661..360f9207b6 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/windowsai.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/windowsai.yml
@@ -47,6 +47,58 @@ jobs:
     parameters:
       BuildArch: 'arm'
 
+- job: WindowsAI_DirectML_X64_StaticRuntime
+  timeoutInMinutes: 120
+  workspace:
+    clean: all
+  pool:
+    name: 'Win-GPU-2019'
+    demands: [ ]
+  steps:
+    - template: ../../templates/windowsai-nuget-build.yml
+      parameters:
+        BuildArch: 'x64'
+        Runtime: 'static'
+
+- job: WindowsAI_DirectML_X86_StaticRuntime
+  timeoutInMinutes: 120
+  workspace:
+    clean: all
+  pool:
+    name: 'Win-GPU-2019'
+    demands: [ ]
+  steps:
+    - template: ../../templates/windowsai-nuget-build.yml
+      parameters:
+        BuildArch: 'x86'
+        Runtime: 'static'
+
+- job: WindowsAI_CPU_ARM64_StaticRuntime
+  timeoutInMinutes: 120
+  workspace:
+    clean: all
+  pool:
+    name: 'Win-CPU-2019'
+    demands: [ ]
+  steps:
+    - template: ../../templates/windowsai-nuget-build.yml
+      parameters:
+        BuildArch: 'arm64'
+        Runtime: 'static'
+
+- job: WindowsAI_CPU_ARM_StaticRuntime
+  timeoutInMinutes: 120
+  workspace:
+    clean: all
+  pool:
+    name: 'Win-CPU-2019'
+    demands: [ ]
+  steps:
+    - template: ../../templates/windowsai-nuget-build.yml
+      parameters:
+        BuildArch: 'arm'
+        Runtime: 'static'
+
 - job: WindowsAI_CPU_X64_Store
   timeoutInMinutes: 120
   workspace:
diff --git a/tools/ci_build/github/azure-pipelines/templates/windowsai-nuget-build.yml b/tools/ci_build/github/azure-pipelines/templates/windowsai-nuget-build.yml
index d872d1a15e..e0aeeaa7c9 100644
--- a/tools/ci_build/github/azure-pipelines/templates/windowsai-nuget-build.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/windowsai-nuget-build.yml
@@ -34,19 +34,23 @@ steps:
       modifyEnvironment: true
       workingFolder: '$(Build.BinariesDirectory)'
 
-  - powershell: @echo ##vso[task.setvariable variable=BuildFlags]--${{ parameters.BuildArch }}
+  - powershell: |
+     Write-Host "##vso[task.setvariable variable=BuildFlags]--${{ parameters.BuildArch }}"
     displayName: Add cross compilation flags
     condition: ne('${{ parameters.BuildArch }}', 'x64')
 
-  - powershell: @echo ##vso[task.setvariable variable=BuildFlags]${{ variables.BuildFlags }} --use_dml
+  - powershell: |
+     Write-Host "##vso[task.setvariable variable=BuildFlags]$(BuildFlags) --use_dml"
     displayName: Add DML flags
     condition: or(eq('${{ parameters.BuildArch }}', ''), eq('${{ parameters.BuildArch }}', 'x86'))
 
-  - powershell: @echo ##vso[task.setvariable variable=BuildFlags]${{ variables.BuildFlags }} --enable_windows_store
+  - powershell: |
+     Write-Host "##vso[task.setvariable variable=BuildFlags]$(BuildFlags) --enable_windows_store"
     displayName: Add Microsoft Store flags
     condition: eq('${{ parameters.BuildForStore }}', 'true')
 
-  - powershell: @echo ##vso[task.setvariable variable=BuildFlags]${{ variables.BuildFlags }} --enable_msvc_static_runtime
+  - powershell: |
+     Write-Host "##vso[task.setvariable variable=BuildFlags]$(BuildFlags) --enable_msvc_static_runtime"
     displayName: Add static runtime flags
     condition: eq('${{ parameters.Runtime }}', 'static')
 
@@ -54,7 +58,7 @@ steps:
     displayName: 'Generate CMake Configuration'
     inputs:
       scriptPath: '$(Build.SourcesDirectory)\tools\ci_build\build.py'
-      arguments: '--build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos $(TelemetryOption) --use_winml --cmake_generator "Visual Studio 16 2019" --update --config RelWithDebInfo --enable_lto --disable_rtti ${{ variables.BuildFlags }}'
+      arguments: '--build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos $(TelemetryOption) --use_winml --cmake_generator "Visual Studio 16 2019" --update --config RelWithDebInfo --enable_lto --disable_rtti $(BuildFlags)'
       workingDirectory: '$(Build.BinariesDirectory)'
 
   - ${{ if or(notIn(parameters['sln_platform'], 'Win32', 'x64'), eq(parameters.BuildForStore, 'true')) }}: