Skip to content

Commit 6b955fb

Browse files
mboehm7mboehm7
committed
[SYSTEMDS-3938] Additional fixes of codestyle and code quality
1 parent 0bfdde3 commit 6b955fb

File tree

68 files changed

+1621
-1401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1621
-1401
lines changed

‎dev/checkstyle/suppressions.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,14 @@
2424

2525
<suppressions>
2626
<!-- Star Imports -->
27-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]common[\\/]Opcodes\.java$"/>
28-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]hops[\\/]fedplanner[\\/]FederatedPlanCostEstimator\.java$"/>
29-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]hops[\\/]fedplanner[\\/]FederatedPlanRewireTransTable\.java$"/>
3027
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]parser[\\/]dml[\\/]DmlLexer\.java$"/>
3128
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]parser[\\/]dml[\\/]DmlParser\.java$"/>
32-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]CloudUtils\.java$"/>
33-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]ResourceCompiler\.java$"/>
34-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]ResourceOptimizer\.java$"/>
35-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]cost[\\/]CPCostUtils\.java$"/>
36-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]cost[\\/]CostEstimator\.java$"/>
37-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]cost[\\/]SparkCostUtils\.java$"/>
38-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]enumeration[\\/]EnumerationUtils\.java$"/>
39-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]enumeration[\\/]Enumerator\.java$"/>
40-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]enumeration[\\/]GridBasedEnumerator\.java$"/>
41-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]enumeration[\\/]InterestBasedEnumerator\.java$"/>
42-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]enumeration[\\/]PruneBasedEnumerator\.java$"/>
4329
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]gpu[\\/]context[\\/]CSRPointer\.java$"/>
4430
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]io[\\/]ReaderCOGParallel\.java$"/>
4531
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]io[\\/]ReaderCOG\.java$"/>
4632
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]matrix[\\/]data[\\/]DoublePrecisionCudaSupportFunctions\.java$"/>
4733
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]matrix[\\/]data[\\/]LibMatrixDNNLSTM\.java$"/>
4834
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]matrix[\\/]data[\\/]SinglePrecisionCudaSupportFunctions\.java$"/>
49-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]resource[\\/]CloudUtilsTests\.java$"/>
50-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]resource[\\/]CostEstimatorTest\.java$"/>
51-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]resource[\\/]EnumeratorTests\.java$"/>
52-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]resource[\\/]RecompilationTest\.java$"/>
53-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]resource[\\/]ResourceOptimizerTest\.java$"/>
54-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]resource[\\/]ResourceTestUtils\.java$"/>
55-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]sparse[\\/]SparseBlockIndexRange\.java$"/>
56-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]sparse[\\/]SparseBlockScan\.java$"/>
57-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]sparse[\\/]SparseBlockSize\.java$"/>
5835

5936
<!-- Type Name Check -->
6037
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]parser[\\/]dml[\\/]DmlParser\.java$"/>
@@ -69,11 +46,8 @@
6946
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]controlprogram[\\/]paramserv[\\/]dp[\\/]ShuffleFederatedScheme\.java$"/>
7047
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]controlprogram[\\/]paramserv[\\/]dp[\\/]SubsampleToMinFederatedScheme\.java$"/>
7148
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]data[\\/]TensorBlock\.java$"/>
72-
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]cp[\\/]CM_COV_Object\.java$"/>
7349
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]gpu[\\/]GPUInstruction\.java$"/>
74-
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]ooc[\\/]OOCEvictionManager\.java$"/>
7550
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]spark[\\/]BinaryFrameFrameSPInstruction\.java$"/>
76-
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]matrix[\\/]data[\\/]LibMatrixReorg\.java$"/>
7751
<suppress checks="TypeNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]util[\\/]DMVUtils\.java$"/>
7852
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]compress[\\/]mapping[\\/]PreAggregateDDC_DDCTest\.java$"/>
7953
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]compress[\\/]mapping[\\/]PreAggregateDDC_SDCZTest\.java$"/>
@@ -91,15 +65,12 @@
9165
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]builtin[\\/]part2[\\/]BuiltinXgBoostTest_regression\.java$"/>
9266
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]data[\\/]rand[\\/]SampleTest\.java$"/>
9367
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]data[\\/]rand[\\/]SequenceTest\.java$"/>
94-
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]mlcontext[\\/]MLContextFrameTest\.java$"/>
9568
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]ooc[\\/]lmDSTest\.java$"/>
9669
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]unary[\\/]matrix[\\/]IQMTest\.java$"/>
9770
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]unary[\\/]matrix[\\/]RoundTest\.java$"/>
9871
<suppress checks="TypeNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]unary[\\/]scalar[\\/]FullDistributionTest\.java$"/>
9972

