add projects capability in CodeGenerator#5002

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
harishsk merged 1 commit into from
Apr 7, 2020
Merged

add projects capability in CodeGenerator #5002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...ML.CodeGenerator/CodeGenerator/CSharp/AzureCodeGenerator/AzureAttachModelCodeGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ public AzureAttachModelCodeGenerator(Pipeline pipeline, ColumnInferenceResults c
IncludeRecommenderPackage = false,
StablePackageVersion = _settings.StablePackageVersion,
UnstablePackageVersion = _settings.UnstablePackageVersion,
Target = _settings.Target,
}.TransformText(),
Name = $"{ _settings.OutputName }.Model.csproj",
};
Expand Down
48 changes: 9 additions & 39 deletions src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.ML.AutoML;
using Microsoft.ML.CodeGenerator.CodeGenerator;
using Microsoft.ML.CodeGenerator.Templates.Azure.Model;
Expand DownExpand Up@@ -144,7 +145,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName,
includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage,
includeImageTransformerPackage, includeImageClassificationPackage, includeRecommenderPackage, includeOnnxPackage, includeResNet18Package,
_settings.StablePackageVersion, _settings.UnstablePackageVersion);
_settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

var transformsAndTrainers = GenerateTransformsAndTrainers();
var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name, includeOnnxPackage);
Expand DownExpand Up@@ -175,40 +176,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage,
includeMklComponentsPackage, includeFastTreePackage, includeImageTransformerPackage,
includeImageClassificationPackage, includeRecommenderPackage, includeOnnxModel,
_settings.StablePackageVersion, _settings.UnstablePackageVersion);

return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
}

internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent,
string ModelProjectFileContent) GenerateAzureAttachImageModelProjectContents(string namespaceValue)
{
var classLabels = GenerateClassLabels();

// generate ModelInput.cs
var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);

// generate ModelOutput.cs
var modelOutputCSFileContent = new OnnxModelOutputClass()
{
Namespace = namespaceValue,
Target = _settings.Target,
}.TransformText();
modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);

// generate ConsumeModel.cs
var consumeModelCSFileContent = new AzureAttachImageConsumeModel()
{
Namespace = namespaceValue,
Target = _settings.Target,
}.TransformText();
consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);

// generate Model.csproj
var modelProjectFileContent = GenerateModelProjectFileContent(false,
false, false, true,
false, false,true, _settings.StablePackageVersion, _settings.UnstablePackageVersion);
_settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
}
Expand DownExpand Up@@ -366,7 +334,7 @@ internal IList<string> GenerateClassLabels(IDictionary<string, CodeGeneratorSett
private static string GenerateModelProjectFileContent(bool includeLightGbmPackage,
bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
bool includeImageClassificationPackage, bool includeRecommenderPackage, bool includeOnnxModel,
string stablePackageVersion, string unstablePackageVersion)
string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
{
ModelProject modelProject = new ModelProject()
{
Expand All@@ -378,7 +346,8 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
IncludeOnnxModel = includeOnnxModel,
IncludeRecommenderPackage = includeRecommenderPackage,
StablePackageVersion = stablePackageVersion,
UnstablePackageVersion = unstablePackageVersion
UnstablePackageVersion = unstablePackageVersion,
Target = target,
};

return modelProject.TransformText();
Expand DownExpand Up@@ -411,7 +380,7 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
bool includeImageClassificationPackage, bool includeRecommenderPackage,
bool includeOnnxPackage, bool includeResNet18Package,
string stablePackageVersion, string unstablePackageVersion)
string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
{
var predictProjectFileContent = new PredictProject()
{
Expand All@@ -425,7 +394,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
IncludeResNet18Package = includeResNet18Package,
IncludeRecommenderPackage = includeRecommenderPackage,
StablePackageVersion = stablePackageVersion,
UnstablePackageVersion = unstablePackageVersion
UnstablePackageVersion = unstablePackageVersion,
Target = target,
};
return predictProjectFileContent.TransformText();
}
Expand Down
9 changes: 8 additions & 1 deletion src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,13 @@ public virtual string TransformText()
this.Write(" <None Update=\"bestModel.onnx\">\r\n <CopyToOutputDirectory>PreserveNewest</" +
"CopyToOutputDirectory>\r\n </None>\r\n");
}
this.Write(" </ItemGroup>\r\n \r\n</Project>\r\n");
this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if (Target==CSharp.GenerateTarget.Cli) {
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
return this.GenerationEnvironment.ToString();
}

Expand All@@ -85,6 +91,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

}
#region Base class
Expand Down
10 changes: 9 additions & 1 deletion src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.tt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,14 @@
</None>
<#}#>
</ItemGroup>


<ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
<ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
<ProjectCapability Include="ModelBuilderGenerated" />
<#}#>

@justinormontjustinormontApr 6, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's diverging between CLI and MB that we need MLNETCLIGenerated vs ModelBuilderGenerated?

@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from our PM, we want to differentiate ModelBuilder-Generated from MLNet CLI Generated in telemetry data

@justinormontjustinormontApr 6, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.

</ItemGroup>
</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
Expand All@@ -56,4 +63,5 @@ public bool IncludeOnnxModel {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
#>
9 changes: 8 additions & 1 deletion src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,13 @@ public virtual string TransformText()
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model\\");
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n</Project>\r\n");
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if (Target==CSharp.GenerateTarget.Cli) {
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}

@justinormontjustinormontApr 6, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should modify the upstream .tt so the .cs is formatted properly here.

@justinormontjustinormontApr 6, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same w/ ModelProject.tt

@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What you mean

@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LittleLittleCloud aren't these files generated from TT files?

@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR it looks like the CS files were modified directly instead of changing the TT files.

@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind I see them now :)

@justinormontjustinormontApr 6, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added code is currently being formatted as:

machinelearning/src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

Lines 77 to 86 in e84006b

this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if(Target==CSharp.GenerateTarget.Cli){
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
returnthis.GenerationEnvironment.ToString();
}

It should be:

this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");if(Target==CSharp.GenerateTarget.Cli){this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");}else{this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");}this.Write(" </ItemGroup>\r\n</Project>\r\n");returnthis.GenerationEnvironment.ToString();}

The generated .cs files are created from their corresponding .tt T4 template files. The change would occur there. I left a comment on the .cs as it shows the output.

@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT it's auto-gen, I didn't modify those cs file a bit :)

