Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
11 changes: 11 additions & 0 deletions Microsoft.ML.sln
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tokenizers.Tes
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests", "test\Microsoft.ML.FSharp.Tests\Microsoft.ML.FSharp.Tests.fsproj", "{041CB5CD-5832-413E-A894-D9DBED210B16}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Analysis.PerformanceTests", "test\Microsoft.Data.Analysis.PerformanceTests\Microsoft.Data.Analysis.PerformanceTests.csproj", "{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -788,6 +790,14 @@ Global
{041CB5CD-5832-413E-A894-D9DBED210B16}.Release|Any CPU.Build.0 = Release|Any CPU
{041CB5CD-5832-413E-A894-D9DBED210B16}.Release|x64.ActiveCfg = Release|Any CPU
{041CB5CD-5832-413E-A894-D9DBED210B16}.Release|x64.Build.0 = Release|Any CPU
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Debug|x64.ActiveCfg = Debug|Any CPU
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Debug|x64.Build.0 = Debug|Any CPU
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Release|Any CPU.Build.0 = Release|Any CPU
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Release|x64.ActiveCfg = Release|Any CPU
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -870,6 +880,7 @@ Global
{BBC3A950-BD68-45AC-9DBD-A8F4D8847745} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
{C3D82402-F207-4F19-8C57-5AF0FBAF9682} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
{041CB5CD-5832-413E-A894-D9DBED210B16} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<ImplicitUsings>disable</ImplicitUsings>
<TargetFrameworks>net6.0</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use the same version as the other performance projects - $(BenchmarkDotNetVersion)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT there is an issue with the DotNetBenchmark version 0.12.0, that is currently used in ML .Net. It crashes with NotSupportedException("Unknown .NET Runtime") on .Net 6.0.
However. upgrading solution to the latest 0.13.5 leads to build error as Obsolete methods from this library are used in Microsoft.ML.CpuMath.PerformanceTests.

I am not able to build Native part of ML .Net on my laptop ( due to #6823 ), so I can't verify my changes in the CpuMath.PerformanceTests project (or check if it's working correctly on .Net 6.0). That's why I used the latest version only for the DataFrame project.

Could you please help me with building native dlls for the project?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah let me take a look!

</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.Data.Analysis\Microsoft.Data.Analysis.csproj" />
</ItemGroup>

</Project>
202 changes: 202 additions & 0 deletions test/Microsoft.Data.Analysis.PerformanceTests/PerformanceTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;

namespace Microsoft.Data.Analysis.PerformanceTests
{
public class PerformanceTests
{
private const int ItemsCount = 1000000;

private Int32DataFrameColumn _int32Column1;
private Int32DataFrameColumn _int32Column2;

private Int16DataFrameColumn _int16Column1;
private Int16DataFrameColumn _int16Column2;

private DoubleDataFrameColumn _doubleColumn1;
private DoubleDataFrameColumn _doubleColumn2;

private SingleDataFrameColumn _floatColumn1;
private SingleDataFrameColumn _floatColumn2;

[GlobalSetup]
public void SetUp()
{
var values = Enumerable.Range(1, ItemsCount).ToArray();

_int32Column1 = new Int32DataFrameColumn("Column1", values);
_int32Column2 = new Int32DataFrameColumn("Column2", values);

var shortValues = values.Select(v => (short)(v % short.MaxValue + 1)).ToArray();
_int16Column1 = new Int16DataFrameColumn("Column1", shortValues);
_int16Column2 = new Int16DataFrameColumn("Column2", shortValues);

_doubleColumn1 = new DoubleDataFrameColumn("Column1", values.Select(v => (double)v));
_doubleColumn2 = new DoubleDataFrameColumn("Column2", values.Select(v => (double)v));

_floatColumn1 = new SingleDataFrameColumn("Column1", values.Select(v => (float)v));
_floatColumn2 = new SingleDataFrameColumn("Column2", values.Select(v => (float)v));
}

#region Addition

[Benchmark]
public void Add_Int32()
{
var column = _int32Column1 + _int32Column2;
}

[Benchmark]
public void Add_Int16()
{
var column = _int16Column1 + _int16Column2;
}

[Benchmark]
public void Add_Double()
{
var column = _doubleColumn1 + _doubleColumn2;
}

[Benchmark]
public void Add_Float()
{
var column = _floatColumn1 + _floatColumn2;
}

[Benchmark]
public void Add_Int32_Int16()
{
var column = _int32Column1 + _int16Column2;
}

[Benchmark]
public void Add_Double_Float()
{
var column = _doubleColumn1 + _floatColumn2;
}
#endregion

#region Subtract
[Benchmark]
public void Subtract_Int32()
{
var column = _int32Column1 - _int32Column2;
}

[Benchmark]
public void Subtract_Int16()
{
var column = _int16Column1 - _int16Column2;
}

[Benchmark]
public void Subtract_Double()
{
var column = _doubleColumn1 - _doubleColumn2;
}

[Benchmark]
public void Subtract_Float()
{
var column = _floatColumn1 - _floatColumn2;
}

[Benchmark]
public void Subtract_Int32_Int16()
{
var column = _int32Column1 - _int16Column2;
}

[Benchmark]
public void Subtract_Double_Float()
{
var column = _doubleColumn1 - _floatColumn2;
}
#endregion

#region Multiply
[Benchmark]
public void Multiply_Int32()
{
var column = _int32Column1 * _int32Column2;
}

[Benchmark]
public void Multiply_Int16()
{
var column = _int16Column1 * _int16Column2;
}

[Benchmark]
public void Multiply_Double()
{
var column = _doubleColumn1 * _doubleColumn2;
}

[Benchmark]
public void Multiply_Float()
{
var column = _floatColumn1 * _floatColumn2;
}

[Benchmark]
public void Multiply_Int32_Int16()
{
var column = _int32Column1 * _int16Column2;
}

[Benchmark]
public void Multiply_Double_Float()
{
var column = _doubleColumn1 * _floatColumn2;
}
#endregion

#region Divide
[Benchmark]
public void Divide_Int32()
{
var column = _int32Column1 / _int32Column2;
}

[Benchmark]
public void Divide_Int16()
{
var column = _int16Column1 / _int16Column2;
}

[Benchmark]
public void Divide_Double()
{
var column = _doubleColumn1 / _doubleColumn2;
}

[Benchmark]
public void Divide_Float()
{
var column = _floatColumn1 / _floatColumn2;
}

[Benchmark]
public void Divide_Int32_Int16()
{
var column = _int32Column1 / _int16Column2;
}

[Benchmark]
public void Divide_Double_Float()
{
var column = _doubleColumn1 / _floatColumn2;
}
#endregion
}
}
17 changes: 17 additions & 0 deletions test/Microsoft.Data.Analysis.PerformanceTests/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using BenchmarkDotNet.Running;


namespace Microsoft.Data.Analysis.PerformanceTests
{
class Program
{
public static void Main(string[] args)
{
var summary = BenchmarkRunner.Run<PerformanceTests>();
}
}
}