Fix column purpose for PipelineSweeperMacro#461

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
18 commits merged into from Jul 13, 2018
Merged

Fix column purpose for PipelineSweeperMacro #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e1fa741
Merge pull request #1 from dotnet/master
abgoswam Jun 20, 2018
703cb38
Merge pull request #2 from dotnet/master
abgoswam Jun 27, 2018
c3c2125
Merge pull request #3 from dotnet/master
abgoswam Jun 28, 2018
17026a4
Adding arguments to PipelineSweep Macro
abgoswam Jun 29, 2018
c76181c
updating the unit tests
abgoswam Jun 30, 2018
28371fe
taking care of review comments; adding validations for Label, Weight,…
abgoswam Jul 1, 2018
310b395
taking care of some review comments
abgoswam Jul 2, 2018
4fbaf14
some code cleanup
abgoswam Jul 2, 2018
3ca4da9
addressing PR comments
abgoswam Jul 3, 2018
678d727
Merge pull request #4 from dotnet/master
abgoswam Jul 11, 2018
7f94a87
Merge pull request #5 from agoswamiazureml/master
abgoswam Jul 11, 2018
d55b1e0
API changes to use RoleMappedData
abgoswam Jul 11, 2018
c624415
Merge branch 'agoswami/purpose_inference' of https://github.com/agosw…
abgoswam Jul 11, 2018
d4f6102
taking care of review comments
abgoswam Jul 12, 2018
99172e2
using pipeline.UniqueId
abgoswam Jul 12, 2018
fb5ca79
taking care of review comments. update ColumnPurpose 'Group' so it is…
abgoswam Jul 12, 2018
6b34d71
Merge pull request #6 from dotnet/master
abgoswam Jul 12, 2018
3ad0c08
Merge pull request #7 from agoswamiazureml/master
abgoswam Jul 12, 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
25 changes: 21 additions & 4 deletions src/Microsoft.ML.PipelineInference/AutoInference.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ public sealed class AutoMlMlState : IMlState
private TransformInference.SuggestedTransform[] _availableTransforms;
private RecipeInference.SuggestedRecipe.SuggestedLearner[] _availableLearners;
private DependencyMap _dependencyMapping;
private RoleMappedData _dataRoles;
public IPipelineOptimizer AutoMlEngine { get; set; }
public PipelinePattern[] BatchCandidates { get; set; }
public SupportedMetric Metric { get; }
Expand DownExpand Up@@ -313,7 +314,7 @@ private void MainLearningLoop(int batchSize, int numOfTrainingRows)
var currentBatchSize = batchSize;
if (_terminator is IterationTerminator itr)
currentBatchSize = Math.Min(itr.RemainingIterations(_history), batchSize);
var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize);
var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize, _dataRoles);

// Break if no candidates returned, means no valid pipeline available.
if (candidates.Length == 0)
Expand DownExpand Up@@ -370,19 +371,21 @@ private TransformInference.SuggestedTransform[] InferAndFilter(IDataView data, T
TransformInference.SuggestedTransform[] existingTransforms = null)
{
// Infer transforms using experts
var levelTransforms = TransformInference.InferTransforms(_env, data, args);
var levelTransforms = TransformInference.InferTransforms(_env, data, args, _dataRoles);

// Retain only those transforms inferred which were also passed in.
if (existingTransforms != null)
return levelTransforms.Where(t => existingTransforms.Any(t2 => t2.Equals(t))).ToArray();
return levelTransforms;
}

public void InferSearchSpace(int numTransformLevels)
public void InferSearchSpace(int numTransformLevels, RoleMappedData dataRoles = null)
{
var learners = RecipeInference.AllowedLearners(_env, TrainerKind).ToArray();
if (_requestedLearners != null && _requestedLearners.Length > 0)
learners = learners.Where(l => _requestedLearners.Contains(l.LearnerName)).ToArray();

_dataRoles = dataRoles;
ComputeSearchSpace(numTransformLevels, learners, (b, c) => InferAndFilter(b, c));
}

Expand DownExpand Up@@ -536,7 +539,21 @@ public PipelinePattern[] GetNextCandidates(int numberOfCandidates)
var currentBatchSize = numberOfCandidates;
if (_terminator is IterationTerminator itr)
currentBatchSize = Math.Min(itr.RemainingIterations(_history), numberOfCandidates);
BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize);
BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize, _dataRoles);

using (var ch = _host.Start("Suggested Pipeline"))
{
foreach (var pipeline in BatchCandidates)
{
ch.Info($"AutoInference Pipeline Id : {pipeline.UniqueId}");
foreach (var transform in pipeline.Transforms)
{
ch.Info($"AutoInference Transform : {transform.Transform}");
}
ch.Info($"AutoInference Learner : {pipeline.Learner}");
}
}

return BatchCandidates;
}

Expand Down
9 changes: 6 additions & 3 deletions src/Microsoft.ML.PipelineInference/AutoMlEngines/DefaultsEngine.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand DownExpand Up@@ -33,9 +34,10 @@ public DefaultsEngine(IHostEnvironment env, Arguments args)
_currentLearnerIndex = 0;
}

public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
{
var candidates = new List<PipelinePattern>();
DataRoles = dataRoles;

while (candidates.Count < numCandidates)
{
Expand All@@ -53,7 +55,8 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>

do
{ // Make sure transforms set is valid. Repeat until passes verifier.
pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), learner, "", Env);
pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask),
learner, "", Env);
valid = PipelineVerifier(pipeline, transformsBitMask);
count++;
} while (!valid && count <= 1000);
Expand All@@ -77,7 +80,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(out long transf

// Add final features concat transform.
sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));

return sampledTransforms.ToArray();
}
Expand Down
20 changes: 12 additions & 8 deletions src/Microsoft.ML.PipelineInference/AutoMlEngines/RocketEngine.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(RecipeInference
// cause an error in verification, since it isn't included in the original
// dependency mapping (i.e., its level isn't in the dictionary).
sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));
transformsBitMask = mask;

return sampledTransforms.ToArray();
Expand All@@ -202,9 +202,10 @@ private RecipeInference.SuggestedRecipe.SuggestedLearner[] GetTopLearners(IEnume
.Select(t=>AvailableLearners[t.Index]).ToArray();
}

public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
{
var prevCandidates = history.ToArray();
DataRoles = dataRoles;

switch (_currentStage)
{
Expand All@@ -220,7 +221,7 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
// number of candidates, using second stage logic.
UpdateLearners(GetTopLearners(prevCandidates));
_currentStage++;
return GetNextCandidates(prevCandidates, numCandidates);
return GetNextCandidates(prevCandidates, numCandidates, DataRoles);
}
else
return GetInitialPipelines(prevCandidates, remainingNum);
Expand DownExpand Up@@ -252,9 +253,11 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
}
}

private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates) =>
_secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)]
.GetNextCandidates(history, numCandidates);
private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates)
{
var engine = _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)];
return engine.GetNextCandidates(history, numCandidates, DataRoles);
}

private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandidates,
bool defaultHyperParams = false, bool uniformRandomTransforms = false)
Expand DownExpand Up@@ -294,8 +297,9 @@ private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandi
do
{ // Make sure transforms set is valid and have not seen pipeline before.
// Repeat until passes or runs out of chances.
pipeline = new PipelinePattern(SampleTransforms(learner, history,
out var transformsBitMask, uniformRandomTransforms), learner, "", Env);
pipeline = new PipelinePattern(
SampleTransforms(learner, history, out var transformsBitMask, uniformRandomTransforms),
learner, "", Env);
hashKey = GetHashKey(transformsBitMask, learner);
valid = PipelineVerifier(pipeline, transformsBitMask) && !VisitedPipelines.Contains(hashKey);
count++;
Expand Down
6 changes: 4 additions & 2 deletions src/Microsoft.ML.PipelineInference/AutoMlEngines/UniformRandomEngine.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand All@@ -30,8 +31,9 @@ public UniformRandomEngine(IHostEnvironment env)
: base(env, env.Register("UniformRandomEngine(AutoML)"))
{}

public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates)
public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles)
{
DataRoles = dataRoles;
return GetRandomPipelines(numberOfCandidates);
}

Expand DownExpand Up@@ -66,7 +68,7 @@ private PipelinePattern[] GetRandomPipelines(int numOfPipelines)

// Always include features concat transform
selectedTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms));
DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms, DataRoles));

// Compute hash key for checking if we've already seen this pipeline.
// However, if we keep missing, don't want to get stuck in infinite loop.
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.ML.PipelineInference/AutoMlUtils.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,7 +257,7 @@ public static long TransformsToBitmask(TransformInference.SuggestedTransform[] t
/// (In other words, if there would be nothing for that concatenate transform to do.)
/// </summary>
private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env,
IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset)
IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset, RoleMappedData dataRoles)
{
var finalArgs = new TransformInference.Arguments
{
Expand All@@ -266,7 +266,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
ExcludedColumnIndices = excludedColumnIndices
};

var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs);
var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs, dataRoles);

for (int i = 0; i < featuresConcatTransforms.Length; i++)
{
Expand All@@ -282,7 +282,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
/// </summary>
public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env, IDataView data,
AutoInference.DependencyMap dependencyMapping, TransformInference.SuggestedTransform[] selectedTransforms,
TransformInference.SuggestedTransform[] allTransforms)
TransformInference.SuggestedTransform[] allTransforms, RoleMappedData dataRoles)
{
int level = 1;
int atomicGroupLimit = 0;
Expand All@@ -292,7 +292,7 @@ public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHos
atomicGroupLimit = allTransforms.Max(t => t.AtomicGroupId) + 1;
}
var excludedColumnIndices = GetExcludedColumnIndices(selectedTransforms, data, dependencyMapping);
return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit);
return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit, dataRoles);
}

public static IDataView ApplyTransformSet(IHostEnvironment env, IDataView data, TransformInference.SuggestedTransform[] transforms)
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ML.PipelineInference/InferenceUtils.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ public static Type InferPredictorCategoryType(IDataView data, PurposeInference.C
label.ItemKind == DataKind.TX ||
data.Schema.GetColumnType(label.ColumnIndex).IsKey)
{
if (columns.Any(col => col.Purpose == ColumnPurpose.GroupId))
if (columns.Any(col => col.Purpose == ColumnPurpose.Group))
return typeof(SignatureRankerTrainer);
else
return typeof(SignatureMultiClassClassifierTrainer);
Expand DownExpand Up@@ -177,7 +177,7 @@ public enum ColumnPurpose
CategoricalFeature = 4,
TextFeature = 5,
Weight = 6,
GroupId = 7,
Group = 7,
ImagePath = 8
}
}
5 changes: 3 additions & 2 deletions src/Microsoft.ML.PipelineInference/Interfaces/IPipelineOptimizer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
/// </summary>
public interface IPipelineOptimizer
{
PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand All@@ -44,6 +44,7 @@ public abstract class PipelineOptimizerBase : IPipelineOptimizer
protected IDataView OriginalData;
protected IDataView FullyTransformedData;
protected AutoInference.DependencyMap DependencyMapping;
protected RoleMappedData DataRoles;
protected readonly IHostEnvironment Env;
protected readonly IHost Host;
protected readonly Dictionary<long, bool> TransformsMaskValidity;
Expand All@@ -60,7 +61,7 @@ protected PipelineOptimizerBase(IHostEnvironment env, IHost host)
ProbUtils = new SweeperProbabilityUtils(host);
}