this.Write(" </ItemGroup>\r\n</Project>\r\n");
return this.GenerationEnvironment.ToString();
}

Expand All@@ -90,6 +96,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

}
#region Base class
Expand Down
9 changes: 9 additions & 0 deletions src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,14 @@
<ItemGroup>
<ProjectReference Include="..\\<#= Namespace #>.Model\\<#= Namespace #>.Model.csproj" />
</ItemGroup>

<ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
<ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
<ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
</ItemGroup>
</Project>
<#+
public string Namespace {get;set;}
Expand All@@ -54,4 +62,5 @@ public bool IncludeResNet18Package {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

@JakeRadMSFTJakeRadMSFTApr 6, 2020•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I would think of CLI vs ModelBuilder as the Source instead of Target. It's the thing causing the projects to get generated.

@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do

#>
4 changes: 4 additions & 0 deletions ...ests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.ConsoleApp.csproj.approved.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
<ItemGroup>
<ProjectReference Include="..\Test.Model\Test.Model.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectCapability Include="ModelBuilderGenerated" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion ...ovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>


<ItemGroup>
<ProjectCapability Include="ModelBuilderGenerated" />
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions ...CodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.ConsoleApp.csproj.approved.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
<ItemGroup>
<ProjectReference Include="..\CodeGenTest.Model\CodeGenTest.Model.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectCapability Include="ModelBuilderGenerated" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion ...nsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,5 +17,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>


<ItemGroup>
<ProjectCapability Include="ModelBuilderGenerated" />
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions ...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
<ItemGroup>
<ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectCapability Include="MLNETCLIGenerated" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion ...ests/ConsoleCodeGeneratorTests.ModelProjectFileContentTestOnlyStableProjects.approved.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,5 +15,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>


<ItemGroup>
<ProjectCapability Include="MLNETCLIGenerated" />
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions ...rTests.Recommendation_GenerateConsoleAppProjectContents_VerifyPredictProject.approved.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
<ItemGroup>
<ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectCapability Include="MLNETCLIGenerated" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion ...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyModelProject.approved.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>


<ItemGroup>
<ProjectCapability Include="MLNETCLIGenerated" />
</ItemGroup>
</Project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
add projects capability in CodeGenerator#5002

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

harishsk
merged 1 commit into

from

Apr 7, 2020
 Merged


add projects capability in CodeGenerator
#5002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
...ML.CodeGenerator/CodeGenerator/CSharp/AzureCodeGenerator/AzureAttachModelCodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ public AzureAttachModelCodeGenerator(Pipeline pipeline, ColumnInferenceResults c
 IncludeRecommenderPackage = false,
 StablePackageVersion = _settings.StablePackageVersion,
 UnstablePackageVersion = _settings.UnstablePackageVersion,
 Target = _settings.Target,
 }.TransformText(),
 Name = $"{ _settings.OutputName }.Model.csproj",
 };
Expand Down

48 changes: 9 additions & 39 deletions
src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.ML.AutoML;
using Microsoft.ML.CodeGenerator.CodeGenerator;
using Microsoft.ML.CodeGenerator.Templates.Azure.Model;
Expand DownExpand Up@@ -144,7 +145,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName,
 includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage,
 includeImageTransformerPackage, includeImageClassificationPackage, includeRecommenderPackage, includeOnnxPackage, includeResNet18Package,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name, includeOnnxPackage);
Expand DownExpand Up@@ -175,40 +176,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage,
 includeMklComponentsPackage, includeFastTreePackage, includeImageTransformerPackage,
 includeImageClassificationPackage, includeRecommenderPackage, includeOnnxModel,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }

 internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent,
 string ModelProjectFileContent) GenerateAzureAttachImageModelProjectContents(string namespaceValue)
 {
 var classLabels = GenerateClassLabels();

 // generate ModelInput.cs
 var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
 modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);

 // generate ModelOutput.cs
 var modelOutputCSFileContent = new OnnxModelOutputClass()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);

 // generate ConsumeModel.cs
 var consumeModelCSFileContent = new AzureAttachImageConsumeModel()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);

 // generate Model.csproj
 var modelProjectFileContent = GenerateModelProjectFileContent(false,
 false, false, true,
 false, false,true, _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }
Expand DownExpand Up@@ -366,7 +334,7 @@ internal IList<string> GenerateClassLabels(IDictionary<string, CodeGeneratorSett
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage,
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage, bool includeOnnxModel,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 ModelProject modelProject = new ModelProject()
 {
Expand All@@ -378,7 +346,8 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
 IncludeOnnxModel = includeOnnxModel,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };

 return modelProject.TransformText();
Expand DownExpand Up@@ -411,7 +380,7 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage,
 bool includeOnnxPackage, bool includeResNet18Package,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 var predictProjectFileContent = new PredictProject()
 {
Expand All@@ -425,7 +394,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 IncludeResNet18Package = includeResNet18Package,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };
 return predictProjectFileContent.TransformText();
 }
Expand Down

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,13 @@ public virtual string TransformText()
 this.Write(" <None Update=\"bestModel.onnx\">\r\n <CopyToOutputDirectory>PreserveNewest</" +
 "CopyToOutputDirectory>\r\n </None>\r\n");
}
 this.Write(" </ItemGroup>\r\n \r\n</Project>\r\n");
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -85,6 +91,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

10 changes: 9 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,14 @@
 </None>
<#}#>
 </ItemGroup>


 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's diverging between CLI and MB that we need MLNETCLIGenerated vs ModelBuilderGenerated?
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from our PM, we want to differentiate ModelBuilder-Generated from MLNet CLI Generated in telemetry data
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.
 </ItemGroup>
</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
Expand All@@ -56,4 +63,5 @@ public bool IncludeOnnxModel {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
#>

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,13 @@ public virtual string TransformText()
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model\\");
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n</Project>\r\n");
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should modify the upstream .tt so the .cs is formatted properly here.
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same w/ ModelProject.tt
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What you mean
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LittleLittleCloud aren't these files generated from TT files?
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR it looks like the CS files were modified directly instead of changing the TT files.
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind I see them now :)
@justinormontjustinormontApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added code is currently being formatted as:
machinelearning/src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

