Skip to content

Tests for Sse and Software implementations #2200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 25, 2019
Merged

Tests for Sse and Software implementations #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc8c82a
sse and software implementations
Anipik Jan 22, 2019
d494dbf
net461 -> netframwork, automatically copying runtime files, enables s…
Anipik Jan 22, 2019
cc50e07
Ficing build for netfx and adding comment
Anipik Jan 23, 2019
4a4cd0d
link to the remoteexecutor original code and ordering of parameters c…
Anipik Jan 23, 2019
be6912d
removing startup object
Anipik Jan 23, 2019
7aee725
Fixing build after mergeconflicts
Anipik Jan 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Microsoft.ML.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.DataView", "
pkg\Microsoft.Data.DataView\Microsoft.Data.DataView.symbols.nupkgproj = pkg\Microsoft.Data.DataView\Microsoft.Data.DataView.symbols.nupkgproj
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemoteExecutorConsoleApp", "test\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj", "{5E920CAC-5A28-42FB-936E-49C472130953}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -914,6 +916,18 @@ Global
{85D0CAFD-2FE8-496A-88C7-585D35B94243}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
{85D0CAFD-2FE8-496A-88C7-585D35B94243}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
{85D0CAFD-2FE8-496A-88C7-585D35B94243}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Release|Any CPU.Build.0 = Release|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
{5E920CAC-5A28-42FB-936E-49C472130953}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -996,6 +1010,7 @@ Global
{A84717CB-F11A-41C5-A74D-C0F1D47B7431} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
{85D0CAFD-2FE8-496A-88C7-585D35B94243} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
{31D38B21-102B-41C0-9E0A-2FE0BF68D123} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
{5E920CAC-5A28-42FB-936E-49C472130953} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down
2 changes: 2 additions & 0 deletions test/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<TargetFramework Condition="$(Configuration.EndsWith('-netfx'))">net461</TargetFramework>
<TargetFramework Condition="'$(UseIntrinsics)' == 'true'">netcoreapp3.0</TargetFramework>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win-x64</RuntimeIdentifier>
<!-- This is required in order to have following extension files in the output folder of the projects referencing other projects. -->
<AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json</AllowedReferenceRelatedFileExtensions>
<IsPackable>false</IsPackable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.Benchmarks/Harness/Configs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected virtual Job GetJobDefinition()
/// </summary>
private IToolchain CreateToolchain()
{
#if NET461
#if NETFRAMEWORK
var tfm = "net461";
var csProj = CsProjClassicNetToolchain.Net461;
#else
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.Benchmarks/Harness/ProjectGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class ProjectGenerator : CsProjGenerator

public ProjectGenerator(string targetFrameworkMoniker) : base(targetFrameworkMoniker, null, null, null)
{
#if NET461
#if NETFRAMEWORK
runtimeIdentifier = "win-x64";
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<StartupObject>Microsoft.ML.Benchmarks.Program</StartupObject>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="BenchmarkDotNet.Artifacts\**" />
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<StartupObject>Microsoft.ML.CpuMath.PerformanceTests.Program</StartupObject>
<GenerateProgramFile>false</GenerateProgramFile>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions ...icrosoft.ML.CpuMath.UnitTests.netcoreapp/Microsoft.ML.CpuMath.UnitTests.netcoreapp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj " />
<ProjectReference Include="..\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj" />
</ItemGroup>

</Project>
Loading