public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

public virtual void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand Down
Loading
, '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
Fix column purpose for PipelineSweeperMacro#461

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged


18 commits merged into

from
Jul 13, 2018
 Merged


Fix column purpose for PipelineSweeperMacro
#461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
e1fa741

Merge pull request #1 from dotnet/master


abgoswam Jun 20, 2018
703cb38

Merge pull request #2 from dotnet/master


abgoswam Jun 27, 2018
c3c2125

Merge pull request #3 from dotnet/master


abgoswam Jun 28, 2018
17026a4

Adding arguments to PipelineSweep Macro


abgoswam Jun 29, 2018
c76181c

updating the unit tests


abgoswam Jun 30, 2018
28371fe

taking care of review comments; adding validations for Label, Weight,…


abgoswam Jul 1, 2018
310b395

taking care of some review comments


abgoswam Jul 2, 2018
4fbaf14

some code cleanup


abgoswam Jul 2, 2018
3ca4da9

addressing PR comments


abgoswam Jul 3, 2018
678d727

Merge pull request #4 from dotnet/master


abgoswam Jul 11, 2018
7f94a87

Merge pull request #5 from agoswamiazureml/master


abgoswam Jul 11, 2018
d55b1e0

API changes to use RoleMappedData


abgoswam Jul 11, 2018
c624415

Merge branch 'agoswami/purpose_inference' of https://github.com/agosw…


abgoswam Jul 11, 2018
d4f6102

taking care of review comments


abgoswam Jul 12, 2018
99172e2

using pipeline.UniqueId


abgoswam Jul 12, 2018
fb5ca79

taking care of review comments. update ColumnPurpose 'Group' so it is…


abgoswam Jul 12, 2018
6b34d71

Merge pull request #6 from dotnet/master


abgoswam Jul 12, 2018
3ad0c08

Merge pull request #7 from agoswamiazureml/master


abgoswam Jul 12, 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


25 changes: 21 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ public sealed class AutoMlMlState : IMlState
 private TransformInference.SuggestedTransform[] _availableTransforms;
 private RecipeInference.SuggestedRecipe.SuggestedLearner[] _availableLearners;
 private DependencyMap _dependencyMapping;
 private RoleMappedData _dataRoles;
 public IPipelineOptimizer AutoMlEngine { get; set; }
 public PipelinePattern[] BatchCandidates { get; set; }
 public SupportedMetric Metric { get; }
Expand DownExpand Up@@ -313,7 +314,7 @@ private void MainLearningLoop(int batchSize, int numOfTrainingRows)
 var currentBatchSize = batchSize;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), batchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize, _dataRoles);

 // Break if no candidates returned, means no valid pipeline available.
 if (candidates.Length == 0)
Expand DownExpand Up@@ -370,19 +371,21 @@ private TransformInference.SuggestedTransform[] InferAndFilter(IDataView data, T
 TransformInference.SuggestedTransform[] existingTransforms = null)
 {
 // Infer transforms using experts
 var levelTransforms = TransformInference.InferTransforms(_env, data, args);
 var levelTransforms = TransformInference.InferTransforms(_env, data, args, _dataRoles);

 // Retain only those transforms inferred which were also passed in.
 if (existingTransforms != null)
 return levelTransforms.Where(t => existingTransforms.Any(t2 => t2.Equals(t))).ToArray();
 return levelTransforms;
 }

 public void InferSearchSpace(int numTransformLevels)
 public void InferSearchSpace(int numTransformLevels, RoleMappedData dataRoles = null)
 {
 var learners = RecipeInference.AllowedLearners(_env, TrainerKind).ToArray();
 if (_requestedLearners != null && _requestedLearners.Length > 0)
 learners = learners.Where(l => _requestedLearners.Contains(l.LearnerName)).ToArray();

 _dataRoles = dataRoles;
 ComputeSearchSpace(numTransformLevels, learners, (b, c) => InferAndFilter(b, c));
 }

Expand DownExpand Up@@ -536,7 +539,21 @@ public PipelinePattern[] GetNextCandidates(int numberOfCandidates)
 var currentBatchSize = numberOfCandidates;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), numberOfCandidates);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize, _dataRoles);

 using (var ch = _host.Start("Suggested Pipeline"))
 {
 foreach (var pipeline in BatchCandidates)
 {
 ch.Info($"AutoInference Pipeline Id : {pipeline.UniqueId}");
 foreach (var transform in pipeline.Transforms)
 {
 ch.Info($"AutoInference Transform : {transform.Transform}");
 }
 ch.Info($"AutoInference Learner : {pipeline.Learner}");
 }
 }

 return BatchCandidates;
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/DefaultsEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand DownExpand Up@@ -33,9 +34,10 @@ public DefaultsEngine(IHostEnvironment env, Arguments args)
 _currentLearnerIndex = 0;
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var candidates = new List<PipelinePattern>();
 DataRoles = dataRoles;

 while (candidates.Count < numCandidates)
 {
Expand All@@ -53,7 +55,8 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>

 do
 { // Make sure transforms set is valid. Repeat until passes verifier.
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), learner, "", Env);
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), 
 learner, "", Env);
 valid = PipelineVerifier(pipeline, transformsBitMask);
 count++;
 } while (!valid && count <= 1000);
Expand All@@ -77,7 +80,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(out long transf

 // Add final features concat transform.
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));

 return sampledTransforms.ToArray();
 }
Expand Down

20 changes: 12 additions & 8 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/RocketEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(RecipeInference
 // cause an error in verification, since it isn't included in the original 
 // dependency mapping (i.e., its level isn't in the dictionary).
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));
 transformsBitMask = mask;

 return sampledTransforms.ToArray();
Expand All@@ -202,9 +202,10 @@ private RecipeInference.SuggestedRecipe.SuggestedLearner[] GetTopLearners(IEnume
 .Select(t=>AvailableLearners[t.Index]).ToArray();
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var prevCandidates = history.ToArray();
 DataRoles = dataRoles;

 switch (_currentStage)
 {
Expand All@@ -220,7 +221,7 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 // number of candidates, using second stage logic.
 UpdateLearners(GetTopLearners(prevCandidates));
 _currentStage++;
 return GetNextCandidates(prevCandidates, numCandidates);
 return GetNextCandidates(prevCandidates, numCandidates, DataRoles);
 }
 else
 return GetInitialPipelines(prevCandidates, remainingNum);
Expand DownExpand Up@@ -252,9 +253,11 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 }
 }

 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates) =>
 _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)]
 .GetNextCandidates(history, numCandidates);
 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates)
 {
 var engine = _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)];
 return engine.GetNextCandidates(history, numCandidates, DataRoles);
 }

 private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandidates,
 bool defaultHyperParams = false, bool uniformRandomTransforms = false)
Expand DownExpand Up@@ -294,8 +297,9 @@ private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandi
 do
 { // Make sure transforms set is valid and have not seen pipeline before. 
 // Repeat until passes or runs out of chances.
 pipeline = new PipelinePattern(SampleTransforms(learner, history,
 out var transformsBitMask, uniformRandomTransforms), learner, "", Env);
 pipeline = new PipelinePattern(
 SampleTransforms(learner, history, out var transformsBitMask, uniformRandomTransforms), 
 learner, "", Env);
 hashKey = GetHashKey(transformsBitMask, learner);
 valid = PipelineVerifier(pipeline, transformsBitMask) && !VisitedPipelines.Contains(hashKey);
 count++;
Expand Down

6 changes: 4 additions & 2 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/UniformRandomEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand All@@ -30,8 +31,9 @@ public UniformRandomEngine(IHostEnvironment env)
 : base(env, env.Register("UniformRandomEngine(AutoML)"))
 {}

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles)
 {
 DataRoles = dataRoles;
 return GetRandomPipelines(numberOfCandidates);
 }

Expand DownExpand Up@@ -66,7 +68,7 @@ private PipelinePattern[] GetRandomPipelines(int numOfPipelines)

 // Always include features concat transform
 selectedTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms, DataRoles));

 // Compute hash key for checking if we've already seen this pipeline.
 // However, if we keep missing, don't want to get stuck in infinite loop.
Expand Down

8 changes: 4 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,7 +257,7 @@ public static long TransformsToBitmask(TransformInference.SuggestedTransform[] t
 /// (In other words, if there would be nothing for that concatenate transform to do.)
 /// </summary>
 private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env,
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset)
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset, RoleMappedData dataRoles)
 {
 var finalArgs = new TransformInference.Arguments
 {
Expand All@@ -266,7 +266,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 ExcludedColumnIndices = excludedColumnIndices
 };

 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs);
 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs, dataRoles);

 for (int i = 0; i < featuresConcatTransforms.Length; i++)
 {
Expand All@@ -282,7 +282,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 /// </summary>
 public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env, IDataView data,
 AutoInference.DependencyMap dependencyMapping, TransformInference.SuggestedTransform[] selectedTransforms,
 TransformInference.SuggestedTransform[] allTransforms)
 TransformInference.SuggestedTransform[] allTransforms, RoleMappedData dataRoles)
 {
 int level = 1;
 int atomicGroupLimit = 0;
Expand All@@ -292,7 +292,7 @@ public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHos
 atomicGroupLimit = allTransforms.Max(t => t.AtomicGroupId) + 1;
 }
 var excludedColumnIndices = GetExcludedColumnIndices(selectedTransforms, data, dependencyMapping);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit, dataRoles);
 }

 public static IDataView ApplyTransformSet(IHostEnvironment env, IDataView data, TransformInference.SuggestedTransform[] transforms)
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/InferenceUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ public static Type InferPredictorCategoryType(IDataView data, PurposeInference.C
 label.ItemKind == DataKind.TX ||
 data.Schema.GetColumnType(label.ColumnIndex).IsKey)
 {
 if (columns.Any(col => col.Purpose == ColumnPurpose.GroupId))
 if (columns.Any(col => col.Purpose == ColumnPurpose.Group))
 return typeof(SignatureRankerTrainer);
 else
 return typeof(SignatureMultiClassClassifierTrainer);
Expand DownExpand Up@@ -177,7 +177,7 @@ public enum ColumnPurpose
 CategoricalFeature = 4,
 TextFeature = 5,
 Weight = 6,
GroupId = 7,
Group = 7,
 ImagePath = 8
 }
}

5 changes: 3 additions & 2 deletions
src/Microsoft.ML.PipelineInference/Interfaces/IPipelineOptimizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
 /// </summary>
 public interface IPipelineOptimizer
 {
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand All@@ -44,6 +44,7 @@ public abstract class PipelineOptimizerBase : IPipelineOptimizer
 protected IDataView OriginalData;
 protected IDataView FullyTransformedData;
 protected AutoInference.DependencyMap DependencyMapping;
 protected RoleMappedData DataRoles;
 protected readonly IHostEnvironment Env;
 protected readonly IHost Host;
 protected readonly Dictionary<long, bool> TransformsMaskValidity;
Expand All@@ -60,7 +61,7 @@ protected PipelineOptimizerBase(IHostEnvironment env, IHost host)
 ProbUtils = new SweeperProbabilityUtils(host);
 }

 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 public virtual void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand Down
Loading

, '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
Fix column purpose for PipelineSweeperMacro#461

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged


18 commits merged into

from
Jul 13, 2018
 Merged


Fix column purpose for PipelineSweeperMacro
#461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
e1fa741