Lines 77 to 86
in
e84006b
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if(Target==CSharp.GenerateTarget.Cli){
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
returnthis.GenerationEnvironment.ToString();
}
It should be:
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");if(Target==CSharp.GenerateTarget.Cli){this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");}else{this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");}this.Write(" </ItemGroup>\r\n</Project>\r\n");returnthis.GenerationEnvironment.ToString();}
The generated .cs files are created from their corresponding .tt T4 template files. The change would occur there. I left a comment on the .cs as it shows the output.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT it's auto-gen, I didn't modify those cs file a bit :)
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -90,6 +96,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

9 changes: 9 additions & 0 deletions
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,14 @@
 <ItemGroup>
 <ProjectReference Include="..\\<#= Namespace #>.Model\\<#= Namespace #>.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
 </ItemGroup>
</Project>
<#+
public string Namespace {get;set;}
Expand All@@ -54,4 +62,5 @@ public bool IncludeResNet18Package {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
@JakeRadMSFTJakeRadMSFTApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I would think of CLI vs ModelBuilder as the Source instead of Target. It's the thing causing the projects to get generated.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do
#>

4 changes: 4 additions & 0 deletions
...ests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\Test.Model\Test.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...CodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\CodeGenTest.Model\CodeGenTest.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...nsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,5 +17,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ests/ConsoleCodeGeneratorTests.ModelProjectFileContentTestOnlyStableProjects.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,5 +15,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...rTests.Recommendation_GenerateConsoleAppProjectContents_VerifyPredictProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyModelProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add projects capability in CodeGenerator#5002

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

harishsk
merged 1 commit into

from

Apr 7, 2020
 Merged


add projects capability in CodeGenerator
#5002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
...ML.CodeGenerator/CodeGenerator/CSharp/AzureCodeGenerator/AzureAttachModelCodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ public AzureAttachModelCodeGenerator(Pipeline pipeline, ColumnInferenceResults c
 IncludeRecommenderPackage = false,
 StablePackageVersion = _settings.StablePackageVersion,
 UnstablePackageVersion = _settings.UnstablePackageVersion,
 Target = _settings.Target,
 }.TransformText(),
 Name = $"{ _settings.OutputName }.Model.csproj",
 };
Expand Down

48 changes: 9 additions & 39 deletions
src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.ML.AutoML;
using Microsoft.ML.CodeGenerator.CodeGenerator;
using Microsoft.ML.CodeGenerator.Templates.Azure.Model;
Expand DownExpand Up@@ -144,7 +145,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName,
 includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage,
 includeImageTransformerPackage, includeImageClassificationPackage, includeRecommenderPackage, includeOnnxPackage, includeResNet18Package,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name, includeOnnxPackage);
Expand DownExpand Up@@ -175,40 +176,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage,
 includeMklComponentsPackage, includeFastTreePackage, includeImageTransformerPackage,
 includeImageClassificationPackage, includeRecommenderPackage, includeOnnxModel,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }

 internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent,
 string ModelProjectFileContent) GenerateAzureAttachImageModelProjectContents(string namespaceValue)
 {
 var classLabels = GenerateClassLabels();

 // generate ModelInput.cs
 var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
 modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);

 // generate ModelOutput.cs
 var modelOutputCSFileContent = new OnnxModelOutputClass()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);

 // generate ConsumeModel.cs
 var consumeModelCSFileContent = new AzureAttachImageConsumeModel()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);

 // generate Model.csproj
 var modelProjectFileContent = GenerateModelProjectFileContent(false,
 false, false, true,
 false, false,true, _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }
Expand DownExpand Up@@ -366,7 +334,7 @@ internal IList<string> GenerateClassLabels(IDictionary<string, CodeGeneratorSett
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage,
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage, bool includeOnnxModel,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 ModelProject modelProject = new ModelProject()
 {
Expand All@@ -378,7 +346,8 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
 IncludeOnnxModel = includeOnnxModel,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };

 return modelProject.TransformText();
Expand DownExpand Up@@ -411,7 +380,7 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage,
 bool includeOnnxPackage, bool includeResNet18Package,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 var predictProjectFileContent = new PredictProject()
 {
Expand All@@ -425,7 +394,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 IncludeResNet18Package = includeResNet18Package,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };
 return predictProjectFileContent.TransformText();
 }
Expand Down

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,13 @@ public virtual string TransformText()
 this.Write(" <None Update=\"bestModel.onnx\">\r\n <CopyToOutputDirectory>PreserveNewest</" +
 "CopyToOutputDirectory>\r\n </None>\r\n");
}
 this.Write(" </ItemGroup>\r\n \r\n</Project>\r\n");
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -85,6 +91,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

10 changes: 9 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,14 @@
 </None>
<#}#>
 </ItemGroup>


 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's diverging between CLI and MB that we need MLNETCLIGenerated vs ModelBuilderGenerated?
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from our PM, we want to differentiate ModelBuilder-Generated from MLNet CLI Generated in telemetry data
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.
 </ItemGroup>
</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
Expand All@@ -56,4 +63,5 @@ public bool IncludeOnnxModel {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
#>

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,13 @@ public virtual string TransformText()
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model\\");
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n</Project>\r\n");
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should modify the upstream .tt so the .cs is formatted properly here.
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same w/ ModelProject.tt
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What you mean
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LittleLittleCloud aren't these files generated from TT files?
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR it looks like the CS files were modified directly instead of changing the TT files.
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind I see them now :)
@justinormontjustinormontApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added code is currently being formatted as:
machinelearning/src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

Lines 77 to 86
in
e84006b
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if(Target==CSharp.GenerateTarget.Cli){
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
returnthis.GenerationEnvironment.ToString();
}
It should be:
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");if(Target==CSharp.GenerateTarget.Cli){this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");}else{this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");}this.Write(" </ItemGroup>\r\n</Project>\r\n");returnthis.GenerationEnvironment.ToString();}
The generated .cs files are created from their corresponding .tt T4 template files. The change would occur there. I left a comment on the .cs as it shows the output.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT it's auto-gen, I didn't modify those cs file a bit :)
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -90,6 +96,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

