Skip to content

[CodeGenerator] Fix MLNet.CLI build error. #5546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Dec 10, 2020
Merged

[CodeGenerator] Fix MLNet.CLI build error. #5546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c073e6b
upgrade to 3.1
LittleLittleCloud Apr 28, 2020
8f0fc1a
write inline data using invariantCulture
LittleLittleCloud Apr 28, 2020
e96d716
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud Apr 29, 2020
8c17bbe
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud May 14, 2020
b2947f5
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud May 18, 2020
ff1c909
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud May 20, 2020
dad9055
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud Jul 20, 2020
741d77a
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud Jul 21, 2020
594c828
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud Aug 26, 2020
cc4def8
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud Sep 14, 2020
0610a9b
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud Oct 12, 2020
6190825
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud Oct 13, 2020
c2edc76
Merge branch 'master' of https://github.com/dotnet/machinelearning
LittleLittleCloud Dec 10, 2020
9ee3678
fix mlnet build error
LittleLittleCloud Dec 10, 2020
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
5 changes: 3 additions & 2 deletions src/Microsoft.ML.CodeGenerator/Templates/Console/ConsumeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ public class ConsumeModel
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath(""");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, """);
this.Write(this.ToStringHelper.ToStringWithCulture(MLNetModelName));
this.Write("\");\r\n");
if(IsAzureImage || IsAzureObjectDetection){
this.Write(" \r\n public static string OnnxModelPath = Path.GetFullPath(\"");
this.Write(" \r\n public static string OnnxModelPath = Path.Combine(System.AppContext.Ba" +
"seDirectory, \"");
this.Write(this.ToStringHelper.ToStringWithCulture(OnnxModelName));
this.Write("\");\r\n");
}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ML.CodeGenerator/Templates/Console/ConsumeModel.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ namespace <#= Namespace #>.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("<#= MLNetModelName #>");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "<#= MLNetModelName #>");
<#if(IsAzureImage || IsAzureObjectDetection){ #>
public static string OnnxModelPath = Path.GetFullPath("<#= OnnxModelName #>");
public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "<#= OnnxModelName #>");
<#} #>

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
Expand Down
2 changes: 1 addition & 1 deletion ...provalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.ConsumeModel.cs.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Test.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("\path\to\model");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "\path\to\model");

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
// Method for consuming model in your app
Expand Down
4 changes: 2 additions & 2 deletions ...lTests/ConsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.ConsumeModel.cs.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ namespace CodeGenTest.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("/path/to/model");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "/path/to/model");

public static string OnnxModelPath = Path.GetFullPath("/path/to/onnxModel");
public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "/path/to/onnxModel");

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
// Method for consuming model in your app
Expand Down
4 changes: 2 additions & 2 deletions ...soleCodeGeneratorTests.AzureObjectDetectionCodeGeneratorTest.ConsumeModel.cs.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ namespace CodeGenTest.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("/path/to/model");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "/path/to/model");

public static string OnnxModelPath = Path.GetFullPath("/path/to/onnxModel");
public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "/path/to/onnxModel");

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
// Method for consuming model in your app
Expand Down
2 changes: 1 addition & 1 deletion ...erator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsumeModelContentTest.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace TestNamespace.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("x:\models\model.zip");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "x:\models\model.zip");

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
// Method for consuming model in your app
Expand Down
2 changes: 1 addition & 1 deletion ...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyConsumeModel.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace TestNamespace.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("x:\models\model.zip");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "x:\models\model.zip");

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
// Method for consuming model in your app
Expand Down
4 changes: 2 additions & 2 deletions ...L.CodeGenerator.Tests/ApprovalTests/TemplateTest.TestConsumeModel_AzureImage.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ namespace Namespace.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("mlmodel.zip");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "mlmodel.zip");

public static string OnnxModelPath = Path.GetFullPath("onnx.onnx");
public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "onnx.onnx");

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
// Method for consuming model in your app
Expand Down
4 changes: 2 additions & 2 deletions ...rator.Tests/ApprovalTests/TemplateTest.TestConsumeModel_AzureObjectDetection.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ namespace Namespace.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("mlmodel.zip");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "mlmodel.zip");

public static string OnnxModelPath = Path.GetFullPath("onnx.onnx");
public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "onnx.onnx");

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
// Method for consuming model in your app
Expand Down
2 changes: 1 addition & 1 deletion ...ApprovalTests/TemplateTest.TestConsumeModel_NotAzureImage_NotObjectDetection.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Namespace.Model
{
private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);

public static string MLNetModelPath = Path.GetFullPath("mlmodel.zip");
public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "mlmodel.zip");

// For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
// Method for consuming model in your app
Expand Down