Skip to content

Added Microsoft.ML.Benchmarks Project #62

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.

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 10 commits into from
May 15, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
99 changes: 99 additions & 0 deletions Microsoft.ML.sln
Original file line number Diff line number Diff line change
Expand Up @@ -85,100 +85,198 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "specs", "specs", "{2DEFC784
Documentation\specs\mvp.md = Documentation\specs\mvp.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Benchmarks", "test\Microsoft.ML.Benchmarks\Microsoft.ML.Benchmarks.csproj", "{77705689-F08D-44B5-A775-3F844EE744AC}"
Copy link
Member

@markusweimer markusweimer May 8, 2018

Choose a reason for hiding this comment

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

Shall we mark the .sln as binary? Merging it is usually hopeless anyway :) #Closed

Copy link
Member Author

@KrzysztofCwalina KrzysztofCwalina May 8, 2018

Choose a reason for hiding this comment

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

@eerhardt/@danmosemsft, any opinions on this? #Closed

Copy link
Member

@eerhardt eerhardt May 8, 2018

Choose a reason for hiding this comment

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

It is possible to merge .sln files. They are rather touchy though - white space is actually important.

We don't do this in any other repo that I'm aware of. And it is always good to be able to read/review the .sln file edits. So unless we have a compelling reason to make this change, I'd vote we keep it as-is. #Closed

Copy link
Member

@danmoseley danmoseley May 9, 2018

Choose a reason for hiding this comment

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

Text works ok in other repos. #Closed

Copy link
Contributor

Choose a reason for hiding this comment

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

SLN is a text file. A messy one perhaps. It has been merged as a text file for at least 10 years. On few occasions it was quite useful to see the text. With proper training it is quite mergeable


In reply to: 186587605 [](ancestors = 186587605)

EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}.Debug|x64.ActiveCfg = Debug|Any CPU
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}.Debug|x64.Build.0 = Debug|Any CPU
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}.Release|Any CPU.Build.0 = Release|Any CPU
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}.Release|x64.ActiveCfg = Release|Any CPU
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}.Release|x64.Build.0 = Release|Any CPU
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6}.Debug|x64.ActiveCfg = Debug|Any CPU
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6}.Debug|x64.Build.0 = Debug|Any CPU
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6}.Release|Any CPU.Build.0 = Release|Any CPU
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6}.Release|x64.ActiveCfg = Release|Any CPU
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6}.Release|x64.Build.0 = Release|Any CPU
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Debug|x64.ActiveCfg = Debug|Any CPU
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 not have any configurations for Any CPU. ML.NET only supports x64 as of now.

Copy link
Member Author

Choose a reason for hiding this comment

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

Note that AnyCpu is a preexisting (before this PR) configuration. I was actually trying to remove it, but VS gets confused and adds it back. I can play a bit more with it, but I think it should be a separate PR as it's a separate/preexisting issue).

