sync forked features/automl branch to upstream

build.proj

@@ -68,7 +68,7 @@
     <Message Importance="High" Text="Building packages ..." />
 
     <ItemGroup>
-      <PkgProject Include="pkg\Microsoft.ML.AutoML\Microsoft.ML.AutoML.symbols.nupkgproj" />
+      <PkgProject Include="pkg\Microsoft.ML.AutoML\*.nupkgproj" />
       <PkgProject Include="pkg\mlnet\*.nupkgproj" />
     </ItemGroup>
 

build/BranchInfo.props

@@ -22,13 +22,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsStableProject)' == 'true'">
     <MajorVersion>1</MajorVersion>
-    <MinorVersion>1</MinorVersion>
+    <MinorVersion>3</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <PreReleaseLabel>preview</PreReleaseLabel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsStableProject)' != 'true'">
     <MajorVersion>0</MajorVersion>
-    <MinorVersion>4</MinorVersion>
+    <MinorVersion>15</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <PreReleaseLabel>preview</PreReleaseLabel>
   </PropertyGroup>

src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MlDotNetPackageVersion>1.0.0</MlDotNetPackageVersion>
+    <MlDotNetPackageVersion>1.2.0</MlDotNetPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Microsoft.ML.AutoML/Utils/MLNetUtils/Conversions.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Globalization;
 
 namespace Microsoft.ML.AutoML
 {
@@ -25,7 +26,7 @@ public static bool TryParse(in TX src, out R4 dst)
                 dst = R4.NaN;
                 return true;
             }
-            if (float.TryParse(str, out dst))
+            if (float.TryParse(str, NumberStyles.Float, CultureInfo.InvariantCulture, out dst))
             {
                 return true;
             }

src/Microsoft.ML.AutoML/Utils/SweepableParamAttributes.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 
@@ -144,7 +145,7 @@ public SweepableFloatParam(float min, float max, float stepSize = -1, int numSte
 
         public override void SetUsingValueText(string valueText)
         {
-            RawValue = float.Parse(valueText);
+            RawValue = float.Parse(valueText, CultureInfo.InvariantCulture);
         }
 
         public override SweepableParam Clone() =>

src/mlnet/Templates/Console/ModelInputClass.cs

@@ -25,7 +25,7 @@ public partial class ModelInputClass : ModelInputClassBase
         /// </summary>
         public virtual string TransformText()
         {
-            Write(@"//*****************************************************************************************
+            this.Write(@"//*****************************************************************************************
 //*                                                                                       *
 //* This is an auto-generated file by Microsoft ML.NET CLI (Command-Line Interface) tool. *
 //*                                                                                       *
@@ -34,15 +34,15 @@ public virtual string TransformText()
 using Microsoft.ML.Data;
 
 namespace  ");
-            Write(ToStringHelper.ToStringWithCulture(Namespace));
-            Write(".Model.DataModels\r\n{\r\n    public class ModelInput\r\n    {\r\n");
+            this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
+            this.Write(".Model.DataModels\r\n{\r\n    public class ModelInput\r\n    {\r\n");
 foreach(var label in ClassLabels){
-            Write("       ");
-            Write(ToStringHelper.ToStringWithCulture(label));
-            Write("\r\n");
+            this.Write("       ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(label));
+            this.Write("\r\n");
 }
-            Write("}\r\n}\r\n");
-            return GenerationEnvironment.ToString();
+            this.Write("}\r\n}\r\n");
+            return this.GenerationEnvironment.ToString();
         }
 
 public IList<string> ClassLabels {get;set;}
@@ -72,15 +72,15 @@ protected System.Text.StringBuilder GenerationEnvironment
         {
             get
             {
-                if ((generationEnvironmentField == null))
+                if ((this.generationEnvironmentField == null))
                 {
-                    generationEnvironmentField = new global::System.Text.StringBuilder();
+                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
                 }
-                return generationEnvironmentField;
+                return this.generationEnvironmentField;
             }
             set
             {
-                generationEnvironmentField = value;
+                this.generationEnvironmentField = value;
             }
         }
         /// <summary>
@@ -90,11 +90,11 @@ public System.CodeDom.Compiler.CompilerErrorCollection Errors
         {
             get
             {
-                if ((errorsField == null))
+                if ((this.errorsField == null))
                 {
-                    errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
+                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
                 }
-                return errorsField;
+                return this.errorsField;
             }
         }
         /// <summary>
@@ -104,11 +104,11 @@ private System.Collections.Generic.List<int> indentLengths
         {
             get
             {
-                if ((indentLengthsField == null))
+                if ((this.indentLengthsField == null))
                 {
-                    indentLengthsField = new global::System.Collections.Generic.List<int>();
+                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
                 }
-                return indentLengthsField;
+                return this.indentLengthsField;
             }
         }
         /// <summary>
@@ -118,7 +118,7 @@ public string CurrentIndent
         {
             get
             {
-                return currentIndentField;
+                return this.currentIndentField;
             }
         }
         /// <summary>
@@ -128,11 +128,11 @@ public string CurrentIndent
         {
             get
             {
-                return sessionField;
+                return this.sessionField;
             }
             set
             {
-                sessionField = value;
+                this.sessionField = value;
             }
         }
         #endregion
@@ -148,59 +148,59 @@ public void Write(string textToAppend)
             }
             // If we're starting off, or if the previous text ended with a newline,
             // we have to append the current indent first.
-            if (((GenerationEnvironment.Length == 0) 
-                        || endsWithNewline))
+            if (((this.GenerationEnvironment.Length == 0) 
+                        || this.endsWithNewline))
             {
-                GenerationEnvironment.Append(currentIndentField);
-                endsWithNewline = false;
+                this.GenerationEnvironment.Append(this.currentIndentField);
+                this.endsWithNewline = false;
             }
             // Check if the current text ends with a newline
             if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
             {
-                endsWithNewline = true;
+                this.endsWithNewline = true;
             }
             // This is an optimization. If the current indent is "", then we don't have to do any
             // of the more complex stuff further down.
-            if ((currentIndentField.Length == 0))
+            if ((this.currentIndentField.Length == 0))
             {
-                GenerationEnvironment.Append(textToAppend);
+                this.GenerationEnvironment.Append(textToAppend);
                 return;
             }
             // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + currentIndentField));
+            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
             // If the text ends with a newline, then we should strip off the indent added at the very end
             // because the appropriate indent will be added when the next time Write() is called
-            if (endsWithNewline)
+            if (this.endsWithNewline)
             {
-                GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - currentIndentField.Length));
+                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
             }
             else
             {
-                GenerationEnvironment.Append(textToAppend);
+                this.GenerationEnvironment.Append(textToAppend);
             }
         }
         /// <summary>
         /// Write text directly into the generated output
         /// </summary>
         public void WriteLine(string textToAppend)
         {
-            Write(textToAppend);
-            GenerationEnvironment.AppendLine();
-            endsWithNewline = true;
+            this.Write(textToAppend);
+            this.GenerationEnvironment.AppendLine();
+            this.endsWithNewline = true;
         }
         /// <summary>
         /// Write formatted text directly into the generated output
         /// </summary>
         public void Write(string format, params object[] args)
         {
-            Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
         }
         /// <summary>
         /// Write formatted text directly into the generated output
         /// </summary>
         public void WriteLine(string format, params object[] args)
         {
-            WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
         }
         /// <summary>
         /// Raise an error