Merge pull request #1 from dotnet/master


abgoswam Jun 20, 2018
703cb38

Merge pull request #2 from dotnet/master


abgoswam Jun 27, 2018
c3c2125

Merge pull request #3 from dotnet/master


abgoswam Jun 28, 2018
17026a4

Adding arguments to PipelineSweep Macro


abgoswam Jun 29, 2018
c76181c

updating the unit tests


abgoswam Jun 30, 2018
28371fe

taking care of review comments; adding validations for Label, Weight,…


abgoswam Jul 1, 2018
310b395

taking care of some review comments


abgoswam Jul 2, 2018
4fbaf14

some code cleanup


abgoswam Jul 2, 2018
3ca4da9

addressing PR comments


abgoswam Jul 3, 2018
678d727

Merge pull request #4 from dotnet/master


abgoswam Jul 11, 2018
7f94a87

Merge pull request #5 from agoswamiazureml/master


abgoswam Jul 11, 2018
d55b1e0

API changes to use RoleMappedData


abgoswam Jul 11, 2018
c624415

Merge branch 'agoswami/purpose_inference' of https://github.com/agosw…


abgoswam Jul 11, 2018
d4f6102

taking care of review comments


abgoswam Jul 12, 2018
99172e2

using pipeline.UniqueId


abgoswam Jul 12, 2018
fb5ca79

taking care of review comments. update ColumnPurpose 'Group' so it is…


abgoswam Jul 12, 2018
6b34d71

Merge pull request #6 from dotnet/master


abgoswam Jul 12, 2018
3ad0c08

Merge pull request #7 from agoswamiazureml/master


abgoswam Jul 12, 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


25 changes: 21 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ public sealed class AutoMlMlState : IMlState
 private TransformInference.SuggestedTransform[] _availableTransforms;
 private RecipeInference.SuggestedRecipe.SuggestedLearner[] _availableLearners;
 private DependencyMap _dependencyMapping;
 private RoleMappedData _dataRoles;
 public IPipelineOptimizer AutoMlEngine { get; set; }
 public PipelinePattern[] BatchCandidates { get; set; }
 public SupportedMetric Metric { get; }
Expand DownExpand Up@@ -313,7 +314,7 @@ private void MainLearningLoop(int batchSize, int numOfTrainingRows)
 var currentBatchSize = batchSize;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), batchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize, _dataRoles);

 // Break if no candidates returned, means no valid pipeline available.
 if (candidates.Length == 0)
Expand DownExpand Up@@ -370,19 +371,21 @@ private TransformInference.SuggestedTransform[] InferAndFilter(IDataView data, T
 TransformInference.SuggestedTransform[] existingTransforms = null)
 {
 // Infer transforms using experts
 var levelTransforms = TransformInference.InferTransforms(_env, data, args);
 var levelTransforms = TransformInference.InferTransforms(_env, data, args, _dataRoles);

 // Retain only those transforms inferred which were also passed in.
 if (existingTransforms != null)
 return levelTransforms.Where(t => existingTransforms.Any(t2 => t2.Equals(t))).ToArray();
 return levelTransforms;
 }

 public void InferSearchSpace(int numTransformLevels)
 public void InferSearchSpace(int numTransformLevels, RoleMappedData dataRoles = null)
 {
 var learners = RecipeInference.AllowedLearners(_env, TrainerKind).ToArray();
 if (_requestedLearners != null && _requestedLearners.Length > 0)
 learners = learners.Where(l => _requestedLearners.Contains(l.LearnerName)).ToArray();

 _dataRoles = dataRoles;
 ComputeSearchSpace(numTransformLevels, learners, (b, c) => InferAndFilter(b, c));
 }

Expand DownExpand Up@@ -536,7 +539,21 @@ public PipelinePattern[] GetNextCandidates(int numberOfCandidates)
 var currentBatchSize = numberOfCandidates;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), numberOfCandidates);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize, _dataRoles);

 using (var ch = _host.Start("Suggested Pipeline"))
 {
 foreach (var pipeline in BatchCandidates)
 {
 ch.Info($"AutoInference Pipeline Id : {pipeline.UniqueId}");
 foreach (var transform in pipeline.Transforms)
 {
 ch.Info($"AutoInference Transform : {transform.Transform}");
 }
 ch.Info($"AutoInference Learner : {pipeline.Learner}");
 }
 }

 return BatchCandidates;
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/DefaultsEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand DownExpand Up@@ -33,9 +34,10 @@ public DefaultsEngine(IHostEnvironment env, Arguments args)
 _currentLearnerIndex = 0;
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var candidates = new List<PipelinePattern>();
 DataRoles = dataRoles;

 while (candidates.Count < numCandidates)
 {
Expand All@@ -53,7 +55,8 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>

 do
 { // Make sure transforms set is valid. Repeat until passes verifier.
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), learner, "", Env);
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), 
 learner, "", Env);
 valid = PipelineVerifier(pipeline, transformsBitMask);
 count++;
 } while (!valid && count <= 1000);
Expand All@@ -77,7 +80,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(out long transf

 // Add final features concat transform.
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));

 return sampledTransforms.ToArray();
 }
Expand Down

20 changes: 12 additions & 8 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/RocketEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(RecipeInference
 // cause an error in verification, since it isn't included in the original 
 // dependency mapping (i.e., its level isn't in the dictionary).
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));
 transformsBitMask = mask;

 return sampledTransforms.ToArray();
Expand All@@ -202,9 +202,10 @@ private RecipeInference.SuggestedRecipe.SuggestedLearner[] GetTopLearners(IEnume
 .Select(t=>AvailableLearners[t.Index]).ToArray();
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var prevCandidates = history.ToArray();
 DataRoles = dataRoles;

 switch (_currentStage)
 {
Expand All@@ -220,7 +221,7 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 // number of candidates, using second stage logic.
 UpdateLearners(GetTopLearners(prevCandidates));
 _currentStage++;
 return GetNextCandidates(prevCandidates, numCandidates);
 return GetNextCandidates(prevCandidates, numCandidates, DataRoles);
 }
 else
 return GetInitialPipelines(prevCandidates, remainingNum);
Expand DownExpand Up@@ -252,9 +253,11 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 }
 }

 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates) =>
 _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)]
 .GetNextCandidates(history, numCandidates);
 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates)
 {
 var engine = _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)];
 return engine.GetNextCandidates(history, numCandidates, DataRoles);
 }

 private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandidates,
 bool defaultHyperParams = false, bool uniformRandomTransforms = false)
Expand DownExpand Up@@ -294,8 +297,9 @@ private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandi
 do
 { // Make sure transforms set is valid and have not seen pipeline before. 
 // Repeat until passes or runs out of chances.
 pipeline = new PipelinePattern(SampleTransforms(learner, history,
 out var transformsBitMask, uniformRandomTransforms), learner, "", Env);
 pipeline = new PipelinePattern(
 SampleTransforms(learner, history, out var transformsBitMask, uniformRandomTransforms), 
 learner, "", Env);
 hashKey = GetHashKey(transformsBitMask, learner);
 valid = PipelineVerifier(pipeline, transformsBitMask) && !VisitedPipelines.Contains(hashKey);
 count++;
Expand Down

6 changes: 4 additions & 2 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/UniformRandomEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand All@@ -30,8 +31,9 @@ public UniformRandomEngine(IHostEnvironment env)
 : base(env, env.Register("UniformRandomEngine(AutoML)"))
 {}

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles)
 {
 DataRoles = dataRoles;
 return GetRandomPipelines(numberOfCandidates);
 }

Expand DownExpand Up@@ -66,7 +68,7 @@ private PipelinePattern[] GetRandomPipelines(int numOfPipelines)

 // Always include features concat transform
 selectedTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms, DataRoles));

 // Compute hash key for checking if we've already seen this pipeline.
 // However, if we keep missing, don't want to get stuck in infinite loop.
Expand Down

8 changes: 4 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,7 +257,7 @@ public static long TransformsToBitmask(TransformInference.SuggestedTransform[] t
 /// (In other words, if there would be nothing for that concatenate transform to do.)
 /// </summary>
 private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env,
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset)
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset, RoleMappedData dataRoles)
 {
 var finalArgs = new TransformInference.Arguments
 {
Expand All@@ -266,7 +266,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 ExcludedColumnIndices = excludedColumnIndices
 };

 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs);
 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs, dataRoles);

 for (int i = 0; i < featuresConcatTransforms.Length; i++)
 {
Expand All@@ -282,7 +282,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 /// </summary>
 public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env, IDataView data,
 AutoInference.DependencyMap dependencyMapping, TransformInference.SuggestedTransform[] selectedTransforms,
 TransformInference.SuggestedTransform[] allTransforms)
 TransformInference.SuggestedTransform[] allTransforms, RoleMappedData dataRoles)
 {
 int level = 1;
 int atomicGroupLimit = 0;
Expand All@@ -292,7 +292,7 @@ public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHos
 atomicGroupLimit = allTransforms.Max(t => t.AtomicGroupId) + 1;
 }
 var excludedColumnIndices = GetExcludedColumnIndices(selectedTransforms, data, dependencyMapping);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit, dataRoles);
 }

 public static IDataView ApplyTransformSet(IHostEnvironment env, IDataView data, TransformInference.SuggestedTransform[] transforms)
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/InferenceUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ public static Type InferPredictorCategoryType(IDataView data, PurposeInference.C
 label.ItemKind == DataKind.TX ||
 data.Schema.GetColumnType(label.ColumnIndex).IsKey)
 {
 if (columns.Any(col => col.Purpose == ColumnPurpose.GroupId))
 if (columns.Any(col => col.Purpose == ColumnPurpose.Group))
 return typeof(SignatureRankerTrainer);
 else
 return typeof(SignatureMultiClassClassifierTrainer);
Expand DownExpand Up@@ -177,7 +177,7 @@ public enum ColumnPurpose
 CategoricalFeature = 4,
 TextFeature = 5,
 Weight = 6,
GroupId = 7,
Group = 7,
 ImagePath = 8
 }
}

5 changes: 3 additions & 2 deletions
src/Microsoft.ML.PipelineInference/Interfaces/IPipelineOptimizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
 /// </summary>
 public interface IPipelineOptimizer
 {
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand All@@ -44,6 +44,7 @@ public abstract class PipelineOptimizerBase : IPipelineOptimizer
 protected IDataView OriginalData;
 protected IDataView FullyTransformedData;
 protected AutoInference.DependencyMap DependencyMapping;
 protected RoleMappedData DataRoles;
 protected readonly IHostEnvironment Env;
 protected readonly IHost Host;
 protected readonly Dictionary<long, bool> TransformsMaskValidity;
Expand All@@ -60,7 +61,7 @@ protected PipelineOptimizerBase(IHostEnvironment env, IHost host)
 ProbUtils = new SweeperProbabilityUtils(host);
 }

 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 public virtual void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand Down
Loading

, '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
Fix column purpose for PipelineSweeperMacro#461

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged


18 commits merged into

from
Jul 13, 2018
 Merged


Fix column purpose for PipelineSweeperMacro
#461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
e1fa741

Merge pull request #1 from dotnet/master


abgoswam Jun 20, 2018
703cb38

Merge pull request #2 from dotnet/master


abgoswam Jun 27, 2018
c3c2125

Merge pull request #3 from dotnet/master


abgoswam Jun 28, 2018
17026a4

