From eac967b0a941ba119d5943d1d29a5bd212a90b6f Mon Sep 17 00:00:00 2001 From: J W Date: Sun, 3 May 2020 13:33:10 -0400 Subject: [PATCH 1/2] Initial update to xml doc --- src/Microsoft.ML.OnnxTransformer/doc.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Microsoft.ML.OnnxTransformer/doc.xml b/src/Microsoft.ML.OnnxTransformer/doc.xml index 67b643654c..476c47068c 100644 --- a/src/Microsoft.ML.OnnxTransformer/doc.xml +++ b/src/Microsoft.ML.OnnxTransformer/doc.xml @@ -45,22 +45,22 @@ var imageWidth = 224; var dataFile = GetDataPath("images/images.tsv"); var imageFolder = Path.GetDirectoryName(dataFile); + + var mlContext = new MLContext(); - var data = TextLoader.CreateLoader(env, ctx => ( - imagePath: ctx.LoadText(0), - name: ctx.LoadText(1))) - .Read(new MultiFileSource(dataFile)); + var data = mlContext.Data.LoadFromTextFile<ImageData>, <ImagePrediction>(dataFile); - var pipe = data.MakeNewEstimator() - .Append(row => ( - row.name, - data_0: row.imagePath.LoadAsImage(imageFolder).Resize(imageHeight, imageWidth).ExtractPixels(interleaveArgb: true))) - .Append(row => (row.name, softmaxout_1: row.data_0.ApplyOnnxModel(modelFile))); + var pipe = mlContext.Transforms.LoadImages("data_0", imageFolder: "images", inputColumnName: nameof(ImageData.ImagePath)) + .Append(mlContext.Transforms.ResizeImages("data_0", imageWidth, imageHeight, inputColumnName: "data_0") + .Append(mlContext.Transforms.ExtractPixels("data_0", interleavePixelColors: true)) + .Append(mlContext.Transforms.ApplyOnnxModel(modelFile)); - TestEstimatorCore(pipe.AsDynamic, data.AsDynamic); + TestEstimatorCore(pipe, data); - var result = pipe.Fit(data).Transform(data).AsDynamic; + var result = pipe.Fit(data).Transform(data); + result.Schema.TryGetColumnIndex("softmaxout_1", out int output); + using (var cursor = result.GetRowCursor(col => col == output)) { var buffer = default(VBuffer<float>); @@ -71,7 +71,7 @@ getter(ref buffer); numRows += 1; } - System.Console.Writeline("Number of rows scored=" + numRows); + System.Console.Writeline("Number of rows scored = " + numRows); } From 8a41136c7432adbb14d13dd8aa1e8a8414cc841d Mon Sep 17 00:00:00 2001 From: J W Date: Sun, 3 May 2020 13:36:08 -0400 Subject: [PATCH 2/2] Additional update --- src/Microsoft.ML.OnnxTransformer/doc.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.ML.OnnxTransformer/doc.xml b/src/Microsoft.ML.OnnxTransformer/doc.xml index 476c47068c..b818011ca1 100644 --- a/src/Microsoft.ML.OnnxTransformer/doc.xml +++ b/src/Microsoft.ML.OnnxTransformer/doc.xml @@ -51,16 +51,16 @@ var data = mlContext.Data.LoadFromTextFile<ImageData>, <ImagePrediction>(dataFile); var pipe = mlContext.Transforms.LoadImages("data_0", imageFolder: "images", inputColumnName: nameof(ImageData.ImagePath)) - .Append(mlContext.Transforms.ResizeImages("data_0", imageWidth, imageHeight, inputColumnName: "data_0") - .Append(mlContext.Transforms.ExtractPixels("data_0", interleavePixelColors: true)) - .Append(mlContext.Transforms.ApplyOnnxModel(modelFile)); + .Append(mlContext.Transforms.ResizeImages("data_0", imageWidth, imageHeight, inputColumnName: "data_0") + .Append(mlContext.Transforms.ExtractPixels("data_0", interleavePixelColors: true)) + .Append(mlContext.Transforms.ApplyOnnxModel(modelFile)); TestEstimatorCore(pipe, data); var result = pipe.Fit(data).Transform(data); - - result.Schema.TryGetColumnIndex("softmaxout_1", out int output); - + + var output = result.Schema.GetColumnOrNull("softmaxout_1"); + using (var cursor = result.GetRowCursor(col => col == output)) { var buffer = default(VBuffer<float>);