9 changes: 9 additions & 0 deletions
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,14 @@
 <ItemGroup>
 <ProjectReference Include="..\\<#= Namespace #>.Model\\<#= Namespace #>.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
 </ItemGroup>
</Project>
<#+
public string Namespace {get;set;}
Expand All@@ -54,4 +62,5 @@ public bool IncludeResNet18Package {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
@JakeRadMSFTJakeRadMSFTApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I would think of CLI vs ModelBuilder as the Source instead of Target. It's the thing causing the projects to get generated.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do
#>

4 changes: 4 additions & 0 deletions
...ests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\Test.Model\Test.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...CodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\CodeGenTest.Model\CodeGenTest.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...nsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,5 +17,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ests/ConsoleCodeGeneratorTests.ModelProjectFileContentTestOnlyStableProjects.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,5 +15,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...rTests.Recommendation_GenerateConsoleAppProjectContents_VerifyPredictProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyModelProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add projects capability in CodeGenerator#5002

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

harishsk
merged 1 commit into

from

Apr 7, 2020
 Merged


add projects capability in CodeGenerator
#5002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
...ML.CodeGenerator/CodeGenerator/CSharp/AzureCodeGenerator/AzureAttachModelCodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ public AzureAttachModelCodeGenerator(Pipeline pipeline, ColumnInferenceResults c
 IncludeRecommenderPackage = false,
 StablePackageVersion = _settings.StablePackageVersion,
 UnstablePackageVersion = _settings.UnstablePackageVersion,
 Target = _settings.Target,
 }.TransformText(),
 Name = $"{ _settings.OutputName }.Model.csproj",
 };
Expand Down

48 changes: 9 additions & 39 deletions
src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.ML.AutoML;
using Microsoft.ML.CodeGenerator.CodeGenerator;
using Microsoft.ML.CodeGenerator.Templates.Azure.Model;
Expand DownExpand Up@@ -144,7 +145,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName,
 includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage,
 includeImageTransformerPackage, includeImageClassificationPackage, includeRecommenderPackage, includeOnnxPackage, includeResNet18Package,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name, includeOnnxPackage);
Expand DownExpand Up@@ -175,40 +176,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage,
 includeMklComponentsPackage, includeFastTreePackage, includeImageTransformerPackage,
 includeImageClassificationPackage, includeRecommenderPackage, includeOnnxModel,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }

 internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent,
 string ModelProjectFileContent) GenerateAzureAttachImageModelProjectContents(string namespaceValue)
 {
 var classLabels = GenerateClassLabels();

 // generate ModelInput.cs
 var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
 modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);

 // generate ModelOutput.cs
 var modelOutputCSFileContent = new OnnxModelOutputClass()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);

 // generate ConsumeModel.cs
 var consumeModelCSFileContent = new AzureAttachImageConsumeModel()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);

 // generate Model.csproj
 var modelProjectFileContent = GenerateModelProjectFileContent(false,
 false, false, true,
 false, false,true, _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }
Expand DownExpand Up@@ -366,7 +334,7 @@ internal IList<string> GenerateClassLabels(IDictionary<string, CodeGeneratorSett
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage,
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage, bool includeOnnxModel,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 ModelProject modelProject = new ModelProject()
 {
Expand All@@ -378,7 +346,8 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
 IncludeOnnxModel = includeOnnxModel,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };

 return modelProject.TransformText();
Expand DownExpand Up@@ -411,7 +380,7 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage,
 bool includeOnnxPackage, bool includeResNet18Package,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 var predictProjectFileContent = new PredictProject()
 {
Expand All@@ -425,7 +394,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 IncludeResNet18Package = includeResNet18Package,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };
 return predictProjectFileContent.TransformText();
 }
Expand Down

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,13 @@ public virtual string TransformText()
 this.Write(" <None Update=\"bestModel.onnx\">\r\n <CopyToOutputDirectory>PreserveNewest</" +
 "CopyToOutputDirectory>\r\n </None>\r\n");
}
 this.Write(" </ItemGroup>\r\n \r\n</Project>\r\n");
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -85,6 +91,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

10 changes: 9 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,14 @@
 </None>
<#}#>
 </ItemGroup>


 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's diverging between CLI and MB that we need MLNETCLIGenerated vs ModelBuilderGenerated?
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from our PM, we want to differentiate ModelBuilder-Generated from MLNet CLI Generated in telemetry data
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.
 </ItemGroup>
</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
Expand All@@ -56,4 +63,5 @@ public bool IncludeOnnxModel {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
#>

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,13 @@ public virtual string TransformText()
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model\\");
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n</Project>\r\n");
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should modify the upstream .tt so the .cs is formatted properly here.
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same w/ ModelProject.tt
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What you mean
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LittleLittleCloud aren't these files generated from TT files?
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR it looks like the CS files were modified directly instead of changing the TT files.
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind I see them now :)
@justinormontjustinormontApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added code is currently being formatted as:
machinelearning/src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

Lines 77 to 86
in
e84006b
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if(Target==CSharp.GenerateTarget.Cli){
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
returnthis.GenerationEnvironment.ToString();
}
It should be:
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");if(Target==CSharp.GenerateTarget.Cli){this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");}else{this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");}this.Write(" </ItemGroup>\r\n</Project>\r\n");returnthis.GenerationEnvironment.ToString();}
The generated .cs files are created from their corresponding .tt T4 template files. The change would occur there. I left a comment on the .cs as it shows the output.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT it's auto-gen, I didn't modify those cs file a bit :)
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -90,6 +96,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

9 changes: 9 additions & 0 deletions
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,14 @@
 <ItemGroup>
 <ProjectReference Include="..\\<#= Namespace #>.Model\\<#= Namespace #>.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
 </ItemGroup>