Adding arguments to PipelineSweep Macro


abgoswam Jun 29, 2018
c76181c

updating the unit tests


abgoswam Jun 30, 2018
28371fe

taking care of review comments; adding validations for Label, Weight,…


abgoswam Jul 1, 2018
310b395

taking care of some review comments


abgoswam Jul 2, 2018
4fbaf14

some code cleanup


abgoswam Jul 2, 2018
3ca4da9

addressing PR comments


abgoswam Jul 3, 2018
678d727

Merge pull request #4 from dotnet/master


abgoswam Jul 11, 2018
7f94a87

Merge pull request #5 from agoswamiazureml/master


abgoswam Jul 11, 2018
d55b1e0

API changes to use RoleMappedData


abgoswam Jul 11, 2018
c624415

Merge branch 'agoswami/purpose_inference' of https://github.com/agosw…


abgoswam Jul 11, 2018
d4f6102

taking care of review comments


abgoswam Jul 12, 2018
99172e2

using pipeline.UniqueId


abgoswam Jul 12, 2018
fb5ca79

taking care of review comments. update ColumnPurpose 'Group' so it is…


abgoswam Jul 12, 2018
6b34d71

Merge pull request #6 from dotnet/master


abgoswam Jul 12, 2018
3ad0c08

Merge pull request #7 from agoswamiazureml/master


abgoswam Jul 12, 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


25 changes: 21 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ public sealed class AutoMlMlState : IMlState
 private TransformInference.SuggestedTransform[] _availableTransforms;
 private RecipeInference.SuggestedRecipe.SuggestedLearner[] _availableLearners;
 private DependencyMap _dependencyMapping;
 private RoleMappedData _dataRoles;
 public IPipelineOptimizer AutoMlEngine { get; set; }
 public PipelinePattern[] BatchCandidates { get; set; }
 public SupportedMetric Metric { get; }
Expand DownExpand Up@@ -313,7 +314,7 @@ private void MainLearningLoop(int batchSize, int numOfTrainingRows)
 var currentBatchSize = batchSize;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), batchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize, _dataRoles);

 // Break if no candidates returned, means no valid pipeline available.
 if (candidates.Length == 0)
Expand DownExpand Up@@ -370,19 +371,21 @@ private TransformInference.SuggestedTransform[] InferAndFilter(IDataView data, T
 TransformInference.SuggestedTransform[] existingTransforms = null)
 {
 // Infer transforms using experts
 var levelTransforms = TransformInference.InferTransforms(_env, data, args);
 var levelTransforms = TransformInference.InferTransforms(_env, data, args, _dataRoles);

 // Retain only those transforms inferred which were also passed in.
 if (existingTransforms != null)
 return levelTransforms.Where(t => existingTransforms.Any(t2 => t2.Equals(t))).ToArray();
 return levelTransforms;
 }

 public void InferSearchSpace(int numTransformLevels)
 public void InferSearchSpace(int numTransformLevels, RoleMappedData dataRoles = null)
 {
 var learners = RecipeInference.AllowedLearners(_env, TrainerKind).ToArray();
 if (_requestedLearners != null && _requestedLearners.Length > 0)
 learners = learners.Where(l => _requestedLearners.Contains(l.LearnerName)).ToArray();

 _dataRoles = dataRoles;
 ComputeSearchSpace(numTransformLevels, learners, (b, c) => InferAndFilter(b, c));
 }

Expand DownExpand Up@@ -536,7 +539,21 @@ public PipelinePattern[] GetNextCandidates(int numberOfCandidates)
 var currentBatchSize = numberOfCandidates;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), numberOfCandidates);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize, _dataRoles);

 using (var ch = _host.Start("Suggested Pipeline"))
 {
 foreach (var pipeline in BatchCandidates)
 {
 ch.Info($"AutoInference Pipeline Id : {pipeline.UniqueId}");
 foreach (var transform in pipeline.Transforms)
 {
 ch.Info($"AutoInference Transform : {transform.Transform}");
 }
 ch.Info($"AutoInference Learner : {pipeline.Learner}");
 }
 }

 return BatchCandidates;
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/DefaultsEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand DownExpand Up@@ -33,9 +34,10 @@ public DefaultsEngine(IHostEnvironment env, Arguments args)
 _currentLearnerIndex = 0;
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var candidates = new List<PipelinePattern>();
 DataRoles = dataRoles;

 while (candidates.Count < numCandidates)
 {
Expand All@@ -53,7 +55,8 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>

 do
 { // Make sure transforms set is valid. Repeat until passes verifier.
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), learner, "", Env);
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), 
 learner, "", Env);
 valid = PipelineVerifier(pipeline, transformsBitMask);
 count++;
 } while (!valid && count <= 1000);
Expand All@@ -77,7 +80,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(out long transf

 // Add final features concat transform.
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));

 return sampledTransforms.ToArray();
 }
Expand Down

20 changes: 12 additions & 8 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/RocketEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(RecipeInference
 // cause an error in verification, since it isn't included in the original 
 // dependency mapping (i.e., its level isn't in the dictionary).
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));
 transformsBitMask = mask;

 return sampledTransforms.ToArray();
Expand All@@ -202,9 +202,10 @@ private RecipeInference.SuggestedRecipe.SuggestedLearner[] GetTopLearners(IEnume
 .Select(t=>AvailableLearners[t.Index]).ToArray();
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var prevCandidates = history.ToArray();
 DataRoles = dataRoles;

 switch (_currentStage)
 {
Expand All@@ -220,7 +221,7 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 // number of candidates, using second stage logic.
 UpdateLearners(GetTopLearners(prevCandidates));
 _currentStage++;
 return GetNextCandidates(prevCandidates, numCandidates);
 return GetNextCandidates(prevCandidates, numCandidates, DataRoles);
 }
 else
 return GetInitialPipelines(prevCandidates, remainingNum);
Expand DownExpand Up@@ -252,9 +253,11 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 }
 }

 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates) =>
 _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)]
 .GetNextCandidates(history, numCandidates);
 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates)
 {
 var engine = _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)];
 return engine.GetNextCandidates(history, numCandidates, DataRoles);
 }

 private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandidates,
 bool defaultHyperParams = false, bool uniformRandomTransforms = false)
Expand DownExpand Up@@ -294,8 +297,9 @@ private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandi
 do
 { // Make sure transforms set is valid and have not seen pipeline before. 
 // Repeat until passes or runs out of chances.
 pipeline = new PipelinePattern(SampleTransforms(learner, history,
 out var transformsBitMask, uniformRandomTransforms), learner, "", Env);
 pipeline = new PipelinePattern(
 SampleTransforms(learner, history, out var transformsBitMask, uniformRandomTransforms), 
 learner, "", Env);
 hashKey = GetHashKey(transformsBitMask, learner);
 valid = PipelineVerifier(pipeline, transformsBitMask) && !VisitedPipelines.Contains(hashKey);
 count++;
Expand Down

6 changes: 4 additions & 2 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/UniformRandomEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand All@@ -30,8 +31,9 @@ public UniformRandomEngine(IHostEnvironment env)
 : base(env, env.Register("UniformRandomEngine(AutoML)"))
 {}

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles)
 {
 DataRoles = dataRoles;
 return GetRandomPipelines(numberOfCandidates);
 }

Expand DownExpand Up@@ -66,7 +68,7 @@ private PipelinePattern[] GetRandomPipelines(int numOfPipelines)

 // Always include features concat transform
 selectedTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms, DataRoles));

 // Compute hash key for checking if we've already seen this pipeline.
 // However, if we keep missing, don't want to get stuck in infinite loop.
Expand Down

8 changes: 4 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,7 +257,7 @@ public static long TransformsToBitmask(TransformInference.SuggestedTransform[] t
 /// (In other words, if there would be nothing for that concatenate transform to do.)
 /// </summary>
 private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env,
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset)
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset, RoleMappedData dataRoles)
 {
 var finalArgs = new TransformInference.Arguments
 {
Expand All@@ -266,7 +266,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 ExcludedColumnIndices = excludedColumnIndices
 };

 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs);
 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs, dataRoles);

 for (int i = 0; i < featuresConcatTransforms.Length; i++)
 {
Expand All@@ -282,7 +282,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 /// </summary>
 public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env, IDataView data,
 AutoInference.DependencyMap dependencyMapping, TransformInference.SuggestedTransform[] selectedTransforms,
 TransformInference.SuggestedTransform[] allTransforms)
 TransformInference.SuggestedTransform[] allTransforms, RoleMappedData dataRoles)
 {
 int level = 1;
 int atomicGroupLimit = 0;
Expand All@@ -292,7 +292,7 @@ public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHos
 atomicGroupLimit = allTransforms.Max(t => t.AtomicGroupId) + 1;
 }
 var excludedColumnIndices = GetExcludedColumnIndices(selectedTransforms, data, dependencyMapping);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit, dataRoles);
 }

 public static IDataView ApplyTransformSet(IHostEnvironment env, IDataView data, TransformInference.SuggestedTransform[] transforms)
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/InferenceUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ public static Type InferPredictorCategoryType(IDataView data, PurposeInference.C
 label.ItemKind == DataKind.TX ||
 data.Schema.GetColumnType(label.ColumnIndex).IsKey)
 {
 if (columns.Any(col => col.Purpose == ColumnPurpose.GroupId))
 if (columns.Any(col => col.Purpose == ColumnPurpose.Group))
 return typeof(SignatureRankerTrainer);
 else
 return typeof(SignatureMultiClassClassifierTrainer);
Expand DownExpand Up@@ -177,7 +177,7 @@ public enum ColumnPurpose
 CategoricalFeature = 4,
 TextFeature = 5,
 Weight = 6,
GroupId = 7,
Group = 7,
 ImagePath = 8
 }
}

5 changes: 3 additions & 2 deletions
src/Microsoft.ML.PipelineInference/Interfaces/IPipelineOptimizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
 /// </summary>
 public interface IPipelineOptimizer
 {
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand All@@ -44,6 +44,7 @@ public abstract class PipelineOptimizerBase : IPipelineOptimizer
 protected IDataView OriginalData;
 protected IDataView FullyTransformedData;
 protected AutoInference.DependencyMap DependencyMapping;
 protected RoleMappedData DataRoles;
 protected readonly IHostEnvironment Env;
 protected readonly IHost Host;
 protected readonly Dictionary<long, bool> TransformsMaskValidity;
Expand All@@ -60,7 +61,7 @@ protected PipelineOptimizerBase(IHostEnvironment env, IHost host)
 ProbUtils = new SweeperProbabilityUtils(host);
 }

 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 public virtual void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand Down
Loading

, '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
Fix column purpose for PipelineSweeperMacro#461

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged


18 commits merged into

from
Jul 13, 2018
 Merged


Fix column purpose for PipelineSweeperMacro
#461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
e1fa741

Merge pull request #1 from dotnet/master


abgoswam Jun 20, 2018
703cb38

Merge pull request #2 from dotnet/master


abgoswam Jun 27, 2018
c3c2125

Merge pull request #3 from dotnet/master


abgoswam Jun 28, 2018
17026a4

Adding arguments to PipelineSweep Macro


abgoswam Jun 29, 2018
c76181c

updating the unit tests


abgoswam Jun 30, 2018
28371fe

taking care of review comments; adding validations for Label, Weight,…


abgoswam Jul 1, 2018
310b395

taking care of some review comments


