Skip to content

Commit 289f35c

Browse files
artidoroartidoro
committed
reverting changes, only keeping the switch from input to source column in transformers
1 parent 490cb6c commit 289f35c

File tree

52 files changed

+144
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+144
-144
lines changed

‎src/Microsoft.ML.Data/Transforms/ColumnConcatenatingEstimator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private SchemaShape.Column CheckInputsAndMakeColumn(
7575
for (int i = 0; i < sources.Length; ++i)
7676
{
7777
if (!inputSchema.TryFindColumn(sources[i], out var col))
78-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", sources[i]);
78+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", sources[i]);
7979
if (i == 0)
8080
itemType = col.ItemType;
8181
// For the sake of an estimator I am going to have a hard policy of no keys.

‎src/Microsoft.ML.Data/Transforms/ColumnConcatenatingTransformer.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ private BoundColumn MakeColumn(Schema inputSchema, int iinfo)
453453
{
454454
var (srcName, srcAlias) = _parent._columns[iinfo].Inputs[i];
455455
if (!inputSchema.TryGetColumnIndex(srcName, out int srcCol))
456-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", srcName);
456+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", srcName);
457457
sources[i] = srcCol;
458458

459459
var curType = inputSchema[srcCol].Type;
@@ -476,7 +476,7 @@ private BoundColumn MakeColumn(Schema inputSchema, int iinfo)
476476
totalSize += currentValueCount;
477477
}
478478
else
479-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", srcName, itemType.ToString(), curType.ToString());
479+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", srcName, itemType.ToString(), curType.ToString());
480480

481481
if (isNormalized && !inputSchema[srcCol].IsNormalized())
482482
isNormalized = false;

‎src/Microsoft.ML.Data/Transforms/ColumnCopying.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public override SchemaShape GetOutputSchema(SchemaShape inputSchema)
5353
foreach (var (Source, Name) in Transformer.Columns)
5454
{
5555
if (!inputSchema.TryFindColumn(Source, out var originalColumn))
56-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", Source);
56+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", Source);
5757
var col = new SchemaShape.Column(Name, originalColumn.Kind, originalColumn.ItemType, originalColumn.IsKey, originalColumn.Metadata);
5858
resultDic[Name] = col;
5959
}

‎src/Microsoft.ML.Data/Transforms/ColumnSelecting.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public override SchemaShape GetOutputSchema(SchemaShape inputSchema)
102102
Transformer.SelectColumns,
103103
out IEnumerable<string> invalidColumns))
104104
{
105-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", string.Join(",", invalidColumns));
105+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", string.Join(",", invalidColumns));
106106
}
107107

108108
var columns = inputSchema.Where(c => _selectPredicate(c.Name));
@@ -445,7 +445,7 @@ public Schema GetOutputSchema(Schema inputSchema)
445445
if (!IgnoreMissing && !IsSchemaValid(inputSchema.Select(x => x.Name),
446446
SelectColumns, out IEnumerable<string> invalidColumns))
447447
{
448-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", string.Join(",", invalidColumns));
448+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", string.Join(",", invalidColumns));
449449
}
450450

451451
return new Mapper(this, inputSchema).OutputSchema;
@@ -457,7 +457,7 @@ public IRowToRowMapper GetRowToRowMapper(Schema inputSchema)
457457
if (!IgnoreMissing && !IsSchemaValid(inputSchema.Select(x => x.Name),
458458
SelectColumns, out IEnumerable<string> invalidColumns))
459459
{
460-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", string.Join(",", invalidColumns));
460+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", string.Join(",", invalidColumns));
461461
}
462462

