Remove redundant jump (#5828)

dotnet · Jun 8, 2021 · 1768f36 · 1768f36
1 parent e01dc25
commit 1768f36
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 26 deletions.
diff --git a/src/Microsoft.ML.Core/Data/ModelSaving.cs b/src/Microsoft.ML.Core/Data/ModelSaving.cs
@@ -51,7 +51,6 @@ internal static void SaveModel<T>(RepositoryWriter rep, T value, string path)
                 {
                     sb.SaveAsBinary(writer);
                 }
-                return;
             }
         }
 

diff --git a/src/Microsoft.ML.Core/Utilities/TextReaderStream.cs b/src/Microsoft.ML.Core/Utilities/TextReaderStream.cs
@@ -95,7 +95,6 @@ protected override void Dispose(bool disposing)
 
         public override void Flush()
         {
-            return;
         }
 
         /// <summary>

diff --git a/src/Microsoft.ML.Data/Data/Conversion.cs b/src/Microsoft.ML.Data/Data/Conversion.cs
@@ -1365,7 +1365,6 @@ private void TryParseSigned(long max, in TX text, out long? result)
 
             result = (long)sVal;
             Contracts.Assert(0 <= result && result <= long.MaxValue);
-            return;
         }
 
         /// <summary>

diff --git a/src/Microsoft.ML.FastTree/FastTree.cs b/src/Microsoft.ML.FastTree/FastTree.cs
@@ -330,8 +330,6 @@ private protected void PrintTestGraph(IChannel ch)
                 ch.Info(GetTestGraphHeader());
             else
                 ch.Info(GetTestGraphLine());
-
-            return;
         }
 
         private protected virtual void Initialize(IChannel ch)

diff --git a/src/Microsoft.ML.FastTree/Training/OptimizationAlgorithms/AcceleratedGradientDescent.cs b/src/Microsoft.ML.FastTree/Training/OptimizationAlgorithms/AcceleratedGradientDescent.cs
@@ -54,12 +54,7 @@ internal override InternalRegressionTree TrainingIteration(IChannel ch, bool[] a
 
         internal override void UpdateScores(ScoreTracker t, InternalRegressionTree tree)
         {
-            if (t == TrainingScores)
-            {
-                return;
-                //Special optimized routine for updating TrainingScores is implemented as part of TrainingItearation
-            }
-            else
+            if (t != TrainingScores)
                 base.UpdateScores(t, tree);
         }
 

diff --git a/src/Microsoft.ML.FastTree/Training/Parallel/SingleTrainer.cs b/src/Microsoft.ML.FastTree/Training/Parallel/SingleTrainer.cs
@@ -23,7 +23,6 @@ internal sealed class SingleTrainer : IParallelTraining
     {
         void IParallelTraining.CacheHistogram(bool isSmallerLeaf, int featureIdx, int subfeature, SufficientStatsBase sufficientStatsBase, bool hasWeights)
         {
-            return;
         }
 
         bool IParallelTraining.IsNeedFindLocalBestSplit()
@@ -36,12 +35,10 @@ void IParallelTraining.FindGlobalBestSplit(LeafSplitCandidates smallerChildSplit
             FindBestThresholdFromRawArrayFun findFunction,
             SplitInfo[] bestSplits)
         {
-            return;
         }
 
         void IParallelTraining.GetGlobalDataCountInLeaf(int leafIdx, ref int cnt)
         {
-            return;
         }
 
         bool[] IParallelTraining.GetLocalBinConstructionFeatures(int numFeatures)
@@ -61,42 +58,34 @@ double[] IParallelTraining.GlobalMean(Dataset dataset, InternalRegressionTree tr
 
         void IParallelTraining.PerformGlobalSplit(int leaf, int lteChild, int gtChild, SplitInfo splitInfo)
         {
-            return;
         }
 
         void IParallelTraining.InitIteration(ref bool[] activeFeatures)
         {
-            return;
         }
 
         void IParallelTraining.InitEnvironment()
         {
-            return;
         }
 
         void IParallelTraining.InitTreeLearner(Dataset trainData, int maxNumLeaves, int maxCatSplitPoints, ref int minDocInLeaf)
         {
-            return;
         }
 
         void IParallelTraining.SyncGlobalBoundary(int numFeatures, int maxBin, Double[][] binUpperBounds)
         {
-            return;
         }
 
         void IParallelTraining.FinalizeEnvironment()
         {
-            return;
         }
 
         void IParallelTraining.FinalizeTreeLearner()
         {
-            return;
         }
 
         void IParallelTraining.FinalizeIteration()
         {
-            return;
         }
 
         bool IParallelTraining.IsSkipNonSplittableHistogram()

diff --git a/src/Microsoft.ML.TimeSeries/TimeSeriesUtils.cs b/src/Microsoft.ML.TimeSeries/TimeSeriesUtils.cs
@@ -21,8 +21,6 @@ internal static void SerializeFixedSizeQueue(FixedSizeQueue<Single> queue, Binar
             writer.Write(queue.Count);
             for (int index = 0; index < queue.Count; index++)
                 writer.Write(queue[index]);
-
-            return;
         }
 
         internal static FixedSizeQueue<Single> DeserializeFixedSizeQueueSingle(BinaryReader reader, IHost host)
@@ -52,8 +50,6 @@ internal static void SerializeFixedSizeQueue(FixedSizeQueue<double> queue, Binar
             writer.Write(queue.Count);
             for (int index = 0; index < queue.Count; index++)
                 writer.Write(queue[index]);
-
-            return;
         }
 
         internal static FixedSizeQueue<double> DeserializeFixedSizeQueueDouble(BinaryReader reader, IHost host)
-Original file line number
+Diff line change
@@ Expand Up @@
                     {
                         sb.SaveAsBinary(writer);
                     }
-                    return;
                 }
             }
@@ Expand Down @@