abgoswam Jul 2, 2018
4fbaf14

some code cleanup


abgoswam Jul 2, 2018
3ca4da9

addressing PR comments


abgoswam Jul 3, 2018
678d727

Merge pull request #4 from dotnet/master


abgoswam Jul 11, 2018
7f94a87

Merge pull request #5 from agoswamiazureml/master


abgoswam Jul 11, 2018
d55b1e0

API changes to use RoleMappedData


abgoswam Jul 11, 2018
c624415

Merge branch 'agoswami/purpose_inference' of https://github.com/agosw…


abgoswam Jul 11, 2018
d4f6102

taking care of review comments


abgoswam Jul 12, 2018
99172e2

using pipeline.UniqueId


abgoswam Jul 12, 2018
fb5ca79

taking care of review comments. update ColumnPurpose 'Group' so it is…


abgoswam Jul 12, 2018
6b34d71

Merge pull request #6 from dotnet/master


abgoswam Jul 12, 2018
3ad0c08

Merge pull request #7 from agoswamiazureml/master


abgoswam Jul 12, 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


25 changes: 21 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ public sealed class AutoMlMlState : IMlState
 private TransformInference.SuggestedTransform[] _availableTransforms;
 private RecipeInference.SuggestedRecipe.SuggestedLearner[] _availableLearners;
 private DependencyMap _dependencyMapping;
 private RoleMappedData _dataRoles;
 public IPipelineOptimizer AutoMlEngine { get; set; }
 public PipelinePattern[] BatchCandidates { get; set; }
 public SupportedMetric Metric { get; }
Expand DownExpand Up@@ -313,7 +314,7 @@ private void MainLearningLoop(int batchSize, int numOfTrainingRows)
 var currentBatchSize = batchSize;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), batchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize, _dataRoles);

 // Break if no candidates returned, means no valid pipeline available.
 if (candidates.Length == 0)
Expand DownExpand Up@@ -370,19 +371,21 @@ private TransformInference.SuggestedTransform[] InferAndFilter(IDataView data, T
 TransformInference.SuggestedTransform[] existingTransforms = null)
 {
 // Infer transforms using experts
 var levelTransforms = TransformInference.InferTransforms(_env, data, args);
 var levelTransforms = TransformInference.InferTransforms(_env, data, args, _dataRoles);

 // Retain only those transforms inferred which were also passed in.
 if (existingTransforms != null)
 return levelTransforms.Where(t => existingTransforms.Any(t2 => t2.Equals(t))).ToArray();
 return levelTransforms;
 }

 public void InferSearchSpace(int numTransformLevels)
 public void InferSearchSpace(int numTransformLevels, RoleMappedData dataRoles = null)
 {
 var learners = RecipeInference.AllowedLearners(_env, TrainerKind).ToArray();
 if (_requestedLearners != null && _requestedLearners.Length > 0)
 learners = learners.Where(l => _requestedLearners.Contains(l.LearnerName)).ToArray();

 _dataRoles = dataRoles;
 ComputeSearchSpace(numTransformLevels, learners, (b, c) => InferAndFilter(b, c));
 }

Expand DownExpand Up@@ -536,7 +539,21 @@ public PipelinePattern[] GetNextCandidates(int numberOfCandidates)
 var currentBatchSize = numberOfCandidates;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), numberOfCandidates);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize, _dataRoles);

 using (var ch = _host.Start("Suggested Pipeline"))
 {
 foreach (var pipeline in BatchCandidates)
 {
 ch.Info($"AutoInference Pipeline Id : {pipeline.UniqueId}");
 foreach (var transform in pipeline.Transforms)
 {
 ch.Info($"AutoInference Transform : {transform.Transform}");
 }
 ch.Info($"AutoInference Learner : {pipeline.Learner}");
 }
 }

 return BatchCandidates;
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/DefaultsEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand DownExpand Up@@ -33,9 +34,10 @@ public DefaultsEngine(IHostEnvironment env, Arguments args)
 _currentLearnerIndex = 0;
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var candidates = new List<PipelinePattern>();
 DataRoles = dataRoles;

 while (candidates.Count < numCandidates)
 {
Expand All@@ -53,7 +55,8 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>

 do
 { // Make sure transforms set is valid. Repeat until passes verifier.
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), learner, "", Env);
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), 
 learner, "", Env);
 valid = PipelineVerifier(pipeline, transformsBitMask);
 count++;
 } while (!valid && count <= 1000);
Expand All@@ -77,7 +80,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(out long transf

 // Add final features concat transform.
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));

 return sampledTransforms.ToArray();
 }
Expand Down

20 changes: 12 additions & 8 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/RocketEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(RecipeInference
 // cause an error in verification, since it isn't included in the original 
 // dependency mapping (i.e., its level isn't in the dictionary).
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));
 transformsBitMask = mask;

 return sampledTransforms.ToArray();
Expand All@@ -202,9 +202,10 @@ private RecipeInference.SuggestedRecipe.SuggestedLearner[] GetTopLearners(IEnume
 .Select(t=>AvailableLearners[t.Index]).ToArray();
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var prevCandidates = history.ToArray();
 DataRoles = dataRoles;

 switch (_currentStage)
 {
Expand All@@ -220,7 +221,7 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 // number of candidates, using second stage logic.
 UpdateLearners(GetTopLearners(prevCandidates));
 _currentStage++;
 return GetNextCandidates(prevCandidates, numCandidates);
 return GetNextCandidates(prevCandidates, numCandidates, DataRoles);
 }
 else
 return GetInitialPipelines(prevCandidates, remainingNum);
Expand DownExpand Up@@ -252,9 +253,11 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 }
 }

 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates) =>
 _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)]
 .GetNextCandidates(history, numCandidates);
 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates)
 {
 var engine = _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)];
 return engine.GetNextCandidates(history, numCandidates, DataRoles);
 }

 private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandidates,
 bool defaultHyperParams = false, bool uniformRandomTransforms = false)
Expand DownExpand Up@@ -294,8 +297,9 @@ private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandi
 do
 { // Make sure transforms set is valid and have not seen pipeline before. 
 // Repeat until passes or runs out of chances.
 pipeline = new PipelinePattern(SampleTransforms(learner, history,
 out var transformsBitMask, uniformRandomTransforms), learner, "", Env);
 pipeline = new PipelinePattern(
 SampleTransforms(learner, history, out var transformsBitMask, uniformRandomTransforms), 
 learner, "", Env);
 hashKey = GetHashKey(transformsBitMask, learner);
 valid = PipelineVerifier(pipeline, transformsBitMask) && !VisitedPipelines.Contains(hashKey);
 count++;
Expand Down

6 changes: 4 additions & 2 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/UniformRandomEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand All@@ -30,8 +31,9 @@ public UniformRandomEngine(IHostEnvironment env)
 : base(env, env.Register("UniformRandomEngine(AutoML)"))
 {}

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles)
 {
 DataRoles = dataRoles;
 return GetRandomPipelines(numberOfCandidates);
 }

Expand DownExpand Up@@ -66,7 +68,7 @@ private PipelinePattern[] GetRandomPipelines(int numOfPipelines)

 // Always include features concat transform
 selectedTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms, DataRoles));

 // Compute hash key for checking if we've already seen this pipeline.
 // However, if we keep missing, don't want to get stuck in infinite loop.
Expand Down

8 changes: 4 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,7 +257,7 @@ public static long TransformsToBitmask(TransformInference.SuggestedTransform[] t
 /// (In other words, if there would be nothing for that concatenate transform to do.)
 /// </summary>
 private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env,
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset)
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset, RoleMappedData dataRoles)
 {
 var finalArgs = new TransformInference.Arguments
 {
Expand All@@ -266,7 +266,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 ExcludedColumnIndices = excludedColumnIndices
 };

 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs);
 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs, dataRoles);

 for (int i = 0; i < featuresConcatTransforms.Length; i++)
 {
Expand All@@ -282,7 +282,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 /// </summary>
 public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env, IDataView data,
 AutoInference.DependencyMap dependencyMapping, TransformInference.SuggestedTransform[] selectedTransforms,
 TransformInference.SuggestedTransform[] allTransforms)
 TransformInference.SuggestedTransform[] allTransforms, RoleMappedData dataRoles)
 {
 int level = 1;
 int atomicGroupLimit = 0;
Expand All@@ -292,7 +292,7 @@ public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHos
 atomicGroupLimit = allTransforms.Max(t => t.AtomicGroupId) + 1;
 }
 var excludedColumnIndices = GetExcludedColumnIndices(selectedTransforms, data, dependencyMapping);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit, dataRoles);
 }

 public static IDataView ApplyTransformSet(IHostEnvironment env, IDataView data, TransformInference.SuggestedTransform[] transforms)
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/InferenceUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ public static Type InferPredictorCategoryType(IDataView data, PurposeInference.C
 label.ItemKind == DataKind.TX ||
 data.Schema.GetColumnType(label.ColumnIndex).IsKey)
 {
 if (columns.Any(col => col.Purpose == ColumnPurpose.GroupId))
 if (columns.Any(col => col.Purpose == ColumnPurpose.Group))
 return typeof(SignatureRankerTrainer);
 else
 return typeof(SignatureMultiClassClassifierTrainer);
Expand DownExpand Up@@ -177,7 +177,7 @@ public enum ColumnPurpose
 CategoricalFeature = 4,
 TextFeature = 5,
 Weight = 6,
GroupId = 7,
Group = 7,
 ImagePath = 8
 }
}

5 changes: 3 additions & 2 deletions
src/Microsoft.ML.PipelineInference/Interfaces/IPipelineOptimizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
 /// </summary>
 public interface IPipelineOptimizer
 {
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand All@@ -44,6 +44,7 @@ public abstract class PipelineOptimizerBase : IPipelineOptimizer
 protected IDataView OriginalData;
 protected IDataView FullyTransformedData;
 protected AutoInference.DependencyMap DependencyMapping;
 protected RoleMappedData DataRoles;
 protected readonly IHostEnvironment Env;
 protected readonly IHost Host;
 protected readonly Dictionary<long, bool> TransformsMaskValidity;
Expand All@@ -60,7 +61,7 @@ protected PipelineOptimizerBase(IHostEnvironment env, IHost host)
 ProbUtils = new SweeperProbabilityUtils(host);
 }

 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 public virtual void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand Down
Loading

, '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
Fix column purpose for PipelineSweeperMacro#461

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged


18 commits merged into

from
Jul 13, 2018
 Merged


Fix column purpose for PipelineSweeperMacro
#461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
e1fa741

Merge pull request #1 from dotnet/master


abgoswam Jun 20, 2018
703cb38

Merge pull request #2 from dotnet/master


abgoswam Jun 27, 2018
c3c2125

Merge pull request #3 from dotnet/master


abgoswam Jun 28, 2018
17026a4

Adding arguments to PipelineSweep Macro


abgoswam Jun 29, 2018
c76181c

updating the unit tests


abgoswam Jun 30, 2018
28371fe

taking care of review comments; adding validations for Label, Weight,…


abgoswam Jul 1, 2018
310b395

taking care of some review comments


abgoswam Jul 2, 2018
4fbaf14

some code cleanup


abgoswam Jul 2, 2018
3ca4da9

addressing PR comments


abgoswam Jul 3, 2018
678d727

Merge pull request #4 from dotnet/master


abgoswam Jul 11, 2018
7f94a87