@@ -209,7 +209,7 @@ public void Error(string message)
         {
             System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
             error.ErrorText = message;
-            Errors.Add(error);
+            this.Errors.Add(error);
         }
         /// <summary>
         /// Raise a warning
@@ -219,7 +219,7 @@ public void Warning(string message)
             System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
             error.ErrorText = message;
             error.IsWarning = true;
-            Errors.Add(error);
+            this.Errors.Add(error);
         }
         /// <summary>
         /// Increase the indent
@@ -230,23 +230,23 @@ public void PushIndent(string indent)
             {
                 throw new global::System.ArgumentNullException("indent");
             }
-            currentIndentField = (currentIndentField + indent);
-            indentLengths.Add(indent.Length);
+            this.currentIndentField = (this.currentIndentField + indent);
+            this.indentLengths.Add(indent.Length);
         }
         /// <summary>
         /// Remove the last indent that was added with PushIndent
         /// </summary>
         public string PopIndent()
         {
             string returnValue = "";
-            if ((indentLengths.Count > 0))
+            if ((this.indentLengths.Count > 0))
             {
-                int indentLength = indentLengths[(indentLengths.Count - 1)];
-                indentLengths.RemoveAt((indentLengths.Count - 1));
+                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
+                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
                 if ((indentLength > 0))
                 {
-                    returnValue = currentIndentField.Substring((currentIndentField.Length - indentLength));
-                    currentIndentField = currentIndentField.Remove((currentIndentField.Length - indentLength));
+                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
+                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
                 }
             }
             return returnValue;
@@ -256,8 +256,8 @@ public string PopIndent()
         /// </summary>
         public void ClearIndent()
         {
-            indentLengths.Clear();
-            currentIndentField = "";
+            this.indentLengths.Clear();
+            this.currentIndentField = "";
         }
         #endregion
         #region ToString Helpers
@@ -274,13 +274,13 @@ public System.IFormatProvider FormatProvider
             {
                 get
                 {
-                    return formatProviderField ;
+                    return this.formatProviderField ;
                 }
                 set
                 {
                     if ((value != null))
                     {
-                        formatProviderField  = value;
+                        this.formatProviderField  = value;
                     }
                 }
             }
@@ -303,7 +303,7 @@ public string ToStringWithCulture(object objectToConvert)
                 else
                 {
                     return ((string)(method.Invoke(objectToConvert, new object[] {
-                                formatProviderField })));
+                                this.formatProviderField })));
                 }
             }
         }
@@ -315,7 +315,7 @@ public ToStringInstanceHelper ToStringHelper
         {
             get
             {
-                return toStringHelperField;
+                return this.toStringHelperField;
             }
         }
         #endregion