Skip to content

Commit 72ce253

Browse files
committed
[MINOR] Fix formatting and method name violations
1 parent 99ea489 commit 72ce253

6 files changed

Lines changed: 64 additions & 65 deletions

File tree

src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,7 @@ public void setIXTransform(BiFunction<Boolean, IndexRange, IndexRange> transform
692692
throw new UnsupportedOperationException();
693693
}
694694

695+
@SuppressWarnings("unchecked")
695696
public void setSubscriber(Consumer<OOCStream.QueueCallback<IndexedMatrixValue>> subscriber, boolean incrConsumers) {
696697
if(_deletable)
697698
throw new DMLRuntimeException("Cannot register a new subscriber on " + this + " because has been flagged for deletion");

src/main/java/org/apache/sysds/runtime/instructions/ooc/OOCInstruction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ protected <T> OOCStream<T> mergeOOCStreams(List<OOCStream<T>> streams) {
205205
return new MergedOOCStream<>(streams);
206206
}
207207

208-
@SuppressWarnings({"varargs", "unchecked"})
208+
@SuppressWarnings({"unchecked"})
209209
protected <T> OOCStream<T> mergeOOCStreams(OOCStream<T>... streams) {
210210
return new MergedOOCStream<>(streams);
211211
}
@@ -1093,7 +1093,6 @@ protected <T> CompletableFuture<Void> submitOOCTasks(final List<OOCStream<T>> qu
10931093
};
10941094

10951095
if(callback instanceof OOCStream.GroupQueueCallback<?>) {
1096-
@SuppressWarnings("unchecked")
10971096
OOCStream.GroupQueueCallback<T> group = (OOCStream.GroupQueueCallback<T>) callback;
10981097

10991098
if(localFuture.isDone()) {

src/main/java/org/apache/sysds/runtime/ooc/stream/FilteredOOCStream.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public void setSubscriber(Consumer<QueueCallback<T>> subscriber) {
8585
}
8686

8787
if(cb instanceof OOCStream.GroupQueueCallback<?>) {
88-
@SuppressWarnings("unchecked")
8988
OOCStream.GroupQueueCallback<T> group = (OOCStream.GroupQueueCallback<T>) cb;
9089
for(int i = 0; i < group.size(); i++) {
9190
QueueCallback<T> sub = group.getCallback(i);

src/main/java/org/apache/sysds/runtime/ooc/stream/SplittingOOCStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class SplittingOOCStream<T> implements OOCStream<T> {
3535
private OOCStream<T> _sourceStream;
3636
private SubOOCStream<T>[] _subStreams;
3737

38+
@SuppressWarnings("unchecked")
3839
public SplittingOOCStream(OOCStream<T> sourceStream, Function<T, Integer> partitionFunc, int numPartitions) {
3940
_sourceStream = sourceStream;
4041
_subStreams = new SubOOCStream[numPartitions];
@@ -75,7 +76,6 @@ public SplittingOOCStream(OOCStream<T> sourceStream, Function<T, Integer> partit
7576
}
7677

7778
if(cb instanceof OOCStream.GroupQueueCallback<?>) {
78-
@SuppressWarnings("unchecked")
7979
OOCStream.GroupQueueCallback<T> group = (OOCStream.GroupQueueCallback<T>) cb;
8080
for(int gi = 0; gi < group.size(); gi++) {
8181
OOCStream.QueueCallback<T> sub = group.getCallback(gi);

src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedPerformanceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ public class MatrixMultTransposedPerformanceTest {
3131
private final int k = 200;
3232

3333
@Test
34-
public void testPerf_1_NoTransA_TransB() {
34+
public void testPerf1NoTransATransB() {
3535
System.out.println("Case: C = A %*% t(B)");
3636
runTest(false, true);
3737
System.out.println();
3838
}
3939

4040
@Test
41-
public void testPerf_2_TransA_NoTransB() {
41+
public void testPerf2TransANoTransB() {
4242
System.out.println("Case: C = t(A) %*% B");
4343
runTest(true, false);
4444
System.out.println();
4545
}
4646

4747
@Test
48-
public void testPerf_3_TransA_TransB() {
48+
public void testPerf3TransATransB() {
4949
System.out.println("Case: C = t(A) %*% t(B)");
5050
runTest(true, true);
5151
}

src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedTest.java

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -30,62 +30,62 @@
3030

3131
public class MatrixMultTransposedTest {
3232

33-
// run multiple random scenarios
34-
@Test
35-
public void testCase_noTransA_TransB() {
36-
for(int i=0; i<10; i++) {
37-
runTest(false, true);
38-
}
39-
}
40-
41-
@Test
42-
public void testCase_TransA_NoTransB() {
43-
for(int i=0; i<10; i++) {
44-
runTest(true, false);
45-
}
46-
}
47-
48-
@Test
49-
public void testCase_TransA_TransB() {
50-
for(int i=0; i<10; i++) {
51-
runTest(true, true);
52-
}
53-
}
54-
55-
private void runTest(boolean tA, boolean tB) {
56-
Random rand = new Random();
57-
58-
// generate random dimensions between 1 and 300
59-
int m = rand.nextInt(300) + 1;
60-
int n = rand.nextInt(300) + 1;
61-
int k = rand.nextInt(300) + 1;
62-
63-
64-
int rowsA = tA ? k : m;
65-
int colsA = tA ? m : k;
66-
int rowsB = tB ? n : k;
67-
int colsB = tB ? k : n;
68-
69-
MatrixBlock ma = MatrixBlock.randOperations(rowsA, colsA, 1.0, -1, 1, "uniform", 7);
70-
MatrixBlock mb = MatrixBlock.randOperations(rowsB, colsB, 1.0, -1, 1, "uniform", 3);
71-
72-
MatrixBlock mc = new MatrixBlock(m, n, false);
73-
mc.allocateDenseBlock();
74-
75-
DenseBlock a = ma.getDenseBlock();
76-
DenseBlock b = mb.getDenseBlock();
77-
DenseBlock c = mc.getDenseBlock();
78-
79-
LibMatrixMult.matrixMultDenseDenseMM(a, b, c, tA, tB, n, k, 0, m, 0, n);
80-
81-
mc.recomputeNonZeros();
82-
83-
// calc true result with existing methods
84-
MatrixBlock ma_in = tA ? LibMatrixReorg.transpose(ma) : ma;
85-
MatrixBlock mb_in = tB ? LibMatrixReorg.transpose(mb) : mb;
86-
MatrixBlock expected = LibMatrixMult.matrixMult(ma_in, mb_in);
87-
88-
// compare results
89-
TestUtils.compareMatrices(expected, mc, 1e-8);
90-
}
33+
// run multiple random scenarios
34+
@Test
35+
public void testCaseNoTransATransB() {
36+
for(int i=0; i<10; i++) {
37+
runTest(false, true);
38+
}
39+
}
40+
41+
@Test
42+
public void testCaseTransANoTransB() {
43+
for(int i=0; i<10; i++) {
44+
runTest(true, false);
45+
}
46+
}
47+
48+
@Test
49+
public void testCaseTransATransB() {
50+
for(int i=0; i<10; i++) {
51+
runTest(true, true);
52+
}
53+
}
54+
55+
private void runTest(boolean tA, boolean tB) {
56+
Random rand = new Random();
57+
58+
// generate random dimensions between 1 and 300
59+
int m = rand.nextInt(300) + 1;
60+
int n = rand.nextInt(300) + 1;
61+
int k = rand.nextInt(300) + 1;
62+
63+
64+
int rowsA = tA ? k : m;
65+
int colsA = tA ? m : k;
66+
int rowsB = tB ? n : k;
67+
int colsB = tB ? k : n;
68+
69+
MatrixBlock ma = MatrixBlock.randOperations(rowsA, colsA, 1.0, -1, 1, "uniform", 7);
70+
MatrixBlock mb = MatrixBlock.randOperations(rowsB, colsB, 1.0, -1, 1, "uniform", 3);
71+
72+
MatrixBlock mc = new MatrixBlock(m, n, false);
73+
mc.allocateDenseBlock();
74+
75+
DenseBlock a = ma.getDenseBlock();
76+
DenseBlock b = mb.getDenseBlock();
77+
DenseBlock c = mc.getDenseBlock();
78+
79+
LibMatrixMult.matrixMultDenseDenseMM(a, b, c, tA, tB, n, k, 0, m, 0, n);
80+
81+
mc.recomputeNonZeros();
82+
83+
// calc true result with existing methods
84+
MatrixBlock ma_in = tA ? LibMatrixReorg.transpose(ma) : ma;
85+
MatrixBlock mb_in = tB ? LibMatrixReorg.transpose(mb) : mb;
86+
MatrixBlock expected = LibMatrixMult.matrixMult(ma_in, mb_in);
87+
88+
// compare results
89+
TestUtils.compareMatrices(expected, mc, 1e-8);
90+
}
9191
}

0 commit comments

Comments
 (0)