Merge pull request #5 from agoswamiazureml/master


abgoswam Jul 11, 2018
d55b1e0

API changes to use RoleMappedData


abgoswam Jul 11, 2018
c624415

Merge branch 'agoswami/purpose_inference' of https://github.com/agosw…


abgoswam Jul 11, 2018
d4f6102

taking care of review comments


abgoswam Jul 12, 2018
99172e2

using pipeline.UniqueId


abgoswam Jul 12, 2018
fb5ca79

taking care of review comments. update ColumnPurpose 'Group' so it is…


abgoswam Jul 12, 2018
6b34d71

Merge pull request #6 from dotnet/master


abgoswam Jul 12, 2018
3ad0c08

Merge pull request #7 from agoswamiazureml/master


abgoswam Jul 12, 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


25 changes: 21 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ public sealed class AutoMlMlState : IMlState
 private TransformInference.SuggestedTransform[] _availableTransforms;
 private RecipeInference.SuggestedRecipe.SuggestedLearner[] _availableLearners;
 private DependencyMap _dependencyMapping;
 private RoleMappedData _dataRoles;
 public IPipelineOptimizer AutoMlEngine { get; set; }
 public PipelinePattern[] BatchCandidates { get; set; }
 public SupportedMetric Metric { get; }
Expand DownExpand Up@@ -313,7 +314,7 @@ private void MainLearningLoop(int batchSize, int numOfTrainingRows)
 var currentBatchSize = batchSize;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), batchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize, _dataRoles);

 // Break if no candidates returned, means no valid pipeline available.
 if (candidates.Length == 0)
Expand DownExpand Up@@ -370,19 +371,21 @@ private TransformInference.SuggestedTransform[] InferAndFilter(IDataView data, T
 TransformInference.SuggestedTransform[] existingTransforms = null)
 {
 // Infer transforms using experts
 var levelTransforms = TransformInference.InferTransforms(_env, data, args);
 var levelTransforms = TransformInference.InferTransforms(_env, data, args, _dataRoles);

 // Retain only those transforms inferred which were also passed in.
 if (existingTransforms != null)
 return levelTransforms.Where(t => existingTransforms.Any(t2 => t2.Equals(t))).ToArray();
 return levelTransforms;
 }

 public void InferSearchSpace(int numTransformLevels)
 public void InferSearchSpace(int numTransformLevels, RoleMappedData dataRoles = null)
 {
 var learners = RecipeInference.AllowedLearners(_env, TrainerKind).ToArray();
 if (_requestedLearners != null && _requestedLearners.Length > 0)
 learners = learners.Where(l => _requestedLearners.Contains(l.LearnerName)).ToArray();

 _dataRoles = dataRoles;
 ComputeSearchSpace(numTransformLevels, learners, (b, c) => InferAndFilter(b, c));
 }

Expand DownExpand Up@@ -536,7 +539,21 @@ public PipelinePattern[] GetNextCandidates(int numberOfCandidates)
 var currentBatchSize = numberOfCandidates;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), numberOfCandidates);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize, _dataRoles);

 using (var ch = _host.Start("Suggested Pipeline"))
 {
 foreach (var pipeline in BatchCandidates)
 {
 ch.Info($"AutoInference Pipeline Id : {pipeline.UniqueId}");
 foreach (var transform in pipeline.Transforms)
 {
 ch.Info($"AutoInference Transform : {transform.Transform}");
 }
 ch.Info($"AutoInference Learner : {pipeline.Learner}");
 }
 }

 return BatchCandidates;
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/DefaultsEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand DownExpand Up@@ -33,9 +34,10 @@ public DefaultsEngine(IHostEnvironment env, Arguments args)
 _currentLearnerIndex = 0;
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var candidates = new List<PipelinePattern>();
 DataRoles = dataRoles;

 while (candidates.Count < numCandidates)
 {
Expand All@@ -53,7 +55,8 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>

 do
 { // Make sure transforms set is valid. Repeat until passes verifier.
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), learner, "", Env);
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), 
 learner, "", Env);
 valid = PipelineVerifier(pipeline, transformsBitMask);
 count++;
 } while (!valid && count <= 1000);
Expand All@@ -77,7 +80,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(out long transf

 // Add final features concat transform.
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));

 return sampledTransforms.ToArray();
 }
Expand Down

20 changes: 12 additions & 8 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/RocketEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(RecipeInference
 // cause an error in verification, since it isn't included in the original 
 // dependency mapping (i.e., its level isn't in the dictionary).
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));
 transformsBitMask = mask;

 return sampledTransforms.ToArray();
Expand All@@ -202,9 +202,10 @@ private RecipeInference.SuggestedRecipe.SuggestedLearner[] GetTopLearners(IEnume
 .Select(t=>AvailableLearners[t.Index]).ToArray();
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var prevCandidates = history.ToArray();
 DataRoles = dataRoles;

 switch (_currentStage)
 {
Expand All@@ -220,7 +221,7 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 // number of candidates, using second stage logic.
 UpdateLearners(GetTopLearners(prevCandidates));
 _currentStage++;
 return GetNextCandidates(prevCandidates, numCandidates);
 return GetNextCandidates(prevCandidates, numCandidates, DataRoles);
 }
 else
 return GetInitialPipelines(prevCandidates, remainingNum);
Expand DownExpand Up@@ -252,9 +253,11 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 }
 }

 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates) =>
 _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)]
 .GetNextCandidates(history, numCandidates);
 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates)
 {
 var engine = _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)];
 return engine.GetNextCandidates(history, numCandidates, DataRoles);
 }

 private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandidates,
 bool defaultHyperParams = false, bool uniformRandomTransforms = false)
Expand DownExpand Up@@ -294,8 +297,9 @@ private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandi
 do
 { // Make sure transforms set is valid and have not seen pipeline before. 
 // Repeat until passes or runs out of chances.
 pipeline = new PipelinePattern(SampleTransforms(learner, history,
 out var transformsBitMask, uniformRandomTransforms), learner, "", Env);
 pipeline = new PipelinePattern(
 SampleTransforms(learner, history, out var transformsBitMask, uniformRandomTransforms), 
 learner, "", Env);
 hashKey = GetHashKey(transformsBitMask, learner);
 valid = PipelineVerifier(pipeline, transformsBitMask) && !VisitedPipelines.Contains(hashKey);
 count++;
Expand Down

6 changes: 4 additions & 2 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/UniformRandomEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand All@@ -30,8 +31,9 @@ public UniformRandomEngine(IHostEnvironment env)
 : base(env, env.Register("UniformRandomEngine(AutoML)"))
 {}

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles)
 {
 DataRoles = dataRoles;
 return GetRandomPipelines(numberOfCandidates);
 }

Expand DownExpand Up@@ -66,7 +68,7 @@ private PipelinePattern[] GetRandomPipelines(int numOfPipelines)

 // Always include features concat transform
 selectedTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms, DataRoles));

 // Compute hash key for checking if we've already seen this pipeline.
 // However, if we keep missing, don't want to get stuck in infinite loop.
Expand Down

8 changes: 4 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,7 +257,7 @@ public static long TransformsToBitmask(TransformInference.SuggestedTransform[] t
 /// (In other words, if there would be nothing for that concatenate transform to do.)
 /// </summary>
 private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env,
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset)
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset, RoleMappedData dataRoles)
 {
 var finalArgs = new TransformInference.Arguments
 {
Expand All@@ -266,7 +266,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 ExcludedColumnIndices = excludedColumnIndices
 };

 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs);
 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs, dataRoles);

 for (int i = 0; i < featuresConcatTransforms.Length; i++)
 {
Expand All@@ -282,7 +282,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 /// </summary>
 public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env, IDataView data,
 AutoInference.DependencyMap dependencyMapping, TransformInference.SuggestedTransform[] selectedTransforms,
 TransformInference.SuggestedTransform[] allTransforms)
 TransformInference.SuggestedTransform[] allTransforms, RoleMappedData dataRoles)
 {
 int level = 1;
 int atomicGroupLimit = 0;
Expand All@@ -292,7 +292,7 @@ public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHos
 atomicGroupLimit = allTransforms.Max(t => t.AtomicGroupId) + 1;
 }
 var excludedColumnIndices = GetExcludedColumnIndices(selectedTransforms, data, dependencyMapping);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit, dataRoles);
 }

 public static IDataView ApplyTransformSet(IHostEnvironment env, IDataView data, TransformInference.SuggestedTransform[] transforms)
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/InferenceUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ public static Type InferPredictorCategoryType(IDataView data, PurposeInference.C
 label.ItemKind == DataKind.TX ||
 data.Schema.GetColumnType(label.ColumnIndex).IsKey)
 {
 if (columns.Any(col => col.Purpose == ColumnPurpose.GroupId))
 if (columns.Any(col => col.Purpose == ColumnPurpose.Group))
 return typeof(SignatureRankerTrainer);
 else
 return typeof(SignatureMultiClassClassifierTrainer);
Expand DownExpand Up@@ -177,7 +177,7 @@ public enum ColumnPurpose
 CategoricalFeature = 4,
 TextFeature = 5,
 Weight = 6,
GroupId = 7,
Group = 7,
 ImagePath = 8
 }
}

5 changes: 3 additions & 2 deletions
src/Microsoft.ML.PipelineInference/Interfaces/IPipelineOptimizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
 /// </summary>
 public interface IPipelineOptimizer
 {
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand All@@ -44,6 +44,7 @@ public abstract class PipelineOptimizerBase : IPipelineOptimizer
 protected IDataView OriginalData;
 protected IDataView FullyTransformedData;
 protected AutoInference.DependencyMap DependencyMapping;
 protected RoleMappedData DataRoles;
 protected readonly IHostEnvironment Env;
 protected readonly IHost Host;
 protected readonly Dictionary<long, bool> TransformsMaskValidity;
Expand All@@ -60,7 +61,7 @@ protected PipelineOptimizerBase(IHostEnvironment env, IHost host)
 ProbUtils = new SweeperProbabilityUtils(host);
 }

 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 public virtual void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand Down
Loading

, '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
Fix column purpose for PipelineSweeperMacro#461

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged


18 commits merged into

from
Jul 13, 2018
 Merged


Fix column purpose for PipelineSweeperMacro
#461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
e1fa741

Merge pull request #1 from dotnet/master


abgoswam Jun 20, 2018
703cb38

Merge pull request #2 from dotnet/master


abgoswam Jun 27, 2018
c3c2125

Merge pull request #3 from dotnet/master


abgoswam Jun 28, 2018
17026a4

Adding arguments to PipelineSweep Macro


abgoswam Jun 29, 2018
c76181c

updating the unit tests


abgoswam Jun 30, 2018
28371fe

taking care of review comments; adding validations for Label, Weight,…


abgoswam Jul 1, 2018
310b395

taking care of some review comments


abgoswam Jul 2, 2018
4fbaf14

some code cleanup


abgoswam Jul 2, 2018
3ca4da9

addressing PR comments


abgoswam Jul 3, 2018
678d727

Merge pull request #4 from dotnet/master


abgoswam Jul 11, 2018
7f94a87

Merge pull request #5 from agoswamiazureml/master


abgoswam Jul 11, 2018
d55b1e0

API changes to use RoleMappedData


abgoswam Jul 11, 2018
c624415

Merge branch 'agoswami/purpose_inference' of https://github.com/agosw…


abgoswam Jul 11, 2018
d4f6102

