remove lotus references. (#252)

Author: codemzs

src/Microsoft.ML.Data/Model/Onnx/OnnxContext.cs

@@ -11,7 +11,7 @@
 namespace Microsoft.ML.Runtime.Model.Onnx
 {
     /// <summary>
-    /// A context for defining a lotusIR output.
+    /// A context for defining a ONNX output.
     /// </summary>
     public sealed class OnnxContext
     {

src/Microsoft.ML.Data/Prediction/Calibrator.cs

@@ -1349,8 +1349,6 @@ private static VersionInfo GetVersionInfo()
         public Double ParamA { get; }
         public Double ParamB { get; }
         public bool CanSavePfa => true;
-        public bool CanSaveLotusVNext => true;
-
         public bool CanSaveOnnx => true;
 
         public PlattCalibrator(IHostEnvironment env, Double paramA, Double paramB)

src/Microsoft.ML.Data/Transforms/TransformBase.cs

@@ -471,8 +471,6 @@ private sealed class ColumnTmp : OneToOneColumn
 
         public virtual bool CanSaveOnnx => false;
 
-        public virtual bool CanSaveLotusVNext => false;
-
         protected OneToOneTransformBase(IHostEnvironment env, string name, OneToOneColumn[] column,
             IDataView input, Func<ColumnType, string> testType)
             : base(env, name, input)

src/Microsoft.ML.FastTree/FastTree.cs

@@ -2789,8 +2789,7 @@ public abstract class FastTreePredictionWrapper :
         IWhatTheFeatureValueMapper,
         ICanGetSummaryAsIRow,
         ISingleCanSavePfa,
-        ISingleCanSaveOnnx/*,
-        ISingleCanSaveLotusVNext*/
+        ISingleCanSaveOnnx
     {
         //The below two properties are necessary for tree Visualizer
         public Ensemble TrainedEnsemble { get; }
@@ -2816,7 +2815,6 @@ public abstract class FastTreePredictionWrapper :
         public ColumnType OutputType => NumberType.Float;
         public bool CanSavePfa => true;
         public bool CanSaveOnnx => true;
-        public bool CanSaveLotusVNext => true;
 
         protected internal FastTreePredictionWrapper(IHostEnvironment env, string name, Ensemble trainedEnsemble, int numFeatures, string innerArgs)
             : base(env, name)
@@ -3134,27 +3132,6 @@ public virtual bool SaveAsOnnx(OnnxContext ctx, string[] outputNames, string fea
             return true;
         }
 
-        /*public void SaveAsLotusVNext(LotusVNextContext ctx, string featuresVariableName, string outputColumnName)
-        {
-            Host.CheckValue(ctx, nameof(ctx));
-            Host.CheckValue(featuresVariableName, nameof(featuresVariableName));
-            var tempVariables = new List<string>();
-            foreach (RegressionTree tree in TrainedEnsemble.Trees)
-            {
-                var tempVariable = ctx.DeclareVariable(null, LotusVNextUtils.MakeFloatLiteral(0));
-                tempVariables.Add(tempVariable);
-                tree.SaveAsLotusVNext(ctx, featuresVariableName, tempVariable);
-            }
-
-            var sumExpression = LotusVNextUtils.MakeVariableReference(tempVariables[0]);
-            for (int i = 1; i < tempVariables.Count; i++)
-                sumExpression = LotusVNextUtils.MakeCall("plus",
-                    sumExpression,
-                    LotusVNextUtils.MakeVariableReference(tempVariables[i]));
-
-            ctx.DeclareVariable(outputColumnName, sumExpression);
-        }*/
-
         public void SaveSummary(TextWriter writer, RoleMappedSchema schema)
         {
             writer.WriteLine();

src/Microsoft.ML.FastTree/TreeEnsemble/RegressionTree.cs

@@ -13,9 +13,6 @@
 using Microsoft.ML.Runtime.Data;
 using Microsoft.ML.Runtime.Internal.Utilities;
 using Microsoft.ML.Runtime.Model;
-/*LOTUS
-using Microsoft.ML.Runtime.Model.LotusVNext;
-using LotusvNext.Expressions;*/
 using Microsoft.ML.Runtime.Model.Pfa;
 using Microsoft.ML.Runtime.Internal.Internallearn;
 using Newtonsoft.Json.Linq;
@@ -1295,54 +1292,6 @@ private JToken AsPfaCore(JToken feat, int node)
             return PfaUtils.If(PfaUtils.Call("<=", PfaUtils.Index(feat, SplitFeatures[node]), RawThresholds[node]), lte, gt);
         }
 
-        /*LOTUS
-        internal void SaveAsLotusVNext(LotusVNextContext ctx, string featuresVariableName, string treeOutputVariable)
-        {
-            ctx.AddExpression(SaveAsLotusVNext(0, featuresVariableName, treeOutputVariable));
-        }
-
-        private Expression SaveAsLotusVNext(int node, string featuresVariableName, string treeOutputVariable)
-        {
-            if (node < 0)
-            {
-                return LotusVNextUtils.MakeSet(treeOutputVariable,
-                    LotusVNextUtils.MakeFloatLiteral((float)LeafValue(~node)));
-            }
-
-            Expression cond;
-            if (CategoricalSplit[node])
-            {
-                cond = LotusVNextUtils.MakeCall("gt",
-                    LotusVNextUtils.MakeAttr(featuresVariableName, CategoricalSplitFeatures[node][0]),
-                    LotusVNextUtils.MakeFloatLiteral(0.5f)
-                );
-
-                for (int i = 1; i < CategoricalSplitFeatures[node].Length; i++)
-                {
-                    cond = LotusVNextUtils.MakeCall("or",
-                        cond,
-                        LotusVNextUtils.MakeCall("gt",
-                            LotusVNextUtils.MakeAttr(featuresVariableName, CategoricalSplitFeatures[node][i]),
-                            LotusVNextUtils.MakeFloatLiteral(0.5f)
-                        )
-                    );
-                }
-            }
-            else
-            {
-                cond = LotusVNextUtils.MakeCall("gt",
-                    LotusVNextUtils.MakeAttr(featuresVariableName, SplitFeature(node)),
-                    LotusVNextUtils.MakeFloatLiteral(RawThreshold(node))
-                );
-            }
-
-            return LotusVNextUtils.MakeIf(
-                cond,
-                new[] { SaveAsLotusVNext(GetGtChildForNode(node), featuresVariableName, treeOutputVariable) },
-                new[] { SaveAsLotusVNext(GetLteChildForNode(node), featuresVariableName, treeOutputVariable) }
-            );
-        }*/
-
         public FeatureToGainMap GainMap
         {
             get

src/Microsoft.ML.Transforms/NormalizeTransform.cs

@@ -93,7 +93,6 @@ public string TestType(ColumnType type)
 
         public override bool CanSavePfa => true;
         public override bool CanSaveOnnx => true;
-        public override bool CanSaveLotusVNext => true;
         public const string LoaderSignature = "NormalizeTransform";
         internal const string LoaderSignatureOld = "NormalizeFunction";
         private static VersionInfo GetVersionInfo()