463463
return new SelectColumnsDataTransform(_host, this,
@@ -471,7 +471,7 @@ public IDataView Transform(IDataView input)
471471
if (!IgnoreMissing && !IsSchemaValid(input.Schema.Select(x => x.Name),
472472
SelectColumns, out IEnumerable<string> invalidColumns))
473473
{
474-
throw _host.ExceptSchemaMismatch(nameof(input), "input", string.Join(",", invalidColumns));
474+
throw _host.ExceptSchemaMismatch(nameof(input), "source", string.Join(",", invalidColumns));
475475
}
476476

477477
return new SelectColumnsDataTransform(_host, this, new Mapper(this, input.Schema), input);

‎src/Microsoft.ML.Data/Transforms/DropSlotsTransform.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -462,13 +462,13 @@ public Mapper(SlotsDroppingTransformer parent, Schema inputSchema)
462462
for (int i = 0; i < _parent.ColumnPairs.Length; i++)
463463
{
464464
if (!InputSchema.TryGetColumnIndex(_parent.ColumnPairs[i].input, out _cols[i]))
465-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", _parent.ColumnPairs[i].input);
465+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", _parent.ColumnPairs[i].input);
466466
_srcTypes[i] = inputSchema[_cols[i]].Type;
467467
VectorType srcVectorType = _srcTypes[i] as VectorType;
468468

469469
ColumnType itemType = srcVectorType?.ItemType ?? _srcTypes[i];
470470
if (!IsValidColumnType(itemType))
471-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", _parent.ColumnPairs[i].input);
471+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", _parent.ColumnPairs[i].input);
472472

473473
int valueCount = srcVectorType?.Size ?? 1;
474474
_slotDropper[i] = new SlotDropper(valueCount, _parent.SlotsMin[i], _parent.SlotsMax[i]);

‎src/Microsoft.ML.Data/Transforms/FeatureContributionCalculationTransform.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public Mapper(FeatureContributionCalculatingTransformer parent, Schema schema)
222222

223223
// Check that the featureColumn is present and has the expected type.
224224
if (!schema.TryGetColumnIndex(_parent.ColumnPairs[0].input, out _featureColumnIndex))
225-
throw Host.ExceptSchemaMismatch(nameof(schema), "input", _parent.ColumnPairs[0].input);
225+
throw Host.ExceptSchemaMismatch(nameof(schema), "source", _parent.ColumnPairs[0].input);
226226
_featureColumnType = schema[_featureColumnIndex].Type as VectorType;
227227
if (_featureColumnType == null || _featureColumnType.ItemType != NumberType.R4)
228228
throw Host.ExceptSchemaMismatch(nameof(schema), "feature", _parent.ColumnPairs[0].input, "vector of float.", _featureColumnType.ItemType.ToString());
@@ -317,7 +317,7 @@ public override SchemaShape GetOutputSchema(SchemaShape inputSchema)
317317
// Check that the featureColumn is present.
318318
Host.CheckValue(inputSchema, nameof(inputSchema));
319319
if (!inputSchema.TryFindColumn(_featureColumn, out var col))
320-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", _featureColumn);
320+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", _featureColumn);
321321
// Check that the feature column is of the correct type: a vector of float.
322322
if (col.ItemType != NumberType.R4 || col.Kind != SchemaShape.Column.VectorKind.Vector)
323323
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "column", _featureColumn, "vector of float.", col.GetTypeString());

‎src/Microsoft.ML.Data/Transforms/Hashing.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ internal HashingTransformer(IHostEnvironment env, IDataView input, params Column
260260
{
261261
Schema.Column? srcCol = input.Schema.GetColumnOrNull(ColumnPairs[i].input);
262262
if (srcCol == null)
263-
throw Host.ExceptSchemaMismatch(nameof(input), "input", ColumnPairs[i].input);
263+
throw Host.ExceptSchemaMismatch(nameof(input), "source", ColumnPairs[i].input);
264264
CheckInputColumn(input.Schema, i, srcCol.Value.Index);
265265

266266
types[i] = GetOutputType(input.Schema, _columns[i]);
@@ -1240,7 +1240,7 @@ public SchemaShape GetOutputSchema(SchemaShape inputSchema)
12401240
foreach (var colInfo in _columns)
12411241
{
12421242
if (!inputSchema.TryFindColumn(colInfo.Input, out var col))
1243-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input);
1243+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input);
12441244
if (!IsColumnTypeValid(col.ItemType))
12451245
throw _host.ExceptParam(nameof(inputSchema), ExpectedColumnType);
12461246
var metadata = new List<SchemaShape.Column>();

‎src/Microsoft.ML.Data/Transforms/KeyToValue.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,9 @@ public override SchemaShape GetOutputSchema(SchemaShape inputSchema)
520520
foreach (var colInfo in Transformer.Columns)
521521
{
522522
if (!inputSchema.TryFindColumn(colInfo.input, out var col))
523-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.input);
523+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.input);
524524
if (!col.IsKey)
525-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.input, "KeyType", col.GetTypeString());
525+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.input, "KeyType", col.GetTypeString());
526526

