Skip to content

Commit bf9701d

Browse files
committed
Added Linux & Mac changes for Arcade (#5479)
* Initial Windows, Linux, Macos builds test * Add Linux/MacOS specific CI requirements * Run Arcade CI tests on MacOS/Linux * Fix final package building * Add benchmark download to benchmars .csporj file * Print detailed status of each unit test * Install CentOS & Ubuntu build dependencies * Use container names to differenciate between Ubuntu & CentOS * Remove sudo usage in CentOS * Fix Linux build dependencies * Add -y param to apt install * Remove installation of Linux dependencies * Minor additions * Rename Benchmarks to PerformanceTests for Arcade * Changes * Added benchmark doc changes * Pre-merge changes
1 parent 9f63803 commit bf9701d

39 files changed

+164
-141
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# Tool Runtime Dir
77
/[Tt]ools/
88
/.dotnet/
9+
/.packages/
910

1011
# User-specific files
1112
*.suo

.vsts-dotnet-ci.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,42 @@ resources:
1111
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8
1212

1313
jobs:
14-
# - template: /build/ci/job-template.yml
15-
# parameters:
16-
# name: Centos_x64_NetCoreApp31
17-
# buildScript: ./build.sh
18-
# container: CentosContainer
19-
# customMatrixes:
20-
# Debug_Build:
21-
# _configuration: Debug-netcoreapp3_1
22-
# _config_short: DI
23-
# _includeBenchmarkData: false
24-
# _targetFramework: netcoreapp3.1
25-
# Release_Build:
26-
# _configuration: Release-netcoreapp3_1
27-
# _config_short: RI
28-
# _includeBenchmarkData: true
29-
# _targetFramework: netcoreapp3.1
30-
# innerLoop: true
31-
# pool:
32-
# name: Hosted Ubuntu 1604
14+
- template: /build/ci/job-template.yml
15+
parameters:
16+
name: Centos_x64_NetCoreApp31
17+
buildScript: ./build.sh
18+
container: CentosContainer
19+
customMatrixes:
20+
Debug_Build:
21+
_configuration: Debug-netcoreapp3_1
22+
_config_short: DI
23+
_includeBenchmarkData: false
24+
_targetFramework: netcoreapp3.1
25+
Release_Build:
26+
_configuration: Release-netcoreapp3_1
27+
_config_short: RI
28+
_includeBenchmarkData: true
29+
_targetFramework: netcoreapp3.1
30+
innerLoop: true
31+
pool:
32+
name: Hosted Ubuntu 1604
3333

34-
# - template: /build/ci/job-template.yml
35-
# parameters:
36-
# name: Ubuntu_x64_NetCoreApp21
37-
# buildScript: ./build.sh
38-
# container: UbuntuContainer
39-
# innerLoop: true
40-
# pool:
41-
# name: Hosted Ubuntu 1604
34+
- template: /build/ci/job-template.yml
35+
parameters:
36+
name: Ubuntu_x64_NetCoreApp21
37+
buildScript: ./build.sh
38+
container: UbuntuContainer
39+
innerLoop: true
40+
pool:
41+
name: Hosted Ubuntu 1604
4242

43-
# - template: /build/ci/job-template.yml
44-
# parameters:
45-
# name: MacOS_x64_NetCoreApp21
46-
# buildScript: ./build.sh
47-
# innerLoop: true
48-
# pool:
49-
# name: Hosted macOS
43+
- template: /build/ci/job-template.yml
44+
parameters:
45+
name: MacOS_x64_NetCoreApp21
46+
buildScript: ./build.sh
47+
innerLoop: true
48+
pool:
49+
name: Hosted macOS
5050

5151
- template: /build/ci/job-template.yml
5252
parameters:

Microsoft.ML.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{D3D38B03-B55
4848
pkg\Directory.Build.props = pkg\Directory.Build.props
4949
EndProjectSection
5050
EndProject
51-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Benchmarks", "test\Microsoft.ML.Benchmarks\Microsoft.ML.Benchmarks.csproj", "{7A9DB75F-2CA5-4184-9EF5-1F17EB39483F}"
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.PerformanceTests", "test\Microsoft.ML.PerformanceTests\Microsoft.ML.PerformanceTests.csproj", "{7A9DB75F-2CA5-4184-9EF5-1F17EB39483F}"
5252
EndProject
5353
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj", "{64F40A0D-D4C2-4AA7-8470-E9CC437827E4}"
5454
EndProject

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
1010
done
1111
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1212

13-
"$DIR/eng/common/build.sh" --restore --build --pack --warnAsError false "$@"
13+
"$DIR/eng/common/build.sh" --restore --build --warnAsError false "$@"

build/ci/job-template.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ jobs:
5858
brew untap local/openssl |
5959
brew untap local/python2
6060
displayName: MacOS Homebrew bug Workaround
61+
# Extra MacOS step required to install OS-specific dependencies
6162
- ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
6263
- script: brew update && brew unlink python@3.8 && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
63-
displayName: Install build dependencies
64+
displayName: Install MacOS build dependencies
6465
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
6566
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"
6667
displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path
@@ -186,5 +187,5 @@ jobs:
186187
artifactName: ${{ parameters.name }} $(_config_short)
187188
artifactType: container
188189
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
189-
- script: ${{ parameters.buildScript }} -pack -ci
190+
- script: ${{ parameters.buildScript }} -pack -ci
190191
displayName: Build Packages

src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.InferenceTesting" + PublicKey.Value)]
1414
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformerTest" + PublicKey.Value)]
1515
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.AutoML.Tests" + PublicKey.Value)]
16-
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Benchmarks" + PublicKey.Value)]
16+
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.PerformanceTests" + PublicKey.Value)]
1717

1818
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.EntryPoints" + PublicKey.Value)]
1919
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Maml" + PublicKey.Value)]

src/Microsoft.ML.CpuMath/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
[assembly: InternalsVisibleTo("Microsoft.ML.Sweeper" + PublicKey.Value)]
1616
[assembly: InternalsVisibleTo("Microsoft.ML.TimeSeries" + PublicKey.Value)]
1717
[assembly: InternalsVisibleTo("Microsoft.ML.Transforms" + PublicKey.Value)]
18-
[assembly: InternalsVisibleTo("Microsoft.ML.Benchmarks.Tests" + PublicKey.Value)]
18+
[assembly: InternalsVisibleTo("Microsoft.ML.PerformanceTests.Tests" + PublicKey.Value)]
1919

2020
[assembly: WantsToBeBestFriends]

src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformerTest" + PublicKey.Value)]
1313
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Predictor.Tests" + PublicKey.Value)]
1414
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.Tests" + PublicKey.Value)]
15-
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Benchmarks" + PublicKey.Value)]
15+
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.PerformanceTests" + PublicKey.Value)]
1616
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.AutoML.Tests" + PublicKey.Value)]
1717

18-
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Benchmarks" + PublicKey.Value)]
18+
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.PerformanceTests" + PublicKey.Value)]
1919
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.EntryPoints" + PublicKey.Value)]
2020
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Maml" + PublicKey.Value)]
2121
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.ResultProcessor" + PublicKey.Value)]

src/Microsoft.ML.Maml/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Microsoft.ML;
77

88
[assembly: InternalsVisibleTo("Microsoft.ML.TestFramework" + PublicKey.Value)]
9-
[assembly: InternalsVisibleTo("Microsoft.ML.Benchmarks" + PublicKey.Value)]
9+
[assembly: InternalsVisibleTo("Microsoft.ML.PerformanceTests" + PublicKey.Value)]
1010
[assembly: InternalsVisibleTo("Microsoft.ML.ResultProcessor" + PublicKey.Value)]
1111

1212
[assembly: InternalsVisibleTo("RunTests" + InternalPublicKey.Value)]

src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,6 @@
123123

124124
<Target Name="Test" />
125125

126+
<Target Name="PerformanceTest"/>
127+
126128
</Project>

0 commit comments

Comments
 (0)