Skip to content

Commit daa8d44

Browse files
eerhardteerhardt
committed
Fix CpuMath tests on netfx.
Combine the two separate CpuMath UnitTest projects into a single project.
1 parent c4f55f9 commit daa8d44

File tree

5 files changed

+30
-74
lines changed

5 files changed

+30
-74
lines changed

‎Microsoft.ML.sln

Lines changed: 26 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CodeAnalyzer.T
9292
EndProject
9393
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CpuMath.PerformanceTests", "test\Microsoft.ML.CpuMath.PerformanceTests\Microsoft.ML.CpuMath.PerformanceTests.csproj", "{7333EDEF-4144-405C-A5EC-6F42201857D8}"
9494
EndProject
95-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CpuMath.UnitTests.netstandard", "test\Microsoft.ML.CpuMath.UnitTests.netstandard\Microsoft.ML.CpuMath.UnitTests.netstandard.csproj", "{A0E562A9-0E6D-470D-B180-6EB44BA84D60}"
96-
EndProject
97-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CpuMath.UnitTests.netcoreapp", "test\Microsoft.ML.CpuMath.UnitTests.netcoreapp\Microsoft.ML.CpuMath.UnitTests.netcoreapp.csproj", "{5F81A2A4-73AD-494C-B387-07D605EC8826}"
95+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CpuMath.UnitTests", "test\Microsoft.ML.CpuMath.UnitTests\Microsoft.ML.CpuMath.UnitTests.csproj", "{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}"
9896
EndProject
9997
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests", "test\Microsoft.ML.FSharp.Tests\Microsoft.ML.FSharp.Tests.fsproj", "{802233D6-8CC0-46AD-9F23-FEE1E9AED9B3}"
10098
EndProject
@@ -906,54 +904,30 @@ Global
906904
{7333EDEF-4144-405C-A5EC-6F42201857D8}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
907905
{7333EDEF-4144-405C-A5EC-6F42201857D8}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
908906
{7333EDEF-4144-405C-A5EC-6F42201857D8}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
909-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
910-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug|Any CPU.Build.0 = Debug|Any CPU
911-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug|x64.ActiveCfg = Debug|Any CPU
912-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug|x64.Build.0 = Debug|Any CPU
913-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug-netcoreapp3_0|Any CPU.ActiveCfg = Debug-netcoreapp3_0|Any CPU
914-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug-netcoreapp3_0|Any CPU.Build.0 = Debug-netcoreapp3_0|Any CPU
915-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug-netcoreapp3_0|x64.ActiveCfg = Debug-netcoreapp3_0|Any CPU
916-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug-netcoreapp3_0|x64.Build.0 = Debug-netcoreapp3_0|Any CPU
917-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
918-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
919-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug-netfx|x64.ActiveCfg = Debug-netfx|Any CPU
920-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Debug-netfx|x64.Build.0 = Debug-netfx|Any CPU
921-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release|Any CPU.ActiveCfg = Release|Any CPU
922-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release|Any CPU.Build.0 = Release|Any CPU
923-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release|x64.ActiveCfg = Release|Any CPU
924-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release|x64.Build.0 = Release|Any CPU
925-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release-netcoreapp3_0|Any CPU.ActiveCfg = Release-netcoreapp3_0|Any CPU
926-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release-netcoreapp3_0|Any CPU.Build.0 = Release-netcoreapp3_0|Any CPU
927-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release-netcoreapp3_0|x64.ActiveCfg = Release-netcoreapp3_0|Any CPU
928-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release-netcoreapp3_0|x64.Build.0 = Release-netcoreapp3_0|Any CPU
929-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
930-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
931-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
932-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
933-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
934-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug|Any CPU.Build.0 = Debug|Any CPU
935-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug|x64.ActiveCfg = Debug|Any CPU
936-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug|x64.Build.0 = Debug|Any CPU
937-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug-netcoreapp3_0|Any CPU.ActiveCfg = Debug-netcoreapp3_0|Any CPU
938-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug-netcoreapp3_0|Any CPU.Build.0 = Debug-netcoreapp3_0|Any CPU
939-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug-netcoreapp3_0|x64.ActiveCfg = Debug-netcoreapp3_0|Any CPU
940-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug-netcoreapp3_0|x64.Build.0 = Debug-netcoreapp3_0|Any CPU
941-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
942-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
943-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug-netfx|x64.ActiveCfg = Debug-netfx|Any CPU
944-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Debug-netfx|x64.Build.0 = Debug-netfx|Any CPU
945-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release|Any CPU.ActiveCfg = Release|Any CPU
946-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release|Any CPU.Build.0 = Release|Any CPU
947-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release|x64.ActiveCfg = Release|Any CPU
948-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release|x64.Build.0 = Release|Any CPU
949-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release-netcoreapp3_0|Any CPU.ActiveCfg = Release-netcoreapp3_0|Any CPU
950-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release-netcoreapp3_0|Any CPU.Build.0 = Release-netcoreapp3_0|Any CPU
951-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release-netcoreapp3_0|x64.ActiveCfg = Release-netcoreapp3_0|Any CPU
952-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release-netcoreapp3_0|x64.Build.0 = Release-netcoreapp3_0|Any CPU
953-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
954-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
955-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
956-
{5F81A2A4-73AD-494C-B387-07D605EC8826}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
907+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
908+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug|Any CPU.Build.0 = Debug|Any CPU
909+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug|x64.ActiveCfg = Debug|Any CPU
910+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug|x64.Build.0 = Debug|Any CPU
911+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug-netcoreapp3_0|Any CPU.ActiveCfg = Debug|Any CPU
912+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug-netcoreapp3_0|Any CPU.Build.0 = Debug|Any CPU
913+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug-netcoreapp3_0|x64.ActiveCfg = Debug|Any CPU
914+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug-netcoreapp3_0|x64.Build.0 = Debug|Any CPU
915+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug-netfx|Any CPU.ActiveCfg = Debug|Any CPU
916+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug-netfx|Any CPU.Build.0 = Debug|Any CPU
917+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug-netfx|x64.ActiveCfg = Debug|Any CPU
918+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Debug-netfx|x64.Build.0 = Debug|Any CPU
919+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release|Any CPU.ActiveCfg = Release|Any CPU
920+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release|Any CPU.Build.0 = Release|Any CPU
921+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release|x64.ActiveCfg = Release|Any CPU
922+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release|x64.Build.0 = Release|Any CPU
923+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release-netcoreapp3_0|Any CPU.ActiveCfg = Release|Any CPU
924+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release-netcoreapp3_0|Any CPU.Build.0 = Release|Any CPU
925+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release-netcoreapp3_0|x64.ActiveCfg = Release|Any CPU
926+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release-netcoreapp3_0|x64.Build.0 = Release|Any CPU
927+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release-netfx|Any CPU.ActiveCfg = Release|Any CPU
928+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release-netfx|Any CPU.Build.0 = Release|Any CPU
929+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release-netfx|x64.ActiveCfg = Release|Any CPU
930+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132}.Release-netfx|x64.Build.0 = Release|Any CPU
957931
{802233D6-8CC0-46AD-9F23-FEE1E9AED9B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
958932
{802233D6-8CC0-46AD-9F23-FEE1E9AED9B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
959933
{802233D6-8CC0-46AD-9F23-FEE1E9AED9B3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1590,8 +1564,7 @@ Global
15901564
{B4E55B2D-2A92-46E7-B72F-E76D6FD83440} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E}
15911565
{3E4ABF07-7970-4BE6-B45B-A13D3C397545} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
15921566
{7333EDEF-4144-405C-A5EC-6F42201857D8} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
1593-
{A0E562A9-0E6D-470D-B180-6EB44BA84D60} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
1594-
{5F81A2A4-73AD-494C-B387-07D605EC8826} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
1567+
{E97D8B5A-3035-4D41-9B0D-77FF8FB8D132} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
15951568
{802233D6-8CC0-46AD-9F23-FEE1E9AED9B3} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
15961569
{00E38F77-1E61-4CDF-8F97-1417D4E85053} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
15971570
{A7222F41-1CF0-47D9-B80C-B4D77B027A61} = {09EADF06-BE25-4228-AB53-95AE3E15B530}

‎src/Microsoft.ML.CpuMath/AssemblyInfo.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
using System.Runtime.CompilerServices;
66
using Microsoft.ML.Internal.CpuMath.Core;
77

8-
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netstandard" + PublicKey.TestValue)]
9-
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
8+
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests" + PublicKey.TestValue)]
109
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
1110
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
1211
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]

‎test/Microsoft.ML.CpuMath.UnitTests.netcoreapp/Microsoft.ML.CpuMath.UnitTests.netcoreapp.csproj

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎test/Microsoft.ML.CpuMath.UnitTests.netstandard/Microsoft.ML.CpuMath.UnitTests.netstandard.csproj renamed to ‎test/Microsoft.ML.CpuMath.UnitTests/Microsoft.ML.CpuMath.UnitTests.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
<ProjectReference Include="..\..\src\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj " />
55
<ProjectReference Include="..\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj" />
66
</ItemGroup>
7-
8-
<ItemGroup>
7+
8+
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
99
<NativeAssemblyReference Include="CpuMathNative" />
1010
</ItemGroup>
11-
12-
<ItemGroup>
13-
<Compile Include="..\Microsoft.ML.CpuMath.UnitTests.netcoreapp\UnitTests.cs" />
14-
</ItemGroup>
15-
11+
1612
</Project>

‎test/Microsoft.ML.CpuMath.UnitTests.netcoreapp/UnitTests.cs renamed to ‎test/Microsoft.ML.CpuMath.UnitTests/UnitTests.cs

File renamed without changes.

0 commit comments

Comments
 (0)