527527
if (!col.Metadata.TryFindColumn(MetadataUtils.Kinds.KeyValues, out var keyMetaCol))
528528
throw Host.ExceptParam(nameof(inputSchema), $"Input column '{colInfo.input}' doesn't contain key values metadata");

‎src/Microsoft.ML.Data/Transforms/KeyToVector.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected override void CheckInputColumn(Schema inputSchema, int col, int srcCol
137137
var type = inputSchema[srcCol].Type;
138138
string reason = TestIsKey(type);
139139
if (reason != null)
140-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", ColumnPairs[col].input, reason, type.ToString());
140+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", ColumnPairs[col].input, reason, type.ToString());
141141
}
142142

143143
public KeyToVectorMappingTransformer(IHostEnvironment env, params ColumnInfo[] columns) :
@@ -284,7 +284,7 @@ private ColInfo[] CreateInfos(Schema inputSchema)
284284
for (int i = 0; i < _parent.ColumnPairs.Length; i++)
285285
{
286286
if (!inputSchema.TryGetColumnIndex(_parent.ColumnPairs[i].input, out int colSrc))
287-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", _parent.ColumnPairs[i].input);
287+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", _parent.ColumnPairs[i].input);
288288
var type = inputSchema[colSrc].Type;
289289
_parent.CheckInputColumn(inputSchema, i, colSrc);
290290
infos[i] = new ColInfo(_parent.ColumnPairs[i].output, _parent.ColumnPairs[i].input, type);
@@ -770,9 +770,9 @@ public override SchemaShape GetOutputSchema(SchemaShape inputSchema)
770770
foreach (var colInfo in Transformer.Columns)
771771
{
772772
if (!inputSchema.TryFindColumn(colInfo.Input, out var col))
773-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input);
773+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input);
774774
if (!col.ItemType.IsStandardScalar())
775-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input);
775+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input);
776776

777777
var metadata = new List<SchemaShape.Column>();
778778
if (col.Metadata.TryFindColumn(MetadataUtils.Kinds.KeyValues, out var keyMeta))

‎src/Microsoft.ML.Data/Transforms/Normalizer.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,12 @@ public SchemaShape GetOutputSchema(SchemaShape inputSchema)
252252
foreach (var colInfo in _columns)
253253
{
254254
if (!inputSchema.TryFindColumn(colInfo.Input, out var col))
255-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input);
255+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input);
256256
if (col.Kind == SchemaShape.Column.VectorKind.VariableVector)
257-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input, "known-size vector or scalar", col.GetTypeString());
257+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input, "known-size vector or scalar", col.GetTypeString());
258258

259259
if (!col.ItemType.Equals(NumberType.R4) && !col.ItemType.Equals(NumberType.R8))
260-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input, "vector or scalar of float or double", col.GetTypeString());
260+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input, "vector or scalar of float or double", col.GetTypeString());
261261

262262
var isNormalizedMeta = new SchemaShape.Column(MetadataUtils.Kinds.IsNormalized, SchemaShape.Column.VectorKind.Scalar,
263263
BoolType.Instance, false);
@@ -401,7 +401,7 @@ public static NormalizingTransformer Train(IHostEnvironment env, IDataView data,
401401
var info = columns[i];
402402
bool success = data.Schema.TryGetColumnIndex(info.Input, out srcCols[i]);
403403
if (!success)
404-
throw env.ExceptSchemaMismatch(nameof(data), "input", info.Input);
404+
throw env.ExceptSchemaMismatch(nameof(data), "source", info.Input);
405405
srcTypes[i] = data.Schema[srcCols[i]].Type;
406406
activeCols.Add(data.Schema[srcCols[i]]);
407407

@@ -562,10 +562,10 @@ protected override void CheckInputColumn(Schema inputSchema, int col, int srcCol
562562
var colType = inputSchema[srcCol].Type;
563563
VectorType vectorType = colType as VectorType;
564564
if (vectorType != null && !vectorType.IsKnownSize)
565-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", ColumnPairs[col].input, expectedType, "variable-size vector");
565+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", ColumnPairs[col].input, expectedType, "variable-size vector");
566566
ColumnType itemType = vectorType?.ItemType ?? colType;
567567
if (!itemType.Equals(NumberType.R4) && !itemType.Equals(NumberType.R8))
568-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", ColumnPairs[col].input, expectedType, colType.ToString());
568+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", ColumnPairs[col].input, expectedType, colType.ToString());
569569
}
570570

571571
// Temporary: enables SignatureDataTransform factory methods.

‎src/Microsoft.ML.Data/Transforms/OneToOneTransformerBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private void CheckInput(Schema inputSchema, int col, out int srcCol)
7474
Contracts.Assert(0 <= col && col < ColumnPairs.Length);
7575

7676
if (!inputSchema.TryGetColumnIndex(ColumnPairs[col].input, out srcCol))
77-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", ColumnPairs[col].input);
77+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", ColumnPairs[col].input);
7878
CheckInputColumn(inputSchema, col, srcCol);
7979
}
8080