</Project>
<#+
public string Namespace {get;set;}
Expand All@@ -54,4 +62,5 @@ public bool IncludeResNet18Package {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
@JakeRadMSFTJakeRadMSFTApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I would think of CLI vs ModelBuilder as the Source instead of Target. It's the thing causing the projects to get generated.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do
#>

4 changes: 4 additions & 0 deletions
...ests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\Test.Model\Test.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...CodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\CodeGenTest.Model\CodeGenTest.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...nsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,5 +17,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ests/ConsoleCodeGeneratorTests.ModelProjectFileContentTestOnlyStableProjects.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,5 +15,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...rTests.Recommendation_GenerateConsoleAppProjectContents_VerifyPredictProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyModelProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
add projects capability in CodeGenerator#5002

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

harishsk
merged 1 commit into

from

Apr 7, 2020
 Merged


add projects capability in CodeGenerator
#5002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
...ML.CodeGenerator/CodeGenerator/CSharp/AzureCodeGenerator/AzureAttachModelCodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ public AzureAttachModelCodeGenerator(Pipeline pipeline, ColumnInferenceResults c
 IncludeRecommenderPackage = false,
 StablePackageVersion = _settings.StablePackageVersion,
 UnstablePackageVersion = _settings.UnstablePackageVersion,
 Target = _settings.Target,
 }.TransformText(),
 Name = $"{ _settings.OutputName }.Model.csproj",
 };
Expand Down

48 changes: 9 additions & 39 deletions
src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.ML.AutoML;
using Microsoft.ML.CodeGenerator.CodeGenerator;
using Microsoft.ML.CodeGenerator.Templates.Azure.Model;
Expand DownExpand Up@@ -144,7 +145,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName,
 includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage,
 includeImageTransformerPackage, includeImageClassificationPackage, includeRecommenderPackage, includeOnnxPackage, includeResNet18Package,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name, includeOnnxPackage);
Expand DownExpand Up@@ -175,40 +176,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage,
 includeMklComponentsPackage, includeFastTreePackage, includeImageTransformerPackage,
 includeImageClassificationPackage, includeRecommenderPackage, includeOnnxModel,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }

 internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent,
 string ModelProjectFileContent) GenerateAzureAttachImageModelProjectContents(string namespaceValue)
 {
 var classLabels = GenerateClassLabels();

 // generate ModelInput.cs
 var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
 modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);

 // generate ModelOutput.cs
 var modelOutputCSFileContent = new OnnxModelOutputClass()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);

 // generate ConsumeModel.cs
 var consumeModelCSFileContent = new AzureAttachImageConsumeModel()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);

 // generate Model.csproj
 var modelProjectFileContent = GenerateModelProjectFileContent(false,
 false, false, true,
 false, false,true, _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }
Expand DownExpand Up@@ -366,7 +334,7 @@ internal IList<string> GenerateClassLabels(IDictionary<string, CodeGeneratorSett
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage,
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage, bool includeOnnxModel,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 ModelProject modelProject = new ModelProject()
 {
Expand All@@ -378,7 +346,8 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
 IncludeOnnxModel = includeOnnxModel,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };

 return modelProject.TransformText();
Expand DownExpand Up@@ -411,7 +380,7 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage,
 bool includeOnnxPackage, bool includeResNet18Package,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 var predictProjectFileContent = new PredictProject()
 {
Expand All@@ -425,7 +394,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 IncludeResNet18Package = includeResNet18Package,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };
 return predictProjectFileContent.TransformText();
 }
Expand Down

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,13 @@ public virtual string TransformText()
 this.Write(" <None Update=\"bestModel.onnx\">\r\n <CopyToOutputDirectory>PreserveNewest</" +
 "CopyToOutputDirectory>\r\n </None>\r\n");
}
 this.Write(" </ItemGroup>\r\n \r\n</Project>\r\n");
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -85,6 +91,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

10 changes: 9 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,14 @@
 </None>
<#}#>
 </ItemGroup>


 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's diverging between CLI and MB that we need MLNETCLIGenerated vs ModelBuilderGenerated?
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from our PM, we want to differentiate ModelBuilder-Generated from MLNet CLI Generated in telemetry data
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.
 </ItemGroup>
</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
Expand All@@ -56,4 +63,5 @@ public bool IncludeOnnxModel {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
#>

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,13 @@ public virtual string TransformText()
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model\\");
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n</Project>\r\n");
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should modify the upstream .tt so the .cs is formatted properly here.
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same w/ ModelProject.tt
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What you mean
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LittleLittleCloud aren't these files generated from TT files?
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR it looks like the CS files were modified directly instead of changing the TT files.
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind I see them now :)
@justinormontjustinormontApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added code is currently being formatted as:
machinelearning/src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

Lines 77 to 86
in
e84006b
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if(Target==CSharp.GenerateTarget.Cli){
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
returnthis.GenerationEnvironment.ToString();
}
It should be:
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");if(Target==CSharp.GenerateTarget.Cli){this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");}else{this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");}this.Write(" </ItemGroup>\r\n</Project>\r\n");returnthis.GenerationEnvironment.ToString();}
The generated .cs files are created from their corresponding .tt T4 template files. The change would occur there. I left a comment on the .cs as it shows the output.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT it's auto-gen, I didn't modify those cs file a bit :)
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -90,6 +96,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

9 changes: 9 additions & 0 deletions
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,14 @@
 <ItemGroup>
 <ProjectReference Include="..\\<#= Namespace #>.Model\\<#= Namespace #>.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
 </ItemGroup>
</Project>
<#+
public string Namespace {get;set;}
Expand All@@ -54,4 +62,5 @@ public bool IncludeResNet18Package {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
@JakeRadMSFTJakeRadMSFTApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I would think of CLI vs ModelBuilder as the Source instead of Target. It's the thing causing the projects to get generated.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do
#>

4 changes: 4 additions & 0 deletions
...ests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\Test.Model\Test.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...CodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\CodeGenTest.Model\CodeGenTest.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...nsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,5 +17,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ests/ConsoleCodeGeneratorTests.ModelProjectFileContentTestOnlyStableProjects.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,5 +15,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...rTests.Recommendation_GenerateConsoleAppProjectContents_VerifyPredictProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyModelProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add projects capability in CodeGenerator#5002

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

harishsk
merged 1 commit into

from

Apr 7, 2020
 Merged


add projects capability in CodeGenerator
#5002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
...ML.CodeGenerator/CodeGenerator/CSharp/AzureCodeGenerator/AzureAttachModelCodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ public AzureAttachModelCodeGenerator(Pipeline pipeline, ColumnInferenceResults c
 IncludeRecommenderPackage = false,
 StablePackageVersion = _settings.StablePackageVersion,
 UnstablePackageVersion = _settings.UnstablePackageVersion,
 Target = _settings.Target,
 }.TransformText(),
 Name = $"{ _settings.OutputName }.Model.csproj",
 };
