Propose sweep#365

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

Closed
Nepomuceno wants to merge 2 commits into from
Closed

Propose sweep #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87f0c4b
WIP Propose Sweeps
ross-p-smith Jun 15, 2018
2bd9cfb
Correcting singleton and adding tests
Jun 15, 2018
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
7 changes: 7 additions & 0 deletions Microsoft.ML.sln
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Mi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Console", "src\Microsoft.ML.Console\Microsoft.ML.Console.csproj", "{362A98CF-FBF7-4EBB-A11B-990BBF845B15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand DownExpand Up@@ -208,6 +210,10 @@ Global
{362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.Build.0 = Release|Any CPU
{3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand DownExpand Up@@ -243,6 +249,7 @@ Global
{7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
{64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
{362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
{3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down
12 changes: 6 additions & 6 deletions src/Microsoft.ML.Sweeper/Algorithms/Grid.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ protected SweeperBase(ArgumentsBase args, IHostEnvironment env, IValueGenerator[
SweepParameters = sweepParameters;
}

public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
{
var prevParamSets = previousRuns?.Select(r => r.ParameterSet).ToList() ?? new List<ParameterSet>();
var result = new List<ParameterSet>();
Expand All@@ -80,12 +80,11 @@ public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResul
(AlreadyGenerated(paramSet, prevParamSets) || AlreadyGenerated(paramSet, result)));

Contracts.Assert(paramSet != null);
result.Add(paramSet);
if (!result.Contains(paramSet))
result.Add(paramSet);
}

return result.ToArray();
}

protected abstract ParameterSet CreateParamSet();

protected static bool AlreadyGenerated(ParameterSet paramSet, IEnumerable<ParameterSet> previousRuns)
Expand DownExpand Up@@ -150,7 +149,7 @@ public RandomGridSweeper(IHostEnvironment env, Arguments args, IValueGenerator[]
}
}

public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
{
if (_nGridPoints == 0)
return base.ProposeSweeps(maxSweeps, previousRuns);
Expand All@@ -173,7 +172,8 @@ public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResu
if (!AlreadyGenerated(_cache[iPerm], prevParamSets))
break;
}
result.Add(_cache[iPerm]);
if (!result.Contains(_cache[iPerm]))
result.Add(_cache[iPerm]);
}
return result.ToArray();
}
Expand Down
22 changes: 22 additions & 0 deletions test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>

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

</Project>
53 changes: 53 additions & 0 deletions test/Microsoft.ML.Sweeper.Tests/SweeperUniqueValuesTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.PipelineInference;
using Microsoft.ML.Runtime.RunTests;
using Microsoft.ML.Runtime.Sweeper;
using System;
using System.IO;
using Xunit;

namespace Microsoft.ML.Sweeper.Tests
{
public class SweeperUniqueValuesTest
{
[Fact]
public void SweeperReturnsDistinctValuesForUniformRandomSweeper()
{
DiscreteValueGenerator valueGenerator = SetSingleParameter();
using (var writer = new StreamWriter(new MemoryStream()))
using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
{
var sweeper = new UniformRandomSweeper(env, new SweeperBase.ArgumentsBase(), new[] { valueGenerator });
var results = sweeper.ProposeSweeps(5000);
Assert.NotNull(results);
int length = results.Length;
Assert.Equal(2, length);
}
}
[Fact]
public void SweeperReturnsDistinctValuesForRandomGridSweeper()
{
DiscreteValueGenerator valueGenerator = SetSingleParameter();
using (var writer = new StreamWriter(new MemoryStream()))
using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
{
var sweeper = new RandomGridSweeper(env, new RandomGridSweeper.Arguments(), new[] { valueGenerator });
var results = sweeper.ProposeSweeps(5000);
Assert.NotNull(results);
int length = results.Length;
Assert.Equal(2, length);
}
}

private static DiscreteValueGenerator SetSingleParameter()
{
var args = new DiscreteParamArguments();
args.Name = "TestParam";
args.Values = new string[] { "one", "two" };
var valueGenerator = new DiscreteValueGenerator(args);
return valueGenerator;
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Propose sweep#365

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

 Closed

Nepomuceno
wants to merge
2
commits into

from

 Closed


Propose sweep
#365
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
87f0c4b

WIP Propose Sweeps


ross-p-smith Jun 15, 2018
2bd9cfb

Correcting singleton and adding tests

Jun 15, 2018

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


7 changes: 7 additions & 0 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Mi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Console", "src\Microsoft.ML.Console\Microsoft.ML.Console.csproj", "{362A98CF-FBF7-4EBB-A11B-990BBF845B15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand DownExpand Up@@ -208,6 +210,10 @@ Global
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.Build.0 = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
Expand DownExpand Up@@ -243,6 +249,7 @@ Global
 {7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
 SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down

12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Sweeper/Algorithms/Grid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ protected SweeperBase(ArgumentsBase args, IHostEnvironment env, IValueGenerator[
 SweepParameters = sweepParameters;
 }

 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 var prevParamSets = previousRuns?.Select(r => r.ParameterSet).ToList() ?? new List<ParameterSet>();
 var result = new List<ParameterSet>();
Expand All@@ -80,12 +80,11 @@ public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResul
 (AlreadyGenerated(paramSet, prevParamSets) || AlreadyGenerated(paramSet, result)));

 Contracts.Assert(paramSet != null);
 result.Add(paramSet);
 if (!result.Contains(paramSet))
 result.Add(paramSet);
 }

 return result.ToArray();
 }

 protected abstract ParameterSet CreateParamSet();

 protected static bool AlreadyGenerated(ParameterSet paramSet, IEnumerable<ParameterSet> previousRuns)
Expand DownExpand Up@@ -150,7 +149,7 @@ public RandomGridSweeper(IHostEnvironment env, Arguments args, IValueGenerator[]
 }
 }

 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 if (_nGridPoints == 0)
 return base.ProposeSweeps(maxSweeps, previousRuns);
Expand All@@ -173,7 +172,8 @@ public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResu
 if (!AlreadyGenerated(_cache[iPerm], prevParamSets))
 break;
 }
 result.Add(_cache[iPerm]);
 if (!result.Contains(_cache[iPerm]))
 result.Add(_cache[iPerm]);
 }
 return result.ToArray();
 }
Expand Down

22 changes: 22 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>

 <IsPackable>false</IsPackable>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 </ItemGroup>

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

</Project>

53 changes: 53 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/SweeperUniqueValuesTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.PipelineInference;
using Microsoft.ML.Runtime.RunTests;
using Microsoft.ML.Runtime.Sweeper;
using System;
using System.IO;
using Xunit;

namespace Microsoft.ML.Sweeper.Tests
{
 public class SweeperUniqueValuesTest
 {
 [Fact]
 public void SweeperReturnsDistinctValuesForUniformRandomSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new UniformRandomSweeper(env, new SweeperBase.ArgumentsBase(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }
 [Fact]
 public void SweeperReturnsDistinctValuesForRandomGridSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new RandomGridSweeper(env, new RandomGridSweeper.Arguments(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }

 private static DiscreteValueGenerator SetSingleParameter()
 {
 var args = new DiscreteParamArguments();
 args.Name = "TestParam";
 args.Values = new string[] { "one", "two" };
 var valueGenerator = new DiscreteValueGenerator(args);
 return valueGenerator;
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Propose sweep#365

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

 Closed

Nepomuceno
wants to merge
2
commits into

from

 Closed


Propose sweep
#365
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
87f0c4b

WIP Propose Sweeps


ross-p-smith Jun 15, 2018
2bd9cfb

Correcting singleton and adding tests

Jun 15, 2018

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


7 changes: 7 additions & 0 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Mi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Console", "src\Microsoft.ML.Console\Microsoft.ML.Console.csproj", "{362A98CF-FBF7-4EBB-A11B-990BBF845B15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand DownExpand Up@@ -208,6 +210,10 @@ Global
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.Build.0 = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
Expand DownExpand Up@@ -243,6 +249,7 @@ Global
 {7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
 SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down

12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Sweeper/Algorithms/Grid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ protected SweeperBase(ArgumentsBase args, IHostEnvironment env, IValueGenerator[
 SweepParameters = sweepParameters;
 }

 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 var prevParamSets = previousRuns?.Select(r => r.ParameterSet).ToList() ?? new List<ParameterSet>();
 var result = new List<ParameterSet>();
Expand All@@ -80,12 +80,11 @@ public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResul
 (AlreadyGenerated(paramSet, prevParamSets) || AlreadyGenerated(paramSet, result)));

 Contracts.Assert(paramSet != null);
 result.Add(paramSet);
 if (!result.Contains(paramSet))
 result.Add(paramSet);
 }

 return result.ToArray();
 }

 protected abstract ParameterSet CreateParamSet();

 protected static bool AlreadyGenerated(ParameterSet paramSet, IEnumerable<ParameterSet> previousRuns)
Expand DownExpand Up@@ -150,7 +149,7 @@ public RandomGridSweeper(IHostEnvironment env, Arguments args, IValueGenerator[]
 }
 }

 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 if (_nGridPoints == 0)
 return base.ProposeSweeps(maxSweeps, previousRuns);
Expand All@@ -173,7 +172,8 @@ public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResu
 if (!AlreadyGenerated(_cache[iPerm], prevParamSets))
 break;
 }
 result.Add(_cache[iPerm]);
 if (!result.Contains(_cache[iPerm]))
 result.Add(_cache[iPerm]);
 }
 return result.ToArray();
 }
Expand Down

22 changes: 22 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>

 <IsPackable>false</IsPackable>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 </ItemGroup>

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

</Project>

53 changes: 53 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/SweeperUniqueValuesTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.PipelineInference;
using Microsoft.ML.Runtime.RunTests;
using Microsoft.ML.Runtime.Sweeper;
using System;
using System.IO;
using Xunit;

namespace Microsoft.ML.Sweeper.Tests
{
 public class SweeperUniqueValuesTest
 {
 [Fact]
 public void SweeperReturnsDistinctValuesForUniformRandomSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new UniformRandomSweeper(env, new SweeperBase.ArgumentsBase(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }
 [Fact]
 public void SweeperReturnsDistinctValuesForRandomGridSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new RandomGridSweeper(env, new RandomGridSweeper.Arguments(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }

 private static DiscreteValueGenerator SetSingleParameter()
 {
 var args = new DiscreteParamArguments();
 args.Name = "TestParam";
 args.Values = new string[] { "one", "two" };
 var valueGenerator = new DiscreteValueGenerator(args);
 return valueGenerator;
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Propose sweep#365

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

 Closed

Nepomuceno
wants to merge
2
commits into

from

 Closed


Propose sweep
#365
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
87f0c4b

WIP Propose Sweeps


ross-p-smith Jun 15, 2018
2bd9cfb

Correcting singleton and adding tests

Jun 15, 2018

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


7 changes: 7 additions & 0 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Mi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Console", "src\Microsoft.ML.Console\Microsoft.ML.Console.csproj", "{362A98CF-FBF7-4EBB-A11B-990BBF845B15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand DownExpand Up@@ -208,6 +210,10 @@ Global
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.Build.0 = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
Expand DownExpand Up@@ -243,6 +249,7 @@ Global
 {7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
 SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down

12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Sweeper/Algorithms/Grid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ protected SweeperBase(ArgumentsBase args, IHostEnvironment env, IValueGenerator[
 SweepParameters = sweepParameters;
 }

 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 var prevParamSets = previousRuns?.Select(r => r.ParameterSet).ToList() ?? new List<ParameterSet>();
 var result = new List<ParameterSet>();
Expand All@@ -80,12 +80,11 @@ public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResul
 (AlreadyGenerated(paramSet, prevParamSets) || AlreadyGenerated(paramSet, result)));

 Contracts.Assert(paramSet != null);
 result.Add(paramSet);
 if (!result.Contains(paramSet))
 result.Add(paramSet);
 }

 return result.ToArray();
 }

 protected abstract ParameterSet CreateParamSet();

 protected static bool AlreadyGenerated(ParameterSet paramSet, IEnumerable<ParameterSet> previousRuns)
Expand DownExpand Up@@ -150,7 +149,7 @@ public RandomGridSweeper(IHostEnvironment env, Arguments args, IValueGenerator[]
 }
 }

 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 if (_nGridPoints == 0)
 return base.ProposeSweeps(maxSweeps, previousRuns);
Expand All@@ -173,7 +172,8 @@ public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResu
 if (!AlreadyGenerated(_cache[iPerm], prevParamSets))
 break;
 }
 result.Add(_cache[iPerm]);
 if (!result.Contains(_cache[iPerm]))
 result.Add(_cache[iPerm]);
 }
 return result.ToArray();
 }
Expand Down

22 changes: 22 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>

 <IsPackable>false</IsPackable>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 </ItemGroup>

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

</Project>

53 changes: 53 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/SweeperUniqueValuesTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.PipelineInference;
using Microsoft.ML.Runtime.RunTests;
using Microsoft.ML.Runtime.Sweeper;
using System;
using System.IO;
using Xunit;

namespace Microsoft.ML.Sweeper.Tests
{
 public class SweeperUniqueValuesTest
 {
 [Fact]
 public void SweeperReturnsDistinctValuesForUniformRandomSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new UniformRandomSweeper(env, new SweeperBase.ArgumentsBase(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }
 [Fact]
 public void SweeperReturnsDistinctValuesForRandomGridSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new RandomGridSweeper(env, new RandomGridSweeper.Arguments(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }

 private static DiscreteValueGenerator SetSingleParameter()
 {
 var args = new DiscreteParamArguments();
 args.Name = "TestParam";
 args.Values = new string[] { "one", "two" };
 var valueGenerator = new DiscreteValueGenerator(args);
 return valueGenerator;
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Propose sweep#365

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

 Closed

Nepomuceno
wants to merge
2
commits into

from

 Closed


Propose sweep
#365
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
87f0c4b

WIP Propose Sweeps


ross-p-smith Jun 15, 2018
2bd9cfb

Correcting singleton and adding tests

Jun 15, 2018

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


7 changes: 7 additions & 0 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Mi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Console", "src\Microsoft.ML.Console\Microsoft.ML.Console.csproj", "{362A98CF-FBF7-4EBB-A11B-990BBF845B15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand DownExpand Up@@ -208,6 +210,10 @@ Global
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.Build.0 = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
Expand DownExpand Up@@ -243,6 +249,7 @@ Global
 {7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
 SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down

12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Sweeper/Algorithms/Grid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ protected SweeperBase(ArgumentsBase args, IHostEnvironment env, IValueGenerator[
 SweepParameters = sweepParameters;
 }

 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 var prevParamSets = previousRuns?.Select(r => r.ParameterSet).ToList() ?? new List<ParameterSet>();
 var result = new List<ParameterSet>();
Expand All@@ -80,12 +80,11 @@ public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResul
 (AlreadyGenerated(paramSet, prevParamSets) || AlreadyGenerated(paramSet, result)));

 Contracts.Assert(paramSet != null);
 result.Add(paramSet);
 if (!result.Contains(paramSet))
 result.Add(paramSet);
 }

 return result.ToArray();
 }

 protected abstract ParameterSet CreateParamSet();

 protected static bool AlreadyGenerated(ParameterSet paramSet, IEnumerable<ParameterSet> previousRuns)
Expand DownExpand Up@@ -150,7 +149,7 @@ public RandomGridSweeper(IHostEnvironment env, Arguments args, IValueGenerator[]
 }
 }

 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 if (_nGridPoints == 0)
 return base.ProposeSweeps(maxSweeps, previousRuns);
Expand All@@ -173,7 +172,8 @@ public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResu
 if (!AlreadyGenerated(_cache[iPerm], prevParamSets))
 break;
 }
 result.Add(_cache[iPerm]);
 if (!result.Contains(_cache[iPerm]))
 result.Add(_cache[iPerm]);
 }
 return result.ToArray();
 }
Expand Down

22 changes: 22 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>

 <IsPackable>false</IsPackable>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 </ItemGroup>

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

</Project>

53 changes: 53 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/SweeperUniqueValuesTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.PipelineInference;
using Microsoft.ML.Runtime.RunTests;
using Microsoft.ML.Runtime.Sweeper;
using System;
using System.IO;
using Xunit;

namespace Microsoft.ML.Sweeper.Tests
{
 public class SweeperUniqueValuesTest
 {
 [Fact]
 public void SweeperReturnsDistinctValuesForUniformRandomSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new UniformRandomSweeper(env, new SweeperBase.ArgumentsBase(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }
 [Fact]
 public void SweeperReturnsDistinctValuesForRandomGridSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new RandomGridSweeper(env, new RandomGridSweeper.Arguments(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }

 private static DiscreteValueGenerator SetSingleParameter()
 {
 var args = new DiscreteParamArguments();
 args.Name = "TestParam";
 args.Values = new string[] { "one", "two" };
 var valueGenerator = new DiscreteValueGenerator(args);
 return valueGenerator;
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Propose sweep#365

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

 Closed

Nepomuceno
wants to merge
2
commits into

from

 Closed


Propose sweep
#365
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
87f0c4b

WIP Propose Sweeps


ross-p-smith Jun 15, 2018
2bd9cfb

Correcting singleton and adding tests

Jun 15, 2018

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


7 changes: 7 additions & 0 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Mi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Console", "src\Microsoft.ML.Console\Microsoft.ML.Console.csproj", "{362A98CF-FBF7-4EBB-A11B-990BBF845B15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand DownExpand Up@@ -208,6 +210,10 @@ Global
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.Build.0 = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
Expand DownExpand Up@@ -243,6 +249,7 @@ Global
 {7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
 SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down

12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Sweeper/Algorithms/Grid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ protected SweeperBase(ArgumentsBase args, IHostEnvironment env, IValueGenerator[
 SweepParameters = sweepParameters;
 }

 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 var prevParamSets = previousRuns?.Select(r => r.ParameterSet).ToList() ?? new List<ParameterSet>();
 var result = new List<ParameterSet>();
Expand All@@ -80,12 +80,11 @@ public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResul
 (AlreadyGenerated(paramSet, prevParamSets) || AlreadyGenerated(paramSet, result)));

 Contracts.Assert(paramSet != null);
 result.Add(paramSet);
 if (!result.Contains(paramSet))
 result.Add(paramSet);
 }

 return result.ToArray();
 }

 protected abstract ParameterSet CreateParamSet();

 protected static bool AlreadyGenerated(ParameterSet paramSet, IEnumerable<ParameterSet> previousRuns)
Expand DownExpand Up@@ -150,7 +149,7 @@ public RandomGridSweeper(IHostEnvironment env, Arguments args, IValueGenerator[]
 }
 }

 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 if (_nGridPoints == 0)
 return base.ProposeSweeps(maxSweeps, previousRuns);
Expand All@@ -173,7 +172,8 @@ public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResu
 if (!AlreadyGenerated(_cache[iPerm], prevParamSets))
 break;
 }
 result.Add(_cache[iPerm]);
 if (!result.Contains(_cache[iPerm]))
 result.Add(_cache[iPerm]);
 }
 return result.ToArray();
 }
Expand Down

22 changes: 22 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>

 <IsPackable>false</IsPackable>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 </ItemGroup>

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

</Project>

53 changes: 53 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/SweeperUniqueValuesTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.PipelineInference;
using Microsoft.ML.Runtime.RunTests;
using Microsoft.ML.Runtime.Sweeper;
using System;
using System.IO;
using Xunit;

namespace Microsoft.ML.Sweeper.Tests
{
 public class SweeperUniqueValuesTest
 {
 [Fact]
 public void SweeperReturnsDistinctValuesForUniformRandomSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new UniformRandomSweeper(env, new SweeperBase.ArgumentsBase(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }
 [Fact]
 public void SweeperReturnsDistinctValuesForRandomGridSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new RandomGridSweeper(env, new RandomGridSweeper.Arguments(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }

 private static DiscreteValueGenerator SetSingleParameter()
 {
 var args = new DiscreteParamArguments();
 args.Name = "TestParam";
 args.Values = new string[] { "one", "two" };
 var valueGenerator = new DiscreteValueGenerator(args);
 return valueGenerator;
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Propose sweep#365

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

 Closed

Nepomuceno
wants to merge
2
commits into

from

 Closed


Propose sweep
#365
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
87f0c4b

WIP Propose Sweeps


ross-p-smith Jun 15, 2018
2bd9cfb

Correcting singleton and adding tests

Jun 15, 2018

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


7 changes: 7 additions & 0 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Mi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Console", "src\Microsoft.ML.Console\Microsoft.ML.Console.csproj", "{362A98CF-FBF7-4EBB-A11B-990BBF845B15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand DownExpand Up@@ -208,6 +210,10 @@ Global
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.Build.0 = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
Expand DownExpand Up@@ -243,6 +249,7 @@ Global
 {7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
 SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down

12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Sweeper/Algorithms/Grid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ protected SweeperBase(ArgumentsBase args, IHostEnvironment env, IValueGenerator[
 SweepParameters = sweepParameters;
 }

 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 var prevParamSets = previousRuns?.Select(r => r.ParameterSet).ToList() ?? new List<ParameterSet>();
 var result = new List<ParameterSet>();
Expand All@@ -80,12 +80,11 @@ public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResul
 (AlreadyGenerated(paramSet, prevParamSets) || AlreadyGenerated(paramSet, result)));

 Contracts.Assert(paramSet != null);
 result.Add(paramSet);
 if (!result.Contains(paramSet))
 result.Add(paramSet);
 }

 return result.ToArray();
 }

 protected abstract ParameterSet CreateParamSet();

 protected static bool AlreadyGenerated(ParameterSet paramSet, IEnumerable<ParameterSet> previousRuns)
Expand DownExpand Up@@ -150,7 +149,7 @@ public RandomGridSweeper(IHostEnvironment env, Arguments args, IValueGenerator[]
 }
 }

 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 if (_nGridPoints == 0)
 return base.ProposeSweeps(maxSweeps, previousRuns);
Expand All@@ -173,7 +172,8 @@ public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResu
 if (!AlreadyGenerated(_cache[iPerm], prevParamSets))
 break;
 }
 result.Add(_cache[iPerm]);
 if (!result.Contains(_cache[iPerm]))
 result.Add(_cache[iPerm]);
 }
 return result.ToArray();
 }
Expand Down

22 changes: 22 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>

 <IsPackable>false</IsPackable>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 </ItemGroup>

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

</Project>

53 changes: 53 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/SweeperUniqueValuesTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.PipelineInference;
using Microsoft.ML.Runtime.RunTests;
using Microsoft.ML.Runtime.Sweeper;
using System;
using System.IO;
using Xunit;

namespace Microsoft.ML.Sweeper.Tests
{
 public class SweeperUniqueValuesTest
 {
 [Fact]
 public void SweeperReturnsDistinctValuesForUniformRandomSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new UniformRandomSweeper(env, new SweeperBase.ArgumentsBase(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }
 [Fact]
 public void SweeperReturnsDistinctValuesForRandomGridSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new RandomGridSweeper(env, new RandomGridSweeper.Arguments(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }

 private static DiscreteValueGenerator SetSingleParameter()
 {
 var args = new DiscreteParamArguments();
 args.Name = "TestParam";
 args.Values = new string[] { "one", "two" };
 var valueGenerator = new DiscreteValueGenerator(args);
 return valueGenerator;
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Propose sweep#365

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

 Closed

Nepomuceno
wants to merge
2
commits into

from

 Closed


Propose sweep
#365
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
87f0c4b

WIP Propose Sweeps


ross-p-smith Jun 15, 2018
2bd9cfb

Correcting singleton and adding tests

Jun 15, 2018

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


7 changes: 7 additions & 0 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Mi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Console", "src\Microsoft.ML.Console\Microsoft.ML.Console.csproj", "{362A98CF-FBF7-4EBB-A11B-990BBF845B15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand DownExpand Up@@ -208,6 +210,10 @@ Global
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15}.Release|Any CPU.Build.0 = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
Expand DownExpand Up@@ -243,6 +249,7 @@ Global
 {7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
 SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down

12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Sweeper/Algorithms/Grid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ protected SweeperBase(ArgumentsBase args, IHostEnvironment env, IValueGenerator[
 SweepParameters = sweepParameters;
 }

 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 var prevParamSets = previousRuns?.Select(r => r.ParameterSet).ToList() ?? new List<ParameterSet>();
 var result = new List<ParameterSet>();
Expand All@@ -80,12 +80,11 @@ public virtual ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResul
 (AlreadyGenerated(paramSet, prevParamSets) || AlreadyGenerated(paramSet, result)));

 Contracts.Assert(paramSet != null);
 result.Add(paramSet);
 if (!result.Contains(paramSet))
 result.Add(paramSet);
 }

 return result.ToArray();
 }

 protected abstract ParameterSet CreateParamSet();

 protected static bool AlreadyGenerated(ParameterSet paramSet, IEnumerable<ParameterSet> previousRuns)
Expand DownExpand Up@@ -150,7 +149,7 @@ public RandomGridSweeper(IHostEnvironment env, Arguments args, IValueGenerator[]
 }
 }

 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns)
 public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResult> previousRuns = null)
 {
 if (_nGridPoints == 0)
 return base.ProposeSweeps(maxSweeps, previousRuns);
Expand All@@ -173,7 +172,8 @@ public override ParameterSet[] ProposeSweeps(int maxSweeps, IEnumerable<IRunResu
 if (!AlreadyGenerated(_cache[iPerm], prevParamSets))
 break;
 }
 result.Add(_cache[iPerm]);
 if (!result.Contains(_cache[iPerm]))
 result.Add(_cache[iPerm]);
 }
 return result.ToArray();
 }
Expand Down

22 changes: 22 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>

 <IsPackable>false</IsPackable>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
 <PackageReference Include="xunit" Version="2.3.1" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 </ItemGroup>

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

</Project>

53 changes: 53 additions & 0 deletions
test/Microsoft.ML.Sweeper.Tests/SweeperUniqueValuesTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.PipelineInference;
using Microsoft.ML.Runtime.RunTests;
using Microsoft.ML.Runtime.Sweeper;
using System;
using System.IO;
using Xunit;

namespace Microsoft.ML.Sweeper.Tests
{
 public class SweeperUniqueValuesTest
 {
 [Fact]
 public void SweeperReturnsDistinctValuesForUniformRandomSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new UniformRandomSweeper(env, new SweeperBase.ArgumentsBase(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }
 [Fact]
 public void SweeperReturnsDistinctValuesForRandomGridSweeper()
 {
 DiscreteValueGenerator valueGenerator = SetSingleParameter();
 using (var writer = new StreamWriter(new MemoryStream()))
 using (var env = new TlcEnvironment(42, outWriter: writer, errWriter: writer))
 {
 var sweeper = new RandomGridSweeper(env, new RandomGridSweeper.Arguments(), new[] { valueGenerator });
 var results = sweeper.ProposeSweeps(5000);
 Assert.NotNull(results);
 int length = results.Length;
 Assert.Equal(2, length);
 }
 }

 private static DiscreteValueGenerator SetSingleParameter()
 {
 var args = new DiscreteParamArguments();
 args.Name = "TestParam";
 args.Values = new string[] { "one", "two" };
 var valueGenerator = new DiscreteValueGenerator(args);
 return valueGenerator;
 }
 }
}