Skip to content

Fix the treatment of LightGbm Evaluation Metric parameters in ML.NET … #3815

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
merged 6 commits into from
Jun 12, 2019
Merged

Fix the treatment of LightGbm Evaluation Metric parameters in ML.NET … #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf9e65e
Fix the treatment of LightGbm Evaluation Metric parameters in ML.NET …
najeeb-kazmi Jun 4, 2019
b59dbdb
Regenerate EntryPoints
najeeb-kazmi Jun 4, 2019
f8c07aa
Reverting breaking change, to be fixed in separate issue
najeeb-kazmi Jun 4, 2019
9e87ad7
Adding test
najeeb-kazmi Jun 4, 2019
b079958
Merge branch 'master' into 3761
najeeb-kazmi Jun 12, 2019
8a1bbc2
Fix build errors
najeeb-kazmi Jun 12, 2019
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
6 changes: 3 additions & 3 deletions src/Microsoft.ML.LightGbm/LightGbmBinaryTrainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ public enum EvaluateMetricType
static Options()
{
NameMapping.Add(nameof(EvaluateMetricType), "metric");
NameMapping.Add(nameof(EvaluateMetricType.None), "");
NameMapping.Add(nameof(EvaluateMetricType.None), "None");
NameMapping.Add(nameof(EvaluateMetricType.Default), "");
NameMapping.Add(nameof(EvaluateMetricType.Logloss), "binary_logloss");
NameMapping.Add(nameof(EvaluateMetricType.Error), "binary_error");
NameMapping.Add(nameof(EvaluateMetricType.AreaUnderCurve), "auc");
Expand All @@ -180,8 +181,7 @@ internal override Dictionary<string, object> ToDictionary(IHost host)
res[GetOptionName(nameof(UnbalancedSets))] = UnbalancedSets;
res[GetOptionName(nameof(WeightOfPositiveExamples))] = WeightOfPositiveExamples;
res[GetOptionName(nameof(Sigmoid))] = Sigmoid;
if (EvaluationMetric != EvaluateMetricType.Default)
res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());

return res;
}
Expand Down
5 changes: 3 additions & 2 deletions src/Microsoft.ML.LightGbm/LightGbmMulticlassTrainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ public enum EvaluateMetricType
static Options()
{
NameMapping.Add(nameof(EvaluateMetricType), "metric");
NameMapping.Add(nameof(EvaluateMetricType.None), "None");
NameMapping.Add(nameof(EvaluateMetricType.Default), "");
NameMapping.Add(nameof(EvaluateMetricType.Error), "multi_error");
NameMapping.Add(nameof(EvaluateMetricType.LogLoss), "multi_logloss");
}
Expand All @@ -109,8 +111,7 @@ internal override Dictionary<string, object> ToDictionary(IHost host)
var res = base.ToDictionary(host);

res[GetOptionName(nameof(Sigmoid))] = Sigmoid;
if(EvaluationMetric != EvaluateMetricType.Default)
res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());

return res;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.ML.LightGbm/LightGbmRankingTrainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ static Options()
{
NameMapping.Add(nameof(CustomGains), "label_gain");
NameMapping.Add(nameof(EvaluateMetricType), "metric");
NameMapping.Add(nameof(EvaluateMetricType.None), "");
NameMapping.Add(nameof(EvaluateMetricType.None), "None");
NameMapping.Add(nameof(EvaluateMetricType.Default), "");
NameMapping.Add(nameof(EvaluateMetricType.MeanAveragedPrecision), "map");
NameMapping.Add(nameof(EvaluateMetricType.NormalizedDiscountedCumulativeGain), "ndcg");
}
Expand All @@ -159,8 +160,7 @@ internal override Dictionary<string, object> ToDictionary(IHost host)
var res = base.ToDictionary(host);
res[GetOptionName(nameof(Sigmoid))] = Sigmoid;
res[GetOptionName(nameof(CustomGains))] = string.Join(",", CustomGains);
if (EvaluationMetric != EvaluateMetricType.Default)
res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());

return res;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.ML.LightGbm/LightGbmRegressionTrainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ public enum EvaluateMetricType
static Options()
{
NameMapping.Add(nameof(EvaluateMetricType), "metric");
NameMapping.Add(nameof(EvaluateMetricType.None), "");
NameMapping.Add(nameof(EvaluateMetricType.None), "None");
NameMapping.Add(nameof(EvaluateMetricType.Default), "");
NameMapping.Add(nameof(EvaluateMetricType.MeanAbsoluteError), "mae");
NameMapping.Add(nameof(EvaluateMetricType.RootMeanSquaredError), "rmse");
NameMapping.Add(nameof(EvaluateMetricType.MeanSquaredError), "mse");
Expand All @@ -147,8 +148,7 @@ static Options()
internal override Dictionary<string, object> ToDictionary(IHost host)
{
var res = base.ToDictionary(host);
if (EvaluationMetric != EvaluateMetricType.Default)
res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());

return res;
}
Expand Down
19 changes: 19 additions & 0 deletions test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,25 @@ public void LightGbmMulticlassEstimator()
Done();
}

/// <summary>
/// LightGbmMulticlass TrainerEstimator test with options
/// </summary>
[LightGBMFact]
public void LightGbmMulticlassEstimatorWithOptions()
{
var options = new LightGbmMulticlassTrainer.Options
{
EvaluationMetric = LightGbmMulticlassTrainer.Options.EvaluateMetricType.Default
};

var (pipeline, dataView) = GetMulticlassPipeline();
var trainer = ML.MulticlassClassification.Trainers.LightGbm(options);
var pipe = pipeline.Append(trainer)
.Append(new KeyToValueMappingEstimator(Env, "PredictedLabel"));
TestEstimatorCore(pipe, dataView);
Done();
}

/// <summary>
/// LightGbmMulticlass CorrectSigmoid test
/// </summary>
Expand Down