Skip to content

Commit 6e9ae5f

Browse files
artidoroartidoro
committed
merge fix
1 parent cc1a4c5 commit 6e9ae5f

27 files changed

Lines changed: 146 additions & 146 deletions

File tree

‎src/Microsoft.ML.Core/Prediction/ITrainer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.ML
1919
[BestFriend]
2020
internal delegate void SignatureBinaryClassifierTrainer();
2121
[BestFriend]
22-
internal delegate void SignatureMulticlassClassifierTrainer();
22+
internal delegate void SignatureMulticlassClassificationTrainer();
2323
[BestFriend]
2424
internal delegate void SignatureRegressorTrainer();
2525
[BestFriend]

‎src/Microsoft.ML.Data/DataLoadSave/TransformerChain.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public static TransformerChain<ITransformer> LoadFrom(IHostEnvironment env, Stre
278278
pred = new BinaryPredictionTransformer<IPredictorProducing<float>>(env, predictor as IPredictorProducing<float>, chain.Schema,
279279
roles.Where(x => x.Key.Value == RoleMappedSchema.ColumnRole.Feature.Value).First().Value);
280280
else if (predictor.PredictionKind == PredictionKind.MulticlassClassification)
281-
pred = new MulticlassClassificationPredictionTransformer<IPredictorProducing<VBuffer<float>>>(env,
281+
pred = new MulticlassPredictionTransformer<IPredictorProducing<VBuffer<float>>>(env,
282282
predictor as IPredictorProducing<VBuffer<float>>, chain.Schema,
283283
roles.Where(x => x.Key.Value == RoleMappedSchema.ColumnRole.Feature.Value).First().Value,
284284
roles.Where(x => x.Key.Value == RoleMappedSchema.ColumnRole.Label.Value).First().Value);

‎src/Microsoft.ML.Data/Scorers/BinaryClassifierScorer.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private static ISchemaBoundMapper WrapIfNeeded(IHostEnvironment env, ISchemaBoun
7373
}
7474

7575
/// <summary>
76-
/// This is a utility method used to determine whether <see cref="MulticlassClassifierScorer.LabelNameBindableMapper"/>
76+
/// This is a utility method used to determine whether <see cref="MulticlassClassificationScorer.LabelNameBindableMapper"/>
7777
/// can or should be used to wrap <paramref name="mapper"/>. This will not throw, since the
7878
/// desired behavior in the event that it cannot be wrapped, is to just back off to the original
7979
/// "unwrapped" bound mapper.
@@ -82,7 +82,7 @@ private static ISchemaBoundMapper WrapIfNeeded(IHostEnvironment env, ISchemaBoun
8282
/// <param name="labelNameType">The type of the label names from the metadata (either
8383
/// originating from the key value metadata of the training label column, or deserialized
8484
/// from the model of a bindable mapper)</param>
85-
/// <returns>Whether we can call <see cref="MulticlassClassifierScorer.LabelNameBindableMapper.CreateBound{T}"/> with
85+
/// <returns>Whether we can call <see cref="MulticlassClassificationScorer.LabelNameBindableMapper.CreateBound{T}"/> with
8686
/// this mapper and expect it to succeed</returns>
8787
private static bool CanWrap(ISchemaBoundMapper mapper, DataViewType labelNameType)
8888
{
@@ -119,7 +119,7 @@ private static ISchemaBoundMapper WrapCore<T>(IHostEnvironment env, ISchemaBound
119119
ValueGetter<VBuffer<T>> getter = (ref VBuffer<T> value) =>
120120
labelColumn.GetKeyValues(ref value);
121121

122-
return MulticlassClassifierScorer.LabelNameBindableMapper.CreateBound<T>(env, (ISchemaBoundRowMapper)mapper, type, getter, AnnotationUtils.Kinds.TrainingLabelValues, CanWrap);
122+
return MulticlassClassificationScorer.LabelNameBindableMapper.CreateBound<T>(env, (ISchemaBoundRowMapper)mapper, type, getter, AnnotationUtils.Kinds.TrainingLabelValues, CanWrap);
123123
}
124124

125125
[BestFriend]
@@ -288,7 +288,7 @@ private protected override JToken PredictedLabelPfa(string[] mapperOutputs)
288288

289289
private static DataViewType GetPredColType(DataViewType scoreType, ISchemaBoundRowMapper mapper)
290290
{
291-
var labelNameBindableMapper = mapper.Bindable as MulticlassClassifierScorer.LabelNameBindableMapper;
291+
var labelNameBindableMapper = mapper.Bindable as MulticlassClassificationScorer.LabelNameBindableMapper;
292292
if (labelNameBindableMapper == null)
293293
return BooleanDataViewType.Instance;
294294
return new KeyType(typeof(uint), labelNameBindableMapper.Type.Size);

‎src/Microsoft.ML.Data/Scorers/MulticlassClassificationScorer.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
using Microsoft.ML.Runtime;
1717
using Newtonsoft.Json.Linq;
1818

19-
[assembly: LoadableClass(typeof(MulticlassClassifierScorer),
20-
typeof(MulticlassClassifierScorer.Arguments), typeof(SignatureDataScorer),
19+
[assembly: LoadableClass(typeof(MulticlassClassificationScorer),
20+
typeof(MulticlassClassificationScorer.Arguments), typeof(SignatureDataScorer),
2121
"Multi-Class Classifier Scorer", "MultiClassClassifierScorer", "MultiClassClassifier",
2222
"MultiClass", AnnotationUtils.Const.ScoreColumnKind.MulticlassClassification)]
2323

24-
[assembly: LoadableClass(typeof(MulticlassClassifierScorer), null, typeof(SignatureLoadDataTransform),
25-
"Multi-Class Classifier Scorer", MulticlassClassifierScorer.LoaderSignature)]
24+
[assembly: LoadableClass(typeof(MulticlassClassificationScorer), null, typeof(SignatureLoadDataTransform),
25+
"Multi-Class Classifier Scorer", MulticlassClassificationScorer.LoaderSignature)]
2626

27-
[assembly: LoadableClass(typeof(ISchemaBindableMapper), typeof(MulticlassClassifierScorer.LabelNameBindableMapper), null, typeof(SignatureLoadModel),
28-
"Multi-Class Label-Name Mapper", MulticlassClassifierScorer.LabelNameBindableMapper.LoaderSignature)]
27+
[assembly: LoadableClass(typeof(ISchemaBindableMapper), typeof(MulticlassClassificationScorer.LabelNameBindableMapper), null, typeof(SignatureLoadModel),
28+
"Multi-Class Label-Name Mapper", MulticlassClassificationScorer.LabelNameBindableMapper.LoaderSignature)]
2929

3030
namespace Microsoft.ML.Data
3131
{
32-
internal sealed class MulticlassClassifierScorer : PredictedLabelScorerBase
32+
internal sealed class MulticlassClassificationScorer : PredictedLabelScorerBase
3333
{
3434
// REVIEW: consider outputting probabilities when multi-class classifiers distinguish
3535
// between scores and probabilities (using IDistributionPredictor)
@@ -48,7 +48,7 @@ private static VersionInfo GetVersionInfo()
4848
verReadableCur: 0x00010003,
4949
verWeCanReadBack: 0x00010003,
5050
loaderSignature: LoaderSignature,
51-
loaderAssemblyName: typeof(MulticlassClassifierScorer).Assembly.FullName);
51+
loaderAssemblyName: typeof(MulticlassClassificationScorer).Assembly.FullName);
5252
}
5353

5454
private const string RegistrationName = "MultiClassClassifierScore";
@@ -455,18 +455,18 @@ internal static ISchemaBoundMapper WrapCore<T>(IHostEnvironment env, ISchemaBoun
455455
}
456456

457457
[BestFriend]
458-
internal MulticlassClassifierScorer(IHostEnvironment env, Arguments args, IDataView data, ISchemaBoundMapper mapper, RoleMappedSchema trainSchema)
458+
internal MulticlassClassificationScorer(IHostEnvironment env, Arguments args, IDataView data, ISchemaBoundMapper mapper, RoleMappedSchema trainSchema)
459459
: base(args, env, data, WrapIfNeeded(env, mapper, trainSchema), trainSchema, RegistrationName, AnnotationUtils.Const.ScoreColumnKind.MulticlassClassification,
460460
AnnotationUtils.Const.ScoreValueKind.Score, OutputTypeMatches, GetPredColType)
461461
{
462462
}
463463

464-
private MulticlassClassifierScorer(IHostEnvironment env, MulticlassClassifierScorer transform, IDataView newSource)
464+
private MulticlassClassificationScorer(IHostEnvironment env, MulticlassClassificationScorer transform, IDataView newSource)
465465
: base(env, transform, newSource, RegistrationName)
466466
{
467467
}
468468

469-
private MulticlassClassifierScorer(IHost host, ModelLoadContext ctx, IDataView input)
469+
private MulticlassClassificationScorer(IHost host, ModelLoadContext ctx, IDataView input)
470470
: base(host, ctx, input, OutputTypeMatches, GetPredColType)
471471
{
472472
// *** Binary format ***
@@ -476,14 +476,14 @@ private MulticlassClassifierScorer(IHost host, ModelLoadContext ctx, IDataView i
476476
/// <summary>
477477
/// Corresponds to <see cref="SignatureLoadDataTransform"/>.
478478
/// </summary>
479-
private static MulticlassClassifierScorer Create(IHostEnvironment env, ModelLoadContext ctx, IDataView input)
479+
private static MulticlassClassificationScorer Create(IHostEnvironment env, ModelLoadContext ctx, IDataView input)
480480
{
481481
Contracts.CheckValue(env, nameof(env));
482482
var h = env.Register(RegistrationName);
483483
h.CheckValue(ctx, nameof(ctx));
484484
h.CheckValue(input, nameof(input));
485485
ctx.CheckAtModel(GetVersionInfo());
486-
return h.Apply("Loading Model", ch => new MulticlassClassifierScorer(h, ctx, input));
486+
return h.Apply("Loading Model", ch => new MulticlassClassificationScorer(h, ctx, input));
487487
}
488488

489489
private protected override void SaveCore(ModelSaveContext ctx)
@@ -502,7 +502,7 @@ private protected override IDataTransform ApplyToDataCore(IHostEnvironment env,
502502
Contracts.CheckValue(env, nameof(env));
503503
Contracts.CheckValue(newSource, nameof(newSource));
504504

505-
return new MulticlassClassifierScorer(env, this, newSource);
505+
return new MulticlassClassificationScorer(env, this, newSource);
506506
}
507507

508508
protected override Delegate GetPredictedLabelGetter(DataViewRow output, out Delegate scoreGetter)

‎src/Microsoft.ML.Data/Scorers/PredictionTransformer.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: LoadableClass(typeof(BinaryPredictionTransformer<IPredictorProducing<float>>), typeof(BinaryPredictionTransformer), null, typeof(SignatureLoadModel),
1313
"", BinaryPredictionTransformer.LoaderSignature)]
1414

15-
[assembly: LoadableClass(typeof(MulticlassClassificationPredictionTransformer<IPredictorProducing<VBuffer<float>>>), typeof(MulticlassPredictionTransformer), null, typeof(SignatureLoadModel),
15+
[assembly: LoadableClass(typeof(MulticlassPredictionTransformer<IPredictorProducing<VBuffer<float>>>), typeof(MulticlassPredictionTransformer), null, typeof(SignatureLoadModel),
1616
"", MulticlassPredictionTransformer.LoaderSignature)]
1717

1818
[assembly: LoadableClass(typeof(RegressionPredictionTransformer<IPredictorProducing<float>>), typeof(RegressionPredictionTransformer), null, typeof(SignatureLoadModel),
@@ -398,23 +398,23 @@ private static VersionInfo GetVersionInfo()
398398
/// Base class for the <see cref="ISingleFeaturePredictionTransformer{TModel}"/> working on multi-class classification tasks.
399399
/// </summary>
400400
/// <typeparam name="TModel">An implementation of the <see cref="IPredictorProducing{TResult}"/></typeparam>
401-
public sealed class MulticlassClassificationPredictionTransformer<TModel> : SingleFeaturePredictionTransformerBase<TModel>
401+
public sealed class MulticlassPredictionTransformer<TModel> : SingleFeaturePredictionTransformerBase<TModel>
402402
where TModel : class
403403
{
404404
private readonly string _trainLabelColumn;
405405

406406
[BestFriend]
407-
internal MulticlassClassificationPredictionTransformer(IHostEnvironment env, TModel model, DataViewSchema inputSchema, string featureColumn, string labelColumn)
408-
: base(Contracts.CheckRef(env, nameof(env)).Register(nameof(MulticlassClassificationPredictionTransformer<TModel>)), model, inputSchema, featureColumn)
407+
internal MulticlassPredictionTransformer(IHostEnvironment env, TModel model, DataViewSchema inputSchema, string featureColumn, string labelColumn)
408+
: base(Contracts.CheckRef(env, nameof(env)).Register(nameof(MulticlassPredictionTransformer<TModel>)), model, inputSchema, featureColumn)
409409
{
410410
Host.CheckValueOrNull(labelColumn);
411411

412412
_trainLabelColumn = labelColumn;
413413
SetScorer();
414414
}
415415

416-
internal MulticlassClassificationPredictionTransformer(IHostEnvironment env, ModelLoadContext ctx)
417-
: base(Contracts.CheckRef(env, nameof(env)).Register(nameof(MulticlassClassificationPredictionTransformer<TModel>)), ctx)
416+
internal MulticlassPredictionTransformer(IHostEnvironment env, ModelLoadContext ctx)
417+
: base(Contracts.CheckRef(env, nameof(env)).Register(nameof(MulticlassPredictionTransformer<TModel>)), ctx)
418418
{
419419
// *** Binary format ***
420420
// <base info>
@@ -427,8 +427,8 @@ internal MulticlassClassificationPredictionTransformer(IHostEnvironment env, Mod
427427
private void SetScorer()
428428
{
429429
var schema = new RoleMappedSchema(TrainSchema, _trainLabelColumn, FeatureColumn);
430-
var args = new MulticlassClassifierScorer.Arguments();
431-
Scorer = new MulticlassClassifierScorer(Host, args, new EmptyDataView(Host, TrainSchema), BindableMapper.Bind(Host, schema), schema);
430+
var args = new MulticlassClassificationScorer.Arguments();
431+
Scorer = new MulticlassClassificationScorer(Host, args, new EmptyDataView(Host, TrainSchema), BindableMapper.Bind(Host, schema), schema);
432432
}
433433

434434
private protected override void SaveCore(ModelSaveContext ctx)
@@ -452,7 +452,7 @@ private static VersionInfo GetVersionInfo()
452452
verReadableCur: 0x00010001,
453453
verWeCanReadBack: 0x00010001,
454454
loaderSignature: MulticlassPredictionTransformer.LoaderSignature,
455-
loaderAssemblyName: typeof(MulticlassClassificationPredictionTransformer<>).Assembly.FullName);
455+
loaderAssemblyName: typeof(MulticlassPredictionTransformer<>).Assembly.FullName);
456456
}
457457
}
458458

@@ -605,8 +605,8 @@ internal static class MulticlassPredictionTransformer
605605
{
606606
public const string LoaderSignature = "MulticlassPredXfer";
607607

608-
public static MulticlassClassificationPredictionTransformer<IPredictorProducing<VBuffer<float>>> Create(IHostEnvironment env, ModelLoadContext ctx)
609-
=> new MulticlassClassificationPredictionTransformer<IPredictorProducing<VBuffer<float>>>(env, ctx);
608+
public static MulticlassPredictionTransformer<IPredictorProducing<VBuffer<float>>> Create(IHostEnvironment env, ModelLoadContext ctx)
609+
=> new MulticlassPredictionTransformer<IPredictorProducing<VBuffer<float>>>(env, ctx);
610610
}
611611

612612
internal static class RegressionPredictionTransformer

‎src/Microsoft.ML.Ensemble/OutputCombiners/MultiStacking.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public sealed class Arguments : ArgumentsBase, ISupportMulticlassOutputCombinerF
4242
{
4343
// REVIEW: If we make this public again it should be an *estimator* of this type of predictor, rather than the (deprecated) ITrainer.
4444
[Argument(ArgumentType.Multiple, HelpText = "Base predictor for meta learning", ShortName = "bp", SortOrder = 50,
45-
Visibility = ArgumentAttribute.VisibilityType.CmdLineOnly, SignatureType = typeof(SignatureMulticlassClassifierTrainer))]
45+
Visibility = ArgumentAttribute.VisibilityType.CmdLineOnly, SignatureType = typeof(SignatureMulticlassClassificationTrainer))]
4646
[TGUI(Label = "Base predictor")]
4747
public IComponentFactory<ITrainer<TVectorPredictor>> BasePredictorType;
4848

‎src/Microsoft.ML.Ensemble/Trainer/Multiclass/MulticlassDataPartitionEnsembleTrainer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
[assembly: LoadableClass(MulticlassDataPartitionEnsembleTrainer.Summary, typeof(MulticlassDataPartitionEnsembleTrainer),
1616
typeof(MulticlassDataPartitionEnsembleTrainer.Arguments),
17-
new[] { typeof(SignatureMulticlassClassifierTrainer), typeof(SignatureTrainer) },
17+
new[] { typeof(SignatureMulticlassClassificationTrainer), typeof(SignatureTrainer) },
1818
MulticlassDataPartitionEnsembleTrainer.UserNameValue,
1919
MulticlassDataPartitionEnsembleTrainer.LoadNameValue)]
2020

@@ -47,7 +47,7 @@ public sealed class Arguments : ArgumentsBase
4747
public ISupportMulticlassOutputCombinerFactory OutputCombiner = new MultiMedian.Options();
4848

4949
// REVIEW: If we make this public again it should be an *estimator* of this type of predictor, rather than the (deprecated) ITrainer.
50-
[Argument(ArgumentType.Multiple, HelpText = "Base predictor type", ShortName = "bp,basePredictorTypes", SortOrder = 1, Visibility = ArgumentAttribute.VisibilityType.CmdLineOnly, SignatureType = typeof(SignatureMulticlassClassifierTrainer))]
50+
[Argument(ArgumentType.Multiple, HelpText = "Base predictor type", ShortName = "bp,basePredictorTypes", SortOrder = 1, Visibility = ArgumentAttribute.VisibilityType.CmdLineOnly, SignatureType = typeof(SignatureMulticlassClassificationTrainer))]
5151
internal IComponentFactory<ITrainer<TVectorPredictor>>[] BasePredictors;
5252

5353
internal override IComponentFactory<ITrainer<TVectorPredictor>>[] GetPredictorFactories() => BasePredictors;

‎src/Microsoft.ML.EntryPoints/CrossValidationMacro.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
302302
MacroUtils.ConvertIdataViewsToArray(env, node.Context, subGraphNodes, overallMetricsVars, overallArrayVar.VarName);
303303
MacroUtils.ConvertIdataViewsToArray(env, node.Context, subGraphNodes, instanceMetricsVars, instanceArrayVar.VarName);
304304
if (input.Kind == MacroUtils.TrainerKinds.SignatureBinaryClassifierTrainer ||
305-
input.Kind == MacroUtils.TrainerKinds.SignatureMulticlassClassifierTrainer)
305+
input.Kind == MacroUtils.TrainerKinds.SignatureMulticlassClassificationTrainer)
306306
{
307307
confusionMatrixArrayVar = new ArrayVar<IDataView>();
308308
MacroUtils.ConvertIdataViewsToArray(env, node.Context, subGraphNodes, confusionMatrixVars, confusionMatrixArrayVar.VarName);
@@ -426,7 +426,7 @@ private static IMamlEvaluator GetEvaluator(IHostEnvironment env, MacroUtils.Trai
426426
{
427427
case MacroUtils.TrainerKinds.SignatureBinaryClassifierTrainer:
428428
return new BinaryClassifierMamlEvaluator(env, new BinaryClassifierMamlEvaluator.Arguments());
429-
case MacroUtils.TrainerKinds.SignatureMulticlassClassifierTrainer:
429+
case MacroUtils.TrainerKinds.SignatureMulticlassClassificationTrainer:
430430
return new MulticlassClassificationMamlEvaluator(env, new MulticlassClassificationMamlEvaluator.Arguments());
431431
case MacroUtils.TrainerKinds.SignatureRegressorTrainer:
432432
return new RegressionMamlEvaluator(env, new RegressionMamlEvaluator.Arguments());

‎src/Microsoft.ML.EntryPoints/MacroUtils.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal static class MacroUtils
2222
public enum TrainerKinds
2323
{
2424
SignatureBinaryClassifierTrainer,
25-
SignatureMulticlassClassifierTrainer,
25+
SignatureMulticlassClassificationTrainer,
2626
SignatureRankerTrainer,
2727
SignatureRegressorTrainer,
2828
SignatureMultiOutputRegressorTrainer,
@@ -51,7 +51,7 @@ public static EvaluateInputBase GetEvaluatorArgs(TrainerKinds kind, out string e
5151
case TrainerKinds.SignatureBinaryClassifierTrainer:
5252
entryPointName = "Models.BinaryClassificationEvaluator";
5353
return new BinaryClassifierMamlEvaluator.Arguments() { LabelColumn = settings.LabelColumn, WeightColumn = settings.WeightColumn, NameColumn = settings.NameColumn };
54-
case TrainerKinds.SignatureMulticlassClassifierTrainer:
54+
case TrainerKinds.SignatureMulticlassClassificationTrainer:
5555
entryPointName = "Models.ClassificationEvaluator";
5656
return new MulticlassClassificationMamlEvaluator.Arguments() { LabelColumn = settings.LabelColumn, WeightColumn = settings.WeightColumn, NameColumn = settings.NameColumn };
5757
case TrainerKinds.SignatureRankerTrainer:

0 commit comments

Comments
 (0)