Skip to content

Commit d65af0f

Browse files
Anipikeerhardt
authored andcommitted
Update build tools version and use netcoreapp3.0 on ubuntu CI (#2687)
* temp * running ubuntu leg on netcoreapp3.0 * correcting names in build definations * intrinsics environment variables name corrected
1 parent 49a96c5 commit d65af0f

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

.vsts-dotnet-ci.yml

+18
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ phases:
3131
parameters:
3232
name: Centos
3333
buildScript: ./build.sh
34+
customMatrixes:
35+
Build_Debug_Intrinsics:
36+
_configuration: Debug-Intrinsics
37+
_config_short: DI
38+
_includeBenchmarkData: false
39+
Build_Release:
40+
_configuration: Release
41+
_config_short: R
42+
_includeBenchmarkData: true
3443
queue:
3544
name: Hosted Ubuntu 1604
3645
container: CentosContainer
@@ -39,6 +48,15 @@ phases:
3948
parameters:
4049
name: Ubuntu
4150
buildScript: ./build.sh
51+
customMatrixes:
52+
Build_Debug:
53+
_configuration: Debug
54+
_config_short: D
55+
_includeBenchmarkData: false
56+
Build_Release_Intrinsics:
57+
_configuration: Release-Intrinsics
58+
_config_short: RI
59+
_includeBenchmarkData: true
4260
queue:
4361
name: Hosted Ubuntu 1604
4462
container: UbuntuContainer

BuildToolsVersion.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0-preview1-03129-01
1+
3.0.0-preview1-03721-01

test/Microsoft.ML.CpuMath.UnitTests.netcoreapp/UnitTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public class CpuMathUtilsUnitTests
2525
#if NETCOREAPP3_0
2626
private static Dictionary<string, string> DisableAvxEnvironmentVariables;
2727
private static Dictionary<string, string> DisableAvxAndSseEnvironmentVariables;
28-
private static readonly string disableAvx = "COMPlus_EnableAvx";
29-
private static readonly string disableSse = "COMPlus_EnableSse";
28+
private static readonly string disableAvx = "COMPlus_EnableAVX";
29+
private static readonly string disableSse = "COMPlus_EnableSSE";
3030
private static readonly string disableAvxAndSse = "COMPlus_EnableHWIntrinsic";
3131
#endif
3232

0 commit comments

Comments
 (0)