Add a DNN Image Featurizer Transform Estimator #1447
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <PackageDescription>ML.NET component for pretrained AlexNet image featurization</PackageDescription> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="../Microsoft.ML.OnnxTransform/Microsoft.ML.OnnxTransform.nupkgproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="$(LocalAppData)\mlnet-resources\AlexNetOnnx\AlexNet.onnx" Pack="true" PackagePath=".\lib\netstandard2.0\AlexNetOnnx" /> | ||
|
There was a problem hiding this comment. These Instead, these files should be placed in the See https://docs.microsoft.com/en-us/nuget/reference/nuspec#including-content-files #Closed There was a problem hiding this comment. |
||
| <Content Include="$(LocalAppData)\mlnet-resources\AlexNetPrepOnnx\AlexNetPreprocess.onnx" Pack="true" PackagePath=".\lib\netstandard2.0\AlexNetPrepOnnx" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <Project DefaultTargets="Pack"> | ||
|
|
||
| <Import Project="Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj" /> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <PackageDescription>ML.NET component for pretrained ResNet101 image featurization</PackageDescription> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="../Microsoft.ML.OnnxTransform/Microsoft.ML.OnnxTransform.nupkgproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="$(LocalAppData)\mlnet-resources\ResNet101Onnx\ResNet101.onnx" Pack="true" PackagePath=".\lib\netstandard2.0\ResNet101Onnx" /> | ||
| <Content Include="$(LocalAppData)\mlnet-resources\ResNetPrepOnnx\ResNetPreprocess.onnx" Pack="true" PackagePath=".\lib\netstandard2.0\ResNetPrepOnnx" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <Project DefaultTargets="Pack"> | ||
|
|
||
| <Import Project="Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj" /> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <PackageDescription>ML.NET component for pretrained ResNet18 image featurization</PackageDescription> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="../Microsoft.ML.OnnxTransform/Microsoft.ML.OnnxTransform.nupkgproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="$(LocalAppData)\mlnet-resources\ResNet18Onnx\ResNet18.onnx" Pack="true" PackagePath=".\lib\netstandard2.0\ResNet18Onnx" /> | ||
| <Content Include="$(LocalAppData)\mlnet-resources\ResNetPrepOnnx\ResNetPreprocess.onnx" Pack="true" PackagePath=".\lib\netstandard2.0\ResNetPrepOnnx" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <Project DefaultTargets="Pack"> | ||
|
|
||
| <Import Project="Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj" /> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <PackageDescription>ML.NET component for pretrained ResNet50 image featurization</PackageDescription> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="../Microsoft.ML.OnnxTransform/Microsoft.ML.OnnxTransform.nupkgproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="$(LocalAppData)\mlnet-resources\ResNet50Onnx\ResNet50.onnx" Pack="true" PackagePath=".\lib\netstandard2.0\ResNet50Onnx" /> | ||
| <Content Include="$(LocalAppData)\mlnet-resources\ResNetPrepOnnx\ResNetPreprocess.onnx" Pack="true" PackagePath=".\lib\netstandard2.0\ResNetPrepOnnx" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <Project DefaultTargets="Pack"> | ||
|
|
||
| <Import Project="Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj" /> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,58 @@ | ||||||||||
| // Licensed to the .NET Foundation under one or more agreements. | ||||||||||
| // The .NET Foundation licenses this file to you under the MIT license. | ||||||||||
| // See the LICENSE file in the project root for more information. | ||||||||||
|
|
||||||||||
| using Microsoft.ML.Runtime; | ||||||||||
| using Microsoft.ML.Runtime.Data; | ||||||||||
| using System.IO; | ||||||||||
| using System.Reflection; | ||||||||||
|
|
||||||||||
| namespace Microsoft.ML.Transforms | ||||||||||
| { | ||||||||||
| /// <summary> | ||||||||||
| /// This is an extension method to be used with the <see cref="DnnImageFeaturizerEstimator"/> in order to use a pretrained AlexNet model. | ||||||||||
| /// The NuGet containing this extension is also guaranteed to include the binary model file. Note that when building the project | ||||||||||
| /// containing this extension method, the corresponding binary model will be downloaded from the CDN at | ||||||||||
| /// https://express-tlcresources.azureedge.net/image/AlexNetPrepOnnx/AlexNetPreprocess.onnx and | ||||||||||
| /// https://express-tlcresources.azureedge.net/image/AlexNetOnnx/AlexNet.onnx and placed into the local app directory | ||||||||||
| /// folder under mlnet-resources. | ||||||||||
|
There was a problem hiding this comment. does this comment about This doesn't make sense for an XML summary comment on a class. The XML comments are for the users of this API, not developers working on this file. #Resolved There was a problem hiding this comment. |
||||||||||
| /// </summary> | ||||||||||
| public static class AlexNetExtension | ||||||||||
|
There was a problem hiding this comment.
(nit) it is nice to keep the class name and the containing file name in sync.
|
||||||||||
| { | ||||||||||
| /// <summary> | ||||||||||
| /// If including this through a NuGet, the location of the model will be the same as of this file. This looks for the model there. | ||||||||||
| /// This should be the default way to use AlexNet if importing the model from a NuGet. | ||||||||||
| /// </summary> | ||||||||||
| public static EstimatorChain<OnnxTransform> AlexNet(this DnnImageModelSelector dnnModelContext, IHostEnvironment env, string input, string output) | ||||||||||
| { | ||||||||||
| var modelChain = new EstimatorChain<OnnxTransform>(); | ||||||||||
| var tempCol = "onnxDnnPrep"; | ||||||||||
| var execDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); | ||||||||||
|
|
||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||
| // There are two estimators created below. The first one is for image preprocessing and the second one is the actual DNN model. | ||||||||||
| var prepEstimator = new OnnxScoringEstimator(env, Path.Combine(execDir, "AlexNetPrepOnnx", "AlexNetPreprocess.onnx"), input, tempCol); | ||||||||||
| var mainEstimator = new OnnxScoringEstimator(env, Path.Combine(execDir, "AlexNetOnnx", "AlexNet.onnx"), tempCol, output); | ||||||||||
| modelChain = modelChain.Append(prepEstimator); | ||||||||||
| modelChain = modelChain.Append(mainEstimator); | ||||||||||
| return modelChain; | ||||||||||
| } | ||||||||||
|
|
||||||||||
| /// <summary> | ||||||||||
| /// This allows a custom model location to be specified. This is useful is a custom model is specified, | ||||||||||
| /// or if the model is desired to be placed or shipped separately in a different folder from the main application. Note that because Onnx models | ||||||||||
| /// must be in a directory all by themsleves for the OnnxTransform to work, this method appends a AlexNetOnnx/AlexNetPrepOnnx subdirectory | ||||||||||
| /// to the passed in directory to prevent having to make that directory manually each time. | ||||||||||
| /// </summary> | ||||||||||
| public static EstimatorChain<OnnxTransform> AlexNet(this DnnImageModelSelector dnnModelContext, IHostEnvironment env, string input, string output, string modelDir) | ||||||||||
| { | ||||||||||
| var modelChain = new EstimatorChain<OnnxTransform>(); | ||||||||||
| var tempCol = "onnxDnnPrep"; | ||||||||||
|
|
||||||||||
| var prepEstimator = new OnnxScoringEstimator(env, Path.Combine(modelDir, "AlexNetPrepOnnx", "AlexNetPreprocess.onnx"), input, tempCol); | ||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||
| var mainEstimator = new OnnxScoringEstimator(env, Path.Combine(modelDir, "AlexNetOnnx", "AlexNet.onnx"), tempCol, output); | ||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||
| modelChain = modelChain.Append(prepEstimator); | ||||||||||
| modelChain = modelChain.Append(mainEstimator); | ||||||||||
| return modelChain; | ||||||||||
| } | ||||||||||
| } | ||||||||||
| } | ||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.AlexNet</IncludeInPackage> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Microsoft.ML.OnnxTransform\Microsoft.ML.OnnxTransform.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <LocalAppDataDir>$(LocalAppData)</LocalAppDataDir> | ||
| <MlnetAppDataDir>$(LocalAppData)/mlnet-resources</MlnetAppDataDir> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PreprocessFile Include="$(MlnetAppDataDir)/AlexNetPrepOnnx/AlexNetPreprocess.onnx" | ||
| Url="https://express-tlcresources.azureedge.net/image/AlexNetPrepOnnx/AlexNetPreprocess.onnx " | ||
| DestinationFile="$(MlnetAppDataDir)/AlexNetPrepOnnx/AlexNetPreprocess.onnx" | ||
| DestinationDir="$(MlnetAppDataDir)/AlexNetPrepOnnx" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ModelFile Include="$(MlnetAppDataDir)/AlexNetOnnx/AlexNet.onnx" | ||
| Url="https://express-tlcresources.azureedge.net/image/AlexNetOnnx/AlexNet.onnx" | ||
| DestinationFile="$(MlnetAppDataDir)/AlexNetOnnx/AlexNet.onnx" | ||
| DestinationDir="$(MlnetAppDataDir)/AlexNetOnnx" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="DownloadPrepModels" Inputs="@(PreprocessFile)" Outputs="%(PreprocessFile.DestinationFile)"> | ||
| <Message Importance="High" Text="Downloading external model files... %(PreprocessFile.DestinationFile)" /> | ||
| <MakeDir Directories="$(MlnetAppDataDir)" /> | ||
| <MakeDir Directories="$(LocalAppDataDir)" /> | ||
| <MakeDir Directories="%(PreprocessFile.DestinationDir)" /> | ||
| <DownloadFilesFromUrl Items="@(PreprocessFile)"/> | ||
| </Target> | ||
|
|
||
| <Target Name="DownloadMainModels" | ||
| DependsOnTargets="DownloadPrepModels" | ||
| AfterTargets="Build" | ||
| Inputs="@(ModelFile)" Outputs="%(ModelFile.DestinationFile)"> | ||
| <Message Importance="High" Text="Downloading external model files... %(ModelFile.DestinationFile)" /> | ||
| <MakeDir Directories="%(ModelFile.DestinationDir)" /> | ||
| <DownloadFilesFromUrl Items="@(ModelFile)"/> | ||
| </Target> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.ResNet101</IncludeInPackage> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Microsoft.ML.OnnxTransform\Microsoft.ML.OnnxTransform.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <LocalAppDataDir>$(LocalAppData)</LocalAppDataDir> | ||
| <MlnetAppDataDir>$(LocalAppData)/mlnet-resources</MlnetAppDataDir> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PreprocessFile Include="$(MlnetAppDataDir)/ResNetPrepOnnx/ResNetPreprocess.onnx" | ||
| Url="https://express-tlcresources.azureedge.net/image/ResNetPrepOnnx/ResNetPreprocess.onnx " | ||
| DestinationFile="$(MlnetAppDataDir)/ResNetPrepOnnx/ResNetPreprocess.onnx" | ||
| DestinationDir="$(MlnetAppDataDir)/ResNetPrepOnnx" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ModelFile Include="$(MlnetAppDataDir)/ResNet101Onnx/ResNet101.onnx" | ||
| Url="https://express-tlcresources.azureedge.net/image/ResNet101Onnx/ResNet101.onnx" | ||
| DestinationFile="$(MlnetAppDataDir)/ResNet101Onnx/ResNet101.onnx" | ||
| DestinationDir="$(MlnetAppDataDir)/ResNet101Onnx" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="DownloadPrepModels" Inputs="@(PreprocessFile)" Outputs="%(PreprocessFile.DestinationFile)"> | ||
| <Message Importance="High" Text="Downloading external model files... %(PreprocessFile.DestinationFile)" /> | ||
| <MakeDir Directories="$(MlnetAppDataDir)" /> | ||
| <MakeDir Directories="$(LocalAppDataDir)" /> | ||
| <MakeDir Directories="%(PreprocessFile.DestinationDir)" /> | ||
| <DownloadFilesFromUrl Items="@(PreprocessFile)"/> | ||
| </Target> | ||
|
|
||
| <Target Name="DownloadMainModels" | ||
| DependsOnTargets="DownloadPrepModels" | ||
| AfterTargets="Build" | ||
| Inputs="@(ModelFile)" Outputs="%(ModelFile.DestinationFile)"> | ||
| <Message Importance="High" Text="Downloading external model files... %(ModelFile.DestinationFile)" /> | ||
| <MakeDir Directories="%(ModelFile.DestinationDir)" /> | ||
| <DownloadFilesFromUrl Items="@(ModelFile)"/> | ||
| </Target> | ||
|
|
||
| </Project> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not aligned? #Resolved