Skip to content

Commit 61bb660

Browse files
committed
[SYSTEMDS-3938] Fix einsum codestyle and code quality
1 parent 05b2298 commit 61bb660

File tree

11 files changed

+450
-481
lines changed

11 files changed

+450
-481
lines changed

dev/checkstyle/suppressions.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]enumeration[\\/]GridBasedEnumerator\.java$"/>
4141
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]enumeration[\\/]InterestBasedEnumerator\.java$"/>
4242
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]resource[\\/]enumeration[\\/]PruneBasedEnumerator\.java$"/>
43-
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]cp[\\/]EinsumCPInstruction\.java$"/>
4443
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]gpu[\\/]context[\\/]CSRPointer\.java$"/>
4544
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]io[\\/]ReaderCOGParallel\.java$"/>
4645
<suppress checks="AvoidStarImportCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]io[\\/]ReaderCOG\.java$"/>
@@ -103,8 +102,6 @@
103102
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]hops[\\/]fedplanner[\\/]FederatedPlannerLogger\.java$"/>
104103
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]protobuf[\\/]SysdsProtos\.java$"/>
105104
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]compress[\\/]lib[\\/]CLALibBinaryCellOp\.java$"/>
106-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EinsumContext\.java$"/>
107-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EinsumEquationValidator\.java$"/>
108105
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]gpu[\\/]DnnGPUInstruction\.java$"/>
109106
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]gpu[\\/]context[\\/]CudaMemoryAllocator\.java$"/>
110107
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]gpu[\\/]context[\\/]GPUContextPool\.java$"/>
@@ -130,14 +127,7 @@
130127
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]transform[\\/]TransformFrameEncodeBagOfWords\.java$"/>
131128
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]gpu[\\/]cudaSupportFunctions[\\/]CudaCublasGeamTest\.java$"/>
132129
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]gpu[\\/]cudaSupportFunctions[\\/]CudaCusparseCsrGemmTest\.java$"/>
133-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EOpNodeBinary\.java$"/>
134-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EOpNodeData\.java$"/>
135-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EOpNodeFuse\.java$"/>
136-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EOpNodeUnary\.java$"/>
137-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EOpNode\.java$"/>
138-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]cp[\\/]EinsumCPInstruction\.java$"/>
139130
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]matrix[\\/]data[\\/]LibMatrixMult\.java$"/>
140-
<suppress checks="RegexpMultilineCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]functions[\\/]einsum[\\/]EinsumTest\.java$"/>
141131

142132
<!-- LocalVariableNameCheck -->
143133
<suppress checks="LocalVariableNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]api[\\/]PythonDMLScript\.java$"/>
@@ -193,7 +183,6 @@
193183
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]compress[\\/]lib[\\/]CLALibRightMultBy\.java$"/>
194184
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]controlprogram[\\/]federated[\\/]FederatedSSLUtil\.java$"/>
195185
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]controlprogram[\\/]paramserv[\\/]ParamServer\.java$"/>
196-
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]cp[\\/]EinsumCPInstruction\.java$"/>
197186
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]instructions[\\/]spark[\\/]UnaryMatrixSPInstruction\.java$"/>
198187
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]io[\\/]hdf5[\\/]H5\.java$"/>
199188
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]iogen[\\/]ReaderMappingIndex\.java$"/>
@@ -358,6 +347,4 @@
358347
<suppress checks="MethodNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]gpu[\\/]nn[\\/]DNNOperationsGPUTest\.java$"/>
359348
<suppress checks="MethodNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]usertest[\\/]UserInterfaceTest\.java$"/>
360349
<suppress checks="MethodNameCheck" files=".*src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]test[\\/]usertest[\\/]pythonapi[\\/]StartupTest\.java$"/>
361-
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EOpNodeBinary\.java$"/>
362-
<suppress checks="MethodNameCheck" files=".*src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]sysds[\\/]runtime[\\/]einsum[\\/]EinsumSpoofRowwise\.java$"/>
363350
</suppressions>

src/main/java/org/apache/sysds/runtime/einsum/EOpNode.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@
2727
import java.util.List;
2828

2929
public abstract class EOpNode {
30-
public Character c1;
31-
public Character c2;
30+
public Character c1;
31+
public Character c2;
3232
public Integer dim1;
3333
public Integer dim2;
34-
public EOpNode(Character c1, Character c2, Integer dim1, Integer dim2) {
35-
this.c1 = c1;
36-
this.c2 = c2;
34+
public EOpNode(Character c1, Character c2, Integer dim1, Integer dim2) {
35+
this.c1 = c1;
36+
this.c2 = c2;
3737
this.dim1 = dim1;
3838
this.dim2 = dim2;
39-
}
39+
}
4040

41-
public String getOutputString() {
42-
if(c1 == null) return "''";
43-
if(c2 == null) return c1.toString();
44-
return c1.toString() + c2.toString();
45-
}
41+
public String getOutputString() {
42+
if(c1 == null) return "''";
43+
if(c2 == null) return c1.toString();
44+
return c1.toString() + c2.toString();
45+
}
4646
public abstract List<EOpNode> getChildren();
4747

4848
public String[] recursivePrintString(){
49-
ArrayList<String[]> inpStrings = new ArrayList<>();
49+
List<String[]> inpStrings = new ArrayList<>();
5050
for (EOpNode node : getChildren()) {
5151
inpStrings.add(node.recursivePrintString());
5252
}
@@ -61,8 +61,8 @@ public String[] recursivePrintString(){
6161
return res;
6262
};
6363

64-
public abstract MatrixBlock computeEOpNode(ArrayList<MatrixBlock> inputs, int numOfThreads, Log LOG);
64+
public abstract MatrixBlock computeEOpNode(List<MatrixBlock> inputs, int numOfThreads, Log LOG);
6565

66-
public abstract EOpNode reorderChildrenAndOptimize(EOpNode parent, Character outChar1, Character outChar2);
66+
public abstract EOpNode reorderChildrenAndOptimize(EOpNode parent, Character outChar1, Character outChar2);
6767
}
6868

0 commit comments

Comments
 (0)