Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
11 changes: 11 additions & 0 deletions src/Microsoft.ML.Data/Utilities/ModelFileUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ internal static class ModelFileUtils
{
public const string DirPredictor = "Predictor";
public const string DirDataLoaderModel = "DataLoaderModel";
public const string DirTransformerChain = "TransformerChain";
Comment thread
najeeb-kazmi marked this conversation as resolved.
Outdated
public const string SchemaEntryName = "Schema";
// ResultsProcessor needs access to this constant.
public const string DirTrainingInfo = "TrainingInfo";

Expand Down Expand Up @@ -64,6 +66,15 @@ public static IDataView LoadPipeline(IHostEnvironment env, RepositoryReader rep,
Contracts.CheckValue(env, nameof(env));
env.CheckValue(rep, nameof(rep));
env.CheckValue(files, nameof(files));

var entry = rep.OpenEntryOrNull(SchemaEntryName);
if (entry != null)
{
var loader = new BinaryLoader(env, new BinaryLoader.Arguments(), entry.Stream);
ModelLoadContext.LoadModel<ITransformer, SignatureLoadModel>(env, out var transformerChain, rep, DirTransformerChain);
return transformerChain.Transform(loader);
}

using (var ent = rep.OpenEntry(DirDataLoaderModel, ModelLoadContext.ModelStreamName))
{
ILegacyDataLoader loader;
Expand Down
88 changes: 88 additions & 0 deletions test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,94 @@ public void EntryPointExecGraphCommand()
cmd.Run();
}

[Fact]
public void ScoreTransformerChainModel()
{
var dataPath = GetDataPath("wikipedia-detox-250-line-data.tsv");
var modelPath = DeleteOutputPath("model.zip");

var mlContext = new MLContext();

var data = new TextLoader(Env,
new TextLoader.Options()
{
AllowQuoting = true,
Separator = "\t",
HasHeader = true,
Columns = new[]
{
new TextLoader.Column("Label", DataKind.Boolean, 0),
new TextLoader.Column("SentimentText", DataKind.String, 1)
}
}).Load(dataPath);

var pipeline = mlContext.Transforms.Text.FeaturizeText("Features", "SentimentText")
.Append(mlContext.BinaryClassification.Trainers.AveragedPerceptron());

var model = pipeline.Fit(data);

mlContext.Model.Save(model, data.Schema, modelPath);

string inputGraph = string.Format(@"
{{
'Inputs': {{
'file': '{0}',
'transform_model': '{1}'
}},
'Nodes': [
{{
'Name': 'Data.CustomTextLoader',
'Inputs': {{
'CustomSchema': 'col=Sentiment:I8:0 col=SentimentText:TX:1 quote+ header=+ sep=tab',
'InputFile': '$file'
}},
'Outputs': {{
'Data': '$data'
}}
}},
{{
'Name': 'Transforms.DatasetTransformScorer',
'Inputs': {{
'Data': '$data',
'TransformModel': '$transform_model'
}},
'Outputs': {{
'ScoredData': '$scoredVectorData'
}}
}},
{{
'Inputs': {{
'Data': '$scoredVectorData'
}},
'Name': 'Transforms.ScoreColumnSelector',
'Outputs': {{
'OutputData': '$scoreColumnsOnlyData'
}}
}},
{{
'Inputs': {{
'Data': '$scoreColumnsOnlyData',
'PredictedLabelColumn': 'PredictedLabel'
}},
'Name': 'Transforms.PredictedLabelColumnOriginalValueConverter',
'Outputs': {{
'OutputData': '$output_data'
}}
}}
],
'Outputs': {{
'output_data': '$output_data'
}}
}}", EscapePath(dataPath), EscapePath(modelPath));

var jsonPath = DeleteOutputPath("graph.json");
File.WriteAllLines(jsonPath, new[] { inputGraph });

var args = new ExecuteGraphCommand.Arguments() { GraphPath = jsonPath };
var cmd = new ExecuteGraphCommand(Env, args);
cmd.Run();
Comment thread
najeeb-kazmi marked this conversation as resolved.
}

//[Fact]
//public void EntryPointArrayOfVariables()
//{
Expand Down