taking care of review comments


abgoswam Jul 12, 2018
99172e2

using pipeline.UniqueId


abgoswam Jul 12, 2018
fb5ca79

taking care of review comments. update ColumnPurpose 'Group' so it is…


abgoswam Jul 12, 2018
6b34d71

Merge pull request #6 from dotnet/master


abgoswam Jul 12, 2018
3ad0c08

Merge pull request #7 from agoswamiazureml/master


abgoswam Jul 12, 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


25 changes: 21 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ public sealed class AutoMlMlState : IMlState
 private TransformInference.SuggestedTransform[] _availableTransforms;
 private RecipeInference.SuggestedRecipe.SuggestedLearner[] _availableLearners;
 private DependencyMap _dependencyMapping;
 private RoleMappedData _dataRoles;
 public IPipelineOptimizer AutoMlEngine { get; set; }
 public PipelinePattern[] BatchCandidates { get; set; }
 public SupportedMetric Metric { get; }
Expand DownExpand Up@@ -313,7 +314,7 @@ private void MainLearningLoop(int batchSize, int numOfTrainingRows)
 var currentBatchSize = batchSize;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), batchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize, _dataRoles);

 // Break if no candidates returned, means no valid pipeline available.
 if (candidates.Length == 0)
Expand DownExpand Up@@ -370,19 +371,21 @@ private TransformInference.SuggestedTransform[] InferAndFilter(IDataView data, T
 TransformInference.SuggestedTransform[] existingTransforms = null)
 {
 // Infer transforms using experts
 var levelTransforms = TransformInference.InferTransforms(_env, data, args);
 var levelTransforms = TransformInference.InferTransforms(_env, data, args, _dataRoles);

 // Retain only those transforms inferred which were also passed in.
 if (existingTransforms != null)
 return levelTransforms.Where(t => existingTransforms.Any(t2 => t2.Equals(t))).ToArray();
 return levelTransforms;
 }

 public void InferSearchSpace(int numTransformLevels)
 public void InferSearchSpace(int numTransformLevels, RoleMappedData dataRoles = null)
 {
 var learners = RecipeInference.AllowedLearners(_env, TrainerKind).ToArray();
 if (_requestedLearners != null && _requestedLearners.Length > 0)
 learners = learners.Where(l => _requestedLearners.Contains(l.LearnerName)).ToArray();

 _dataRoles = dataRoles;
 ComputeSearchSpace(numTransformLevels, learners, (b, c) => InferAndFilter(b, c));
 }

Expand DownExpand Up@@ -536,7 +539,21 @@ public PipelinePattern[] GetNextCandidates(int numberOfCandidates)
 var currentBatchSize = numberOfCandidates;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), numberOfCandidates);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize, _dataRoles);

 using (var ch = _host.Start("Suggested Pipeline"))
 {
 foreach (var pipeline in BatchCandidates)
 {
 ch.Info($"AutoInference Pipeline Id : {pipeline.UniqueId}");
 foreach (var transform in pipeline.Transforms)
 {
 ch.Info($"AutoInference Transform : {transform.Transform}");
 }
 ch.Info($"AutoInference Learner : {pipeline.Learner}");
 }
 }

 return BatchCandidates;
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/DefaultsEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand DownExpand Up@@ -33,9 +34,10 @@ public DefaultsEngine(IHostEnvironment env, Arguments args)
 _currentLearnerIndex = 0;
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var candidates = new List<PipelinePattern>();
 DataRoles = dataRoles;

 while (candidates.Count < numCandidates)
 {
Expand All@@ -53,7 +55,8 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>

 do
 { // Make sure transforms set is valid. Repeat until passes verifier.
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), learner, "", Env);
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), 
 learner, "", Env);
 valid = PipelineVerifier(pipeline, transformsBitMask);
 count++;
 } while (!valid && count <= 1000);
Expand All@@ -77,7 +80,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(out long transf

 // Add final features concat transform.
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));

 return sampledTransforms.ToArray();
 }
Expand Down

20 changes: 12 additions & 8 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/RocketEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(RecipeInference
 // cause an error in verification, since it isn't included in the original 
 // dependency mapping (i.e., its level isn't in the dictionary).
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));
 transformsBitMask = mask;

 return sampledTransforms.ToArray();
Expand All@@ -202,9 +202,10 @@ private RecipeInference.SuggestedRecipe.SuggestedLearner[] GetTopLearners(IEnume
 .Select(t=>AvailableLearners[t.Index]).ToArray();
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var prevCandidates = history.ToArray();
 DataRoles = dataRoles;

 switch (_currentStage)
 {
Expand All@@ -220,7 +221,7 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 // number of candidates, using second stage logic.
 UpdateLearners(GetTopLearners(prevCandidates));
 _currentStage++;
 return GetNextCandidates(prevCandidates, numCandidates);
 return GetNextCandidates(prevCandidates, numCandidates, DataRoles);
 }
 else
 return GetInitialPipelines(prevCandidates, remainingNum);
Expand DownExpand Up@@ -252,9 +253,11 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 }
 }

 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates) =>
 _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)]
 .GetNextCandidates(history, numCandidates);
 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates)
 {
 var engine = _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)];
 return engine.GetNextCandidates(history, numCandidates, DataRoles);
 }

 private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandidates,
 bool defaultHyperParams = false, bool uniformRandomTransforms = false)
Expand DownExpand Up@@ -294,8 +297,9 @@ private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandi
 do
 { // Make sure transforms set is valid and have not seen pipeline before. 
 // Repeat until passes or runs out of chances.
 pipeline = new PipelinePattern(SampleTransforms(learner, history,
 out var transformsBitMask, uniformRandomTransforms), learner, "", Env);
 pipeline = new PipelinePattern(
 SampleTransforms(learner, history, out var transformsBitMask, uniformRandomTransforms), 
 learner, "", Env);
 hashKey = GetHashKey(transformsBitMask, learner);
 valid = PipelineVerifier(pipeline, transformsBitMask) && !VisitedPipelines.Contains(hashKey);
 count++;
Expand Down

6 changes: 4 additions & 2 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/UniformRandomEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand All@@ -30,8 +31,9 @@ public UniformRandomEngine(IHostEnvironment env)
 : base(env, env.Register("UniformRandomEngine(AutoML)"))
 {}

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles)
 {
 DataRoles = dataRoles;
 return GetRandomPipelines(numberOfCandidates);
 }

Expand DownExpand Up@@ -66,7 +68,7 @@ private PipelinePattern[] GetRandomPipelines(int numOfPipelines)

 // Always include features concat transform
 selectedTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms, DataRoles));

 // Compute hash key for checking if we've already seen this pipeline.
 // However, if we keep missing, don't want to get stuck in infinite loop.
Expand Down

8 changes: 4 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,7 +257,7 @@ public static long TransformsToBitmask(TransformInference.SuggestedTransform[] t
 /// (In other words, if there would be nothing for that concatenate transform to do.)
 /// </summary>
 private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env,
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset)
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset, RoleMappedData dataRoles)
 {
 var finalArgs = new TransformInference.Arguments
 {
Expand All@@ -266,7 +266,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 ExcludedColumnIndices = excludedColumnIndices
 };

 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs);
 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs, dataRoles);

 for (int i = 0; i < featuresConcatTransforms.Length; i++)
 {
Expand All@@ -282,7 +282,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 /// </summary>
 public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env, IDataView data,
 AutoInference.DependencyMap dependencyMapping, TransformInference.SuggestedTransform[] selectedTransforms,
 TransformInference.SuggestedTransform[] allTransforms)
 TransformInference.SuggestedTransform[] allTransforms, RoleMappedData dataRoles)
 {
 int level = 1;
 int atomicGroupLimit = 0;
Expand All@@ -292,7 +292,7 @@ public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHos
 atomicGroupLimit = allTransforms.Max(t => t.AtomicGroupId) + 1;
 }
 var excludedColumnIndices = GetExcludedColumnIndices(selectedTransforms, data, dependencyMapping);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit, dataRoles);
 }

 public static IDataView ApplyTransformSet(IHostEnvironment env, IDataView data, TransformInference.SuggestedTransform[] transforms)
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/InferenceUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ public static Type InferPredictorCategoryType(IDataView data, PurposeInference.C
 label.ItemKind == DataKind.TX ||
 data.Schema.GetColumnType(label.ColumnIndex).IsKey)
 {
 if (columns.Any(col => col.Purpose == ColumnPurpose.GroupId))
 if (columns.Any(col => col.Purpose == ColumnPurpose.Group))
 return typeof(SignatureRankerTrainer);
 else
 return typeof(SignatureMultiClassClassifierTrainer);
Expand DownExpand Up@@ -177,7 +177,7 @@ public enum ColumnPurpose
 CategoricalFeature = 4,
 TextFeature = 5,
 Weight = 6,
GroupId = 7,
Group = 7,
 ImagePath = 8
 }
}

5 changes: 3 additions & 2 deletions
src/Microsoft.ML.PipelineInference/Interfaces/IPipelineOptimizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
 /// </summary>
 public interface IPipelineOptimizer
 {
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand All@@ -44,6 +44,7 @@ public abstract class PipelineOptimizerBase : IPipelineOptimizer
 protected IDataView OriginalData;
 protected IDataView FullyTransformedData;
 protected AutoInference.DependencyMap DependencyMapping;
 protected RoleMappedData DataRoles;
 protected readonly IHostEnvironment Env;
 protected readonly IHost Host;
 protected readonly Dictionary<long, bool> TransformsMaskValidity;
Expand All@@ -60,7 +61,7 @@ protected PipelineOptimizerBase(IHostEnvironment env, IHost host)
 ProbUtils = new SweeperProbabilityUtils(host);
 }

 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 public virtual void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand Down
Loading

, '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
Fix column purpose for PipelineSweeperMacro#461

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged


18 commits merged into

from
Jul 13, 2018
 Merged


Fix column purpose for PipelineSweeperMacro
#461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
e1fa741

Merge pull request #1 from dotnet/master


abgoswam Jun 20, 2018
703cb38

Merge pull request #2 from dotnet/master


abgoswam Jun 27, 2018
c3c2125

Merge pull request #3 from dotnet/master


abgoswam Jun 28, 2018
17026a4

Adding arguments to PipelineSweep Macro


abgoswam Jun 29, 2018
c76181c

updating the unit tests


abgoswam Jun 30, 2018
28371fe

taking care of review comments; adding validations for Label, Weight,…


abgoswam Jul 1, 2018
310b395

taking care of some review comments


abgoswam Jul 2, 2018
4fbaf14

some code cleanup


abgoswam Jul 2, 2018
3ca4da9

addressing PR comments


abgoswam Jul 3, 2018
678d727

Merge pull request #4 from dotnet/master


abgoswam Jul 11, 2018
7f94a87

Merge pull request #5 from agoswamiazureml/master


abgoswam Jul 11, 2018
d55b1e0

API changes to use RoleMappedData


abgoswam Jul 11, 2018
c624415

Merge branch 'agoswami/purpose_inference' of https://github.com/agosw…


abgoswam Jul 11, 2018
d4f6102

taking care of review comments


abgoswam Jul 12, 2018
99172e2

using pipeline.UniqueId


abgoswam Jul 12, 2018
fb5ca79

taking care of review comments. update ColumnPurpose 'Group' so it is…


abgoswam Jul 12, 2018
6b34d71

