18 changes: 18 additions & 0 deletions src/Microsoft.ML.AutoML/ColumnInference/ColumnInformationUtil.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,24 @@ public static IEnumerable<string> GetColumnNames(ColumnInformation columnInforma
return columnNames;
}

public static IDictionary<ColumnPurpose, int> CountColumnsByPurpose(ColumnInformation columnInformation)
{
var result = new Dictionary<ColumnPurpose, int>();
var columnNames = GetColumnNames(columnInformation);
foreach (var columnName in columnNames)

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.

looks to me this can be a more terse implementation using linq grouping. are we anti-linq in this repo? :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I love LINQ! Here, I think the existing way is more readable, but I see where you're coming from. Style is so idiosyncratic

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.

This is my version, you think this isn't that readable? Fair warning, I haven't tested if it works :)

 var columnNames = ColumnInformationUtil.GetColumnNames(this.ColumnInformation);
var columnPurposes = columnNames.Select(c => (Name: c, Purpose: ColumnInformation.GetColumnPurpose(c))).Where(c => c.Purpose != null);
var purposeCounts = columnPurposes.GroupBy(c => c.Purpose).ToDictionary(c => c.Key, c => c.Count());

{
var purpose = columnInformation.GetColumnPurpose(columnName);
if (purpose == null)
{
continue;
}

result.TryGetValue(purpose.Value, out int count);
result[purpose.Value] = ++count;
}
return result;
}

private static void AddStringsToListIfNotNull(List<string> list, IEnumerable<string> strings)
{
foreach (var str in strings)
Expand Down
29 changes: 29 additions & 0 deletions src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
};
}

/// <summary>
/// The names of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> AllHyperparameterNames = GetAllSweepableParameterNames();
Comment thread
Dmitry-A marked this conversation as resolved.

public static IEnumerable<SweepableParam> BuildAveragePerceptronParams()
{
return BuildAveragedLinearArgsParams().Concat(BuildOnlineLinearArgsParams());
Expand DownExpand Up@@ -172,5 +177,29 @@ public static IEnumerable<SweepableParam> BuildSymSgdLogisticRegressionParams()
new SweepableDiscreteParam("UpdateFrequency", new object[] { "<Auto>", 5, 20 })
};
}

