Revert "Fix the treatment of LightGbm Evaluation Metric parameters in ML.NET … (dotnet#3815)"

codemzs · codemzs · commit fae1e299722b · 2019-07-02T18:39:17.000-07:00
This reverts commit 23332c1. # Conflicts: # test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs
diff --git a/src/Microsoft.ML.LightGbm/LightGbmBinaryTrainer.cs b/src/Microsoft.ML.LightGbm/LightGbmBinaryTrainer.cs
@@ -167,8 +167,7 @@ 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.None), "");
                 NameMapping.Add(nameof(EvaluateMetricType.Logloss), "binary_logloss");
                 NameMapping.Add(nameof(EvaluateMetricType.Error), "binary_error");
                 NameMapping.Add(nameof(EvaluateMetricType.AreaUnderCurve), "auc");
@@ -181,7 +180,8 @@ internal override Dictionary<string, object> ToDictionary(IHost host)
                 res[GetOptionName(nameof(UnbalancedSets))] = UnbalancedSets;
                 res[GetOptionName(nameof(WeightOfPositiveExamples))] = WeightOfPositiveExamples;
                 res[GetOptionName(nameof(Sigmoid))] = Sigmoid;
-                res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
+                if (EvaluationMetric != EvaluateMetricType.Default)
+                    res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
 
                 return res;
             }
diff --git a/src/Microsoft.ML.LightGbm/LightGbmMulticlassTrainer.cs b/src/Microsoft.ML.LightGbm/LightGbmMulticlassTrainer.cs
@@ -106,8 +106,6 @@ 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");
             }
@@ -118,7 +116,8 @@ internal override Dictionary<string, object> ToDictionary(IHost host)
 
                 res[GetOptionName(nameof(UnbalancedSets))] = UnbalancedSets;
                 res[GetOptionName(nameof(Sigmoid))] = Sigmoid;
-                res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
+                if(EvaluationMetric != EvaluateMetricType.Default)
+                    res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
 
                 return res;
             }
diff --git a/src/Microsoft.ML.LightGbm/LightGbmRankingTrainer.cs b/src/Microsoft.ML.LightGbm/LightGbmRankingTrainer.cs
@@ -149,8 +149,7 @@ static Options()
             {
                 NameMapping.Add(nameof(CustomGains), "label_gain");
                 NameMapping.Add(nameof(EvaluateMetricType), "metric");
-                NameMapping.Add(nameof(EvaluateMetricType.None), "None");
-                NameMapping.Add(nameof(EvaluateMetricType.Default), "");
+                NameMapping.Add(nameof(EvaluateMetricType.None), "");
                 NameMapping.Add(nameof(EvaluateMetricType.MeanAveragedPrecision), "map");
                 NameMapping.Add(nameof(EvaluateMetricType.NormalizedDiscountedCumulativeGain), "ndcg");
             }
@@ -160,7 +159,8 @@ 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);
-                res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
+                if (EvaluationMetric != EvaluateMetricType.Default)
+                    res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
 
                 return res;
             }
diff --git a/src/Microsoft.ML.LightGbm/LightGbmRegressionTrainer.cs b/src/Microsoft.ML.LightGbm/LightGbmRegressionTrainer.cs
@@ -138,8 +138,7 @@ 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.None), "");
                 NameMapping.Add(nameof(EvaluateMetricType.MeanAbsoluteError), "mae");
                 NameMapping.Add(nameof(EvaluateMetricType.RootMeanSquaredError), "rmse");
                 NameMapping.Add(nameof(EvaluateMetricType.MeanSquaredError), "mse");
@@ -148,7 +147,8 @@ static Options()
             internal override Dictionary<string, object> ToDictionary(IHost host)
             {
                 var res = base.ToDictionary(host);
-                res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
+                if (EvaluationMetric != EvaluateMetricType.Default)
+                    res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());
 
                 return res;
             }
diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs b/test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs
@@ -301,26 +301,7 @@ public void LightGbmMulticlassEstimator()
         }
 
         /// <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
