Skip to content

Implementing copy column estimator #706

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Aug 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Microsoft.ML.Data/EntryPoints/SchemaManipulation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ public static CommonOutputs.TransformOutput CopyColumns(IHostEnvironment env, Co
var host = env.Register("CopyColumns");
host.CheckValue(input, nameof(input));
EntryPointUtils.CheckInputArgs(host, input);

var xf = new CopyColumnsTransform(env, input, input.Data);
var xf = CopyColumnsTransform.Create(env, input, input.Data);
return new CommonOutputs.TransformOutput { Model = new TransformModel(env, xf, input.Data), OutputData = xf };
}

Expand Down
9 changes: 4 additions & 5 deletions src/Microsoft.ML.Data/EntryPoints/ScoreColumnSelector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ public static CommonOutputs.TransformOutput SelectColumns(IHostEnvironment env,
Contracts.CheckValue(env, nameof(env));
env.CheckValue(input, nameof(input));
EntryPointUtils.CheckInputArgs(env, input);
int colMax;
var view = input.Data;
var maxScoreId = view.Schema.GetMaxMetadataKind(out colMax, MetadataUtils.Kinds.ScoreColumnSetId);
var maxScoreId = view.Schema.GetMaxMetadataKind(out int colMax, MetadataUtils.Kinds.ScoreColumnSetId);
List<int> indices = new List<int>();
for (int i = 0; i < view.Schema.ColumnCount; i++)
{
Expand Down Expand Up @@ -82,7 +81,7 @@ public static CommonOutputs.TransformOutput RenameBinaryPredictionScoreColumns(I
// Rename all the score columns.
int colMax;
var maxScoreId = input.Data.Schema.GetMaxMetadataKind(out colMax, MetadataUtils.Kinds.ScoreColumnSetId);
var copyCols = new List<CopyColumnsTransform.Column>();
var copyCols = new List<(string Source, string Name)>();
for (int i = 0; i < input.Data.Schema.ColumnCount; i++)
{
if (input.Data.Schema.IsHidden(i))
Expand All @@ -99,10 +98,10 @@ public static CommonOutputs.TransformOutput RenameBinaryPredictionScoreColumns(I
}
var source = input.Data.Schema.GetColumnName(i);
var name = source + "." + positiveClass;
copyCols.Add(new CopyColumnsTransform.Column() { Name = name, Source = source });
copyCols.Add((source, name));
}

var copyColumn = new CopyColumnsTransform(env, new CopyColumnsTransform.Arguments() { Column = copyCols.ToArray() }, input.Data);
var copyColumn = new CopyColumnsTransform(env, copyCols.ToArray()).Transform(input.Data);
var dropColumn = new DropColumnsTransform(env, new DropColumnsTransform.Arguments() { Column = copyCols.Select(c => c.Source).ToArray() }, copyColumn);
return new CommonOutputs.TransformOutput { Model = new TransformModel(env, dropColumn, input.Data), OutputData = dropColumn };
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -925,18 +925,7 @@ protected override IDataView GetOverallResultsCore(IDataView overall)

private IDataView ChangeTopKAccColumnName(IDataView input)
{
var cpyArgs = new CopyColumnsTransform.Arguments
{
Column = new[]
{
new CopyColumnsTransform.Column()
{
Name=string.Format(TopKAccuracyFormat, _outputTopKAcc),
Source=MultiClassClassifierEvaluator.TopKAccuracy
}
}
};
input = new CopyColumnsTransform(Host, cpyArgs, input);
input = new CopyColumnsTransform(Host, (MultiClassClassifierEvaluator.TopKAccuracy, string.Format(TopKAccuracyFormat, _outputTopKAcc))).Transform(input);
var dropArgs = new DropColumnsTransform.Arguments
{
Column = new[] { MultiClassClassifierEvaluator.TopKAccuracy }
Expand Down
Loading