Expand Down

48 changes: 9 additions & 39 deletions
src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.ML.AutoML;
using Microsoft.ML.CodeGenerator.CodeGenerator;
using Microsoft.ML.CodeGenerator.Templates.Azure.Model;
Expand DownExpand Up@@ -144,7 +145,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName,
 includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage,
 includeImageTransformerPackage, includeImageClassificationPackage, includeRecommenderPackage, includeOnnxPackage, includeResNet18Package,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name, includeOnnxPackage);
Expand DownExpand Up@@ -175,40 +176,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage,
 includeMklComponentsPackage, includeFastTreePackage, includeImageTransformerPackage,
 includeImageClassificationPackage, includeRecommenderPackage, includeOnnxModel,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }

 internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent,
 string ModelProjectFileContent) GenerateAzureAttachImageModelProjectContents(string namespaceValue)
 {
 var classLabels = GenerateClassLabels();

 // generate ModelInput.cs
 var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
 modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);

 // generate ModelOutput.cs
 var modelOutputCSFileContent = new OnnxModelOutputClass()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);

 // generate ConsumeModel.cs
 var consumeModelCSFileContent = new AzureAttachImageConsumeModel()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);

 // generate Model.csproj
 var modelProjectFileContent = GenerateModelProjectFileContent(false,
 false, false, true,
 false, false,true, _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }
Expand DownExpand Up@@ -366,7 +334,7 @@ internal IList<string> GenerateClassLabels(IDictionary<string, CodeGeneratorSett
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage,
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage, bool includeOnnxModel,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 ModelProject modelProject = new ModelProject()
 {
Expand All@@ -378,7 +346,8 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
 IncludeOnnxModel = includeOnnxModel,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };

 return modelProject.TransformText();
Expand DownExpand Up@@ -411,7 +380,7 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage,
 bool includeOnnxPackage, bool includeResNet18Package,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 var predictProjectFileContent = new PredictProject()
 {
Expand All@@ -425,7 +394,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 IncludeResNet18Package = includeResNet18Package,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };
 return predictProjectFileContent.TransformText();
 }
Expand Down

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,13 @@ public virtual string TransformText()
 this.Write(" <None Update=\"bestModel.onnx\">\r\n <CopyToOutputDirectory>PreserveNewest</" +
 "CopyToOutputDirectory>\r\n </None>\r\n");
}
 this.Write(" </ItemGroup>\r\n \r\n</Project>\r\n");
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -85,6 +91,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

10 changes: 9 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,14 @@
 </None>
<#}#>
 </ItemGroup>


 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's diverging between CLI and MB that we need MLNETCLIGenerated vs ModelBuilderGenerated?
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from our PM, we want to differentiate ModelBuilder-Generated from MLNet CLI Generated in telemetry data
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.
 </ItemGroup>
</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
Expand All@@ -56,4 +63,5 @@ public bool IncludeOnnxModel {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
#>

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,13 @@ public virtual string TransformText()
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model\\");
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n</Project>\r\n");
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should modify the upstream .tt so the .cs is formatted properly here.
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same w/ ModelProject.tt
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What you mean
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LittleLittleCloud aren't these files generated from TT files?
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR it looks like the CS files were modified directly instead of changing the TT files.
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind I see them now :)
@justinormontjustinormontApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added code is currently being formatted as:
machinelearning/src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

Lines 77 to 86
in
e84006b
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if(Target==CSharp.GenerateTarget.Cli){
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
returnthis.GenerationEnvironment.ToString();
}
It should be:
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");if(Target==CSharp.GenerateTarget.Cli){this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");}else{this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");}this.Write(" </ItemGroup>\r\n</Project>\r\n");returnthis.GenerationEnvironment.ToString();}
The generated .cs files are created from their corresponding .tt T4 template files. The change would occur there. I left a comment on the .cs as it shows the output.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT it's auto-gen, I didn't modify those cs file a bit :)
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -90,6 +96,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

9 changes: 9 additions & 0 deletions
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,14 @@
 <ItemGroup>
 <ProjectReference Include="..\\<#= Namespace #>.Model\\<#= Namespace #>.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
 </ItemGroup>
</Project>
<#+
public string Namespace {get;set;}
Expand All@@ -54,4 +62,5 @@ public bool IncludeResNet18Package {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
@JakeRadMSFTJakeRadMSFTApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I would think of CLI vs ModelBuilder as the Source instead of Target. It's the thing causing the projects to get generated.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do
#>

4 changes: 4 additions & 0 deletions
...ests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\Test.Model\Test.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...CodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\CodeGenTest.Model\CodeGenTest.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...nsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,5 +17,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ests/ConsoleCodeGeneratorTests.ModelProjectFileContentTestOnlyStableProjects.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,5 +15,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...rTests.Recommendation_GenerateConsoleAppProjectContents_VerifyPredictProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyModelProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add projects capability in CodeGenerator#5002

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

harishsk
merged 1 commit into

from

Apr 7, 2020
 Merged


add projects capability in CodeGenerator
#5002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
...ML.CodeGenerator/CodeGenerator/CSharp/AzureCodeGenerator/AzureAttachModelCodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ public AzureAttachModelCodeGenerator(Pipeline pipeline, ColumnInferenceResults c
 IncludeRecommenderPackage = false,
 StablePackageVersion = _settings.StablePackageVersion,
 UnstablePackageVersion = _settings.UnstablePackageVersion,
 Target = _settings.Target,
 }.TransformText(),
 Name = $"{ _settings.OutputName }.Model.csproj",
 };
Expand Down

48 changes: 9 additions & 39 deletions
src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.ML.AutoML;
using Microsoft.ML.CodeGenerator.CodeGenerator;
using Microsoft.ML.CodeGenerator.Templates.Azure.Model;
Expand DownExpand Up@@ -144,7 +145,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName,
 includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage,
 includeImageTransformerPackage, includeImageClassificationPackage, includeRecommenderPackage, includeOnnxPackage, includeResNet18Package,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name, includeOnnxPackage);