10073
<!-- RegexpMultilineCheck (spaces detection; should be tabs) -->
101-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]hops[\\/]fedplanner[\\/]FederatedPlannerFedCostBased\.java$"/>
102-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]hops[\\/]fedplanner[\\/]FederatedPlannerLogger\.java$"/>
10374
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]protobuf[\\/]SysdsProtos\.java$"/>
10475
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]compress[\\/]lib[\\/]CLALibBinaryCellOp\.java$"/>
10576
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]gpu[\\/]DnnGPUInstruction\.java$"/>
@@ -120,27 +91,20 @@
12091
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]applications[\\/]nn[\\/]transformers[\\/]BertLayerTest\.java$"/>
12192
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]compress[\\/]readers[\\/]ReadersTest\.java$"/>
12293
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]matrix[\\/]STFTTest\.java$"/>
123-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]component[\\/]misc[\\/]DMLScriptTest\.java$"/>
12494
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]io[\\/]parquet[\\/]FrameParquetSchemaTest\.java$"/>
12595
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]jmlc[\\/]JMLConnectionTest\.java$"/>
12696
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]rewrite[\\/]RewriteQuantizationFusedCompressionTest\.java$"/>
12797
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]transform[\\/]TransformFrameEncodeBagOfWords\.java$"/>
12898
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]gpu[\\/]cudaSupportFunctions[\\/]CudaCublasGeamTest\.java$"/>
12999
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]gpu[\\/]cudaSupportFunctions[\\/]CudaCusparseCsrGemmTest\.java$"/>
130-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]matrix[\\/]data[\\/]LibMatrixMult\.java$"/>
131100

132101
<!-- LocalVariableNameCheck -->
133102
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]api[\\/]PythonDMLScript\.java$"/>
134-
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]parser[\\/]DMLTranslator\.java$"/>
135103
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]parser[\\/]dml[\\/]DmlParser\.java$"/>
136104
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]compress[\\/]colgroup[\\/]ColGroupFactory\.java$"/>
137105
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]compress[\\/]colgroup[\\/]dictionary[\\/]MatrixBlockDictionary\.java$"/>
138106
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]compress[\\/]colgroup[\\/]mapping[\\/]MapToFactory\.java$"/>
139107
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]compress[\\/]lib[\\/]CLALibLeftMultBy\.java$"/>
140-
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]controlprogram[\\/]caching[\\/]MatrixObject\.java$"/>
141-
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]controlprogram[\\/]paramserv[\\/]ParamServer\.java$"/>
142-
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]frame[\\/]data[\\/]lib[\\/]FrameLibAppend\.java$"/>
143-
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]spark[\\/]utils[\\/]RDDSortUtils\.java$"/>
144108
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]iogen[\\/]template[\\/]FrameGenerateReaderParallel\.java$"/>
145109
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]iogen[\\/]template[\\/]MatrixGenerateReaderParallel\.java$"/>
146110
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]matrix[\\/]data[\\/]LibMatrixCuDNNRnnAlgorithm\.java$"/>

‎src/main/java/org/apache/sysds/common/Opcodes.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,25 @@
1919

2020
package org.apache.sysds.common;
2121

22-
import org.apache.sysds.lops.*;
22+
import org.apache.sysds.lops.Append;
23+
import org.apache.sysds.lops.DataGen;
24+
import org.apache.sysds.lops.LeftIndex;
25+
import org.apache.sysds.lops.RightIndex;
26+
import org.apache.sysds.lops.Compression;
27+
import org.apache.sysds.lops.DeCompression;
28+
import org.apache.sysds.lops.Local;
29+
import org.apache.sysds.lops.Checkpoint;
30+
import org.apache.sysds.lops.WeightedCrossEntropy;
31+
import org.apache.sysds.lops.WeightedCrossEntropyR;
32+
import org.apache.sysds.lops.WeightedDivMM;
33+
import org.apache.sysds.lops.WeightedDivMMR;
34+
import org.apache.sysds.lops.WeightedSigmoid;
35+
import org.apache.sysds.lops.WeightedSigmoidR;
36+
import org.apache.sysds.lops.WeightedSquaredLoss;
37+
import org.apache.sysds.lops.WeightedSquaredLossR;
38+
import org.apache.sysds.lops.WeightedUnaryMM;
39+
import org.apache.sysds.lops.WeightedUnaryMMR;
40+
2341
import org.apache.sysds.common.Types.OpOp1;
2442
import org.apache.sysds.hops.FunctionOp;
2543

‎src/main/java/org/apache/sysds/hops/fedplanner/FederatedPlanCostEstimator.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919

2020
package org.apache.sysds.hops.fedplanner;
2121

22+
import java.util.Iterator;
23+
import java.util.LinkedHashMap;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.NoSuchElementException;
27+
2228
import org.apache.commons.lang3.tuple.Pair;
2329
import org.apache.sysds.common.Types;
2430
import org.apache.sysds.hops.DataOp;
@@ -28,7 +34,6 @@
2834
import org.apache.sysds.hops.fedplanner.FederatedMemoTable.HopCommon;
2935
import org.apache.sysds.runtime.instructions.fed.FEDInstruction.FederatedOutput;
3036

31-
import java.util.*;
3237

