From 6d0ab2ffef2079233a945561c9f14d9a1fb2a673 Mon Sep 17 00:00:00 2001 From: LittleLittleCloud Date: Fri, 14 Feb 2020 10:53:33 -0800 Subject: [PATCH] add reference to onnx package in model project --- .../CodeGenerator/CSharp/CodeGenerator.cs | 47 ------------------- .../Templates/Console/ModelProject.cs | 5 ++ .../Templates/Console/ModelProject.tt | 3 ++ ...neratorTest.test.Model.csproj.approved.txt | 1 + ...Test.CodeGenTest.Model.csproj.approved.txt | 1 + 5 files changed, 10 insertions(+), 47 deletions(-) diff --git a/src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs b/src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs index da4b68a225..e8f488985e 100644 --- a/src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs +++ b/src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs @@ -93,53 +93,6 @@ public void GenerateOutput() Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath); } - public void GenerateAzureRemoteImageOutput() - { - // Get Namespace - var namespaceValue = Utils.Normalize(_settings.OutputName); - var labelType = _columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == _settings.LabelName).First().DataKind; - Type labelTypeCsharp = Utils.GetCSharpType(labelType); - - // Generate Model Project - var modelProjectContents = GenerateAzureAttachImageModelProjectContents(namespaceValue); - - var modelProjectDir = Path.Combine(_settings.OutputBaseDir, $"{_settings.OutputName}.Model"); - var modelProjectName = $"{_settings.OutputName}.Model.csproj"; - - // Get Normalize Mapping - var normalizeContent = new NormalizeMapping() - { - Namespace = namespaceValue, - Target = _settings.Target, - }.TransformText(); - normalizeContent = Utils.FormatCode(normalizeContent); - - // Write files to disk - Utils.WriteOutputToFiles(modelProjectContents.ModelInputCSFileContent, "ModelInput.cs", modelProjectDir); - Utils.WriteOutputToFiles(modelProjectContents.ModelOutputCSFileContent, "ModelOutput.cs", modelProjectDir); - Utils.WriteOutputToFiles(modelProjectContents.ConsumeModelCSFileContent, "ConsumeModel.cs", modelProjectDir); - Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelProjectDir); - Utils.WriteOutputToFiles(normalizeContent, "NormalizeMapping.cs", modelProjectDir); - - // Generate ConsoleApp Project - var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, - false, false, false, true, false, false, true, true); - - // Write files to disk. - var consoleAppProjectDir = Path.Combine(_settings.OutputBaseDir, $"{_settings.OutputName}.ConsoleApp"); - var consoleAppProjectName = $"{_settings.OutputName}.ConsoleApp.csproj"; - - Utils.WriteOutputToFiles(consoleAppProjectContents.ConsoleAppProgramCSFileContent, "Program.cs", consoleAppProjectDir); - Utils.WriteOutputToFiles(consoleAppProjectContents.modelBuilderCSFileContent, "ModelBuilder.cs", consoleAppProjectDir); - Utils.WriteOutputToFiles(consoleAppProjectContents.ConsoleAppProjectFileContent, consoleAppProjectName, consoleAppProjectDir); - - // New solution file. - Utils.CreateSolutionFile(_settings.OutputName, _settings.OutputBaseDir); - - // Add projects to solution - var solutionPath = Path.Combine(_settings.OutputBaseDir, $"{_settings.OutputName}.sln"); - Utils.AddProjectsToSolution(modelProjectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath); - } private void SetRequiredNugetPackages(IEnumerable trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage, ref bool includeFastTreePackage, ref bool includeImageTransformerPackage, ref bool includeImageClassificationPackage, ref bool includeRecommenderPackage) diff --git a/src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs b/src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs index 793f3dc82d..68f4c44d11 100644 --- a/src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs +++ b/src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs @@ -49,6 +49,11 @@ public virtual string TransformText() this.Write(" \r\n"); +} + if (IncludeOnnxModel){ + this.Write(" \r\n"); } if (IncludeImageClassificationPackage){ this.Write(" <#}#> +<# if (IncludeOnnxModel){ #> + +<#}#> <# if (IncludeImageClassificationPackage){ #> diff --git a/test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt b/test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt index 6a98db8b95..e10e9a0460 100644 --- a/test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt +++ b/test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt @@ -5,6 +5,7 @@ + diff --git a/test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt b/test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt index ef82b82bde..acb39d2ebe 100644 --- a/test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt +++ b/test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt @@ -6,6 +6,7 @@ +