+        /// LightGbmMulticlass CorrectSigmoid test 
         /// </summary>
         [LightGBMFact]
         public void LightGbmMulticlassEstimatorCorrectSigmoid()

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,6 @@ public enum EvaluateMetricType`
`106`	`106`	`static Options()`
`107`	`107`	`{`
`108`	`108`	`NameMapping.Add(nameof(EvaluateMetricType), "metric");`
`109`		`- NameMapping.Add(nameof(EvaluateMetricType.None), "None");`
`110`		`- NameMapping.Add(nameof(EvaluateMetricType.Default), "");`
`111`	`109`	`NameMapping.Add(nameof(EvaluateMetricType.Error), "multi_error");`
`112`	`110`	`NameMapping.Add(nameof(EvaluateMetricType.LogLoss), "multi_logloss");`
`113`	`111`	`}`
`@@ -118,7 +116,8 @@ internal override Dictionary<string, object> ToDictionary(IHost host)`
`118`	`116`
`119`	`117`	`res[GetOptionName(nameof(UnbalancedSets))] = UnbalancedSets;`
`120`	`118`	`res[GetOptionName(nameof(Sigmoid))] = Sigmoid;`
`121`		`- res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());`
	`119`	`+ if(EvaluationMetric != EvaluateMetricType.Default)`
	`120`	`+ res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());`
`122`	`121`
`123`	`122`	`return res;`
`124`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,7 @@ static Options()`
`149`	`149`	`{`
`150`	`150`	`NameMapping.Add(nameof(CustomGains), "label_gain");`
`151`	`151`	`NameMapping.Add(nameof(EvaluateMetricType), "metric");`
`152`		`- NameMapping.Add(nameof(EvaluateMetricType.None), "None");`
`153`		`- NameMapping.Add(nameof(EvaluateMetricType.Default), "");`
	`152`	`+ NameMapping.Add(nameof(EvaluateMetricType.None), "");`
`154`	`153`	`NameMapping.Add(nameof(EvaluateMetricType.MeanAveragedPrecision), "map");`
`155`	`154`	`NameMapping.Add(nameof(EvaluateMetricType.NormalizedDiscountedCumulativeGain), "ndcg");`
`156`	`155`	`}`
`@@ -160,7 +159,8 @@ internal override Dictionary<string, object> ToDictionary(IHost host)`
`160`	`159`	`var res = base.ToDictionary(host);`
`161`	`160`	`res[GetOptionName(nameof(Sigmoid))] = Sigmoid;`
`162`	`161`	`res[GetOptionName(nameof(CustomGains))] = string.Join(",", CustomGains);`
`163`		`- res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());`
	`162`	`+ if (EvaluationMetric != EvaluateMetricType.Default)`
	`163`	`+ res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());`
`164`	`164`
`165`	`165`	`return res;`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,7 @@ public enum EvaluateMetricType`
`138`	`138`	`static Options()`
`139`	`139`	`{`
`140`	`140`	`NameMapping.Add(nameof(EvaluateMetricType), "metric");`
`141`		`- NameMapping.Add(nameof(EvaluateMetricType.None), "None");`
`142`		`- NameMapping.Add(nameof(EvaluateMetricType.Default), "");`
	`141`	`+ NameMapping.Add(nameof(EvaluateMetricType.None), "");`
`143`	`142`	`NameMapping.Add(nameof(EvaluateMetricType.MeanAbsoluteError), "mae");`
`144`	`143`	`NameMapping.Add(nameof(EvaluateMetricType.RootMeanSquaredError), "rmse");`
`145`	`144`	`NameMapping.Add(nameof(EvaluateMetricType.MeanSquaredError), "mse");`
`@@ -148,7 +147,8 @@ static Options()`
`148`	`147`	`internal override Dictionary<string, object> ToDictionary(IHost host)`
`149`	`148`	`{`
`150`	`149`	`var res = base.ToDictionary(host);`
`151`		`- res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());`
	`150`	`+ if (EvaluationMetric != EvaluateMetricType.Default)`
	`151`	`+ res[GetOptionName(nameof(EvaluateMetricType))] = GetOptionName(EvaluationMetric.ToString());`
`152`	`152`
`153`	`153`	`return res;`
`154`	`154`	`}`