This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/main by this push:
new 72ce253f11 [MINOR] Fix formatting and method name violations
72ce253f11 is described below
commit 72ce253f1147d3abb7f700901061b33c97739774
Author: Matthias Boehm <[email protected]>
AuthorDate: Tue Mar 31 12:04:22 2026 +0200
[MINOR] Fix formatting and method name violations
---
.../runtime/instructions/ooc/CachingStream.java | 1 +
.../runtime/instructions/ooc/OOCInstruction.java | 3 +-
.../runtime/ooc/stream/FilteredOOCStream.java | 1 -
.../runtime/ooc/stream/SplittingOOCStream.java | 2 +-
.../MatrixMultTransposedPerformanceTest.java | 6 +-
.../matrixmult/MatrixMultTransposedTest.java | 116 ++++++++++-----------
6 files changed, 64 insertions(+), 65 deletions(-)
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java
b/src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java
index b7c4e2aa64..56c265fe5e 100644
--- a/src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java
+++ b/src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java
@@ -692,6 +692,7 @@ public class CachingStream implements
OOCStreamable<IndexedMatrixValue> {
throw new UnsupportedOperationException();
}
+ @SuppressWarnings("unchecked")
public void
setSubscriber(Consumer<OOCStream.QueueCallback<IndexedMatrixValue>> subscriber,
boolean incrConsumers) {
if(_deletable)
throw new DMLRuntimeException("Cannot register a new
subscriber on " + this + " because has been flagged for deletion");
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/ooc/OOCInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/ooc/OOCInstruction.java
index 2b90a02604..aaa24ac2f4 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/ooc/OOCInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/ooc/OOCInstruction.java
@@ -205,7 +205,7 @@ public abstract class OOCInstruction extends Instruction {
return new MergedOOCStream<>(streams);
}
- @SuppressWarnings({"varargs", "unchecked"})
+ @SuppressWarnings({"unchecked"})
protected <T> OOCStream<T> mergeOOCStreams(OOCStream<T>... streams) {
return new MergedOOCStream<>(streams);
}
@@ -1093,7 +1093,6 @@ public abstract class OOCInstruction extends Instruction {
};
if(callback instanceof
OOCStream.GroupQueueCallback<?>) {
- @SuppressWarnings("unchecked")
OOCStream.GroupQueueCallback<T>
group = (OOCStream.GroupQueueCallback<T>) callback;
if(localFuture.isDone()) {
diff --git
a/src/main/java/org/apache/sysds/runtime/ooc/stream/FilteredOOCStream.java
b/src/main/java/org/apache/sysds/runtime/ooc/stream/FilteredOOCStream.java
index a6e978e030..4ad28ae616 100644
--- a/src/main/java/org/apache/sysds/runtime/ooc/stream/FilteredOOCStream.java
+++ b/src/main/java/org/apache/sysds/runtime/ooc/stream/FilteredOOCStream.java
@@ -85,7 +85,6 @@ public class FilteredOOCStream<T> implements OOCStream<T> {
}
if(cb instanceof OOCStream.GroupQueueCallback<?>) {
- @SuppressWarnings("unchecked")
OOCStream.GroupQueueCallback<T> group =
(OOCStream.GroupQueueCallback<T>) cb;
for(int i = 0; i < group.size(); i++) {
QueueCallback<T> sub =
group.getCallback(i);
diff --git
a/src/main/java/org/apache/sysds/runtime/ooc/stream/SplittingOOCStream.java
b/src/main/java/org/apache/sysds/runtime/ooc/stream/SplittingOOCStream.java
index a83ae4d01f..fb19611c25 100644
--- a/src/main/java/org/apache/sysds/runtime/ooc/stream/SplittingOOCStream.java
+++ b/src/main/java/org/apache/sysds/runtime/ooc/stream/SplittingOOCStream.java
@@ -35,6 +35,7 @@ public class SplittingOOCStream<T> implements OOCStream<T> {
private OOCStream<T> _sourceStream;
private SubOOCStream<T>[] _subStreams;
+ @SuppressWarnings("unchecked")
public SplittingOOCStream(OOCStream<T> sourceStream, Function<T,
Integer> partitionFunc, int numPartitions) {
_sourceStream = sourceStream;
_subStreams = new SubOOCStream[numPartitions];
@@ -75,7 +76,6 @@ public class SplittingOOCStream<T> implements OOCStream<T> {
}
if(cb instanceof
OOCStream.GroupQueueCallback<?>) {
- @SuppressWarnings("unchecked")
OOCStream.GroupQueueCallback<T>
group = (OOCStream.GroupQueueCallback<T>) cb;
for(int gi = 0; gi <
group.size(); gi++) {
OOCStream.QueueCallback<T> sub = group.getCallback(gi);
diff --git
a/src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedPerformanceTest.java
b/src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedPerformanceTest.java
index 18d62251a0..94d8a5cfbb 100644
---
a/src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedPerformanceTest.java
+++
b/src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedPerformanceTest.java
@@ -31,21 +31,21 @@ public class MatrixMultTransposedPerformanceTest {
private final int k = 200;
@Test
- public void testPerf_1_NoTransA_TransB() {
+ public void testPerf1NoTransATransB() {
System.out.println("Case: C = A %*% t(B)");
runTest(false, true);
System.out.println();
}
@Test
- public void testPerf_2_TransA_NoTransB() {
+ public void testPerf2TransANoTransB() {
System.out.println("Case: C = t(A) %*% B");
runTest(true, false);
System.out.println();
}
@Test
- public void testPerf_3_TransA_TransB() {
+ public void testPerf3TransATransB() {
System.out.println("Case: C = t(A) %*% t(B)");
runTest(true, true);
}
diff --git
a/src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedTest.java
b/src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedTest.java
index 6c18df009f..2b9f09ba13 100644
---
a/src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedTest.java
+++
b/src/test/java/org/apache/sysds/test/component/matrixmult/MatrixMultTransposedTest.java
@@ -30,62 +30,62 @@ import java.util.Random;
public class MatrixMultTransposedTest {
- // run multiple random scenarios
- @Test
- public void testCase_noTransA_TransB() {
- for(int i=0; i<10; i++) {
- runTest(false, true);
- }
- }
-
- @Test
- public void testCase_TransA_NoTransB() {
- for(int i=0; i<10; i++) {
- runTest(true, false);
- }
- }
-
- @Test
- public void testCase_TransA_TransB() {
- for(int i=0; i<10; i++) {
- runTest(true, true);
- }
- }
-
- private void runTest(boolean tA, boolean tB) {
- Random rand = new Random();
-
- // generate random dimensions between 1 and 300
- int m = rand.nextInt(300) + 1;
- int n = rand.nextInt(300) + 1;
- int k = rand.nextInt(300) + 1;
-
-
- int rowsA = tA ? k : m;
- int colsA = tA ? m : k;
- int rowsB = tB ? n : k;
- int colsB = tB ? k : n;
-
- MatrixBlock ma = MatrixBlock.randOperations(rowsA, colsA, 1.0, -1, 1,
"uniform", 7);
- MatrixBlock mb = MatrixBlock.randOperations(rowsB, colsB, 1.0, -1, 1,
"uniform", 3);
-
- MatrixBlock mc = new MatrixBlock(m, n, false);
- mc.allocateDenseBlock();
-
- DenseBlock a = ma.getDenseBlock();
- DenseBlock b = mb.getDenseBlock();
- DenseBlock c = mc.getDenseBlock();
-
- LibMatrixMult.matrixMultDenseDenseMM(a, b, c, tA, tB, n, k, 0, m, 0,
n);
-
- mc.recomputeNonZeros();
-
- // calc true result with existing methods
- MatrixBlock ma_in = tA ? LibMatrixReorg.transpose(ma) : ma;
- MatrixBlock mb_in = tB ? LibMatrixReorg.transpose(mb) : mb;
- MatrixBlock expected = LibMatrixMult.matrixMult(ma_in, mb_in);
-
- // compare results
- TestUtils.compareMatrices(expected, mc, 1e-8);
- }
+ // run multiple random scenarios
+ @Test
+ public void testCaseNoTransATransB() {
+ for(int i=0; i<10; i++) {
+ runTest(false, true);
+ }
+ }
+
+ @Test
+ public void testCaseTransANoTransB() {
+ for(int i=0; i<10; i++) {
+ runTest(true, false);
+ }
+ }
+
+ @Test
+ public void testCaseTransATransB() {
+ for(int i=0; i<10; i++) {
+ runTest(true, true);
+ }
+ }
+
+ private void runTest(boolean tA, boolean tB) {
+ Random rand = new Random();
+
+ // generate random dimensions between 1 and 300
+ int m = rand.nextInt(300) + 1;
+ int n = rand.nextInt(300) + 1;
+ int k = rand.nextInt(300) + 1;
+
+
+ int rowsA = tA ? k : m;
+ int colsA = tA ? m : k;
+ int rowsB = tB ? n : k;
+ int colsB = tB ? k : n;
+
+ MatrixBlock ma = MatrixBlock.randOperations(rowsA, colsA, 1.0,
-1, 1, "uniform", 7);
+ MatrixBlock mb = MatrixBlock.randOperations(rowsB, colsB, 1.0,
-1, 1, "uniform", 3);
+
+ MatrixBlock mc = new MatrixBlock(m, n, false);
+ mc.allocateDenseBlock();
+
+ DenseBlock a = ma.getDenseBlock();
+ DenseBlock b = mb.getDenseBlock();
+ DenseBlock c = mc.getDenseBlock();
+
+ LibMatrixMult.matrixMultDenseDenseMM(a, b, c, tA, tB, n, k, 0,
m, 0, n);
+
+ mc.recomputeNonZeros();
+
+ // calc true result with existing methods
+ MatrixBlock ma_in = tA ? LibMatrixReorg.transpose(ma) : ma;
+ MatrixBlock mb_in = tB ? LibMatrixReorg.transpose(mb) : mb;
+ MatrixBlock expected = LibMatrixMult.matrixMult(ma_in, mb_in);
+
+ // compare results
+ TestUtils.compareMatrices(expected, mc, 1e-8);
+ }
}