3338
/**
3439
* Cost estimator for federated execution plans.

‎src/main/java/org/apache/sysds/hops/fedplanner/FederatedPlanRewireTransTable.java‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,29 @@
2323
import org.apache.commons.lang3.tuple.ImmutablePair;
2424
import org.apache.sysds.common.Types;
2525
import org.apache.sysds.common.Types.ParamBuiltinOp;
26-
import org.apache.sysds.hops.*;
26+
import org.apache.sysds.hops.AggBinaryOp;
27+
import org.apache.sysds.hops.AggUnaryOp;
28+
import org.apache.sysds.hops.BinaryOp;
29+
import org.apache.sysds.hops.DataGenOp;
30+
import org.apache.sysds.hops.DataOp;
31+
import org.apache.sysds.hops.DnnOp;
32+
import org.apache.sysds.hops.FunctionOp;
2733
import org.apache.sysds.hops.FunctionOp.FunctionType;
28-
import org.apache.sysds.parser.*;
34+
import org.apache.sysds.hops.Hop;
35+
import org.apache.sysds.hops.IndexingOp;
36+
import org.apache.sysds.hops.LeftIndexingOp;
37+
import org.apache.sysds.hops.LiteralOp;
38+
import org.apache.sysds.hops.NaryOp;
39+
import org.apache.sysds.hops.ParameterizedBuiltinOp;
40+
import org.apache.sysds.hops.QuaternaryOp;
41+
import org.apache.sysds.hops.ReorgOp;
42+
import org.apache.sysds.hops.TernaryOp;
43+
import org.apache.sysds.hops.UnaryOp;
2944
import org.apache.sysds.hops.fedplanner.FederatedMemoTable.HopCommon;
3045
import org.apache.sysds.hops.rewrite.HopRewriteUtils;
3146
import org.apache.sysds.runtime.controlprogram.federated.FederatedRange;
3247
import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
3348
import org.apache.sysds.runtime.util.UtilFunctions;
34-
import java.util.*;
3549
import org.apache.sysds.runtime.instructions.fed.InitFEDInstruction;
3650
import org.apache.sysds.runtime.controlprogram.federated.FederatedData;
3751
import java.net.InetAddress;
@@ -49,8 +63,26 @@
4963
import org.apache.sysds.common.Types.DataType;
5064
import org.apache.sysds.common.Types.ReOrgOp;
5165
import org.apache.sysds.lops.MMTSJ.MMTSJType;
66+
import org.apache.sysds.parser.DMLProgram;
67+
import org.apache.sysds.parser.DataExpression;
68+
import org.apache.sysds.parser.ForStatement;
69+
import org.apache.sysds.parser.ForStatementBlock;
70+
import org.apache.sysds.parser.FunctionStatement;
71+
import org.apache.sysds.parser.FunctionStatementBlock;
72+
import org.apache.sysds.parser.IfStatement;
73+
import org.apache.sysds.parser.IfStatementBlock;
74+
import org.apache.sysds.parser.StatementBlock;
75+
import org.apache.sysds.parser.VariableSet;
76+
import org.apache.sysds.parser.WhileStatement;
77+
import org.apache.sysds.parser.WhileStatementBlock;
78+
5279
import java.util.ArrayList;
80+
import java.util.HashMap;
81+
import java.util.HashSet;
82+
import java.util.Iterator;
5383
import java.util.List;
84+
import java.util.Map;
85+
import java.util.Set;
5486

5587
public class FederatedPlanRewireTransTable {
5688

‎src/main/java/org/apache/sysds/hops/fedplanner/FederatedPlannerFedCostBased.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@ public void rewriteFunctionDynamic(FunctionStatementBlock function, LocalVariabl
6464
private void rewriteHop(FedPlan optimalPlan, FederatedMemoTable memoTable, Set<Long> visited) {
6565
long hopID = optimalPlan.getHopRef().getHopID();
6666

67-
if (visited.contains(hopID)) {
68-
return;
69-
} else {
70-
visited.add(hopID);
71-
}
67+
if (visited.contains(hopID)) {
68+
return;
69+
} else {
70+
visited.add(hopID);
71+
}
7272

73-
for (Pair<Long, FEDInstruction.FederatedOutput> childFedPlanPair : optimalPlan.getChildFedPlans()) {
74-
FedPlan childPlan = memoTable.getFedPlanAfterPrune(childFedPlanPair);
75-
76-
// DEBUG: Check if getFedPlanAfterPrune returns null
77-
if (childPlan == null) {
73+
for (Pair<Long, FEDInstruction.FederatedOutput> childFedPlanPair : optimalPlan.getChildFedPlans()) {
74+
FedPlan childPlan = memoTable.getFedPlanAfterPrune(childFedPlanPair);
75+
76+
// DEBUG: Check if getFedPlanAfterPrune returns null
77+
if (childPlan == null) {
7878
FederatedPlannerLogger.logNullChildPlanDebug(childFedPlanPair, optimalPlan, memoTable);
79-
continue;
80-
}
81-
79+
continue;
80+
}
81+
8282
rewriteHop(childPlan, memoTable, visited);
83-
}
83+
}
8484

8585
if (optimalPlan.getFedOutType() == FEDInstruction.FederatedOutput.LOUT) {
8686
optimalPlan.setFederatedOutput(FEDInstruction.FederatedOutput.LOUT);

0 commit comments

Comments
 (0)