Expand DownExpand Up@@ -175,40 +176,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage,
 includeMklComponentsPackage, includeFastTreePackage, includeImageTransformerPackage,
 includeImageClassificationPackage, includeRecommenderPackage, includeOnnxModel,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }

 internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent,
 string ModelProjectFileContent) GenerateAzureAttachImageModelProjectContents(string namespaceValue)
 {
 var classLabels = GenerateClassLabels();

 // generate ModelInput.cs
 var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
 modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);

 // generate ModelOutput.cs
 var modelOutputCSFileContent = new OnnxModelOutputClass()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);

 // generate ConsumeModel.cs
 var consumeModelCSFileContent = new AzureAttachImageConsumeModel()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);

 // generate Model.csproj
 var modelProjectFileContent = GenerateModelProjectFileContent(false,
 false, false, true,
 false, false,true, _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }
Expand DownExpand Up@@ -366,7 +334,7 @@ internal IList<string> GenerateClassLabels(IDictionary<string, CodeGeneratorSett
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage,
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage, bool includeOnnxModel,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 ModelProject modelProject = new ModelProject()
 {
Expand All@@ -378,7 +346,8 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
 IncludeOnnxModel = includeOnnxModel,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };

 return modelProject.TransformText();
Expand DownExpand Up@@ -411,7 +380,7 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage,
 bool includeOnnxPackage, bool includeResNet18Package,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 var predictProjectFileContent = new PredictProject()
 {
Expand All@@ -425,7 +394,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 IncludeResNet18Package = includeResNet18Package,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };
 return predictProjectFileContent.TransformText();
 }
Expand Down

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,13 @@ public virtual string TransformText()
 this.Write(" <None Update=\"bestModel.onnx\">\r\n <CopyToOutputDirectory>PreserveNewest</" +
 "CopyToOutputDirectory>\r\n </None>\r\n");
}
 this.Write(" </ItemGroup>\r\n \r\n</Project>\r\n");
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -85,6 +91,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

10 changes: 9 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,14 @@
 </None>
<#}#>
 </ItemGroup>


 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's diverging between CLI and MB that we need MLNETCLIGenerated vs ModelBuilderGenerated?
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from our PM, we want to differentiate ModelBuilder-Generated from MLNet CLI Generated in telemetry data
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.
 </ItemGroup>
</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
Expand All@@ -56,4 +63,5 @@ public bool IncludeOnnxModel {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
#>

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,13 @@ public virtual string TransformText()
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model\\");
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n</Project>\r\n");
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should modify the upstream .tt so the .cs is formatted properly here.
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same w/ ModelProject.tt
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What you mean
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LittleLittleCloud aren't these files generated from TT files?
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR it looks like the CS files were modified directly instead of changing the TT files.
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind I see them now :)
@justinormontjustinormontApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added code is currently being formatted as:
machinelearning/src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

Lines 77 to 86
in
e84006b
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if(Target==CSharp.GenerateTarget.Cli){
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
returnthis.GenerationEnvironment.ToString();
}
It should be:
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");if(Target==CSharp.GenerateTarget.Cli){this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");}else{this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");}this.Write(" </ItemGroup>\r\n</Project>\r\n");returnthis.GenerationEnvironment.ToString();}
The generated .cs files are created from their corresponding .tt T4 template files. The change would occur there. I left a comment on the .cs as it shows the output.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT it's auto-gen, I didn't modify those cs file a bit :)
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -90,6 +96,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

9 changes: 9 additions & 0 deletions
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,14 @@
 <ItemGroup>
 <ProjectReference Include="..\\<#= Namespace #>.Model\\<#= Namespace #>.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
 </ItemGroup>
</Project>
<#+
public string Namespace {get;set;}
Expand All@@ -54,4 +62,5 @@ public bool IncludeResNet18Package {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
@JakeRadMSFTJakeRadMSFTApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I would think of CLI vs ModelBuilder as the Source instead of Target. It's the thing causing the projects to get generated.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do
#>

4 changes: 4 additions & 0 deletions
...ests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\Test.Model\Test.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...CodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\CodeGenTest.Model\CodeGenTest.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...nsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,5 +17,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ests/ConsoleCodeGeneratorTests.ModelProjectFileContentTestOnlyStableProjects.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,5 +15,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...rTests.Recommendation_GenerateConsoleAppProjectContents_VerifyPredictProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyModelProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
add projects capability in CodeGenerator#5002

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

harishsk
merged 1 commit into

from

Apr 7, 2020
 Merged


add projects capability in CodeGenerator
#5002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
...ML.CodeGenerator/CodeGenerator/CSharp/AzureCodeGenerator/AzureAttachModelCodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ public AzureAttachModelCodeGenerator(Pipeline pipeline, ColumnInferenceResults c
 IncludeRecommenderPackage = false,
 StablePackageVersion = _settings.StablePackageVersion,
 UnstablePackageVersion = _settings.UnstablePackageVersion,
 Target = _settings.Target,
 }.TransformText(),
 Name = $"{ _settings.OutputName }.Model.csproj",
 };
Expand Down

48 changes: 9 additions & 39 deletions
src/Microsoft.ML.CodeGenerator/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.ML.AutoML;
using Microsoft.ML.CodeGenerator.CodeGenerator;
using Microsoft.ML.CodeGenerator.Templates.Azure.Model;
Expand DownExpand Up@@ -144,7 +145,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName,
 includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage,
 includeImageTransformerPackage, includeImageClassificationPackage, includeRecommenderPackage, includeOnnxPackage, includeResNet18Package,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name, includeOnnxPackage);
Expand DownExpand Up@@ -175,40 +176,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage,
 includeMklComponentsPackage, includeFastTreePackage, includeImageTransformerPackage,
 includeImageClassificationPackage, includeRecommenderPackage, includeOnnxModel,
 _settings.StablePackageVersion, _settings.UnstablePackageVersion);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }

 internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent,
 string ModelProjectFileContent) GenerateAzureAttachImageModelProjectContents(string namespaceValue)
 {
 var classLabels = GenerateClassLabels();

 // generate ModelInput.cs
 var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
 modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);

 // generate ModelOutput.cs
 var modelOutputCSFileContent = new OnnxModelOutputClass()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);

 // generate ConsumeModel.cs
 var consumeModelCSFileContent = new AzureAttachImageConsumeModel()
 {
 Namespace = namespaceValue,
 Target = _settings.Target,
 }.TransformText();
 consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);

 // generate Model.csproj
 var modelProjectFileContent = GenerateModelProjectFileContent(false,
 false, false, true,
 false, false,true, _settings.StablePackageVersion, _settings.UnstablePackageVersion);
 _settings.StablePackageVersion, _settings.UnstablePackageVersion, _settings.Target);

 return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
 }