‎src/Microsoft.ML.Data/Transforms/RangeFilter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private RangeFilter(IHost host, ModelLoadContext ctx, IDataView input)
156156

157157
_type = schema[_index].Type;
158158
if (_type != NumberType.R4 && _type != NumberType.R8 && _type.GetKeyCount() == 0)
159-
throw Host.ExceptSchemaMismatch(nameof(schema), "source", column, "flaot, double or KeyType", _type.ToString());
159+
throw Host.ExceptSchemaMismatch(nameof(schema), "source", column, "float, double or KeyType", _type.ToString());
160160

161161
_min = ctx.Reader.ReadDouble();
162162
_max = ctx.Reader.ReadDouble();

‎src/Microsoft.ML.Data/Transforms/TypeConverting.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ public override SchemaShape GetOutputSchema(SchemaShape inputSchema)
575575
foreach (var colInfo in Transformer.Columns)
576576
{
577577
if (!inputSchema.TryFindColumn(colInfo.Input, out var col))
578-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input);
578+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input);
579579
if (!TypeConvertingTransformer.GetNewType(Host, col.ItemType, colInfo.OutputKind, colInfo.OutputKeyCount, out PrimitiveType newType))
580580
throw Host.ExceptParam(nameof(inputSchema), $"Can't convert {colInfo.Input} into {newType.ToString()}");
581581
if (!Data.Conversion.Conversions.Instance.TryGetStandardConversion(col.ItemType, newType, out Delegate del, out bool identity))

‎src/Microsoft.ML.Data/Transforms/ValueMapping.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public override SchemaShape GetOutputSchema(SchemaShape inputSchema)
7474
foreach (var (Input, Output) in _columns)
7575
{
7676
if (!inputSchema.TryFindColumn(Input, out var originalColumn))
77-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", Input);
77+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", Input);
7878

7979
if ((originalColumn.Kind == SchemaShape.Column.VectorKind.VariableVector ||
8080
originalColumn.Kind == SchemaShape.Column.VectorKind.Vector) && Transformer.ValueColumnType is VectorType)

‎src/Microsoft.ML.Data/Transforms/ValueToKeyMappingEstimator.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ public SchemaShape GetOutputSchema(SchemaShape inputSchema)
6262
foreach (var colInfo in _columns)
6363
{
6464
if (!inputSchema.TryFindColumn(colInfo.Input, out var col))
65-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input);
65+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input);
6666

6767
if (!col.ItemType.IsStandardScalar())
68-
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "input", colInfo.Input);
68+
throw _host.ExceptSchemaMismatch(nameof(inputSchema), "source", colInfo.Input);
6969
SchemaShape metadata;
7070

7171
// In the event that we are transforming something that is of type key, we will get their type of key value

‎src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformer.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,11 @@ private ColInfo[] CreateInfos(Schema inputSchema)
284284
for (int i = 0; i < ColumnPairs.Length; i++)
285285
{
286286
if (!inputSchema.TryGetColumnIndex(ColumnPairs[i].input, out int colSrc))
287-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", ColumnPairs[i].input);
287+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", ColumnPairs[i].input);
288288
var type = inputSchema[colSrc].Type;
289289
string reason = TestIsKnownDataKind(type);
290290
if (reason != null)
291-
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "input", ColumnPairs[i].input, reason, type.ToString());
291+
throw Host.ExceptSchemaMismatch(nameof(inputSchema), "source", ColumnPairs[i].input, reason, type.ToString());
292292
infos[i] = new ColInfo(ColumnPairs[i].output, ColumnPairs[i].input, type);
293293
}
294294
return infos;

0 commit comments

Comments
 (0)