{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Debug|x64.Build.0 = Debug|Any CPU
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Release|Any CPU.Build.0 = Release|Any CPU
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Release|x64.ActiveCfg = Release|Any CPU
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Release|x64.Build.0 = Release|Any CPU
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Debug|x64.ActiveCfg = Debug|Any CPU
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Debug|x64.Build.0 = Debug|Any CPU
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release|Any CPU.Build.0 = Release|Any CPU
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release|x64.ActiveCfg = Release|Any CPU
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release|x64.Build.0 = Release|Any CPU
{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Debug|x64.ActiveCfg = Debug|Any CPU
{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Debug|x64.Build.0 = Debug|Any CPU
{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Release|Any CPU.Build.0 = Release|Any CPU
{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Release|x64.ActiveCfg = Release|Any CPU
{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Release|x64.Build.0 = Release|Any CPU
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug|x64.ActiveCfg = Debug|Any CPU
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug|x64.Build.0 = Debug|Any CPU
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Release|Any CPU.Build.0 = Release|Any CPU
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Release|x64.ActiveCfg = Release|Any CPU
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Release|x64.Build.0 = Release|Any CPU
{65D0603E-B96C-4DFC-BDD1-705891B88C18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{65D0603E-B96C-4DFC-BDD1-705891B88C18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65D0603E-B96C-4DFC-BDD1-705891B88C18}.Debug|x64.ActiveCfg = Debug|Any CPU
{65D0603E-B96C-4DFC-BDD1-705891B88C18}.Debug|x64.Build.0 = Debug|Any CPU
{65D0603E-B96C-4DFC-BDD1-705891B88C18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65D0603E-B96C-4DFC-BDD1-705891B88C18}.Release|Any CPU.Build.0 = Release|Any CPU
{65D0603E-B96C-4DFC-BDD1-705891B88C18}.Release|x64.ActiveCfg = Release|Any CPU
{65D0603E-B96C-4DFC-BDD1-705891B88C18}.Release|x64.Build.0 = Release|Any CPU
{707BB22C-7E5F-497A-8C2F-74578F675705}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{707BB22C-7E5F-497A-8C2F-74578F675705}.Debug|Any CPU.Build.0 = Debug|Any CPU
{707BB22C-7E5F-497A-8C2F-74578F675705}.Debug|x64.ActiveCfg = Debug|Any CPU
{707BB22C-7E5F-497A-8C2F-74578F675705}.Debug|x64.Build.0 = Debug|Any CPU
{707BB22C-7E5F-497A-8C2F-74578F675705}.Release|Any CPU.ActiveCfg = Release|Any CPU
{707BB22C-7E5F-497A-8C2F-74578F675705}.Release|Any CPU.Build.0 = Release|Any CPU
{707BB22C-7E5F-497A-8C2F-74578F675705}.Release|x64.ActiveCfg = Release|Any CPU
{707BB22C-7E5F-497A-8C2F-74578F675705}.Release|x64.Build.0 = Release|Any CPU
{2911A286-ECA4-4730-97A9-DA1FEE2DED97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2911A286-ECA4-4730-97A9-DA1FEE2DED97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2911A286-ECA4-4730-97A9-DA1FEE2DED97}.Debug|x64.ActiveCfg = Debug|Any CPU
{2911A286-ECA4-4730-97A9-DA1FEE2DED97}.Debug|x64.Build.0 = Debug|Any CPU
{2911A286-ECA4-4730-97A9-DA1FEE2DED97}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2911A286-ECA4-4730-97A9-DA1FEE2DED97}.Release|Any CPU.Build.0 = Release|Any CPU
{2911A286-ECA4-4730-97A9-DA1FEE2DED97}.Release|x64.ActiveCfg = Release|Any CPU
{2911A286-ECA4-4730-97A9-DA1FEE2DED97}.Release|x64.Build.0 = Release|Any CPU
{7288C084-11C0-43BE-AC7F-45DCFEAEEBF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7288C084-11C0-43BE-AC7F-45DCFEAEEBF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7288C084-11C0-43BE-AC7F-45DCFEAEEBF6}.Debug|x64.ActiveCfg = Debug|Any CPU
{7288C084-11C0-43BE-AC7F-45DCFEAEEBF6}.Debug|x64.Build.0 = Debug|Any CPU
{7288C084-11C0-43BE-AC7F-45DCFEAEEBF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7288C084-11C0-43BE-AC7F-45DCFEAEEBF6}.Release|Any CPU.Build.0 = Release|Any CPU
{7288C084-11C0-43BE-AC7F-45DCFEAEEBF6}.Release|x64.ActiveCfg = Release|Any CPU
{7288C084-11C0-43BE-AC7F-45DCFEAEEBF6}.Release|x64.Build.0 = Release|Any CPU
{F1CAE3AB-4F86-4BC0-BBA8-C4A58E7E8A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1CAE3AB-4F86-4BC0-BBA8-C4A58E7E8A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1CAE3AB-4F86-4BC0-BBA8-C4A58E7E8A4A}.Debug|x64.ActiveCfg = Debug|Any CPU
{F1CAE3AB-4F86-4BC0-BBA8-C4A58E7E8A4A}.Debug|x64.Build.0 = Debug|Any CPU
{F1CAE3AB-4F86-4BC0-BBA8-C4A58E7E8A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1CAE3AB-4F86-4BC0-BBA8-C4A58E7E8A4A}.Release|Any CPU.Build.0 = Release|Any CPU
{F1CAE3AB-4F86-4BC0-BBA8-C4A58E7E8A4A}.Release|x64.ActiveCfg = Release|Any CPU
{F1CAE3AB-4F86-4BC0-BBA8-C4A58E7E8A4A}.Release|x64.Build.0 = Release|Any CPU
{58E06735-1129-4DD5-86E0-6BBFF049AAD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58E06735-1129-4DD5-86E0-6BBFF049AAD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58E06735-1129-4DD5-86E0-6BBFF049AAD9}.Debug|x64.ActiveCfg = Debug|Any CPU
{58E06735-1129-4DD5-86E0-6BBFF049AAD9}.Debug|x64.Build.0 = Debug|Any CPU
{58E06735-1129-4DD5-86E0-6BBFF049AAD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58E06735-1129-4DD5-86E0-6BBFF049AAD9}.Release|Any CPU.Build.0 = Release|Any CPU
{58E06735-1129-4DD5-86E0-6BBFF049AAD9}.Release|x64.ActiveCfg = Release|Any CPU
{58E06735-1129-4DD5-86E0-6BBFF049AAD9}.Release|x64.Build.0 = Release|Any CPU
{D956E291-F6E5-4474-9023-91793F45ABEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D956E291-F6E5-4474-9023-91793F45ABEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D956E291-F6E5-4474-9023-91793F45ABEB}.Debug|x64.ActiveCfg = Debug|Any CPU
{D956E291-F6E5-4474-9023-91793F45ABEB}.Debug|x64.Build.0 = Debug|Any CPU
{D956E291-F6E5-4474-9023-91793F45ABEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D956E291-F6E5-4474-9023-91793F45ABEB}.Release|Any CPU.Build.0 = Release|Any CPU
{D956E291-F6E5-4474-9023-91793F45ABEB}.Release|x64.ActiveCfg = Release|Any CPU
{D956E291-F6E5-4474-9023-91793F45ABEB}.Release|x64.Build.0 = Release|Any CPU
{2F636A2C-062C-49F4-85F3-60DCADAB6A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F636A2C-062C-49F4-85F3-60DCADAB6A43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F636A2C-062C-49F4-85F3-60DCADAB6A43}.Debug|x64.ActiveCfg = Debug|Any CPU
{2F636A2C-062C-49F4-85F3-60DCADAB6A43}.Debug|x64.Build.0 = Debug|Any CPU
{2F636A2C-062C-49F4-85F3-60DCADAB6A43}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F636A2C-062C-49F4-85F3-60DCADAB6A43}.Release|Any CPU.Build.0 = Release|Any CPU
{2F636A2C-062C-49F4-85F3-60DCADAB6A43}.Release|x64.ActiveCfg = Release|Any CPU
{2F636A2C-062C-49F4-85F3-60DCADAB6A43}.Release|x64.Build.0 = Release|Any CPU
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}.Debug|x64.ActiveCfg = Debug|Any CPU
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}.Debug|x64.Build.0 = Debug|Any CPU
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}.Release|Any CPU.Build.0 = Release|Any CPU
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}.Release|x64.ActiveCfg = Release|Any CPU
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}.Release|x64.Build.0 = Release|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|x64.ActiveCfg = Debug|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|x64.Build.0 = Debug|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|x64.ActiveCfg = Release|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|x64.Build.0 = Release|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|x64.ActiveCfg = Debug|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|x64.Build.0 = Debug|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|x64.ActiveCfg = Release|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|x64.Build.0 = Release|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|x64.ActiveCfg = Debug|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|x64.Build.0 = Debug|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.Build.0 = Release|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Release|x64.ActiveCfg = Release|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Release|x64.Build.0 = Release|Any CPU
{3769FCC3-9AFF-4C37-97E9-6854324681DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3769FCC3-9AFF-4C37-97E9-6854324681DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3769FCC3-9AFF-4C37-97E9-6854324681DF}.Debug|x64.ActiveCfg = Debug|Any CPU
{3769FCC3-9AFF-4C37-97E9-6854324681DF}.Debug|x64.Build.0 = Debug|Any CPU
{3769FCC3-9AFF-4C37-97E9-6854324681DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3769FCC3-9AFF-4C37-97E9-6854324681DF}.Release|Any CPU.Build.0 = Release|Any CPU
{3769FCC3-9AFF-4C37-97E9-6854324681DF}.Release|x64.ActiveCfg = Release|Any CPU
{3769FCC3-9AFF-4C37-97E9-6854324681DF}.Release|x64.Build.0 = Release|Any CPU
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E}.Debug|x64.ActiveCfg = Debug|Any CPU
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E}.Debug|x64.Build.0 = Debug|Any CPU
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E}.Release|Any CPU.Build.0 = Release|Any CPU
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E}.Release|x64.ActiveCfg = Release|Any CPU
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E}.Release|x64.Build.0 = Release|Any CPU
{16BB1454-2108-40E5-B3A6-594654005303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{16BB1454-2108-40E5-B3A6-594654005303}.Debug|Any CPU.Build.0 = Debug|Any CPU
{16BB1454-2108-40E5-B3A6-594654005303}.Debug|x64.ActiveCfg = Debug|Any CPU
{16BB1454-2108-40E5-B3A6-594654005303}.Debug|x64.Build.0 = Debug|Any CPU
{16BB1454-2108-40E5-B3A6-594654005303}.Release|Any CPU.ActiveCfg = Release|Any CPU
{16BB1454-2108-40E5-B3A6-594654005303}.Release|Any CPU.Build.0 = Release|Any CPU
{16BB1454-2108-40E5-B3A6-594654005303}.Release|x64.ActiveCfg = Release|Any CPU
{16BB1454-2108-40E5-B3A6-594654005303}.Release|x64.Build.0 = Release|Any CPU
{55C8122D-79EA-48AB-85D0-EB551FC1C427}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{55C8122D-79EA-48AB-85D0-EB551FC1C427}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55C8122D-79EA-48AB-85D0-EB551FC1C427}.Debug|x64.ActiveCfg = Debug|Any CPU
{55C8122D-79EA-48AB-85D0-EB551FC1C427}.Debug|x64.Build.0 = Debug|Any CPU
{55C8122D-79EA-48AB-85D0-EB551FC1C427}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55C8122D-79EA-48AB-85D0-EB551FC1C427}.Release|Any CPU.Build.0 = Release|Any CPU
{55C8122D-79EA-48AB-85D0-EB551FC1C427}.Release|x64.ActiveCfg = Release|Any CPU
{55C8122D-79EA-48AB-85D0-EB551FC1C427}.Release|x64.Build.0 = Release|Any CPU
{77705689-F08D-44B5-A775-3F844EE744AC}.Debug|Any CPU.ActiveCfg = Debug|x64
{77705689-F08D-44B5-A775-3F844EE744AC}.Debug|x64.ActiveCfg = Debug|x64
{77705689-F08D-44B5-A775-3F844EE744AC}.Debug|x64.Build.0 = Debug|x64
{77705689-F08D-44B5-A775-3F844EE744AC}.Release|Any CPU.ActiveCfg = Release|x64
{77705689-F08D-44B5-A775-3F844EE744AC}.Release|x64.ActiveCfg = Release|x64
{77705689-F08D-44B5-A775-3F844EE744AC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -210,6 +308,7 @@ Global
{52794B40-AB8A-41AF-9EF7-799C80D6E0BC} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
{DB751004-5D49-4B88-B78F-29CA9887087D} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
{2DEFC784-F2B5-44EA-ABBB-0DCF3E689DAC} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
{77705689-F08D-44B5-A775-3F844EE744AC} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down
18 changes: 18 additions & 0 deletions test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<TargetFramework>net472</TargetFramework>
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason this doesn't target .NET Core or .NET Standard?

Copy link
Member Author

@KrzysztofCwalina KrzysztofCwalina May 8, 2018

Choose a reason for hiding this comment

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

It's an exe, so it cannot be .NET Standard (which is for dlls). It could be .NET Core app, but NetFx app makes it easier to run it, as the project output is an exe.
Also, the output of this project does not really matter: BenchmarkDotNet generates the actual program that is being run during the test, and the generated project can be .NET Core (it's just a change in the config I can make if we prefer .net core test).

Copy link
Member

Choose a reason for hiding this comment

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

Still, the dependency of .NET 4.7 makes this code unrunable on Linux, right? Can't we make it dual-target? netcoreapp and net472?

Copy link
Member Author

Choose a reason for hiding this comment

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

Makes sense. I will change the host app to .NET Core too.

<Platforms>x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.ML.StandardLearners\Microsoft.ML.StandardLearners.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ML\Microsoft.ML.csproj" />
</ItemGroup>
<ItemGroup>
<NativeAssemblyReference Include="CpuMathNative" />
</ItemGroup>
</Project>
46 changes: 46 additions & 0 deletions test/Microsoft.ML.Benchmarks/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// 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.Configs;
using BenchmarkDotNet.Diagnosers;
using BenchmarkDotNet.Jobs;
using BenchmarkDotNet.Running;
using System.IO;

namespace Microsoft.ML.Benchmarks
{
public class Program
{
/// <summary>
/// execute dotnet run -c Release and choose the benchmarks you want to run
/// </summary>
/// <param name="args"></param>
public static void Main(string[] args)
{
BenchmarkSwitcher
.FromAssembly(typeof(Program).Assembly)
.Run(null, CreateClrVsCoreConfig());
}

private static IConfig CreateClrVsCoreConfig()
{
var config = DefaultConfig.Instance.With(
Job.ShortRun.
With(BenchmarkDotNet.Environments.Platform.X64)).
With(MemoryDiagnoser.Default);
return config;
}

internal static string GetDataPath(string name)
=> Path.GetFullPath(Path.Combine(_dataRoot, name));

static readonly string _dataRoot;
static Program()
{
var currentAssemblyLocation = new FileInfo(typeof(Program).Assembly.Location);
var rootDir = currentAssemblyLocation.Directory.Parent.Parent.Parent.Parent.FullName;
_dataRoot = Path.Combine(rootDir, "test", "data");
}
}
}
Loading