Expand DownExpand Up@@ -366,7 +334,7 @@ internal IList<string> GenerateClassLabels(IDictionary<string, CodeGeneratorSett
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage,
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage, bool includeOnnxModel,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 ModelProject modelProject = new ModelProject()
 {
Expand All@@ -378,7 +346,8 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
 IncludeOnnxModel = includeOnnxModel,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };

 return modelProject.TransformText();
Expand DownExpand Up@@ -411,7 +380,7 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 bool includeMklComponentsPackage, bool includeFastTreePackage, bool includeImageTransformerPackage,
 bool includeImageClassificationPackage, bool includeRecommenderPackage,
 bool includeOnnxPackage, bool includeResNet18Package,
 string stablePackageVersion, string unstablePackageVersion)
 string stablePackageVersion, string unstablePackageVersion, GenerateTarget target)
 {
 var predictProjectFileContent = new PredictProject()
 {
Expand All@@ -425,7 +394,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 IncludeResNet18Package = includeResNet18Package,
 IncludeRecommenderPackage = includeRecommenderPackage,
 StablePackageVersion = stablePackageVersion,
 UnstablePackageVersion = unstablePackageVersion
 UnstablePackageVersion = unstablePackageVersion,
 Target = target,
 };
 return predictProjectFileContent.TransformText();
 }
Expand Down

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,13 @@ public virtual string TransformText()
 this.Write(" <None Update=\"bestModel.onnx\">\r\n <CopyToOutputDirectory>PreserveNewest</" +
 "CopyToOutputDirectory>\r\n </None>\r\n");
}
 this.Write(" </ItemGroup>\r\n \r\n</Project>\r\n");
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -85,6 +91,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

10 changes: 9 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,14 @@
 </None>
<#}#>
 </ItemGroup>


 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's diverging between CLI and MB that we need MLNETCLIGenerated vs ModelBuilderGenerated?
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from our PM, we want to differentiate ModelBuilder-Generated from MLNet CLI Generated in telemetry data
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.
 </ItemGroup>
</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
Expand All@@ -56,4 +63,5 @@ public bool IncludeOnnxModel {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
#>

9 changes: 8 additions & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,13 @@ public virtual string TransformText()
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model\\");
 this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n</Project>\r\n");
 this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
 if (Target==CSharp.GenerateTarget.Cli) {
 this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
 this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should modify the upstream .tt so the .cs is formatted properly here.
@justinormontjustinormontApr 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same w/ ModelProject.tt
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What you mean
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LittleLittleCloud aren't these files generated from TT files?
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR it looks like the CS files were modified directly instead of changing the TT files.
@JakeRadMSFTJakeRadMSFTApr 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind I see them now :)
@justinormontjustinormontApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added code is currently being formatted as:
machinelearning/src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

Lines 77 to 86
in
e84006b
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");
if(Target==CSharp.GenerateTarget.Cli){
this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");
}else{
this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");
}
this.Write(" </ItemGroup>\r\n</Project>\r\n");
returnthis.GenerationEnvironment.ToString();
}
It should be:
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));this.Write(".Model.csproj\" />\r\n </ItemGroup>\r\n\r\n <ItemGroup>\r\n");if(Target==CSharp.GenerateTarget.Cli){this.Write(" <ProjectCapability Include=\"MLNETCLIGenerated\" />\r\n");}else{this.Write(" <ProjectCapability Include=\"ModelBuilderGenerated\" />\r\n");}this.Write(" </ItemGroup>\r\n</Project>\r\n");returnthis.GenerationEnvironment.ToString();}
The generated .cs files are created from their corresponding .tt T4 template files. The change would occur there. I left a comment on the .cs as it shows the output.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JakeRadMSFT it's auto-gen, I didn't modify those cs file a bit :)
 this.Write(" </ItemGroup>\r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

Expand All@@ -90,6 +96,7 @@ public virtual string TransformText()
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}

 }
 #region Base class
Expand Down

9 changes: 9 additions & 0 deletions
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,14 @@
 <ItemGroup>
 <ProjectReference Include="..\\<#= Namespace #>.Model\\<#= Namespace #>.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
<# if (Target==CSharp.GenerateTarget.Cli) {#>
 <ProjectCapability Include="MLNETCLIGenerated" />
<#}else{#>
 <ProjectCapability Include="ModelBuilderGenerated" />
<#}#>
 </ItemGroup>
</Project>
<#+
public string Namespace {get;set;}
Expand All@@ -54,4 +62,5 @@ public bool IncludeResNet18Package {get; set;}
public bool IncludeRecommenderPackage {get;set;}
public string StablePackageVersion {get;set;}
public string UnstablePackageVersion {get;set;}
internal CSharp.GenerateTarget Target {get;set;}
@JakeRadMSFTJakeRadMSFTApr 6, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I would think of CLI vs ModelBuilder as the Source instead of Target. It's the thing causing the projects to get generated.
@LittleLittleCloudLittleLittleCloudApr 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do
#>

4 changes: 4 additions & 0 deletions
...ests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\Test.Model\Test.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.test.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...CodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.ConsoleApp.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\CodeGenTest.Model\CodeGenTest.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...nsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.CodeGenTest.Model.csproj.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,5 +17,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="ModelBuilderGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...ests/ConsoleCodeGeneratorTests.ModelProjectFileContentTestOnlyStableProjects.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,5 +15,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

4 changes: 4 additions & 0 deletions
...rTests.Recommendation_GenerateConsoleAppProjectContents_VerifyPredictProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,8 @@
 <ItemGroup>
 <ProjectReference Include="..\MyNamespace.Model\MyNamespace.Model.csproj" />
 </ItemGroup>

 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>

5 changes: 4 additions & 1 deletion
...eneratorTests.Recommendation_GenerateModelProjectContents_VerifyModelProject.approved.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,8 @@
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>


 <ItemGroup>
 <ProjectCapability Include="MLNETCLIGenerated" />
 </ItemGroup>
</Project>