added in win-arm64 (#6813)

* added in win-arm64

* fixed MKL arm64 cmake issue

* right helix queue

* added in win-arm64

* fixed MKL arm64 cmake issue

* right helix queue

* fixing arm tests

* makes x64 test detection better

* change test label

* fixed onnx files not being included

* added new win-arm baselines

* baseline changes

* fixed build issue

* fixed test

* one more basleine

* fixed pack for mkl redist

* .NET update

Author: michaelgsharp

.vsts-dotnet-ci.yml

@@ -131,7 +131,30 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: Windows_x64_Net60
+    architecture: arm64
+    name: Windows_cross_arm64_Net6
+    buildScript: build.cmd
+    customMatrixes:
+      Debug_Build:
+        _configuration: Debug
+        _config_short: DI
+        _includeBenchmarkData: false
+        _targetFramework:  net6.0
+      Release_Build:
+        _configuration: Release
+        _config_short: RI
+        _includeBenchmarkData: false
+        _targetFramework:  net6.0
+    innerLoop: true
+    vsTestConfiguration: "/Framework:.NETCoreApp,Version=v6.0"
+    pool:
+      name: NetCore-Public
+      demands: ImageOverride -equals 1es-windows-2019-open
+    helixQueue: windows.11.arm64.open
+
+- template: /build/ci/job-template.yml
+  parameters:
+    name: Windows_x64_Net6
     buildScript: build.cmd
     innerLoop: true
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
@@ -164,7 +187,7 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: Windows_x86_Net60
+    name: Windows_x86_Net6
     architecture: x86
     buildScript: build.cmd
     innerLoop: true

build/vsts-ci.yml

@@ -63,7 +63,7 @@ stages:
       displayName: Build Native Assets
 
     - task: PublishBuildArtifacts@1
-      displayName: Publish Linux package assets
+      displayName: Publish Linux_arm package assets
       inputs:
         pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
         artifactName: pkgassets
@@ -86,7 +86,7 @@ stages:
       displayName: Build Native Assets
 
     - task: PublishBuildArtifacts@1
-      displayName: Publish Linux package assets
+      displayName: Publish Linux_arm64 package assets
       inputs:
         pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
         artifactName: pkgassets
@@ -133,14 +133,38 @@ stages:
       displayName: Build Native Assets
 
     - task: PublishBuildArtifacts@1
-      displayName: Publish macOS package assets
+      displayName: Publish macOS_M1 package assets
+      inputs:
+        pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
+        artifactName: pkgassets
+        artifactType: container
+
+    - template: /eng/common/templates/steps/generate-sbom.yml
+
+  ################################################################################
+  - job: Windows_arm64
+  ################################################################################
+    pool:
+      name: NetCore1ESPool-Internal
+      demands: ImageOverride -equals windows.vs2019.amd64
+    steps:
+    # Only build native assets to avoid conflicts.
+    - script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=arm64 /p:CopyPackageAssets=true
+      displayName: Build Native Assets
+
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Windows_arm64 package assets
       inputs:
         pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
         artifactName: pkgassets
         artifactType: container
 
     - template: /eng/common/templates/steps/generate-sbom.yml
 
+    # Terminate all dotnet build processes.
+    - script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown
+      displayName: Dotnet Server Shutdown
+
   ################################################################################
   - job: Windows_x86
   ################################################################################

eng/Versions.props

@@ -78,7 +78,7 @@
     <ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
     <BenchmarkDotNetVersion>0.13.1</BenchmarkDotNetVersion>
     <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
-    <DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
+    <DotNetRuntime80Version>8.0.0</DotNetRuntime80Version>
     <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23265.1</MicrosoftDotNetXUnitExtensionsVersion>

eng/pkg/CommonPackage.props

@@ -13,12 +13,20 @@
       <Visible>false</Visible>
       <Link>%(Filename)%(Extension)</Link>
     </Content>
+
     <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
              Condition="'$(PlatformTarget)' == 'x86'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>false</Visible>
       <Link>%(Filename)%(Extension)</Link>
     </Content>
+
+    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-arm64\native\*.dll"
+             Condition="'$(PlatformTarget)' == 'arm64'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+      <Link>%(Filename)%(Extension)</Link>
+    </Content>
   </ItemGroup>
 
 </Project>

eng/pkg/Pack.props

@@ -58,12 +58,21 @@
       <Visible>false</Visible>
       <Link>%(Filename)%(Extension)</Link>
     </Content>
+
     <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
              Condition="'$(PlatformTarget)' == 'x86'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>false</Visible>
       <Link>%(Filename)%(Extension)</Link>
     </Content>
+
+    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-arm64\native\*.dll"
+             Condition="'$(PlatformTarget)' == 'arm64'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+      <Link>%(Filename)%(Extension)</Link>
+    </Content>
+
   </ItemGroup>
 
   <!-- Work around https://github.com/NuGet/Home/issues/6091 -->

src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj

@@ -86,6 +86,7 @@
       <!--The path needed to be hardcoded for this to work on our publishing CI-->
       <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-x86\native" />
       <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-x64\native" />
+      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-arm64\native"/>
     </ItemGroup>
   </Target>
 

src/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props

@@ -19,6 +19,13 @@
       <Visible>false</Visible>
       <Link>%(Filename)%(Extension)</Link>
     </Content>
+
+    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-arm64\nativeassets\netstandard2.0\*.dll"
+             Condition="'$(PlatformTarget)' == 'arm64'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+      <Link>%(Filename)%(Extension)</Link>
+    </Content> 
   </ItemGroup>
 
 </Project>

src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj

@@ -7,6 +7,8 @@
     <PackageLicenseExpression></PackageLicenseExpression>
     <PackageDescription>$(MSBuildProjectName) contains the MKL library redistributed as a NuGet package.</PackageDescription>
     <PackageTags>$(PackageTags) MLNET MKL</PackageTags>
+    <!-- No native dependencies on arm so causes nuget package failure -->
+    <IsPackable Condition="'$(TargetArchitecture)' == 'arm64' Or '$(TargetArchitecture)' == 'arm'">false</IsPackable>
      <!-- Empty package with no managed dependencies, only native, so no need to warn for empty lib folder/dependencies -->
     <NoWarn>$(NoWarn);NU5127;NU5128</NoWarn>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>

src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj

@@ -26,6 +26,7 @@
       <!--The path needed to be hardcoded for this to work on our publishing CI-->
       <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\MatrixFactorizationNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\MatrixFactorizationNative.pdb" TargetPath="..\..\runtimes\win-x86\native"/>
       <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\MatrixFactorizationNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\MatrixFactorizationNative.pdb" TargetPath="..\..\runtimes\win-x64\native"/>
+      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\MatrixFactorizationNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\MatrixFactorizationNative.pdb" TargetPath="..\..\runtimes\win-arm64\native"/>
     </ItemGroup>
   </Target>
 </Project>

src/Microsoft.ML/Microsoft.ML.csproj

@@ -66,6 +66,7 @@
       <!--The path needed to be hardcoded for this to work on our publishing CI-->
       <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-x86\native"/>
       <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-x64\native"/>
+      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-arm64\native"/>
     </ItemGroup>
   </Target>
 </Project>