Skip to content

Commit 0fbd3d2

Browse files
committed
Changed type to useImageType in LoadImages(). Changed appropriate variable names in ImageClassificationTransform.cs
1 parent 2417888 commit 0fbd3d2

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/Microsoft.ML.Dnn/ImageClassificationTransform.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,8 @@ public Mapper(ImageClassificationTransformer parent, DataViewSchema inputSchema)
813813
private class OutputCache
814814
{
815815
public long Position;
816-
private ValueGetter<VBuffer<byte>> _imageBufGetter;
817-
private VBuffer<byte> _imageBuf;
816+
private ValueGetter<VBuffer<byte>> _imageGetter;
817+
private VBuffer<byte> _image;
818818
private Runner _runner;
819819
private ImageProcessor _imageProcessor;
820820
public UInt32 PredictedLabel { get; set; }
@@ -823,8 +823,8 @@ private class OutputCache
823823

824824
public OutputCache(DataViewRow input, ImageClassificationTransformer transformer)
825825
{
826-
_imageBuf = default;
827-
_imageBufGetter = input.GetGetter<VBuffer<byte>>(input.Schema[transformer._inputs[0]]);
826+
_image = default;
827+
_imageGetter = input.GetGetter<VBuffer<byte>>(input.Schema[transformer._inputs[0]]);
828828
_runner = new Runner(transformer._session);
829829
_runner.AddInput(transformer._inputTensorName);
830830
_runner.AddOutputs(transformer._softmaxTensorName);
@@ -841,8 +841,8 @@ public void UpdateCacheIfNeeded()
841841
if (_inputRow.Position != Position)
842842
{
843843
Position = _inputRow.Position;
844-
_imageBufGetter(ref _imageBuf);
845-
var processedTensor = _imageProcessor.ProcessImage(_imageBuf);
844+
_imageGetter(ref _image);
845+
var processedTensor = _imageProcessor.ProcessImage(_image);
846846
var outputTensor = _runner.AddInput(processedTensor, 0).Run();
847847
ClassProbabilities = outputTensor[0].ToArray<float>();
848848
PredictedLabel = (UInt32)outputTensor[1].ToArray<long>()[0];

src/Microsoft.ML.ImageAnalytics/ExtensionsCatalog.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ internal static ImageLoadingEstimator LoadImages(this TransformsCatalog catalog,
107107
/// <param name="inputColumnName">Name of the column with paths to the images to load.
108108
/// This estimator operates over text data.</param>
109109
/// <param name="imageFolder">Folder where to look for images.</param>
110-
/// <param name="type">Image type flag - If true loads image as a VectorDataView type else loads image as ImageDataViewType. Defaults to ImageDataViewType if not specified or false.</param>
110+
/// <param name="useImageType">Image type flag - If true loads image as a VectorDataView type else loads image as ImageDataViewType. Defaults to ImageDataViewType if not specified or false.</param>
111111
/// <example>
112112
/// <format type="text/markdown">
113113
/// <![CDATA[
114114
/// [!code-csharp[LoadImages](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/ImageAnalytics/LoadImages.cs)]
115115
/// ]]></format>
116116
/// </example>
117-
public static ImageLoadingEstimator LoadImages(this TransformsCatalog catalog, string outputColumnName, string imageFolder, bool type, string inputColumnName = null)
118-
=> new ImageLoadingEstimator(CatalogUtils.GetEnvironment(catalog), imageFolder, type, new[] { (outputColumnName, inputColumnName ?? outputColumnName) });
117+
public static ImageLoadingEstimator LoadImages(this TransformsCatalog catalog, string outputColumnName, string imageFolder, bool useImageType, string inputColumnName = null)
118+
=> new ImageLoadingEstimator(CatalogUtils.GetEnvironment(catalog), imageFolder, useImageType, new[] { (outputColumnName, inputColumnName ?? outputColumnName) });
119119

120120
/// <summary>
121121
/// Loads the images from the <see cref="ImageLoadingTransformer.ImageFolder" /> into memory.
@@ -129,7 +129,7 @@ public static ImageLoadingEstimator LoadImages(this TransformsCatalog catalog, s
129129
/// </remarks>
130130
/// <param name="catalog">The transform's catalog.</param>
131131
/// <param name="imageFolder">Folder where to look for images.</param>
132-
/// <param name="type">Image type flag - If true loads image as a VectorDataView type else loads image as ImageDataViewType. Defaults to ImageDataViewType if not specified or false.</param>
132+
/// <param name="useImageType ">Image type flag - If true loads image as a VectorDataView type else loads image as ImageDataViewType. Defaults to ImageDataViewType if not specified or false.</param>
133133
/// <param name="columns">Specifies the names of the input columns for the transformation, and their respective output column names.</param>
134134
/// <example>
135135
/// <format type="text/markdown">
@@ -138,11 +138,11 @@ public static ImageLoadingEstimator LoadImages(this TransformsCatalog catalog, s
138138
/// ]]></format>
139139
/// </example>
140140
[BestFriend]
141-
internal static ImageLoadingEstimator LoadImages(this TransformsCatalog catalog, string imageFolder, bool type, params InputOutputColumnPair[] columns)
141+
internal static ImageLoadingEstimator LoadImages(this TransformsCatalog catalog, string imageFolder, bool useImageType, params InputOutputColumnPair[] columns)
142142
{
143143
var env = CatalogUtils.GetEnvironment(catalog);
144144
env.CheckValue(columns, nameof(columns));
145-
return new ImageLoadingEstimator(env, imageFolder, type, InputOutputColumnPair.ConvertToValueTuples(columns));
145+
return new ImageLoadingEstimator(env, imageFolder, useImageType, InputOutputColumnPair.ConvertToValueTuples(columns));
146146
}
147147

148148
/// <summary>

0 commit comments

Comments
 (0)