Skip to content

Commit

Permalink
fix multiclass with nonstandard label (dotnet#207)
Browse files Browse the repository at this point in the history
  • Loading branch information
@daholste @Dmitry-A
daholste authored and Dmitry-A committed Aug 22, 2019
1 parent 5db4b73 commit d08e9cf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion src/Microsoft.ML.Auto/PipelineSuggesters/PipelineSuggester.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,8 @@ private static IEnumerable<SuggestedTransform> CalculateTransforms(
// this is a work-around for ML.NET bug tracked by https://github.com/dotnet/machinelearning/issues/1969
if (task == TaskKind.MulticlassClassification)
{
var transform = ValueToKeyMappingExtension.CreateSuggestedTransform(context, DefaultColumnNames.Label, DefaultColumnNames.Label);
var labelColumn = columns.First(c => c.Item3 == ColumnPurpose.Label).Item1;
var transform = ValueToKeyMappingExtension.CreateSuggestedTransform(context, labelColumn, labelColumn);
transforms.Add(transform);
}
return transforms;
Expand Down
14 changes: 7 additions & 7 deletions src/Microsoft.ML.Auto/TrainerExtensions/MultiTrainerExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public ITrainerEstimator CreateInstance(MLContext mlContext, IEnumerable<Sweepab
ColumnInformation columnInfo)
{
var binaryTrainer = _binaryLearnerCatalogItem.CreateInstance(mlContext, sweepParams, columnInfo) as ITrainerEstimatorProducingFloat;
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer);
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer, labelColumn: columnInfo.LabelColumn);
}

public PipelineNode CreatePipelineNode(IEnumerable<SweepableParam> sweepParams, ColumnInformation columnInfo)
Expand All @@ -46,7 +46,7 @@ public ITrainerEstimator CreateInstance(MLContext mlContext, IEnumerable<Sweepab
ColumnInformation columnInfo)
{
var binaryTrainer = _binaryLearnerCatalogItem.CreateInstance(mlContext, sweepParams, columnInfo) as ITrainerEstimatorProducingFloat;
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer);
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer, labelColumn: columnInfo.LabelColumn);
}

public PipelineNode CreatePipelineNode(IEnumerable<SweepableParam> sweepParams, ColumnInformation columnInfo)
Expand Down Expand Up @@ -89,7 +89,7 @@ public ITrainerEstimator CreateInstance(MLContext mlContext, IEnumerable<Sweepab
ColumnInformation columnInfo)
{
var binaryTrainer = _binaryLearnerCatalogItem.CreateInstance(mlContext, sweepParams, columnInfo) as ITrainerEstimatorProducingFloat;
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer);
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer, labelColumn: columnInfo.LabelColumn);
}

public PipelineNode CreatePipelineNode(IEnumerable<SweepableParam> sweepParams, ColumnInformation columnInfo)
Expand Down Expand Up @@ -132,7 +132,7 @@ public ITrainerEstimator CreateInstance(MLContext mlContext, IEnumerable<Sweepab
ColumnInformation columnInfo)
{
var binaryTrainer = _binaryLearnerCatalogItem.CreateInstance(mlContext, sweepParams, columnInfo) as ITrainerEstimatorProducingFloat;
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer);
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer, labelColumn: columnInfo.LabelColumn);
}

public PipelineNode CreatePipelineNode(IEnumerable<SweepableParam> sweepParams, ColumnInformation columnInfo)
Expand All @@ -154,7 +154,7 @@ public ITrainerEstimator CreateInstance(MLContext mlContext, IEnumerable<Sweepab
ColumnInformation columnInfo)
{
var binaryTrainer = _binaryLearnerCatalogItem.CreateInstance(mlContext, sweepParams, columnInfo) as ITrainerEstimatorProducingFloat;
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer);
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer, labelColumn: columnInfo.LabelColumn);
}

public PipelineNode CreatePipelineNode(IEnumerable<SweepableParam> sweepParams, ColumnInformation columnInfo)
Expand All @@ -176,7 +176,7 @@ public ITrainerEstimator CreateInstance(MLContext mlContext, IEnumerable<Sweepab
ColumnInformation columnInfo)
{
var binaryTrainer = _binaryLearnerCatalogItem.CreateInstance(mlContext, sweepParams, columnInfo) as ITrainerEstimatorProducingFloat;
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer);
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer, labelColumn: columnInfo.LabelColumn);
}

public PipelineNode CreatePipelineNode(IEnumerable<SweepableParam> sweepParams, ColumnInformation columnInfo)
Expand All @@ -198,7 +198,7 @@ public ITrainerEstimator CreateInstance(MLContext mlContext, IEnumerable<Sweepab
ColumnInformation columnInfo)
{
var binaryTrainer = _binaryLearnerCatalogItem.CreateInstance(mlContext, sweepParams, columnInfo) as ITrainerEstimatorProducingFloat;
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer);
return mlContext.MulticlassClassification.Trainers.OneVersusAll(binaryTrainer, labelColumn: columnInfo.LabelColumn);
}

public PipelineNode CreatePipelineNode(IEnumerable<SweepableParam> sweepParams, ColumnInformation columnInfo)
Expand Down

0 comments on commit d08e9cf

Please sign in to comment.