Merge pull request #6 from dotnet/master


abgoswam Jul 12, 2018
3ad0c08

Merge pull request #7 from agoswamiazureml/master


abgoswam Jul 12, 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


25 changes: 21 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ public sealed class AutoMlMlState : IMlState
 private TransformInference.SuggestedTransform[] _availableTransforms;
 private RecipeInference.SuggestedRecipe.SuggestedLearner[] _availableLearners;
 private DependencyMap _dependencyMapping;
 private RoleMappedData _dataRoles;
 public IPipelineOptimizer AutoMlEngine { get; set; }
 public PipelinePattern[] BatchCandidates { get; set; }
 public SupportedMetric Metric { get; }
Expand DownExpand Up@@ -313,7 +314,7 @@ private void MainLearningLoop(int batchSize, int numOfTrainingRows)
 var currentBatchSize = batchSize;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), batchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize);
 var candidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Values, currentBatchSize, _dataRoles);

 // Break if no candidates returned, means no valid pipeline available.
 if (candidates.Length == 0)
Expand DownExpand Up@@ -370,19 +371,21 @@ private TransformInference.SuggestedTransform[] InferAndFilter(IDataView data, T
 TransformInference.SuggestedTransform[] existingTransforms = null)
 {
 // Infer transforms using experts
 var levelTransforms = TransformInference.InferTransforms(_env, data, args);
 var levelTransforms = TransformInference.InferTransforms(_env, data, args, _dataRoles);

 // Retain only those transforms inferred which were also passed in.
 if (existingTransforms != null)
 return levelTransforms.Where(t => existingTransforms.Any(t2 => t2.Equals(t))).ToArray();
 return levelTransforms;
 }

 public void InferSearchSpace(int numTransformLevels)
 public void InferSearchSpace(int numTransformLevels, RoleMappedData dataRoles = null)
 {
 var learners = RecipeInference.AllowedLearners(_env, TrainerKind).ToArray();
 if (_requestedLearners != null && _requestedLearners.Length > 0)
 learners = learners.Where(l => _requestedLearners.Contains(l.LearnerName)).ToArray();

 _dataRoles = dataRoles;
 ComputeSearchSpace(numTransformLevels, learners, (b, c) => InferAndFilter(b, c));
 }

Expand DownExpand Up@@ -536,7 +539,21 @@ public PipelinePattern[] GetNextCandidates(int numberOfCandidates)
 var currentBatchSize = numberOfCandidates;
 if (_terminator is IterationTerminator itr)
 currentBatchSize = Math.Min(itr.RemainingIterations(_history), numberOfCandidates);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize);
 BatchCandidates = AutoMlEngine.GetNextCandidates(_sortedSampledElements.Select(kvp => kvp.Value), currentBatchSize, _dataRoles);

 using (var ch = _host.Start("Suggested Pipeline"))
 {
 foreach (var pipeline in BatchCandidates)
 {
 ch.Info($"AutoInference Pipeline Id : {pipeline.UniqueId}");
 foreach (var transform in pipeline.Transforms)
 {
 ch.Info($"AutoInference Transform : {transform.Transform}");
 }
 ch.Info($"AutoInference Learner : {pipeline.Learner}");
 }
 }

 return BatchCandidates;
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/DefaultsEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand DownExpand Up@@ -33,9 +34,10 @@ public DefaultsEngine(IHostEnvironment env, Arguments args)
 _currentLearnerIndex = 0;
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var candidates = new List<PipelinePattern>();
 DataRoles = dataRoles;

 while (candidates.Count < numCandidates)
 {
Expand All@@ -53,7 +55,8 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>

 do
 { // Make sure transforms set is valid. Repeat until passes verifier.
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), learner, "", Env);
 pipeline = new PipelinePattern(SampleTransforms(out var transformsBitMask), 
 learner, "", Env);
 valid = PipelineVerifier(pipeline, transformsBitMask);
 count++;
 } while (!valid && count <= 1000);
Expand All@@ -77,7 +80,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(out long transf

 // Add final features concat transform.
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));

 return sampledTransforms.ToArray();
 }
Expand Down

20 changes: 12 additions & 8 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/RocketEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ private TransformInference.SuggestedTransform[] SampleTransforms(RecipeInference
 // cause an error in verification, since it isn't included in the original 
 // dependency mapping (i.e., its level isn't in the dictionary).
 sampledTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, sampledTransforms.ToArray(), AvailableTransforms, DataRoles));
 transformsBitMask = mask;

 return sampledTransforms.ToArray();
Expand All@@ -202,9 +202,10 @@ private RecipeInference.SuggestedRecipe.SuggestedLearner[] GetTopLearners(IEnume
 .Select(t=>AvailableLearners[t.Index]).ToArray();
 }

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numCandidates, RoleMappedData dataRoles)
 {
 var prevCandidates = history.ToArray();
 DataRoles = dataRoles;

 switch (_currentStage)
 {
Expand All@@ -220,7 +221,7 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 // number of candidates, using second stage logic.
 UpdateLearners(GetTopLearners(prevCandidates));
 _currentStage++;
 return GetNextCandidates(prevCandidates, numCandidates);
 return GetNextCandidates(prevCandidates, numCandidates, DataRoles);
 }
 else
 return GetInitialPipelines(prevCandidates, remainingNum);
Expand DownExpand Up@@ -252,9 +253,11 @@ public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern>
 }
 }

 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates) =>
 _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)]
 .GetNextCandidates(history, numCandidates);
 private PipelinePattern[] GetInitialPipelines(IEnumerable<PipelinePattern> history, int numCandidates)
 {
 var engine = _secondaryEngines[_randomInit ? nameof(UniformRandomEngine) : nameof(DefaultsEngine)];
 return engine.GetNextCandidates(history, numCandidates, DataRoles);
 }

 private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandidates,
 bool defaultHyperParams = false, bool uniformRandomTransforms = false)
Expand DownExpand Up@@ -294,8 +297,9 @@ private PipelinePattern[] NextCandidates(PipelinePattern[] history, int numCandi
 do
 { // Make sure transforms set is valid and have not seen pipeline before. 
 // Repeat until passes or runs out of chances.
 pipeline = new PipelinePattern(SampleTransforms(learner, history,
 out var transformsBitMask, uniformRandomTransforms), learner, "", Env);
 pipeline = new PipelinePattern(
 SampleTransforms(learner, history, out var transformsBitMask, uniformRandomTransforms), 
 learner, "", Env);
 hashKey = GetHashKey(transformsBitMask, learner);
 valid = PipelineVerifier(pipeline, transformsBitMask) && !VisitedPipelines.Contains(hashKey);
 count++;
Expand Down

6 changes: 4 additions & 2 deletions
src/Microsoft.ML.PipelineInference/AutoMlEngines/UniformRandomEngine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.PipelineInference;

Expand All@@ -30,8 +31,9 @@ public UniformRandomEngine(IHostEnvironment env)
 : base(env, env.Register("UniformRandomEngine(AutoML)"))
 {}

 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates)
 public override PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles)
 {
 DataRoles = dataRoles;
 return GetRandomPipelines(numberOfCandidates);
 }

Expand DownExpand Up@@ -66,7 +68,7 @@ private PipelinePattern[] GetRandomPipelines(int numOfPipelines)

 // Always include features concat transform
 selectedTransforms.AddRange(AutoMlUtils.GetFinalFeatureConcat(Env, FullyTransformedData,
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms));
 DependencyMapping, selectedTransforms.ToArray(), AvailableTransforms, DataRoles));

 // Compute hash key for checking if we've already seen this pipeline.
 // However, if we keep missing, don't want to get stuck in infinite loop.
Expand Down

8 changes: 4 additions & 4 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,7 +257,7 @@ public static long TransformsToBitmask(TransformInference.SuggestedTransform[] t
 /// (In other words, if there would be nothing for that concatenate transform to do.)
 /// </summary>
 private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env,
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset)
 IDataView dataSample, int[] excludedColumnIndices, int level, int atomicIdOffset, RoleMappedData dataRoles)
 {
 var finalArgs = new TransformInference.Arguments
 {
Expand All@@ -266,7 +266,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 ExcludedColumnIndices = excludedColumnIndices
 };

 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs);
 var featuresConcatTransforms = TransformInference.InferConcatNumericFeatures(env, dataSample, finalArgs, dataRoles);

 for (int i = 0; i < featuresConcatTransforms.Length; i++)
 {
Expand All@@ -282,7 +282,7 @@ private static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHo
 /// </summary>
 public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHostEnvironment env, IDataView data,
 AutoInference.DependencyMap dependencyMapping, TransformInference.SuggestedTransform[] selectedTransforms,
 TransformInference.SuggestedTransform[] allTransforms)
 TransformInference.SuggestedTransform[] allTransforms, RoleMappedData dataRoles)
 {
 int level = 1;
 int atomicGroupLimit = 0;
Expand All@@ -292,7 +292,7 @@ public static TransformInference.SuggestedTransform[] GetFinalFeatureConcat(IHos
 atomicGroupLimit = allTransforms.Max(t => t.AtomicGroupId) + 1;
 }
 var excludedColumnIndices = GetExcludedColumnIndices(selectedTransforms, data, dependencyMapping);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit);
 return GetFinalFeatureConcat(env, data, excludedColumnIndices, level, atomicGroupLimit, dataRoles);
 }

 public static IDataView ApplyTransformSet(IHostEnvironment env, IDataView data, TransformInference.SuggestedTransform[] transforms)
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/InferenceUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ public static Type InferPredictorCategoryType(IDataView data, PurposeInference.C
 label.ItemKind == DataKind.TX ||
 data.Schema.GetColumnType(label.ColumnIndex).IsKey)
 {
 if (columns.Any(col => col.Purpose == ColumnPurpose.GroupId))
 if (columns.Any(col => col.Purpose == ColumnPurpose.Group))
 return typeof(SignatureRankerTrainer);
 else
 return typeof(SignatureMultiClassClassifierTrainer);
Expand DownExpand Up@@ -177,7 +177,7 @@ public enum ColumnPurpose
 CategoricalFeature = 4,
 TextFeature = 5,
 Weight = 6,
GroupId = 7,
Group = 7,
 ImagePath = 8
 }
}

5 changes: 3 additions & 2 deletions
src/Microsoft.ML.PipelineInference/Interfaces/IPipelineOptimizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
 /// </summary>
 public interface IPipelineOptimizer
 {
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand All@@ -44,6 +44,7 @@ public abstract class PipelineOptimizerBase : IPipelineOptimizer
 protected IDataView OriginalData;
 protected IDataView FullyTransformedData;
 protected AutoInference.DependencyMap DependencyMapping;
 protected RoleMappedData DataRoles;
 protected readonly IHostEnvironment Env;
 protected readonly IHost Host;
 protected readonly Dictionary<long, bool> TransformsMaskValidity;
Expand All@@ -60,7 +61,7 @@ protected PipelineOptimizerBase(IHostEnvironment env, IHost host)
 ProbUtils = new SweeperProbabilityUtils(host);
 }

 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates);
 public abstract PipelinePattern[] GetNextCandidates(IEnumerable<PipelinePattern> history, int numberOfCandidates, RoleMappedData dataRoles);

 public virtual void SetSpace(TransformInference.SuggestedTransform[] availableTransforms,
 RecipeInference.SuggestedRecipe.SuggestedLearner[] availableLearners,
Expand Down
Loading