/// <summary>
/// Gets the name of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> GetAllSweepableParameterNames()
{
var sweepableParams = new List<SweepableParam>();
Comment thread
Dmitry-A marked this conversation as resolved.
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildFastForestParams());
sweepableParams.AddRange(BuildFastTreeParams());
sweepableParams.AddRange(BuildFastTreeTweedieParams());
sweepableParams.AddRange(BuildLightGbmParamsMulticlass());
sweepableParams.AddRange(BuildLightGbmParams());
sweepableParams.AddRange(BuildLinearSvmParams());
sweepableParams.AddRange(BuildLbfgsLogisticRegressionParams());
sweepableParams.AddRange(BuildOnlineGradientDescentParams());
sweepableParams.AddRange(BuildLbfgsPoissonRegressionParams());
sweepableParams.AddRange(BuildSdcaParams());
sweepableParams.AddRange(BuildOlsParams());
sweepableParams.AddRange(BuildSgdParams());
sweepableParams.AddRange(BuildSymSgdLogisticRegressionParams());
return new HashSet<string>(sweepableParams.Select(p => p.Name));
}
}
}
9 changes: 9 additions & 0 deletions src/mlnet/CodeGenerator/CodeGenerationHelper.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
using Microsoft.ML.CLI.CodeGenerator.CSharp;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.ShellProgressBar;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using Microsoft.ML.Data;
using NLog;
Expand DownExpand Up@@ -51,7 +52,9 @@ public void GenerateCode()
{
inputColumnInformation.IgnoredColumnNames.Add(value);
}
var inferColumnsStopwatch = Stopwatch.StartNew();
columnInference = _automlEngine.InferColumns(context, inputColumnInformation);
InferColumnsEvent.TrackEvent(columnInference.ColumnInformation, inferColumnsStopwatch.Elapsed);
Comment thread
Dmitry-A marked this conversation as resolved.
}
catch (Exception)
{
Expand All@@ -74,6 +77,9 @@ public void GenerateCode()
// The reason why we are doing this way of defining 3 different results is because of the AutoML API
// i.e there is no common class/interface to handle all three tasks together.

// Start a timer for the experiment
var stopwatch = Stopwatch.StartNew();

List<RunDetail<BinaryClassificationMetrics>> completedBinaryRuns = new List<RunDetail<BinaryClassificationMetrics>>();
List<RunDetail<MulticlassClassificationMetrics>> completedMulticlassRuns = new List<RunDetail<MulticlassClassificationMetrics>>();
List<RunDetail<RegressionMetrics>> completedRegressionRuns = new List<RunDetail<RegressionMetrics>>();
Expand DownExpand Up@@ -236,6 +242,7 @@ public void GenerateCode()
{
var binaryMetric = new BinaryExperimentSettings().OptimizingMetric;
var bestBinaryIteration = BestResultUtil.GetBestRun(completedBinaryRuns, binaryMetric);
ExperimentCompletedEvent.TrackEvent(bestBinaryIteration, completedBinaryRuns, TaskKind.BinaryClassification, stopwatch.Elapsed);
bestPipeline = bestBinaryIteration.Pipeline;
bestModel = bestBinaryIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedBinaryRuns.Count());
Expand All@@ -253,6 +260,7 @@ public void GenerateCode()
{
var regressionMetric = new RegressionExperimentSettings().OptimizingMetric;
var bestRegressionIteration = BestResultUtil.GetBestRun(completedRegressionRuns, regressionMetric);
ExperimentCompletedEvent.TrackEvent(bestRegressionIteration, completedRegressionRuns, TaskKind.Regression, stopwatch.Elapsed);
bestPipeline = bestRegressionIteration.Pipeline;
bestModel = bestRegressionIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedRegressionRuns.Count());
Expand All@@ -270,6 +278,7 @@ public void GenerateCode()
{
var muliclassMetric = new MulticlassExperimentSettings().OptimizingMetric;
var bestMulticlassIteration = BestResultUtil.GetBestRun(completedMulticlassRuns, muliclassMetric);
ExperimentCompletedEvent.TrackEvent(bestMulticlassIteration, completedMulticlassRuns, TaskKind.MulticlassClassification, stopwatch.Elapsed);
bestPipeline = bestMulticlassIteration.Pipeline;
bestModel = bestMulticlassIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedMulticlassRuns.Count());
Expand Down
4 changes: 3 additions & 1 deletion src/mlnet/Commands/CommandDefinitions.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,11 @@ namespace Microsoft.ML.CLI.Commands
{
internal static class CommandDefinitions
{
public const string AutoTrainCommandName = "auto-train";

internal static System.CommandLine.Command AutoTrain(ICommandHandler handler)
{
var newCommand = new System.CommandLine.Command("auto-train", "Create a new .NET project using ML.NET to train and run a model", handler: handler)
var newCommand = new System.CommandLine.Command(AutoTrainCommandName, "Create a new .NET project using ML.NET to train and run a model", handler: handler)
{
MlTask(),
Dataset(),
Expand Down
7 changes: 1 addition & 6 deletions src/mlnet/Commands/New/NewCommandHandler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.CodeGenerator;
using Microsoft.ML.CLI.Data;

Expand All@@ -11,18 +10,14 @@ namespace Microsoft.ML.CLI.Commands.New
internal class NewCommand : ICommand
{
private readonly NewCommandSettings _settings;
private readonly MlTelemetry _telemetry;

internal NewCommand(NewCommandSettings settings, MlTelemetry telemetry)
internal NewCommand(NewCommandSettings settings)
{
_settings = settings;
_telemetry = telemetry;
}

public void Execute()
{
_telemetry.LogAutoTrainMlCommand(_settings.Dataset.Name, _settings.MlTask.ToString(), _settings.Dataset.Length);

CodeGenerationHelper codeGenerationHelper = new CodeGenerationHelper(new AutoMLEngine(_settings), _settings); // Needs to be improved.
codeGenerationHelper.GenerateCode();
}
Expand Down
33 changes: 26 additions & 7 deletions src/mlnet/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,13 @@
using System;
using System.CommandLine.Builder;
using System.CommandLine.Invocation;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.Commands;
using Microsoft.ML.CLI.Commands.New;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using NLog;
using NLog.Targets;
Expand All@@ -20,24 +21,33 @@ namespace Microsoft.ML.CLI
public class Program
{
private static Logger _logger = LogManager.GetCurrentClassLogger();

public static void Main(string[] args)
{
var telemetry = new MlTelemetry();
Telemetry.Telemetry.Initialize();
int exitCode = 1;
Exception ex = null;
var stopwatch = Stopwatch.StartNew();

var mlNetCommandEvent = new MLNetCommandEvent();

// Create handler outside so that commandline and the handler is decoupled and testable.
var handler = CommandHandler.Create<NewCommandSettings>(
(options) =>
{
try
{
// Send telemetry event for command issued
mlNetCommandEvent.AutoTrainCommandSettings = options;
Comment thread
Dmitry-A marked this conversation as resolved.
mlNetCommandEvent.TrackEvent();

// Map the verbosity to internal levels
var verbosity = Utils.GetVerbosity(options.Verbosity);

// Build the output path
string outputBaseDir = string.Empty;
if (options.Name == null)
{

options.Name = "Sample" + Utils.GetTaskKind(options.MlTask).ToString();
outputBaseDir = Path.Combine(options.OutputPath.FullName, options.Name);
}
Expand All@@ -50,7 +60,7 @@ public static void Main(string[] args)
options.OutputPath = new DirectoryInfo(outputBaseDir);

// Instantiate the command
var command = new NewCommand(options, telemetry);
var command = new NewCommand(options);

// Override the Logger Configuration
var logconsole = LogManager.Configuration.FindTargetByName("logconsole");
Expand All@@ -67,6 +77,7 @@ public static void Main(string[] args)
}
catch (Exception e)
{
ex = e;
_logger.Log(LogLevel.Error, e.Message);
_logger.Log(LogLevel.Debug, e.ToString());
_logger.Log(LogLevel.Info, Strings.LookIntoLogFile);
Expand All@@ -82,7 +93,8 @@ public static void Main(string[] args)

var parseResult = parser.Parse(args);

if (parseResult.Errors.Count == 0)
var commandParseSucceeded = !parseResult.Errors.Any();
if (commandParseSucceeded)
{
if (parseResult.RootCommandResult.Children.Count > 0)
{
Expand All@@ -95,13 +107,20 @@ public static void Main(string[] args)

var explicitlySpecifiedOptions = options.Where(opt => !opt.IsImplicit).Select(opt => opt.Name);

telemetry.SetCommandAndParameters(command.Name, explicitlySpecifiedOptions);
mlNetCommandEvent.CommandLineParametersUsed = explicitlySpecifiedOptions;
}
}
}

// Send system info telemetry
SystemInfoEvent.TrackEvent();

parser.InvokeAsync(parseResult).Wait();
// Send exit telemetry
ApplicationExitEvent.TrackEvent(exitCode, commandParseSucceeded, stopwatch.Elapsed, ex);
// Flush pending telemetry logs
Telemetry.Telemetry.Flush(TimeSpan.FromSeconds(3));
Environment.Exit(exitCode);
}
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.DotNet.Configurer;
using Microsoft.ML.CLI.Telemetry;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
using RuntimeInformation = System.Runtime.InteropServices.RuntimeInformation;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

using System;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
28 changes: 28 additions & 0 deletions src/mlnet/Telemetry/Events/ApplicationExitEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for CLI application exit.
/// </summary>
internal class ApplicationExitEvent
{
public static void TrackEvent(int exitCode, bool commandParseSucceeded, TimeSpan duration, Exception ex)
{
Telemetry.TrackEvent("application-exit",
new Dictionary<string, string>
{
{ "CommandParseSucceeded", commandParseSucceeded.ToString() },
{ "ExitCode", exitCode.ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration, ex);
}
}
}
36 changes: 36 additions & 0 deletions src/mlnet/Telemetry/Events/ExperimentCompletedEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.ML.AutoML;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for AutoML experiment completion.
/// </summary>
internal static class ExperimentCompletedEvent
{
public static void TrackEvent<TMetrics>(RunDetail<TMetrics> bestRun,
List<RunDetail<TMetrics>> allRuns,
TaskKind machineLearningTask,
TimeSpan duration)
{
Telemetry.TrackEvent("experiment-completed",
new Dictionary<string, string>()
{
{ "BestIterationNum", (allRuns.IndexOf(bestRun) + 1).ToString() },
{ "BestPipeline", Telemetry.GetSanitizedPipelineStr(bestRun.Pipeline) },
{ "BestTrainer", bestRun.TrainerName },
{ "MachineLearningTask", machineLearningTask.ToString() },
{ "NumIterations", allRuns.Count().ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration);
}
}
}
Loading
, '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
18 changes: 18 additions & 0 deletions src/Microsoft.ML.AutoML/ColumnInference/ColumnInformationUtil.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,24 @@ public static IEnumerable<string> GetColumnNames(ColumnInformation columnInforma
return columnNames;
}

public static IDictionary<ColumnPurpose, int> CountColumnsByPurpose(ColumnInformation columnInformation)
{
var result = new Dictionary<ColumnPurpose, int>();
var columnNames = GetColumnNames(columnInformation);
foreach (var columnName in columnNames)

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.

looks to me this can be a more terse implementation using linq grouping. are we anti-linq in this repo? :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I love LINQ! Here, I think the existing way is more readable, but I see where you're coming from. Style is so idiosyncratic

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.

This is my version, you think this isn't that readable? Fair warning, I haven't tested if it works :)

 var columnNames = ColumnInformationUtil.GetColumnNames(this.ColumnInformation);
var columnPurposes = columnNames.Select(c => (Name: c, Purpose: ColumnInformation.GetColumnPurpose(c))).Where(c => c.Purpose != null);
var purposeCounts = columnPurposes.GroupBy(c => c.Purpose).ToDictionary(c => c.Key, c => c.Count());

{
var purpose = columnInformation.GetColumnPurpose(columnName);
if (purpose == null)
{
continue;
}

result.TryGetValue(purpose.Value, out int count);
result[purpose.Value] = ++count;
}
return result;
}

private static void AddStringsToListIfNotNull(List<string> list, IEnumerable<string> strings)
{
foreach (var str in strings)
Expand Down
29 changes: 29 additions & 0 deletions src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
};
}

/// <summary>
/// The names of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> AllHyperparameterNames = GetAllSweepableParameterNames();
Comment thread
Dmitry-A marked this conversation as resolved.

public static IEnumerable<SweepableParam> BuildAveragePerceptronParams()
{
return BuildAveragedLinearArgsParams().Concat(BuildOnlineLinearArgsParams());
Expand DownExpand Up@@ -172,5 +177,29 @@ public static IEnumerable<SweepableParam> BuildSymSgdLogisticRegressionParams()
new SweepableDiscreteParam("UpdateFrequency", new object[] { "<Auto>", 5, 20 })
};
}

/// <summary>
/// Gets the name of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> GetAllSweepableParameterNames()
{
var sweepableParams = new List<SweepableParam>();
Comment thread
Dmitry-A marked this conversation as resolved.
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildFastForestParams());
sweepableParams.AddRange(BuildFastTreeParams());
sweepableParams.AddRange(BuildFastTreeTweedieParams());
sweepableParams.AddRange(BuildLightGbmParamsMulticlass());
sweepableParams.AddRange(BuildLightGbmParams());
sweepableParams.AddRange(BuildLinearSvmParams());
sweepableParams.AddRange(BuildLbfgsLogisticRegressionParams());
sweepableParams.AddRange(BuildOnlineGradientDescentParams());
sweepableParams.AddRange(BuildLbfgsPoissonRegressionParams());
sweepableParams.AddRange(BuildSdcaParams());
sweepableParams.AddRange(BuildOlsParams());
sweepableParams.AddRange(BuildSgdParams());
sweepableParams.AddRange(BuildSymSgdLogisticRegressionParams());
return new HashSet<string>(sweepableParams.Select(p => p.Name));
}
}
}
9 changes: 9 additions & 0 deletions src/mlnet/CodeGenerator/CodeGenerationHelper.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
using Microsoft.ML.CLI.CodeGenerator.CSharp;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.ShellProgressBar;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using Microsoft.ML.Data;
using NLog;
Expand DownExpand Up@@ -51,7 +52,9 @@ public void GenerateCode()
{
inputColumnInformation.IgnoredColumnNames.Add(value);
}
var inferColumnsStopwatch = Stopwatch.StartNew();
columnInference = _automlEngine.InferColumns(context, inputColumnInformation);
InferColumnsEvent.TrackEvent(columnInference.ColumnInformation, inferColumnsStopwatch.Elapsed);
Comment thread
Dmitry-A marked this conversation as resolved.
}
catch (Exception)
{
Expand All@@ -74,6 +77,9 @@ public void GenerateCode()
// The reason why we are doing this way of defining 3 different results is because of the AutoML API
// i.e there is no common class/interface to handle all three tasks together.

// Start a timer for the experiment
var stopwatch = Stopwatch.StartNew();

List<RunDetail<BinaryClassificationMetrics>> completedBinaryRuns = new List<RunDetail<BinaryClassificationMetrics>>();
List<RunDetail<MulticlassClassificationMetrics>> completedMulticlassRuns = new List<RunDetail<MulticlassClassificationMetrics>>();
List<RunDetail<RegressionMetrics>> completedRegressionRuns = new List<RunDetail<RegressionMetrics>>();
Expand DownExpand Up@@ -236,6 +242,7 @@ public void GenerateCode()
{
var binaryMetric = new BinaryExperimentSettings().OptimizingMetric;
var bestBinaryIteration = BestResultUtil.GetBestRun(completedBinaryRuns, binaryMetric);
ExperimentCompletedEvent.TrackEvent(bestBinaryIteration, completedBinaryRuns, TaskKind.BinaryClassification, stopwatch.Elapsed);
bestPipeline = bestBinaryIteration.Pipeline;
bestModel = bestBinaryIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedBinaryRuns.Count());
Expand All@@ -253,6 +260,7 @@ public void GenerateCode()
{
var regressionMetric = new RegressionExperimentSettings().OptimizingMetric;
var bestRegressionIteration = BestResultUtil.GetBestRun(completedRegressionRuns, regressionMetric);
ExperimentCompletedEvent.TrackEvent(bestRegressionIteration, completedRegressionRuns, TaskKind.Regression, stopwatch.Elapsed);
bestPipeline = bestRegressionIteration.Pipeline;
bestModel = bestRegressionIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedRegressionRuns.Count());
Expand All@@ -270,6 +278,7 @@ public void GenerateCode()
{
var muliclassMetric = new MulticlassExperimentSettings().OptimizingMetric;
var bestMulticlassIteration = BestResultUtil.GetBestRun(completedMulticlassRuns, muliclassMetric);
ExperimentCompletedEvent.TrackEvent(bestMulticlassIteration, completedMulticlassRuns, TaskKind.MulticlassClassification, stopwatch.Elapsed);
bestPipeline = bestMulticlassIteration.Pipeline;
bestModel = bestMulticlassIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedMulticlassRuns.Count());
Expand Down
4 changes: 3 additions & 1 deletion src/mlnet/Commands/CommandDefinitions.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,11 @@ namespace Microsoft.ML.CLI.Commands
{
internal static class CommandDefinitions
{
public const string AutoTrainCommandName = "auto-train";

internal static System.CommandLine.Command AutoTrain(ICommandHandler handler)
{
var newCommand = new System.CommandLine.Command("auto-train", "Create a new .NET project using ML.NET to train and run a model", handler: handler)
var newCommand = new System.CommandLine.Command(AutoTrainCommandName, "Create a new .NET project using ML.NET to train and run a model", handler: handler)
{
MlTask(),
Dataset(),
Expand Down
7 changes: 1 addition & 6 deletions src/mlnet/Commands/New/NewCommandHandler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.CodeGenerator;
using Microsoft.ML.CLI.Data;

Expand All@@ -11,18 +10,14 @@ namespace Microsoft.ML.CLI.Commands.New
internal class NewCommand : ICommand
{
private readonly NewCommandSettings _settings;
private readonly MlTelemetry _telemetry;

internal NewCommand(NewCommandSettings settings, MlTelemetry telemetry)
internal NewCommand(NewCommandSettings settings)
{
_settings = settings;
_telemetry = telemetry;
}

public void Execute()
{
_telemetry.LogAutoTrainMlCommand(_settings.Dataset.Name, _settings.MlTask.ToString(), _settings.Dataset.Length);

CodeGenerationHelper codeGenerationHelper = new CodeGenerationHelper(new AutoMLEngine(_settings), _settings); // Needs to be improved.
codeGenerationHelper.GenerateCode();
}
Expand Down
33 changes: 26 additions & 7 deletions src/mlnet/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,13 @@
using System;
using System.CommandLine.Builder;
using System.CommandLine.Invocation;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.Commands;
using Microsoft.ML.CLI.Commands.New;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using NLog;
using NLog.Targets;
Expand All@@ -20,24 +21,33 @@ namespace Microsoft.ML.CLI
public class Program
{
private static Logger _logger = LogManager.GetCurrentClassLogger();

public static void Main(string[] args)
{
var telemetry = new MlTelemetry();
Telemetry.Telemetry.Initialize();
int exitCode = 1;
Exception ex = null;
var stopwatch = Stopwatch.StartNew();

var mlNetCommandEvent = new MLNetCommandEvent();

// Create handler outside so that commandline and the handler is decoupled and testable.
var handler = CommandHandler.Create<NewCommandSettings>(
(options) =>
{
try
{
// Send telemetry event for command issued
mlNetCommandEvent.AutoTrainCommandSettings = options;
Comment thread
Dmitry-A marked this conversation as resolved.
mlNetCommandEvent.TrackEvent();

// Map the verbosity to internal levels
var verbosity = Utils.GetVerbosity(options.Verbosity);

// Build the output path
string outputBaseDir = string.Empty;
if (options.Name == null)
{

options.Name = "Sample" + Utils.GetTaskKind(options.MlTask).ToString();
outputBaseDir = Path.Combine(options.OutputPath.FullName, options.Name);
}
Expand All@@ -50,7 +60,7 @@ public static void Main(string[] args)
options.OutputPath = new DirectoryInfo(outputBaseDir);

// Instantiate the command
var command = new NewCommand(options, telemetry);
var command = new NewCommand(options);

// Override the Logger Configuration
var logconsole = LogManager.Configuration.FindTargetByName("logconsole");
Expand All@@ -67,6 +77,7 @@ public static void Main(string[] args)
}
catch (Exception e)
{
ex = e;
_logger.Log(LogLevel.Error, e.Message);
_logger.Log(LogLevel.Debug, e.ToString());
_logger.Log(LogLevel.Info, Strings.LookIntoLogFile);
Expand All@@ -82,7 +93,8 @@ public static void Main(string[] args)

var parseResult = parser.Parse(args);

if (parseResult.Errors.Count == 0)
var commandParseSucceeded = !parseResult.Errors.Any();
if (commandParseSucceeded)
{
if (parseResult.RootCommandResult.Children.Count > 0)
{
Expand All@@ -95,13 +107,20 @@ public static void Main(string[] args)

var explicitlySpecifiedOptions = options.Where(opt => !opt.IsImplicit).Select(opt => opt.Name);

telemetry.SetCommandAndParameters(command.Name, explicitlySpecifiedOptions);
mlNetCommandEvent.CommandLineParametersUsed = explicitlySpecifiedOptions;
}
}
}

// Send system info telemetry
SystemInfoEvent.TrackEvent();

parser.InvokeAsync(parseResult).Wait();
// Send exit telemetry
ApplicationExitEvent.TrackEvent(exitCode, commandParseSucceeded, stopwatch.Elapsed, ex);
// Flush pending telemetry logs
Telemetry.Telemetry.Flush(TimeSpan.FromSeconds(3));
Environment.Exit(exitCode);
}
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.DotNet.Configurer;
using Microsoft.ML.CLI.Telemetry;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
using RuntimeInformation = System.Runtime.InteropServices.RuntimeInformation;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

using System;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
28 changes: 28 additions & 0 deletions src/mlnet/Telemetry/Events/ApplicationExitEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for CLI application exit.
/// </summary>
internal class ApplicationExitEvent
{
public static void TrackEvent(int exitCode, bool commandParseSucceeded, TimeSpan duration, Exception ex)
{
Telemetry.TrackEvent("application-exit",
new Dictionary<string, string>
{
{ "CommandParseSucceeded", commandParseSucceeded.ToString() },
{ "ExitCode", exitCode.ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration, ex);
}
}
}
36 changes: 36 additions & 0 deletions src/mlnet/Telemetry/Events/ExperimentCompletedEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.ML.AutoML;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for AutoML experiment completion.
/// </summary>
internal static class ExperimentCompletedEvent
{
public static void TrackEvent<TMetrics>(RunDetail<TMetrics> bestRun,
List<RunDetail<TMetrics>> allRuns,
TaskKind machineLearningTask,
TimeSpan duration)
{
Telemetry.TrackEvent("experiment-completed",
new Dictionary<string, string>()
{
{ "BestIterationNum", (allRuns.IndexOf(bestRun) + 1).ToString() },
{ "BestPipeline", Telemetry.GetSanitizedPipelineStr(bestRun.Pipeline) },
{ "BestTrainer", bestRun.TrainerName },
{ "MachineLearningTask", machineLearningTask.ToString() },
{ "NumIterations", allRuns.Count().ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration);
}
}
}
Loading
, '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
18 changes: 18 additions & 0 deletions src/Microsoft.ML.AutoML/ColumnInference/ColumnInformationUtil.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,24 @@ public static IEnumerable<string> GetColumnNames(ColumnInformation columnInforma
return columnNames;
}

public static IDictionary<ColumnPurpose, int> CountColumnsByPurpose(ColumnInformation columnInformation)
{
var result = new Dictionary<ColumnPurpose, int>();
var columnNames = GetColumnNames(columnInformation);
foreach (var columnName in columnNames)

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.

looks to me this can be a more terse implementation using linq grouping. are we anti-linq in this repo? :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I love LINQ! Here, I think the existing way is more readable, but I see where you're coming from. Style is so idiosyncratic

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.

This is my version, you think this isn't that readable? Fair warning, I haven't tested if it works :)

 var columnNames = ColumnInformationUtil.GetColumnNames(this.ColumnInformation);
var columnPurposes = columnNames.Select(c => (Name: c, Purpose: ColumnInformation.GetColumnPurpose(c))).Where(c => c.Purpose != null);
var purposeCounts = columnPurposes.GroupBy(c => c.Purpose).ToDictionary(c => c.Key, c => c.Count());

{
var purpose = columnInformation.GetColumnPurpose(columnName);
if (purpose == null)
{
continue;
}

result.TryGetValue(purpose.Value, out int count);
result[purpose.Value] = ++count;
}
return result;
}

private static void AddStringsToListIfNotNull(List<string> list, IEnumerable<string> strings)
{
foreach (var str in strings)
Expand Down
29 changes: 29 additions & 0 deletions src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
};
}

/// <summary>
/// The names of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> AllHyperparameterNames = GetAllSweepableParameterNames();
Comment thread
Dmitry-A marked this conversation as resolved.

public static IEnumerable<SweepableParam> BuildAveragePerceptronParams()
{
return BuildAveragedLinearArgsParams().Concat(BuildOnlineLinearArgsParams());
Expand DownExpand Up@@ -172,5 +177,29 @@ public static IEnumerable<SweepableParam> BuildSymSgdLogisticRegressionParams()
new SweepableDiscreteParam("UpdateFrequency", new object[] { "<Auto>", 5, 20 })
};
}

/// <summary>
/// Gets the name of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> GetAllSweepableParameterNames()
{
var sweepableParams = new List<SweepableParam>();
Comment thread
Dmitry-A marked this conversation as resolved.
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildFastForestParams());
sweepableParams.AddRange(BuildFastTreeParams());
sweepableParams.AddRange(BuildFastTreeTweedieParams());
sweepableParams.AddRange(BuildLightGbmParamsMulticlass());
sweepableParams.AddRange(BuildLightGbmParams());
sweepableParams.AddRange(BuildLinearSvmParams());
sweepableParams.AddRange(BuildLbfgsLogisticRegressionParams());
sweepableParams.AddRange(BuildOnlineGradientDescentParams());
sweepableParams.AddRange(BuildLbfgsPoissonRegressionParams());
sweepableParams.AddRange(BuildSdcaParams());
sweepableParams.AddRange(BuildOlsParams());
sweepableParams.AddRange(BuildSgdParams());
sweepableParams.AddRange(BuildSymSgdLogisticRegressionParams());
return new HashSet<string>(sweepableParams.Select(p => p.Name));
}
}
}
9 changes: 9 additions & 0 deletions src/mlnet/CodeGenerator/CodeGenerationHelper.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
using Microsoft.ML.CLI.CodeGenerator.CSharp;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.ShellProgressBar;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using Microsoft.ML.Data;
using NLog;
Expand DownExpand Up@@ -51,7 +52,9 @@ public void GenerateCode()
{
inputColumnInformation.IgnoredColumnNames.Add(value);
}
var inferColumnsStopwatch = Stopwatch.StartNew();
columnInference = _automlEngine.InferColumns(context, inputColumnInformation);
InferColumnsEvent.TrackEvent(columnInference.ColumnInformation, inferColumnsStopwatch.Elapsed);
Comment thread
Dmitry-A marked this conversation as resolved.
}
catch (Exception)
{
Expand All@@ -74,6 +77,9 @@ public void GenerateCode()
// The reason why we are doing this way of defining 3 different results is because of the AutoML API
// i.e there is no common class/interface to handle all three tasks together.

// Start a timer for the experiment
var stopwatch = Stopwatch.StartNew();

List<RunDetail<BinaryClassificationMetrics>> completedBinaryRuns = new List<RunDetail<BinaryClassificationMetrics>>();
List<RunDetail<MulticlassClassificationMetrics>> completedMulticlassRuns = new List<RunDetail<MulticlassClassificationMetrics>>();
List<RunDetail<RegressionMetrics>> completedRegressionRuns = new List<RunDetail<RegressionMetrics>>();
Expand DownExpand Up@@ -236,6 +242,7 @@ public void GenerateCode()
{
var binaryMetric = new BinaryExperimentSettings().OptimizingMetric;
var bestBinaryIteration = BestResultUtil.GetBestRun(completedBinaryRuns, binaryMetric);
ExperimentCompletedEvent.TrackEvent(bestBinaryIteration, completedBinaryRuns, TaskKind.BinaryClassification, stopwatch.Elapsed);
bestPipeline = bestBinaryIteration.Pipeline;
bestModel = bestBinaryIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedBinaryRuns.Count());
Expand All@@ -253,6 +260,7 @@ public void GenerateCode()
{
var regressionMetric = new RegressionExperimentSettings().OptimizingMetric;
var bestRegressionIteration = BestResultUtil.GetBestRun(completedRegressionRuns, regressionMetric);
ExperimentCompletedEvent.TrackEvent(bestRegressionIteration, completedRegressionRuns, TaskKind.Regression, stopwatch.Elapsed);
bestPipeline = bestRegressionIteration.Pipeline;
bestModel = bestRegressionIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedRegressionRuns.Count());
Expand All@@ -270,6 +278,7 @@ public void GenerateCode()
{
var muliclassMetric = new MulticlassExperimentSettings().OptimizingMetric;
var bestMulticlassIteration = BestResultUtil.GetBestRun(completedMulticlassRuns, muliclassMetric);
ExperimentCompletedEvent.TrackEvent(bestMulticlassIteration, completedMulticlassRuns, TaskKind.MulticlassClassification, stopwatch.Elapsed);
bestPipeline = bestMulticlassIteration.Pipeline;
bestModel = bestMulticlassIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedMulticlassRuns.Count());
Expand Down
4 changes: 3 additions & 1 deletion src/mlnet/Commands/CommandDefinitions.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,11 @@ namespace Microsoft.ML.CLI.Commands
{
internal static class CommandDefinitions
{
public const string AutoTrainCommandName = "auto-train";

internal static System.CommandLine.Command AutoTrain(ICommandHandler handler)
{
var newCommand = new System.CommandLine.Command("auto-train", "Create a new .NET project using ML.NET to train and run a model", handler: handler)
var newCommand = new System.CommandLine.Command(AutoTrainCommandName, "Create a new .NET project using ML.NET to train and run a model", handler: handler)
{
MlTask(),
Dataset(),
Expand Down
7 changes: 1 addition & 6 deletions src/mlnet/Commands/New/NewCommandHandler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.CodeGenerator;
using Microsoft.ML.CLI.Data;

Expand All@@ -11,18 +10,14 @@ namespace Microsoft.ML.CLI.Commands.New
internal class NewCommand : ICommand
{
private readonly NewCommandSettings _settings;
private readonly MlTelemetry _telemetry;

internal NewCommand(NewCommandSettings settings, MlTelemetry telemetry)
internal NewCommand(NewCommandSettings settings)
{
_settings = settings;
_telemetry = telemetry;
}

public void Execute()
{
_telemetry.LogAutoTrainMlCommand(_settings.Dataset.Name, _settings.MlTask.ToString(), _settings.Dataset.Length);

CodeGenerationHelper codeGenerationHelper = new CodeGenerationHelper(new AutoMLEngine(_settings), _settings); // Needs to be improved.
codeGenerationHelper.GenerateCode();
}
Expand Down
33 changes: 26 additions & 7 deletions src/mlnet/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,13 @@
using System;
using System.CommandLine.Builder;
using System.CommandLine.Invocation;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.Commands;
using Microsoft.ML.CLI.Commands.New;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using NLog;
using NLog.Targets;
Expand All@@ -20,24 +21,33 @@ namespace Microsoft.ML.CLI
public class Program
{
private static Logger _logger = LogManager.GetCurrentClassLogger();

public static void Main(string[] args)
{
var telemetry = new MlTelemetry();
Telemetry.Telemetry.Initialize();
int exitCode = 1;
Exception ex = null;
var stopwatch = Stopwatch.StartNew();

var mlNetCommandEvent = new MLNetCommandEvent();

// Create handler outside so that commandline and the handler is decoupled and testable.
var handler = CommandHandler.Create<NewCommandSettings>(
(options) =>
{
try
{
// Send telemetry event for command issued
mlNetCommandEvent.AutoTrainCommandSettings = options;
Comment thread
Dmitry-A marked this conversation as resolved.
mlNetCommandEvent.TrackEvent();

// Map the verbosity to internal levels
var verbosity = Utils.GetVerbosity(options.Verbosity);

// Build the output path
string outputBaseDir = string.Empty;
if (options.Name == null)
{

options.Name = "Sample" + Utils.GetTaskKind(options.MlTask).ToString();
outputBaseDir = Path.Combine(options.OutputPath.FullName, options.Name);
}
Expand All@@ -50,7 +60,7 @@ public static void Main(string[] args)
options.OutputPath = new DirectoryInfo(outputBaseDir);

// Instantiate the command
var command = new NewCommand(options, telemetry);
var command = new NewCommand(options);

// Override the Logger Configuration
var logconsole = LogManager.Configuration.FindTargetByName("logconsole");
Expand All@@ -67,6 +77,7 @@ public static void Main(string[] args)
}
catch (Exception e)
{
ex = e;
_logger.Log(LogLevel.Error, e.Message);
_logger.Log(LogLevel.Debug, e.ToString());
_logger.Log(LogLevel.Info, Strings.LookIntoLogFile);
Expand All@@ -82,7 +93,8 @@ public static void Main(string[] args)

var parseResult = parser.Parse(args);

if (parseResult.Errors.Count == 0)
var commandParseSucceeded = !parseResult.Errors.Any();
if (commandParseSucceeded)
{
if (parseResult.RootCommandResult.Children.Count > 0)
{
Expand All@@ -95,13 +107,20 @@ public static void Main(string[] args)

var explicitlySpecifiedOptions = options.Where(opt => !opt.IsImplicit).Select(opt => opt.Name);

telemetry.SetCommandAndParameters(command.Name, explicitlySpecifiedOptions);
mlNetCommandEvent.CommandLineParametersUsed = explicitlySpecifiedOptions;
}
}
}

// Send system info telemetry
SystemInfoEvent.TrackEvent();

parser.InvokeAsync(parseResult).Wait();
// Send exit telemetry
ApplicationExitEvent.TrackEvent(exitCode, commandParseSucceeded, stopwatch.Elapsed, ex);
// Flush pending telemetry logs
Telemetry.Telemetry.Flush(TimeSpan.FromSeconds(3));
Environment.Exit(exitCode);
}
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.DotNet.Configurer;
using Microsoft.ML.CLI.Telemetry;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
using RuntimeInformation = System.Runtime.InteropServices.RuntimeInformation;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

using System;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
28 changes: 28 additions & 0 deletions src/mlnet/Telemetry/Events/ApplicationExitEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for CLI application exit.
/// </summary>
internal class ApplicationExitEvent
{
public static void TrackEvent(int exitCode, bool commandParseSucceeded, TimeSpan duration, Exception ex)
{
Telemetry.TrackEvent("application-exit",
new Dictionary<string, string>
{
{ "CommandParseSucceeded", commandParseSucceeded.ToString() },
{ "ExitCode", exitCode.ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration, ex);
}
}
}
36 changes: 36 additions & 0 deletions src/mlnet/Telemetry/Events/ExperimentCompletedEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.ML.AutoML;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for AutoML experiment completion.
/// </summary>
internal static class ExperimentCompletedEvent
{
public static void TrackEvent<TMetrics>(RunDetail<TMetrics> bestRun,
List<RunDetail<TMetrics>> allRuns,
TaskKind machineLearningTask,
TimeSpan duration)
{
Telemetry.TrackEvent("experiment-completed",
new Dictionary<string, string>()
{
{ "BestIterationNum", (allRuns.IndexOf(bestRun) + 1).ToString() },
{ "BestPipeline", Telemetry.GetSanitizedPipelineStr(bestRun.Pipeline) },
{ "BestTrainer", bestRun.TrainerName },
{ "MachineLearningTask", machineLearningTask.ToString() },
{ "NumIterations", allRuns.Count().ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration);
}
}
}
Loading
, '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
18 changes: 18 additions & 0 deletions src/Microsoft.ML.AutoML/ColumnInference/ColumnInformationUtil.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,24 @@ public static IEnumerable<string> GetColumnNames(ColumnInformation columnInforma
return columnNames;
}

public static IDictionary<ColumnPurpose, int> CountColumnsByPurpose(ColumnInformation columnInformation)
{
var result = new Dictionary<ColumnPurpose, int>();
var columnNames = GetColumnNames(columnInformation);
foreach (var columnName in columnNames)

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.

looks to me this can be a more terse implementation using linq grouping. are we anti-linq in this repo? :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I love LINQ! Here, I think the existing way is more readable, but I see where you're coming from. Style is so idiosyncratic

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.

This is my version, you think this isn't that readable? Fair warning, I haven't tested if it works :)

 var columnNames = ColumnInformationUtil.GetColumnNames(this.ColumnInformation);
var columnPurposes = columnNames.Select(c => (Name: c, Purpose: ColumnInformation.GetColumnPurpose(c))).Where(c => c.Purpose != null);
var purposeCounts = columnPurposes.GroupBy(c => c.Purpose).ToDictionary(c => c.Key, c => c.Count());

{
var purpose = columnInformation.GetColumnPurpose(columnName);
if (purpose == null)
{
continue;
}

result.TryGetValue(purpose.Value, out int count);
result[purpose.Value] = ++count;
}
return result;
}

private static void AddStringsToListIfNotNull(List<string> list, IEnumerable<string> strings)
{
foreach (var str in strings)
Expand Down
29 changes: 29 additions & 0 deletions src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
};
}

/// <summary>
/// The names of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> AllHyperparameterNames = GetAllSweepableParameterNames();
Comment thread
Dmitry-A marked this conversation as resolved.

public static IEnumerable<SweepableParam> BuildAveragePerceptronParams()
{
return BuildAveragedLinearArgsParams().Concat(BuildOnlineLinearArgsParams());
Expand DownExpand Up@@ -172,5 +177,29 @@ public static IEnumerable<SweepableParam> BuildSymSgdLogisticRegressionParams()
new SweepableDiscreteParam("UpdateFrequency", new object[] { "<Auto>", 5, 20 })
};
}

/// <summary>
/// Gets the name of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> GetAllSweepableParameterNames()
{
var sweepableParams = new List<SweepableParam>();
Comment thread
Dmitry-A marked this conversation as resolved.
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildFastForestParams());
sweepableParams.AddRange(BuildFastTreeParams());
sweepableParams.AddRange(BuildFastTreeTweedieParams());
sweepableParams.AddRange(BuildLightGbmParamsMulticlass());
sweepableParams.AddRange(BuildLightGbmParams());
sweepableParams.AddRange(BuildLinearSvmParams());
sweepableParams.AddRange(BuildLbfgsLogisticRegressionParams());
sweepableParams.AddRange(BuildOnlineGradientDescentParams());
sweepableParams.AddRange(BuildLbfgsPoissonRegressionParams());
sweepableParams.AddRange(BuildSdcaParams());
sweepableParams.AddRange(BuildOlsParams());
sweepableParams.AddRange(BuildSgdParams());
sweepableParams.AddRange(BuildSymSgdLogisticRegressionParams());
return new HashSet<string>(sweepableParams.Select(p => p.Name));
}
}
}
9 changes: 9 additions & 0 deletions src/mlnet/CodeGenerator/CodeGenerationHelper.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
using Microsoft.ML.CLI.CodeGenerator.CSharp;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.ShellProgressBar;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using Microsoft.ML.Data;
using NLog;
Expand DownExpand Up@@ -51,7 +52,9 @@ public void GenerateCode()
{
inputColumnInformation.IgnoredColumnNames.Add(value);
}
var inferColumnsStopwatch = Stopwatch.StartNew();
columnInference = _automlEngine.InferColumns(context, inputColumnInformation);
InferColumnsEvent.TrackEvent(columnInference.ColumnInformation, inferColumnsStopwatch.Elapsed);
Comment thread
Dmitry-A marked this conversation as resolved.
}
catch (Exception)
{
Expand All@@ -74,6 +77,9 @@ public void GenerateCode()
// The reason why we are doing this way of defining 3 different results is because of the AutoML API
// i.e there is no common class/interface to handle all three tasks together.

// Start a timer for the experiment
var stopwatch = Stopwatch.StartNew();

List<RunDetail<BinaryClassificationMetrics>> completedBinaryRuns = new List<RunDetail<BinaryClassificationMetrics>>();
List<RunDetail<MulticlassClassificationMetrics>> completedMulticlassRuns = new List<RunDetail<MulticlassClassificationMetrics>>();
List<RunDetail<RegressionMetrics>> completedRegressionRuns = new List<RunDetail<RegressionMetrics>>();
Expand DownExpand Up@@ -236,6 +242,7 @@ public void GenerateCode()
{
var binaryMetric = new BinaryExperimentSettings().OptimizingMetric;
var bestBinaryIteration = BestResultUtil.GetBestRun(completedBinaryRuns, binaryMetric);
ExperimentCompletedEvent.TrackEvent(bestBinaryIteration, completedBinaryRuns, TaskKind.BinaryClassification, stopwatch.Elapsed);
bestPipeline = bestBinaryIteration.Pipeline;
bestModel = bestBinaryIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedBinaryRuns.Count());
Expand All@@ -253,6 +260,7 @@ public void GenerateCode()
{
var regressionMetric = new RegressionExperimentSettings().OptimizingMetric;
var bestRegressionIteration = BestResultUtil.GetBestRun(completedRegressionRuns, regressionMetric);
ExperimentCompletedEvent.TrackEvent(bestRegressionIteration, completedRegressionRuns, TaskKind.Regression, stopwatch.Elapsed);
bestPipeline = bestRegressionIteration.Pipeline;
bestModel = bestRegressionIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedRegressionRuns.Count());
Expand All@@ -270,6 +278,7 @@ public void GenerateCode()
{
var muliclassMetric = new MulticlassExperimentSettings().OptimizingMetric;
var bestMulticlassIteration = BestResultUtil.GetBestRun(completedMulticlassRuns, muliclassMetric);
ExperimentCompletedEvent.TrackEvent(bestMulticlassIteration, completedMulticlassRuns, TaskKind.MulticlassClassification, stopwatch.Elapsed);
bestPipeline = bestMulticlassIteration.Pipeline;
bestModel = bestMulticlassIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedMulticlassRuns.Count());
Expand Down
4 changes: 3 additions & 1 deletion src/mlnet/Commands/CommandDefinitions.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,11 @@ namespace Microsoft.ML.CLI.Commands
{
internal static class CommandDefinitions
{
public const string AutoTrainCommandName = "auto-train";

internal static System.CommandLine.Command AutoTrain(ICommandHandler handler)
{
var newCommand = new System.CommandLine.Command("auto-train", "Create a new .NET project using ML.NET to train and run a model", handler: handler)
var newCommand = new System.CommandLine.Command(AutoTrainCommandName, "Create a new .NET project using ML.NET to train and run a model", handler: handler)
{
MlTask(),
Dataset(),
Expand Down
7 changes: 1 addition & 6 deletions src/mlnet/Commands/New/NewCommandHandler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.CodeGenerator;
using Microsoft.ML.CLI.Data;

Expand All@@ -11,18 +10,14 @@ namespace Microsoft.ML.CLI.Commands.New
internal class NewCommand : ICommand
{
private readonly NewCommandSettings _settings;
private readonly MlTelemetry _telemetry;

internal NewCommand(NewCommandSettings settings, MlTelemetry telemetry)
internal NewCommand(NewCommandSettings settings)
{
_settings = settings;
_telemetry = telemetry;
}

public void Execute()
{
_telemetry.LogAutoTrainMlCommand(_settings.Dataset.Name, _settings.MlTask.ToString(), _settings.Dataset.Length);

CodeGenerationHelper codeGenerationHelper = new CodeGenerationHelper(new AutoMLEngine(_settings), _settings); // Needs to be improved.
codeGenerationHelper.GenerateCode();
}
Expand Down
33 changes: 26 additions & 7 deletions src/mlnet/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,13 @@
using System;
using System.CommandLine.Builder;
using System.CommandLine.Invocation;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.Commands;
using Microsoft.ML.CLI.Commands.New;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using NLog;
using NLog.Targets;
Expand All@@ -20,24 +21,33 @@ namespace Microsoft.ML.CLI
public class Program
{
private static Logger _logger = LogManager.GetCurrentClassLogger();

public static void Main(string[] args)
{
var telemetry = new MlTelemetry();
Telemetry.Telemetry.Initialize();
int exitCode = 1;
Exception ex = null;
var stopwatch = Stopwatch.StartNew();

var mlNetCommandEvent = new MLNetCommandEvent();

// Create handler outside so that commandline and the handler is decoupled and testable.
var handler = CommandHandler.Create<NewCommandSettings>(
(options) =>
{
try
{
// Send telemetry event for command issued
mlNetCommandEvent.AutoTrainCommandSettings = options;
Comment thread
Dmitry-A marked this conversation as resolved.
mlNetCommandEvent.TrackEvent();

// Map the verbosity to internal levels
var verbosity = Utils.GetVerbosity(options.Verbosity);

// Build the output path
string outputBaseDir = string.Empty;
if (options.Name == null)
{

options.Name = "Sample" + Utils.GetTaskKind(options.MlTask).ToString();
outputBaseDir = Path.Combine(options.OutputPath.FullName, options.Name);
}
Expand All@@ -50,7 +60,7 @@ public static void Main(string[] args)
options.OutputPath = new DirectoryInfo(outputBaseDir);

// Instantiate the command
var command = new NewCommand(options, telemetry);
var command = new NewCommand(options);

// Override the Logger Configuration
var logconsole = LogManager.Configuration.FindTargetByName("logconsole");
Expand All@@ -67,6 +77,7 @@ public static void Main(string[] args)
}
catch (Exception e)
{
ex = e;
_logger.Log(LogLevel.Error, e.Message);
_logger.Log(LogLevel.Debug, e.ToString());
_logger.Log(LogLevel.Info, Strings.LookIntoLogFile);
Expand All@@ -82,7 +93,8 @@ public static void Main(string[] args)

var parseResult = parser.Parse(args);

if (parseResult.Errors.Count == 0)
var commandParseSucceeded = !parseResult.Errors.Any();
if (commandParseSucceeded)
{
if (parseResult.RootCommandResult.Children.Count > 0)
{
Expand All@@ -95,13 +107,20 @@ public static void Main(string[] args)

var explicitlySpecifiedOptions = options.Where(opt => !opt.IsImplicit).Select(opt => opt.Name);

telemetry.SetCommandAndParameters(command.Name, explicitlySpecifiedOptions);
mlNetCommandEvent.CommandLineParametersUsed = explicitlySpecifiedOptions;
}
}
}

// Send system info telemetry
SystemInfoEvent.TrackEvent();

parser.InvokeAsync(parseResult).Wait();
// Send exit telemetry
ApplicationExitEvent.TrackEvent(exitCode, commandParseSucceeded, stopwatch.Elapsed, ex);
// Flush pending telemetry logs
Telemetry.Telemetry.Flush(TimeSpan.FromSeconds(3));
Environment.Exit(exitCode);
}
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.DotNet.Configurer;
using Microsoft.ML.CLI.Telemetry;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
using RuntimeInformation = System.Runtime.InteropServices.RuntimeInformation;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

using System;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
28 changes: 28 additions & 0 deletions src/mlnet/Telemetry/Events/ApplicationExitEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for CLI application exit.
/// </summary>
internal class ApplicationExitEvent
{
public static void TrackEvent(int exitCode, bool commandParseSucceeded, TimeSpan duration, Exception ex)
{
Telemetry.TrackEvent("application-exit",
new Dictionary<string, string>
{
{ "CommandParseSucceeded", commandParseSucceeded.ToString() },
{ "ExitCode", exitCode.ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration, ex);
}
}
}
36 changes: 36 additions & 0 deletions src/mlnet/Telemetry/Events/ExperimentCompletedEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.ML.AutoML;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for AutoML experiment completion.
/// </summary>
internal static class ExperimentCompletedEvent
{
public static void TrackEvent<TMetrics>(RunDetail<TMetrics> bestRun,
List<RunDetail<TMetrics>> allRuns,
TaskKind machineLearningTask,
TimeSpan duration)
{
Telemetry.TrackEvent("experiment-completed",
new Dictionary<string, string>()
{
{ "BestIterationNum", (allRuns.IndexOf(bestRun) + 1).ToString() },
{ "BestPipeline", Telemetry.GetSanitizedPipelineStr(bestRun.Pipeline) },
{ "BestTrainer", bestRun.TrainerName },
{ "MachineLearningTask", machineLearningTask.ToString() },
{ "NumIterations", allRuns.Count().ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration);
}
}
}
Loading
, '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
18 changes: 18 additions & 0 deletions src/Microsoft.ML.AutoML/ColumnInference/ColumnInformationUtil.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,24 @@ public static IEnumerable<string> GetColumnNames(ColumnInformation columnInforma
return columnNames;
}

public static IDictionary<ColumnPurpose, int> CountColumnsByPurpose(ColumnInformation columnInformation)
{
var result = new Dictionary<ColumnPurpose, int>();
var columnNames = GetColumnNames(columnInformation);
foreach (var columnName in columnNames)

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.

looks to me this can be a more terse implementation using linq grouping. are we anti-linq in this repo? :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I love LINQ! Here, I think the existing way is more readable, but I see where you're coming from. Style is so idiosyncratic

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.

This is my version, you think this isn't that readable? Fair warning, I haven't tested if it works :)

 var columnNames = ColumnInformationUtil.GetColumnNames(this.ColumnInformation);
var columnPurposes = columnNames.Select(c => (Name: c, Purpose: ColumnInformation.GetColumnPurpose(c))).Where(c => c.Purpose != null);
var purposeCounts = columnPurposes.GroupBy(c => c.Purpose).ToDictionary(c => c.Key, c => c.Count());

{
var purpose = columnInformation.GetColumnPurpose(columnName);
if (purpose == null)
{
continue;
}

result.TryGetValue(purpose.Value, out int count);
result[purpose.Value] = ++count;
}
return result;
}

private static void AddStringsToListIfNotNull(List<string> list, IEnumerable<string> strings)
{
foreach (var str in strings)
Expand Down
29 changes: 29 additions & 0 deletions src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
};
}

/// <summary>
/// The names of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> AllHyperparameterNames = GetAllSweepableParameterNames();
Comment thread
Dmitry-A marked this conversation as resolved.

public static IEnumerable<SweepableParam> BuildAveragePerceptronParams()
{
return BuildAveragedLinearArgsParams().Concat(BuildOnlineLinearArgsParams());
Expand DownExpand Up@@ -172,5 +177,29 @@ public static IEnumerable<SweepableParam> BuildSymSgdLogisticRegressionParams()
new SweepableDiscreteParam("UpdateFrequency", new object[] { "<Auto>", 5, 20 })
};
}

/// <summary>
/// Gets the name of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> GetAllSweepableParameterNames()
{
var sweepableParams = new List<SweepableParam>();
Comment thread
Dmitry-A marked this conversation as resolved.
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildFastForestParams());
sweepableParams.AddRange(BuildFastTreeParams());
sweepableParams.AddRange(BuildFastTreeTweedieParams());
sweepableParams.AddRange(BuildLightGbmParamsMulticlass());
sweepableParams.AddRange(BuildLightGbmParams());
sweepableParams.AddRange(BuildLinearSvmParams());
sweepableParams.AddRange(BuildLbfgsLogisticRegressionParams());
sweepableParams.AddRange(BuildOnlineGradientDescentParams());
sweepableParams.AddRange(BuildLbfgsPoissonRegressionParams());
sweepableParams.AddRange(BuildSdcaParams());
sweepableParams.AddRange(BuildOlsParams());
sweepableParams.AddRange(BuildSgdParams());
sweepableParams.AddRange(BuildSymSgdLogisticRegressionParams());
return new HashSet<string>(sweepableParams.Select(p => p.Name));
}
}
}
9 changes: 9 additions & 0 deletions src/mlnet/CodeGenerator/CodeGenerationHelper.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
using Microsoft.ML.CLI.CodeGenerator.CSharp;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.ShellProgressBar;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using Microsoft.ML.Data;
using NLog;
Expand DownExpand Up@@ -51,7 +52,9 @@ public void GenerateCode()
{
inputColumnInformation.IgnoredColumnNames.Add(value);
}
var inferColumnsStopwatch = Stopwatch.StartNew();
columnInference = _automlEngine.InferColumns(context, inputColumnInformation);
InferColumnsEvent.TrackEvent(columnInference.ColumnInformation, inferColumnsStopwatch.Elapsed);
Comment thread
Dmitry-A marked this conversation as resolved.
}
catch (Exception)
{
Expand All@@ -74,6 +77,9 @@ public void GenerateCode()
// The reason why we are doing this way of defining 3 different results is because of the AutoML API
// i.e there is no common class/interface to handle all three tasks together.

// Start a timer for the experiment
var stopwatch = Stopwatch.StartNew();

List<RunDetail<BinaryClassificationMetrics>> completedBinaryRuns = new List<RunDetail<BinaryClassificationMetrics>>();
List<RunDetail<MulticlassClassificationMetrics>> completedMulticlassRuns = new List<RunDetail<MulticlassClassificationMetrics>>();
List<RunDetail<RegressionMetrics>> completedRegressionRuns = new List<RunDetail<RegressionMetrics>>();
Expand DownExpand Up@@ -236,6 +242,7 @@ public void GenerateCode()
{
var binaryMetric = new BinaryExperimentSettings().OptimizingMetric;
var bestBinaryIteration = BestResultUtil.GetBestRun(completedBinaryRuns, binaryMetric);
ExperimentCompletedEvent.TrackEvent(bestBinaryIteration, completedBinaryRuns, TaskKind.BinaryClassification, stopwatch.Elapsed);
bestPipeline = bestBinaryIteration.Pipeline;
bestModel = bestBinaryIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedBinaryRuns.Count());
Expand All@@ -253,6 +260,7 @@ public void GenerateCode()
{
var regressionMetric = new RegressionExperimentSettings().OptimizingMetric;
var bestRegressionIteration = BestResultUtil.GetBestRun(completedRegressionRuns, regressionMetric);
ExperimentCompletedEvent.TrackEvent(bestRegressionIteration, completedRegressionRuns, TaskKind.Regression, stopwatch.Elapsed);
bestPipeline = bestRegressionIteration.Pipeline;
bestModel = bestRegressionIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedRegressionRuns.Count());
Expand All@@ -270,6 +278,7 @@ public void GenerateCode()
{
var muliclassMetric = new MulticlassExperimentSettings().OptimizingMetric;
var bestMulticlassIteration = BestResultUtil.GetBestRun(completedMulticlassRuns, muliclassMetric);
ExperimentCompletedEvent.TrackEvent(bestMulticlassIteration, completedMulticlassRuns, TaskKind.MulticlassClassification, stopwatch.Elapsed);
bestPipeline = bestMulticlassIteration.Pipeline;
bestModel = bestMulticlassIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedMulticlassRuns.Count());
Expand Down
4 changes: 3 additions & 1 deletion src/mlnet/Commands/CommandDefinitions.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,11 @@ namespace Microsoft.ML.CLI.Commands
{
internal static class CommandDefinitions
{
public const string AutoTrainCommandName = "auto-train";

internal static System.CommandLine.Command AutoTrain(ICommandHandler handler)
{
var newCommand = new System.CommandLine.Command("auto-train", "Create a new .NET project using ML.NET to train and run a model", handler: handler)
var newCommand = new System.CommandLine.Command(AutoTrainCommandName, "Create a new .NET project using ML.NET to train and run a model", handler: handler)
{
MlTask(),
Dataset(),
Expand Down
7 changes: 1 addition & 6 deletions src/mlnet/Commands/New/NewCommandHandler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.CodeGenerator;
using Microsoft.ML.CLI.Data;

Expand All@@ -11,18 +10,14 @@ namespace Microsoft.ML.CLI.Commands.New
internal class NewCommand : ICommand
{
private readonly NewCommandSettings _settings;
private readonly MlTelemetry _telemetry;

internal NewCommand(NewCommandSettings settings, MlTelemetry telemetry)
internal NewCommand(NewCommandSettings settings)
{
_settings = settings;
_telemetry = telemetry;
}

public void Execute()
{
_telemetry.LogAutoTrainMlCommand(_settings.Dataset.Name, _settings.MlTask.ToString(), _settings.Dataset.Length);

CodeGenerationHelper codeGenerationHelper = new CodeGenerationHelper(new AutoMLEngine(_settings), _settings); // Needs to be improved.
codeGenerationHelper.GenerateCode();
}
Expand Down
33 changes: 26 additions & 7 deletions src/mlnet/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,13 @@
using System;
using System.CommandLine.Builder;
using System.CommandLine.Invocation;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.Commands;
using Microsoft.ML.CLI.Commands.New;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using NLog;
using NLog.Targets;
Expand All@@ -20,24 +21,33 @@ namespace Microsoft.ML.CLI
public class Program
{
private static Logger _logger = LogManager.GetCurrentClassLogger();

public static void Main(string[] args)
{
var telemetry = new MlTelemetry();
Telemetry.Telemetry.Initialize();
int exitCode = 1;
Exception ex = null;
var stopwatch = Stopwatch.StartNew();

var mlNetCommandEvent = new MLNetCommandEvent();

// Create handler outside so that commandline and the handler is decoupled and testable.
var handler = CommandHandler.Create<NewCommandSettings>(
(options) =>
{
try
{
// Send telemetry event for command issued
mlNetCommandEvent.AutoTrainCommandSettings = options;
Comment thread
Dmitry-A marked this conversation as resolved.
mlNetCommandEvent.TrackEvent();

// Map the verbosity to internal levels
var verbosity = Utils.GetVerbosity(options.Verbosity);

// Build the output path
string outputBaseDir = string.Empty;
if (options.Name == null)
{

options.Name = "Sample" + Utils.GetTaskKind(options.MlTask).ToString();
outputBaseDir = Path.Combine(options.OutputPath.FullName, options.Name);
}
Expand All@@ -50,7 +60,7 @@ public static void Main(string[] args)
options.OutputPath = new DirectoryInfo(outputBaseDir);

// Instantiate the command
var command = new NewCommand(options, telemetry);
var command = new NewCommand(options);

// Override the Logger Configuration
var logconsole = LogManager.Configuration.FindTargetByName("logconsole");
Expand All@@ -67,6 +77,7 @@ public static void Main(string[] args)
}
catch (Exception e)
{
ex = e;
_logger.Log(LogLevel.Error, e.Message);
_logger.Log(LogLevel.Debug, e.ToString());
_logger.Log(LogLevel.Info, Strings.LookIntoLogFile);
Expand All@@ -82,7 +93,8 @@ public static void Main(string[] args)

var parseResult = parser.Parse(args);

if (parseResult.Errors.Count == 0)
var commandParseSucceeded = !parseResult.Errors.Any();
if (commandParseSucceeded)
{
if (parseResult.RootCommandResult.Children.Count > 0)
{
Expand All@@ -95,13 +107,20 @@ public static void Main(string[] args)

var explicitlySpecifiedOptions = options.Where(opt => !opt.IsImplicit).Select(opt => opt.Name);

telemetry.SetCommandAndParameters(command.Name, explicitlySpecifiedOptions);
mlNetCommandEvent.CommandLineParametersUsed = explicitlySpecifiedOptions;
}
}
}

// Send system info telemetry
SystemInfoEvent.TrackEvent();

parser.InvokeAsync(parseResult).Wait();
// Send exit telemetry
ApplicationExitEvent.TrackEvent(exitCode, commandParseSucceeded, stopwatch.Elapsed, ex);
// Flush pending telemetry logs
Telemetry.Telemetry.Flush(TimeSpan.FromSeconds(3));
Environment.Exit(exitCode);
}
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.DotNet.Configurer;
using Microsoft.ML.CLI.Telemetry;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
using RuntimeInformation = System.Runtime.InteropServices.RuntimeInformation;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

using System;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
28 changes: 28 additions & 0 deletions src/mlnet/Telemetry/Events/ApplicationExitEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for CLI application exit.
/// </summary>
internal class ApplicationExitEvent
{
public static void TrackEvent(int exitCode, bool commandParseSucceeded, TimeSpan duration, Exception ex)
{
Telemetry.TrackEvent("application-exit",
new Dictionary<string, string>
{
{ "CommandParseSucceeded", commandParseSucceeded.ToString() },
{ "ExitCode", exitCode.ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration, ex);
}
}
}
36 changes: 36 additions & 0 deletions src/mlnet/Telemetry/Events/ExperimentCompletedEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.ML.AutoML;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for AutoML experiment completion.
/// </summary>
internal static class ExperimentCompletedEvent
{
public static void TrackEvent<TMetrics>(RunDetail<TMetrics> bestRun,
List<RunDetail<TMetrics>> allRuns,
TaskKind machineLearningTask,
TimeSpan duration)
{
Telemetry.TrackEvent("experiment-completed",
new Dictionary<string, string>()
{
{ "BestIterationNum", (allRuns.IndexOf(bestRun) + 1).ToString() },
{ "BestPipeline", Telemetry.GetSanitizedPipelineStr(bestRun.Pipeline) },
{ "BestTrainer", bestRun.TrainerName },
{ "MachineLearningTask", machineLearningTask.ToString() },
{ "NumIterations", allRuns.Count().ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration);
}
}
}
Loading
, '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
18 changes: 18 additions & 0 deletions src/Microsoft.ML.AutoML/ColumnInference/ColumnInformationUtil.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,24 @@ public static IEnumerable<string> GetColumnNames(ColumnInformation columnInforma
return columnNames;
}

public static IDictionary<ColumnPurpose, int> CountColumnsByPurpose(ColumnInformation columnInformation)
{
var result = new Dictionary<ColumnPurpose, int>();
var columnNames = GetColumnNames(columnInformation);
foreach (var columnName in columnNames)

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.

looks to me this can be a more terse implementation using linq grouping. are we anti-linq in this repo? :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I love LINQ! Here, I think the existing way is more readable, but I see where you're coming from. Style is so idiosyncratic

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.

This is my version, you think this isn't that readable? Fair warning, I haven't tested if it works :)

 var columnNames = ColumnInformationUtil.GetColumnNames(this.ColumnInformation);
var columnPurposes = columnNames.Select(c => (Name: c, Purpose: ColumnInformation.GetColumnPurpose(c))).Where(c => c.Purpose != null);
var purposeCounts = columnPurposes.GroupBy(c => c.Purpose).ToDictionary(c => c.Key, c => c.Count());

{
var purpose = columnInformation.GetColumnPurpose(columnName);
if (purpose == null)
{
continue;
}

result.TryGetValue(purpose.Value, out int count);
result[purpose.Value] = ++count;
}
return result;
}

private static void AddStringsToListIfNotNull(List<string> list, IEnumerable<string> strings)
{
foreach (var str in strings)
Expand Down
29 changes: 29 additions & 0 deletions src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
};
}

/// <summary>
/// The names of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> AllHyperparameterNames = GetAllSweepableParameterNames();
Comment thread
Dmitry-A marked this conversation as resolved.

public static IEnumerable<SweepableParam> BuildAveragePerceptronParams()
{
return BuildAveragedLinearArgsParams().Concat(BuildOnlineLinearArgsParams());
Expand DownExpand Up@@ -172,5 +177,29 @@ public static IEnumerable<SweepableParam> BuildSymSgdLogisticRegressionParams()
new SweepableDiscreteParam("UpdateFrequency", new object[] { "<Auto>", 5, 20 })
};
}

/// <summary>
/// Gets the name of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> GetAllSweepableParameterNames()
{
var sweepableParams = new List<SweepableParam>();
Comment thread
Dmitry-A marked this conversation as resolved.
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildFastForestParams());
sweepableParams.AddRange(BuildFastTreeParams());
sweepableParams.AddRange(BuildFastTreeTweedieParams());
sweepableParams.AddRange(BuildLightGbmParamsMulticlass());
sweepableParams.AddRange(BuildLightGbmParams());
sweepableParams.AddRange(BuildLinearSvmParams());
sweepableParams.AddRange(BuildLbfgsLogisticRegressionParams());
sweepableParams.AddRange(BuildOnlineGradientDescentParams());
sweepableParams.AddRange(BuildLbfgsPoissonRegressionParams());
sweepableParams.AddRange(BuildSdcaParams());
sweepableParams.AddRange(BuildOlsParams());
sweepableParams.AddRange(BuildSgdParams());
sweepableParams.AddRange(BuildSymSgdLogisticRegressionParams());
return new HashSet<string>(sweepableParams.Select(p => p.Name));
}
}
}
9 changes: 9 additions & 0 deletions src/mlnet/CodeGenerator/CodeGenerationHelper.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
using Microsoft.ML.CLI.CodeGenerator.CSharp;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.ShellProgressBar;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using Microsoft.ML.Data;
using NLog;
Expand DownExpand Up@@ -51,7 +52,9 @@ public void GenerateCode()
{
inputColumnInformation.IgnoredColumnNames.Add(value);
}
var inferColumnsStopwatch = Stopwatch.StartNew();
columnInference = _automlEngine.InferColumns(context, inputColumnInformation);
InferColumnsEvent.TrackEvent(columnInference.ColumnInformation, inferColumnsStopwatch.Elapsed);
Comment thread
Dmitry-A marked this conversation as resolved.
}
catch (Exception)
{
Expand All@@ -74,6 +77,9 @@ public void GenerateCode()
// The reason why we are doing this way of defining 3 different results is because of the AutoML API
// i.e there is no common class/interface to handle all three tasks together.

// Start a timer for the experiment
var stopwatch = Stopwatch.StartNew();

List<RunDetail<BinaryClassificationMetrics>> completedBinaryRuns = new List<RunDetail<BinaryClassificationMetrics>>();
List<RunDetail<MulticlassClassificationMetrics>> completedMulticlassRuns = new List<RunDetail<MulticlassClassificationMetrics>>();
List<RunDetail<RegressionMetrics>> completedRegressionRuns = new List<RunDetail<RegressionMetrics>>();
Expand DownExpand Up@@ -236,6 +242,7 @@ public void GenerateCode()
{
var binaryMetric = new BinaryExperimentSettings().OptimizingMetric;
var bestBinaryIteration = BestResultUtil.GetBestRun(completedBinaryRuns, binaryMetric);
ExperimentCompletedEvent.TrackEvent(bestBinaryIteration, completedBinaryRuns, TaskKind.BinaryClassification, stopwatch.Elapsed);
bestPipeline = bestBinaryIteration.Pipeline;
bestModel = bestBinaryIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedBinaryRuns.Count());
Expand All@@ -253,6 +260,7 @@ public void GenerateCode()
{
var regressionMetric = new RegressionExperimentSettings().OptimizingMetric;
var bestRegressionIteration = BestResultUtil.GetBestRun(completedRegressionRuns, regressionMetric);
ExperimentCompletedEvent.TrackEvent(bestRegressionIteration, completedRegressionRuns, TaskKind.Regression, stopwatch.Elapsed);
bestPipeline = bestRegressionIteration.Pipeline;
bestModel = bestRegressionIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedRegressionRuns.Count());
Expand All@@ -270,6 +278,7 @@ public void GenerateCode()
{
var muliclassMetric = new MulticlassExperimentSettings().OptimizingMetric;
var bestMulticlassIteration = BestResultUtil.GetBestRun(completedMulticlassRuns, muliclassMetric);
ExperimentCompletedEvent.TrackEvent(bestMulticlassIteration, completedMulticlassRuns, TaskKind.MulticlassClassification, stopwatch.Elapsed);
bestPipeline = bestMulticlassIteration.Pipeline;
bestModel = bestMulticlassIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedMulticlassRuns.Count());
Expand Down
4 changes: 3 additions & 1 deletion src/mlnet/Commands/CommandDefinitions.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,11 @@ namespace Microsoft.ML.CLI.Commands
{
internal static class CommandDefinitions
{
public const string AutoTrainCommandName = "auto-train";

internal static System.CommandLine.Command AutoTrain(ICommandHandler handler)
{
var newCommand = new System.CommandLine.Command("auto-train", "Create a new .NET project using ML.NET to train and run a model", handler: handler)
var newCommand = new System.CommandLine.Command(AutoTrainCommandName, "Create a new .NET project using ML.NET to train and run a model", handler: handler)
{
MlTask(),
Dataset(),
Expand Down
7 changes: 1 addition & 6 deletions src/mlnet/Commands/New/NewCommandHandler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.CodeGenerator;
using Microsoft.ML.CLI.Data;

Expand All@@ -11,18 +10,14 @@ namespace Microsoft.ML.CLI.Commands.New
internal class NewCommand : ICommand
{
private readonly NewCommandSettings _settings;
private readonly MlTelemetry _telemetry;

internal NewCommand(NewCommandSettings settings, MlTelemetry telemetry)
internal NewCommand(NewCommandSettings settings)
{
_settings = settings;
_telemetry = telemetry;
}

public void Execute()
{
_telemetry.LogAutoTrainMlCommand(_settings.Dataset.Name, _settings.MlTask.ToString(), _settings.Dataset.Length);

CodeGenerationHelper codeGenerationHelper = new CodeGenerationHelper(new AutoMLEngine(_settings), _settings); // Needs to be improved.
codeGenerationHelper.GenerateCode();
}
Expand Down
33 changes: 26 additions & 7 deletions src/mlnet/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,13 @@
using System;
using System.CommandLine.Builder;
using System.CommandLine.Invocation;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.Commands;
using Microsoft.ML.CLI.Commands.New;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using NLog;
using NLog.Targets;
Expand All@@ -20,24 +21,33 @@ namespace Microsoft.ML.CLI
public class Program
{
private static Logger _logger = LogManager.GetCurrentClassLogger();

public static void Main(string[] args)
{
var telemetry = new MlTelemetry();
Telemetry.Telemetry.Initialize();
int exitCode = 1;
Exception ex = null;
var stopwatch = Stopwatch.StartNew();

var mlNetCommandEvent = new MLNetCommandEvent();

// Create handler outside so that commandline and the handler is decoupled and testable.
var handler = CommandHandler.Create<NewCommandSettings>(
(options) =>
{
try
{
// Send telemetry event for command issued
mlNetCommandEvent.AutoTrainCommandSettings = options;
Comment thread
Dmitry-A marked this conversation as resolved.
mlNetCommandEvent.TrackEvent();

// Map the verbosity to internal levels
var verbosity = Utils.GetVerbosity(options.Verbosity);

// Build the output path
string outputBaseDir = string.Empty;
if (options.Name == null)
{

options.Name = "Sample" + Utils.GetTaskKind(options.MlTask).ToString();
outputBaseDir = Path.Combine(options.OutputPath.FullName, options.Name);
}
Expand All@@ -50,7 +60,7 @@ public static void Main(string[] args)
options.OutputPath = new DirectoryInfo(outputBaseDir);

// Instantiate the command
var command = new NewCommand(options, telemetry);
var command = new NewCommand(options);

// Override the Logger Configuration
var logconsole = LogManager.Configuration.FindTargetByName("logconsole");
Expand All@@ -67,6 +77,7 @@ public static void Main(string[] args)
}
catch (Exception e)
{
ex = e;
_logger.Log(LogLevel.Error, e.Message);
_logger.Log(LogLevel.Debug, e.ToString());
_logger.Log(LogLevel.Info, Strings.LookIntoLogFile);
Expand All@@ -82,7 +93,8 @@ public static void Main(string[] args)

var parseResult = parser.Parse(args);

if (parseResult.Errors.Count == 0)
var commandParseSucceeded = !parseResult.Errors.Any();
if (commandParseSucceeded)
{
if (parseResult.RootCommandResult.Children.Count > 0)
{
Expand All@@ -95,13 +107,20 @@ public static void Main(string[] args)

var explicitlySpecifiedOptions = options.Where(opt => !opt.IsImplicit).Select(opt => opt.Name);

telemetry.SetCommandAndParameters(command.Name, explicitlySpecifiedOptions);
mlNetCommandEvent.CommandLineParametersUsed = explicitlySpecifiedOptions;
}
}
}

// Send system info telemetry
SystemInfoEvent.TrackEvent();

parser.InvokeAsync(parseResult).Wait();
// Send exit telemetry
ApplicationExitEvent.TrackEvent(exitCode, commandParseSucceeded, stopwatch.Elapsed, ex);
// Flush pending telemetry logs
Telemetry.Telemetry.Flush(TimeSpan.FromSeconds(3));
Environment.Exit(exitCode);
}
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.DotNet.Configurer;
using Microsoft.ML.CLI.Telemetry;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
using RuntimeInformation = System.Runtime.InteropServices.RuntimeInformation;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

using System;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
28 changes: 28 additions & 0 deletions src/mlnet/Telemetry/Events/ApplicationExitEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for CLI application exit.
/// </summary>
internal class ApplicationExitEvent
{
public static void TrackEvent(int exitCode, bool commandParseSucceeded, TimeSpan duration, Exception ex)
{
Telemetry.TrackEvent("application-exit",
new Dictionary<string, string>
{
{ "CommandParseSucceeded", commandParseSucceeded.ToString() },
{ "ExitCode", exitCode.ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration, ex);
}
}
}
36 changes: 36 additions & 0 deletions src/mlnet/Telemetry/Events/ExperimentCompletedEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.ML.AutoML;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for AutoML experiment completion.
/// </summary>
internal static class ExperimentCompletedEvent
{
public static void TrackEvent<TMetrics>(RunDetail<TMetrics> bestRun,
List<RunDetail<TMetrics>> allRuns,
TaskKind machineLearningTask,
TimeSpan duration)
{
Telemetry.TrackEvent("experiment-completed",
new Dictionary<string, string>()
{
{ "BestIterationNum", (allRuns.IndexOf(bestRun) + 1).ToString() },
{ "BestPipeline", Telemetry.GetSanitizedPipelineStr(bestRun.Pipeline) },
{ "BestTrainer", bestRun.TrainerName },
{ "MachineLearningTask", machineLearningTask.ToString() },
{ "NumIterations", allRuns.Count().ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration);
}
}
}
Loading
, '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
18 changes: 18 additions & 0 deletions src/Microsoft.ML.AutoML/ColumnInference/ColumnInformationUtil.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,24 @@ public static IEnumerable<string> GetColumnNames(ColumnInformation columnInforma
return columnNames;
}

public static IDictionary<ColumnPurpose, int> CountColumnsByPurpose(ColumnInformation columnInformation)
{
var result = new Dictionary<ColumnPurpose, int>();
var columnNames = GetColumnNames(columnInformation);
foreach (var columnName in columnNames)

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.

looks to me this can be a more terse implementation using linq grouping. are we anti-linq in this repo? :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I love LINQ! Here, I think the existing way is more readable, but I see where you're coming from. Style is so idiosyncratic

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.

This is my version, you think this isn't that readable? Fair warning, I haven't tested if it works :)

 var columnNames = ColumnInformationUtil.GetColumnNames(this.ColumnInformation);
var columnPurposes = columnNames.Select(c => (Name: c, Purpose: ColumnInformation.GetColumnPurpose(c))).Where(c => c.Purpose != null);
var purposeCounts = columnPurposes.GroupBy(c => c.Purpose).ToDictionary(c => c.Key, c => c.Count());

{
var purpose = columnInformation.GetColumnPurpose(columnName);
if (purpose == null)
{
continue;
}

result.TryGetValue(purpose.Value, out int count);
result[purpose.Value] = ++count;
}
return result;
}

private static void AddStringsToListIfNotNull(List<string> list, IEnumerable<string> strings)
{
foreach (var str in strings)
Expand Down
29 changes: 29 additions & 0 deletions src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
};
}

/// <summary>
/// The names of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> AllHyperparameterNames = GetAllSweepableParameterNames();
Comment thread
Dmitry-A marked this conversation as resolved.

public static IEnumerable<SweepableParam> BuildAveragePerceptronParams()
{
return BuildAveragedLinearArgsParams().Concat(BuildOnlineLinearArgsParams());
Expand DownExpand Up@@ -172,5 +177,29 @@ public static IEnumerable<SweepableParam> BuildSymSgdLogisticRegressionParams()
new SweepableDiscreteParam("UpdateFrequency", new object[] { "<Auto>", 5, 20 })
};
}

/// <summary>
/// Gets the name of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> GetAllSweepableParameterNames()
{
var sweepableParams = new List<SweepableParam>();
Comment thread
Dmitry-A marked this conversation as resolved.
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildFastForestParams());
sweepableParams.AddRange(BuildFastTreeParams());
sweepableParams.AddRange(BuildFastTreeTweedieParams());
sweepableParams.AddRange(BuildLightGbmParamsMulticlass());
sweepableParams.AddRange(BuildLightGbmParams());
sweepableParams.AddRange(BuildLinearSvmParams());
sweepableParams.AddRange(BuildLbfgsLogisticRegressionParams());
sweepableParams.AddRange(BuildOnlineGradientDescentParams());
sweepableParams.AddRange(BuildLbfgsPoissonRegressionParams());
sweepableParams.AddRange(BuildSdcaParams());
sweepableParams.AddRange(BuildOlsParams());
sweepableParams.AddRange(BuildSgdParams());
sweepableParams.AddRange(BuildSymSgdLogisticRegressionParams());
return new HashSet<string>(sweepableParams.Select(p => p.Name));
}
}
}
9 changes: 9 additions & 0 deletions src/mlnet/CodeGenerator/CodeGenerationHelper.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
using Microsoft.ML.CLI.CodeGenerator.CSharp;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.ShellProgressBar;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using Microsoft.ML.Data;
using NLog;
Expand DownExpand Up@@ -51,7 +52,9 @@ public void GenerateCode()
{
inputColumnInformation.IgnoredColumnNames.Add(value);
}
var inferColumnsStopwatch = Stopwatch.StartNew();
columnInference = _automlEngine.InferColumns(context, inputColumnInformation);
InferColumnsEvent.TrackEvent(columnInference.ColumnInformation, inferColumnsStopwatch.Elapsed);
Comment thread
Dmitry-A marked this conversation as resolved.
}
catch (Exception)
{
Expand All@@ -74,6 +77,9 @@ public void GenerateCode()
// The reason why we are doing this way of defining 3 different results is because of the AutoML API
// i.e there is no common class/interface to handle all three tasks together.

// Start a timer for the experiment
var stopwatch = Stopwatch.StartNew();

List<RunDetail<BinaryClassificationMetrics>> completedBinaryRuns = new List<RunDetail<BinaryClassificationMetrics>>();
List<RunDetail<MulticlassClassificationMetrics>> completedMulticlassRuns = new List<RunDetail<MulticlassClassificationMetrics>>();
List<RunDetail<RegressionMetrics>> completedRegressionRuns = new List<RunDetail<RegressionMetrics>>();
Expand DownExpand Up@@ -236,6 +242,7 @@ public void GenerateCode()
{
var binaryMetric = new BinaryExperimentSettings().OptimizingMetric;
var bestBinaryIteration = BestResultUtil.GetBestRun(completedBinaryRuns, binaryMetric);
ExperimentCompletedEvent.TrackEvent(bestBinaryIteration, completedBinaryRuns, TaskKind.BinaryClassification, stopwatch.Elapsed);
bestPipeline = bestBinaryIteration.Pipeline;
bestModel = bestBinaryIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedBinaryRuns.Count());
Expand All@@ -253,6 +260,7 @@ public void GenerateCode()
{
var regressionMetric = new RegressionExperimentSettings().OptimizingMetric;
var bestRegressionIteration = BestResultUtil.GetBestRun(completedRegressionRuns, regressionMetric);
ExperimentCompletedEvent.TrackEvent(bestRegressionIteration, completedRegressionRuns, TaskKind.Regression, stopwatch.Elapsed);
bestPipeline = bestRegressionIteration.Pipeline;
bestModel = bestRegressionIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedRegressionRuns.Count());
Expand All@@ -270,6 +278,7 @@ public void GenerateCode()
{
var muliclassMetric = new MulticlassExperimentSettings().OptimizingMetric;
var bestMulticlassIteration = BestResultUtil.GetBestRun(completedMulticlassRuns, muliclassMetric);
ExperimentCompletedEvent.TrackEvent(bestMulticlassIteration, completedMulticlassRuns, TaskKind.MulticlassClassification, stopwatch.Elapsed);
bestPipeline = bestMulticlassIteration.Pipeline;
bestModel = bestMulticlassIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedMulticlassRuns.Count());
Expand Down
4 changes: 3 additions & 1 deletion src/mlnet/Commands/CommandDefinitions.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,11 @@ namespace Microsoft.ML.CLI.Commands
{
internal static class CommandDefinitions
{
public const string AutoTrainCommandName = "auto-train";

internal static System.CommandLine.Command AutoTrain(ICommandHandler handler)
{
var newCommand = new System.CommandLine.Command("auto-train", "Create a new .NET project using ML.NET to train and run a model", handler: handler)
var newCommand = new System.CommandLine.Command(AutoTrainCommandName, "Create a new .NET project using ML.NET to train and run a model", handler: handler)
{
MlTask(),
Dataset(),
Expand Down
7 changes: 1 addition & 6 deletions src/mlnet/Commands/New/NewCommandHandler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.CodeGenerator;
using Microsoft.ML.CLI.Data;

Expand All@@ -11,18 +10,14 @@ namespace Microsoft.ML.CLI.Commands.New
internal class NewCommand : ICommand
{
private readonly NewCommandSettings _settings;
private readonly MlTelemetry _telemetry;

internal NewCommand(NewCommandSettings settings, MlTelemetry telemetry)
internal NewCommand(NewCommandSettings settings)
{
_settings = settings;
_telemetry = telemetry;
}

public void Execute()
{
_telemetry.LogAutoTrainMlCommand(_settings.Dataset.Name, _settings.MlTask.ToString(), _settings.Dataset.Length);

CodeGenerationHelper codeGenerationHelper = new CodeGenerationHelper(new AutoMLEngine(_settings), _settings); // Needs to be improved.
codeGenerationHelper.GenerateCode();
}
Expand Down
33 changes: 26 additions & 7 deletions src/mlnet/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,13 @@
using System;
using System.CommandLine.Builder;
using System.CommandLine.Invocation;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.Commands;
using Microsoft.ML.CLI.Commands.New;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using NLog;
using NLog.Targets;
Expand All@@ -20,24 +21,33 @@ namespace Microsoft.ML.CLI
public class Program
{
private static Logger _logger = LogManager.GetCurrentClassLogger();

public static void Main(string[] args)
{
var telemetry = new MlTelemetry();
Telemetry.Telemetry.Initialize();
int exitCode = 1;
Exception ex = null;
var stopwatch = Stopwatch.StartNew();

var mlNetCommandEvent = new MLNetCommandEvent();

// Create handler outside so that commandline and the handler is decoupled and testable.
var handler = CommandHandler.Create<NewCommandSettings>(
(options) =>
{
try
{
// Send telemetry event for command issued
mlNetCommandEvent.AutoTrainCommandSettings = options;
Comment thread
Dmitry-A marked this conversation as resolved.
mlNetCommandEvent.TrackEvent();

// Map the verbosity to internal levels
var verbosity = Utils.GetVerbosity(options.Verbosity);

// Build the output path
string outputBaseDir = string.Empty;
if (options.Name == null)
{

options.Name = "Sample" + Utils.GetTaskKind(options.MlTask).ToString();
outputBaseDir = Path.Combine(options.OutputPath.FullName, options.Name);
}
Expand All@@ -50,7 +60,7 @@ public static void Main(string[] args)
options.OutputPath = new DirectoryInfo(outputBaseDir);

// Instantiate the command
var command = new NewCommand(options, telemetry);
var command = new NewCommand(options);

// Override the Logger Configuration
var logconsole = LogManager.Configuration.FindTargetByName("logconsole");
Expand All@@ -67,6 +77,7 @@ public static void Main(string[] args)
}
catch (Exception e)
{
ex = e;
_logger.Log(LogLevel.Error, e.Message);
_logger.Log(LogLevel.Debug, e.ToString());
_logger.Log(LogLevel.Info, Strings.LookIntoLogFile);
Expand All@@ -82,7 +93,8 @@ public static void Main(string[] args)

var parseResult = parser.Parse(args);

if (parseResult.Errors.Count == 0)
var commandParseSucceeded = !parseResult.Errors.Any();
if (commandParseSucceeded)
{
if (parseResult.RootCommandResult.Children.Count > 0)
{
Expand All@@ -95,13 +107,20 @@ public static void Main(string[] args)

var explicitlySpecifiedOptions = options.Where(opt => !opt.IsImplicit).Select(opt => opt.Name);

telemetry.SetCommandAndParameters(command.Name, explicitlySpecifiedOptions);
mlNetCommandEvent.CommandLineParametersUsed = explicitlySpecifiedOptions;
}
}
}

// Send system info telemetry
SystemInfoEvent.TrackEvent();

parser.InvokeAsync(parseResult).Wait();
// Send exit telemetry
ApplicationExitEvent.TrackEvent(exitCode, commandParseSucceeded, stopwatch.Elapsed, ex);
// Flush pending telemetry logs
Telemetry.Telemetry.Flush(TimeSpan.FromSeconds(3));
Environment.Exit(exitCode);
}
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.DotNet.Configurer;
using Microsoft.ML.CLI.Telemetry;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
using RuntimeInformation = System.Runtime.InteropServices.RuntimeInformation;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

using System;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
28 changes: 28 additions & 0 deletions src/mlnet/Telemetry/Events/ApplicationExitEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for CLI application exit.
/// </summary>
internal class ApplicationExitEvent
{
public static void TrackEvent(int exitCode, bool commandParseSucceeded, TimeSpan duration, Exception ex)
{
Telemetry.TrackEvent("application-exit",
new Dictionary<string, string>
{
{ "CommandParseSucceeded", commandParseSucceeded.ToString() },
{ "ExitCode", exitCode.ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration, ex);
}
}
}
36 changes: 36 additions & 0 deletions src/mlnet/Telemetry/Events/ExperimentCompletedEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.ML.AutoML;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for AutoML experiment completion.
/// </summary>
internal static class ExperimentCompletedEvent
{
public static void TrackEvent<TMetrics>(RunDetail<TMetrics> bestRun,
List<RunDetail<TMetrics>> allRuns,
TaskKind machineLearningTask,
TimeSpan duration)
{
Telemetry.TrackEvent("experiment-completed",
new Dictionary<string, string>()
{
{ "BestIterationNum", (allRuns.IndexOf(bestRun) + 1).ToString() },
{ "BestPipeline", Telemetry.GetSanitizedPipelineStr(bestRun.Pipeline) },
{ "BestTrainer", bestRun.TrainerName },
{ "MachineLearningTask", machineLearningTask.ToString() },
{ "NumIterations", allRuns.Count().ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration);
}
}
}
Loading
, '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
18 changes: 18 additions & 0 deletions src/Microsoft.ML.AutoML/ColumnInference/ColumnInformationUtil.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,24 @@ public static IEnumerable<string> GetColumnNames(ColumnInformation columnInforma
return columnNames;
}

public static IDictionary<ColumnPurpose, int> CountColumnsByPurpose(ColumnInformation columnInformation)
{
var result = new Dictionary<ColumnPurpose, int>();
var columnNames = GetColumnNames(columnInformation);
foreach (var columnName in columnNames)

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.

looks to me this can be a more terse implementation using linq grouping. are we anti-linq in this repo? :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I love LINQ! Here, I think the existing way is more readable, but I see where you're coming from. Style is so idiosyncratic

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.

This is my version, you think this isn't that readable? Fair warning, I haven't tested if it works :)

 var columnNames = ColumnInformationUtil.GetColumnNames(this.ColumnInformation);
var columnPurposes = columnNames.Select(c => (Name: c, Purpose: ColumnInformation.GetColumnPurpose(c))).Where(c => c.Purpose != null);
var purposeCounts = columnPurposes.GroupBy(c => c.Purpose).ToDictionary(c => c.Key, c => c.Count());

{
var purpose = columnInformation.GetColumnPurpose(columnName);
if (purpose == null)
{
continue;
}

result.TryGetValue(purpose.Value, out int count);
result[purpose.Value] = ++count;
}
return result;
}

private static void AddStringsToListIfNotNull(List<string> list, IEnumerable<string> strings)
{
foreach (var str in strings)
Expand Down
29 changes: 29 additions & 0 deletions src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
};
}

/// <summary>
/// The names of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> AllHyperparameterNames = GetAllSweepableParameterNames();
Comment thread
Dmitry-A marked this conversation as resolved.

public static IEnumerable<SweepableParam> BuildAveragePerceptronParams()
{
return BuildAveragedLinearArgsParams().Concat(BuildOnlineLinearArgsParams());
Expand DownExpand Up@@ -172,5 +177,29 @@ public static IEnumerable<SweepableParam> BuildSymSgdLogisticRegressionParams()
new SweepableDiscreteParam("UpdateFrequency", new object[] { "<Auto>", 5, 20 })
};
}

/// <summary>
/// Gets the name of every hyperparameter swept across all trainers.
/// </summary>
public static ISet<string> GetAllSweepableParameterNames()
{
var sweepableParams = new List<SweepableParam>();
Comment thread
Dmitry-A marked this conversation as resolved.
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildAveragePerceptronParams());
sweepableParams.AddRange(BuildFastForestParams());
sweepableParams.AddRange(BuildFastTreeParams());
sweepableParams.AddRange(BuildFastTreeTweedieParams());
sweepableParams.AddRange(BuildLightGbmParamsMulticlass());
sweepableParams.AddRange(BuildLightGbmParams());
sweepableParams.AddRange(BuildLinearSvmParams());
sweepableParams.AddRange(BuildLbfgsLogisticRegressionParams());
sweepableParams.AddRange(BuildOnlineGradientDescentParams());
sweepableParams.AddRange(BuildLbfgsPoissonRegressionParams());
sweepableParams.AddRange(BuildSdcaParams());
sweepableParams.AddRange(BuildOlsParams());
sweepableParams.AddRange(BuildSgdParams());
sweepableParams.AddRange(BuildSymSgdLogisticRegressionParams());
return new HashSet<string>(sweepableParams.Select(p => p.Name));
}
}
}
9 changes: 9 additions & 0 deletions src/mlnet/CodeGenerator/CodeGenerationHelper.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
using Microsoft.ML.CLI.CodeGenerator.CSharp;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.ShellProgressBar;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using Microsoft.ML.Data;
using NLog;
Expand DownExpand Up@@ -51,7 +52,9 @@ public void GenerateCode()
{
inputColumnInformation.IgnoredColumnNames.Add(value);
}
var inferColumnsStopwatch = Stopwatch.StartNew();
columnInference = _automlEngine.InferColumns(context, inputColumnInformation);
InferColumnsEvent.TrackEvent(columnInference.ColumnInformation, inferColumnsStopwatch.Elapsed);
Comment thread
Dmitry-A marked this conversation as resolved.
}
catch (Exception)
{
Expand All@@ -74,6 +77,9 @@ public void GenerateCode()
// The reason why we are doing this way of defining 3 different results is because of the AutoML API
// i.e there is no common class/interface to handle all three tasks together.

// Start a timer for the experiment
var stopwatch = Stopwatch.StartNew();

List<RunDetail<BinaryClassificationMetrics>> completedBinaryRuns = new List<RunDetail<BinaryClassificationMetrics>>();
List<RunDetail<MulticlassClassificationMetrics>> completedMulticlassRuns = new List<RunDetail<MulticlassClassificationMetrics>>();
List<RunDetail<RegressionMetrics>> completedRegressionRuns = new List<RunDetail<RegressionMetrics>>();
Expand DownExpand Up@@ -236,6 +242,7 @@ public void GenerateCode()
{
var binaryMetric = new BinaryExperimentSettings().OptimizingMetric;
var bestBinaryIteration = BestResultUtil.GetBestRun(completedBinaryRuns, binaryMetric);
ExperimentCompletedEvent.TrackEvent(bestBinaryIteration, completedBinaryRuns, TaskKind.BinaryClassification, stopwatch.Elapsed);
bestPipeline = bestBinaryIteration.Pipeline;
bestModel = bestBinaryIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedBinaryRuns.Count());
Expand All@@ -253,6 +260,7 @@ public void GenerateCode()
{
var regressionMetric = new RegressionExperimentSettings().OptimizingMetric;
var bestRegressionIteration = BestResultUtil.GetBestRun(completedRegressionRuns, regressionMetric);
ExperimentCompletedEvent.TrackEvent(bestRegressionIteration, completedRegressionRuns, TaskKind.Regression, stopwatch.Elapsed);
bestPipeline = bestRegressionIteration.Pipeline;
bestModel = bestRegressionIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedRegressionRuns.Count());
Expand All@@ -270,6 +278,7 @@ public void GenerateCode()
{
var muliclassMetric = new MulticlassExperimentSettings().OptimizingMetric;
var bestMulticlassIteration = BestResultUtil.GetBestRun(completedMulticlassRuns, muliclassMetric);
ExperimentCompletedEvent.TrackEvent(bestMulticlassIteration, completedMulticlassRuns, TaskKind.MulticlassClassification, stopwatch.Elapsed);
bestPipeline = bestMulticlassIteration.Pipeline;
bestModel = bestMulticlassIteration.Model;
ConsolePrinter.ExperimentResultsHeader(LogLevel.Info, _settings.MlTask, _settings.Dataset.Name, columnInformation.LabelColumnName, elapsedTime.ToString("F2"), completedMulticlassRuns.Count());
Expand Down
4 changes: 3 additions & 1 deletion src/mlnet/Commands/CommandDefinitions.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,11 @@ namespace Microsoft.ML.CLI.Commands
{
internal static class CommandDefinitions
{
public const string AutoTrainCommandName = "auto-train";

internal static System.CommandLine.Command AutoTrain(ICommandHandler handler)
{
var newCommand = new System.CommandLine.Command("auto-train", "Create a new .NET project using ML.NET to train and run a model", handler: handler)
var newCommand = new System.CommandLine.Command(AutoTrainCommandName, "Create a new .NET project using ML.NET to train and run a model", handler: handler)
{
MlTask(),
Dataset(),
Expand Down
7 changes: 1 addition & 6 deletions src/mlnet/Commands/New/NewCommandHandler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.CodeGenerator;
using Microsoft.ML.CLI.Data;

Expand All@@ -11,18 +10,14 @@ namespace Microsoft.ML.CLI.Commands.New
internal class NewCommand : ICommand
{
private readonly NewCommandSettings _settings;
private readonly MlTelemetry _telemetry;

internal NewCommand(NewCommandSettings settings, MlTelemetry telemetry)
internal NewCommand(NewCommandSettings settings)
{
_settings = settings;
_telemetry = telemetry;
}

public void Execute()
{
_telemetry.LogAutoTrainMlCommand(_settings.Dataset.Name, _settings.MlTask.ToString(), _settings.Dataset.Length);

CodeGenerationHelper codeGenerationHelper = new CodeGenerationHelper(new AutoMLEngine(_settings), _settings); // Needs to be improved.
codeGenerationHelper.GenerateCode();
}
Expand Down
33 changes: 26 additions & 7 deletions src/mlnet/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,13 @@
using System;
using System.CommandLine.Builder;
using System.CommandLine.Invocation;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.Telemetry;
using Microsoft.ML.CLI.Commands;
using Microsoft.ML.CLI.Commands.New;
using Microsoft.ML.CLI.Data;
using Microsoft.ML.CLI.Telemetry.Events;
using Microsoft.ML.CLI.Utilities;
using NLog;
using NLog.Targets;
Expand All@@ -20,24 +21,33 @@ namespace Microsoft.ML.CLI
public class Program
{
private static Logger _logger = LogManager.GetCurrentClassLogger();

public static void Main(string[] args)
{
var telemetry = new MlTelemetry();
Telemetry.Telemetry.Initialize();
int exitCode = 1;
Exception ex = null;
var stopwatch = Stopwatch.StartNew();

var mlNetCommandEvent = new MLNetCommandEvent();

// Create handler outside so that commandline and the handler is decoupled and testable.
var handler = CommandHandler.Create<NewCommandSettings>(
(options) =>
{
try
{
// Send telemetry event for command issued
mlNetCommandEvent.AutoTrainCommandSettings = options;
Comment thread
Dmitry-A marked this conversation as resolved.
mlNetCommandEvent.TrackEvent();

// Map the verbosity to internal levels
var verbosity = Utils.GetVerbosity(options.Verbosity);

// Build the output path
string outputBaseDir = string.Empty;
if (options.Name == null)
{

options.Name = "Sample" + Utils.GetTaskKind(options.MlTask).ToString();
outputBaseDir = Path.Combine(options.OutputPath.FullName, options.Name);
}
Expand All@@ -50,7 +60,7 @@ public static void Main(string[] args)
options.OutputPath = new DirectoryInfo(outputBaseDir);

// Instantiate the command
var command = new NewCommand(options, telemetry);
var command = new NewCommand(options);

// Override the Logger Configuration
var logconsole = LogManager.Configuration.FindTargetByName("logconsole");
Expand All@@ -67,6 +77,7 @@ public static void Main(string[] args)
}
catch (Exception e)
{
ex = e;
_logger.Log(LogLevel.Error, e.Message);
_logger.Log(LogLevel.Debug, e.ToString());
_logger.Log(LogLevel.Info, Strings.LookIntoLogFile);
Expand All@@ -82,7 +93,8 @@ public static void Main(string[] args)

var parseResult = parser.Parse(args);

if (parseResult.Errors.Count == 0)
var commandParseSucceeded = !parseResult.Errors.Any();
if (commandParseSucceeded)
{
if (parseResult.RootCommandResult.Children.Count > 0)
{
Expand All@@ -95,13 +107,20 @@ public static void Main(string[] args)

var explicitlySpecifiedOptions = options.Where(opt => !opt.IsImplicit).Select(opt => opt.Name);

telemetry.SetCommandAndParameters(command.Name, explicitlySpecifiedOptions);
mlNetCommandEvent.CommandLineParametersUsed = explicitlySpecifiedOptions;
}
}
}

// Send system info telemetry
SystemInfoEvent.TrackEvent();

parser.InvokeAsync(parseResult).Wait();
// Send exit telemetry
ApplicationExitEvent.TrackEvent(exitCode, commandParseSucceeded, stopwatch.Elapsed, ex);
// Flush pending telemetry logs
Telemetry.Telemetry.Flush(TimeSpan.FromSeconds(3));
Environment.Exit(exitCode);
}
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.DotNet.Configurer;
using Microsoft.ML.CLI.Telemetry;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
using RuntimeInformation = System.Runtime.InteropServices.RuntimeInformation;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

using System;
using System.IO;
using Microsoft.DotNet.AutoML;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.ML.CLI.Telemetry;

namespace Microsoft.DotNet.Configurer
{
Expand Down
28 changes: 28 additions & 0 deletions src/mlnet/Telemetry/Events/ApplicationExitEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for CLI application exit.
/// </summary>
internal class ApplicationExitEvent
{
public static void TrackEvent(int exitCode, bool commandParseSucceeded, TimeSpan duration, Exception ex)
{
Telemetry.TrackEvent("application-exit",
new Dictionary<string, string>
{
{ "CommandParseSucceeded", commandParseSucceeded.ToString() },
{ "ExitCode", exitCode.ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration, ex);
}
}
}
36 changes: 36 additions & 0 deletions src/mlnet/Telemetry/Events/ExperimentCompletedEvent.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.ML.AutoML;

namespace Microsoft.ML.CLI.Telemetry.Events
{
/// <summary>
/// Telemetry event for AutoML experiment completion.
/// </summary>
internal static class ExperimentCompletedEvent
{
public static void TrackEvent<TMetrics>(RunDetail<TMetrics> bestRun,
List<RunDetail<TMetrics>> allRuns,
TaskKind machineLearningTask,
TimeSpan duration)
{
Telemetry.TrackEvent("experiment-completed",
new Dictionary<string, string>()
{
{ "BestIterationNum", (allRuns.IndexOf(bestRun) + 1).ToString() },
{ "BestPipeline", Telemetry.GetSanitizedPipelineStr(bestRun.Pipeline) },
{ "BestTrainer", bestRun.TrainerName },
{ "MachineLearningTask", machineLearningTask.ToString() },
{ "NumIterations", allRuns.Count().ToString() },
{ "PeakMemory", Process.GetCurrentProcess().PeakWorkingSet64.ToString() },
},
duration);
}
}
}
Loading