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 c3b6747ed2 [MINOR] Misc fixes code quality (warnings, formatting,
naming)
c3b6747ed2 is described below
commit c3b6747ed2b4e9a110905696033628b4c79e44e9
Author: Matthias Boehm <[email protected]>
AuthorDate: Sun Mar 29 10:45:29 2026 +0200
[MINOR] Misc fixes code quality (warnings, formatting, naming)
---
.../java/org/apache/sysds/common/Builtins.java | 2 +-
.../runtime/compress/colgroup/ColGroupDDCLZW.java | 1 +
.../instructions/ooc/ReorgOOCInstruction.java | 4 +-
.../instructions/ooc/SubscribableTaskQueue.java | 2 +-
.../BenchCase.java | 90 +++++++++++-----------
.../BenchUtil.java | 9 +--
.../BenchmarkPrimitives.java} | 6 +-
.../Ctx.java | 4 +-
.../PrimitivePerfSuite.java | 2 +-
.../colgroup/DDCLZW/ColGroupDDCLZWTest.java | 1 -
.../ooc/cache/OOCLRUCacheSchedulerTest.java | 2 +-
.../ooc/MatrixMatrixBinaryMultiplicationTest.java | 1 +
12 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/src/main/java/org/apache/sysds/common/Builtins.java
b/src/main/java/org/apache/sysds/common/Builtins.java
index 797377432d..e21c539d6d 100644
--- a/src/main/java/org/apache/sysds/common/Builtins.java
+++ b/src/main/java/org/apache/sysds/common/Builtins.java
@@ -207,7 +207,7 @@ public enum Builtins {
ISNA("is.na", "isNA", false),
ISNAN("is.nan", "isNaN", false),
ISINF("is.infinite", "isInf", false),
- ISN_TRAIN("independentSubnetTrain", true),
+ ISN_TRAIN("independentSubnetTrain", true),
KM("km", true),
KMEANS("kmeans", true),
KMEANSPREDICT("kmeansPredict", true),
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDCLZW.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDCLZW.java
index 8748f628bd..a3926948b8 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDCLZW.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDCLZW.java
@@ -283,6 +283,7 @@ public class ColGroupDDCLZW extends APreAgg implements
IMapToDataGroup {
return mapIndex < _nRows;
}
+ @SuppressWarnings("unused")
void skip(int k) {
for(int i = 0; i < k; i++)
next();
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/ooc/ReorgOOCInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/ooc/ReorgOOCInstruction.java
index db61aeadda..cf77d55972 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/ooc/ReorgOOCInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/ooc/ReorgOOCInstruction.java
@@ -44,7 +44,7 @@ public class ReorgOOCInstruction extends
ComputationOOCInstruction {
// reshape-specific attributes
private final CPOperand _opRows;
private final CPOperand _opCols;
- private final CPOperand _opDims;
+ //private final CPOperand _opDims;
private final CPOperand _opByRow;
protected ReorgOOCInstruction(ReorgOperator op, CPOperand in1,
CPOperand out, String opcode, String istr) {
@@ -64,7 +64,7 @@ public class ReorgOOCInstruction extends
ComputationOOCInstruction {
_ixret = ixret;
_opRows = opRows;
_opCols = opCols;
- _opDims = opDims;
+ //_opDims = opDims;
_opByRow = opByRow;
}
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/ooc/SubscribableTaskQueue.java
b/src/main/java/org/apache/sysds/runtime/instructions/ooc/SubscribableTaskQueue.java
index ce79672831..a2030f5a4a 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/ooc/SubscribableTaskQueue.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/ooc/SubscribableTaskQueue.java
@@ -363,7 +363,7 @@ public class SubscribableTaskQueue<T> extends
LocalTaskQueue<T> implements OOCSt
}
@Override
- public String toString() {
+ public synchronized String toString() {
return "STQ-" + hashCode();
}
}
diff --git
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/BenchCase.java
b/src/test/java/org/apache/sysds/performance/vectprimitives/BenchCase.java
similarity index 68%
rename from
src/test/java/org/apache/sysds/performance/primitives_vector_api/BenchCase.java
rename to
src/test/java/org/apache/sysds/performance/vectprimitives/BenchCase.java
index e8ac3f79f3..2af6069263 100644
---
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/BenchCase.java
+++ b/src/test/java/org/apache/sysds/performance/vectprimitives/BenchCase.java
@@ -18,7 +18,7 @@
*/
-package org.apache.sysds.performance.primitives_vector_api;
+package org.apache.sysds.performance.vectprimitives;
import org.apache.sysds.runtime.codegen.LibSpoofPrimitives;
@@ -30,10 +30,10 @@ public enum BenchCase {
"vectSum dense",
OutKind.SCALAR_DOUBLE,
ctx -> ctx.initDenseA(),
- ctx -> {ctx.scalarRes =
backup_primitives_for_benchmark.scalarvectSum(ctx.a, 0, ctx.len);
+ ctx -> {ctx.scalarRes = BenchmarkPrimitives.scalarvectSum(ctx.a, 0,
ctx.len);
BenchUtil.blackhole = ctx.scalarRes;
},
- ctx -> {ctx.vectorRes =
backup_primitives_for_benchmark.vectSum(ctx.a, 0, ctx.len);
+ ctx -> {ctx.vectorRes = BenchmarkPrimitives.vectSum(ctx.a, 0,
ctx.len);
BenchUtil.blackhole = ctx.vectorRes;},
ctx -> {ctx.ok = Math.abs(ctx.scalarRes - ctx.vectorRes) <= 1e-9;}
),
@@ -43,8 +43,8 @@ public enum BenchCase {
"rowMaxsVectMult dense",
OutKind.SCALAR_DOUBLE,
ctx -> {ctx.initDenseA(); ctx.initDenseB();},
- ctx -> ctx.scalarRes =
backup_primitives_for_benchmark.scalarrowMaxsVectMult(ctx.a, ctx.b, 0, 0,
ctx.len),
- ctx -> ctx.vectorRes =
backup_primitives_for_benchmark.rowMaxsVectMult(ctx.a, ctx.b, 0, 0, ctx.len),
+ ctx -> ctx.scalarRes =
BenchmarkPrimitives.scalarrowMaxsVectMult(ctx.a, ctx.b, 0, 0, ctx.len),
+ ctx -> ctx.vectorRes = BenchmarkPrimitives.rowMaxsVectMult(ctx.a,
ctx.b, 0, 0, ctx.len),
ctx -> {
ctx.ok = Math.abs(ctx.scalarRes - ctx.vectorRes) <= 1e-9;
}
@@ -54,11 +54,11 @@ public enum BenchCase {
"rowMaxsVectMult_aix dense",
OutKind.SCALAR_DOUBLE,
ctx -> {ctx.initDenseA();ctx.initDenseB();ctx.initDenseAInt();},
- ctx -> {ctx.scalarRes =
backup_primitives_for_benchmark.scalarrowMaxsVectMult(ctx.a, ctx.b,
ctx.a_int,0,0,ctx.len);
+ ctx -> {ctx.scalarRes =
BenchmarkPrimitives.scalarrowMaxsVectMult(ctx.a, ctx.b, ctx.a_int,0,0,ctx.len);
BenchUtil.blackhole = ctx.scalarRes;
},
ctx -> {
- ctx.vectorRes =
backup_primitives_for_benchmark.rowMaxsVectMult(ctx.a, ctx.b,
ctx.a_int,0,0,ctx.len);
+ ctx.vectorRes = BenchmarkPrimitives.rowMaxsVectMult(ctx.a,
ctx.b, ctx.a_int,0,0,ctx.len);
BenchUtil.blackhole = ctx.vectorRes;
},
ctx -> {
@@ -70,10 +70,10 @@ public enum BenchCase {
"vectMax dense",
OutKind.SCALAR_DOUBLE,
ctx -> ctx.initDenseA(),
- ctx -> {ctx.scalarRes =
backup_primitives_for_benchmark.scalarvectMax(ctx.a, 0, ctx.len);
+ ctx -> {ctx.scalarRes = BenchmarkPrimitives.scalarvectMax(ctx.a, 0,
ctx.len);
BenchUtil.blackhole = ctx.scalarRes;
},
- ctx -> {ctx.vectorRes =
backup_primitives_for_benchmark.vectMax(ctx.a, 0, ctx.len);
+ ctx -> {ctx.vectorRes = BenchmarkPrimitives.vectMax(ctx.a, 0,
ctx.len);
BenchUtil.blackhole = ctx.vectorRes;},
ctx -> {ctx.ok = Math.abs(ctx.scalarRes - ctx.vectorRes) <= 1e-9;}
),
@@ -81,10 +81,10 @@ public enum BenchCase {
"vectCountnnz dense",
OutKind.SCALAR_DOUBLE,
ctx -> ctx.initDenseA(),
- ctx -> {ctx.scalarRes =
backup_primitives_for_benchmark.scalarvectCountnnz(ctx.a, 0, ctx.len);
+ ctx -> {ctx.scalarRes = BenchmarkPrimitives.scalarvectCountnnz(ctx.a,
0, ctx.len);
BenchUtil.blackhole = ctx.scalarRes;
},
- ctx -> {ctx.vectorRes =
backup_primitives_for_benchmark.vectCountnnz(ctx.a, 0, ctx.len);
+ ctx -> {ctx.vectorRes = BenchmarkPrimitives.vectCountnnz(ctx.a, 0,
ctx.len);
BenchUtil.blackhole = ctx.vectorRes;},
ctx -> {ctx.ok = Math.abs(ctx.scalarRes - ctx.vectorRes) <= 1e-9;}
),
@@ -94,9 +94,9 @@ public enum BenchCase {
VECT_DIV_ADD(
"vectDivAdd dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();
ctx.initDenseADiv();},
- ctx -> backup_primitives_for_benchmark.scalarvectDivAdd(ctx.a,
ctx.bval, ctx.cScalar, 0, 0, ctx.len),
- ctx -> backup_primitives_for_benchmark.vectDivAdd(ctx.a, ctx.bval,
ctx.cVector, 0, 0, ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();
ctx.initDenseADiv();},
+ ctx -> BenchmarkPrimitives.scalarvectDivAdd(ctx.a, ctx.bval,
ctx.cScalar, 0, 0, ctx.len),
+ ctx -> BenchmarkPrimitives.vectDivAdd(ctx.a, ctx.bval, ctx.cVector,
0, 0, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
ctx.ok = ctx.maxDiff <= 1e-9;
@@ -106,8 +106,8 @@ public enum BenchCase {
VECT_DIV_ADD_2(
"vectDivAdd2 dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();},
- ctx -> backup_primitives_for_benchmark.scalarvectDivAdd(ctx.bval,
ctx.a, ctx.cScalar, 0, 0, ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();},
+ ctx -> BenchmarkPrimitives.scalarvectDivAdd(ctx.bval, ctx.a,
ctx.cScalar, 0, 0, ctx.len),
ctx -> LibSpoofPrimitives.vectDivAdd(ctx.bval, ctx.a, ctx.cVector, 0,
0, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -118,8 +118,8 @@ public enum BenchCase {
VECT_DIV_ADD_SPARSE(
"vectDivAdd sparse",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initDenseAInt();
ctx.initbval();},
- ctx -> backup_primitives_for_benchmark.scalarvectDivAdd(ctx.a,
ctx.bval, ctx.cScalar, ctx.a_int, 0, 0,ctx.len, ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initDenseAInt();
ctx.initbval();},
+ ctx -> BenchmarkPrimitives.scalarvectDivAdd(ctx.a, ctx.bval,
ctx.cScalar, ctx.a_int, 0, 0,ctx.len, ctx.len),
ctx -> LibSpoofPrimitives.vectDivAdd(ctx.a, ctx.bval, ctx.cVector,
ctx.a_int, 0, 0,ctx.len, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -131,8 +131,8 @@ public enum BenchCase {
VECT_DIV_ADD_SPARSE2(
"vectDivAdd2 sparse",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initDenseAInt();
ctx.initbval();},
- ctx -> backup_primitives_for_benchmark.scalarvectDivAdd(ctx.bval,
ctx.a, ctx.cScalar, ctx.a_int, 0, 0,ctx.len, ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initDenseAInt();
ctx.initbval();},
+ ctx -> BenchmarkPrimitives.scalarvectDivAdd(ctx.bval, ctx.a,
ctx.cScalar, ctx.a_int, 0, 0,ctx.len, ctx.len),
ctx -> LibSpoofPrimitives.vectDivAdd(ctx.bval, ctx.a, ctx.cVector,
ctx.a_int, 0, 0,ctx.len, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -143,8 +143,8 @@ public enum BenchCase {
VECT_DIV_WRITE(
"vectDivWrite dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectDivWrite(ctx.a, ctx.bval, 0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();},
+ ctx -> ctx.cScalar = BenchmarkPrimitives.scalarvectDivWrite(ctx.a,
ctx.bval, 0,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectDivWrite(ctx.a, ctx.bval,
0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -154,8 +154,8 @@ public enum BenchCase {
VECT_DIV_WRITE2(
"vectDivWrite2 dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectDivWrite(ctx.bval, ctx.a, 0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();},
+ ctx -> ctx.cScalar = BenchmarkPrimitives.scalarvectDivWrite(ctx.bval,
ctx.a, 0,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectDivWrite(ctx.bval, ctx.a,
0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -165,8 +165,8 @@ public enum BenchCase {
VECT_DIV_WRITE3(
"vectDivWrite3 dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();
ctx.initDenseBDiv();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectDivWrite(ctx.a, ctx.b, 0, 0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();
ctx.initDenseBDiv();},
+ ctx -> ctx.cScalar = BenchmarkPrimitives.scalarvectDivWrite(ctx.a,
ctx.b, 0, 0,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectDivWrite(ctx.a, ctx.b, 0,
0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -179,8 +179,8 @@ public enum BenchCase {
VECT_EQUAL_WRITE(
"vectEqualWrite dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectEqualWrite(ctx.a, ctx.bval,
0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();},
+ ctx -> ctx.cScalar = BenchmarkPrimitives.scalarvectEqualWrite(ctx.a,
ctx.bval, 0,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectEqualWrite(ctx.a,
ctx.bval, 0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -190,8 +190,8 @@ public enum BenchCase {
VECT_EQUAL_ADD(
"vectEqualAdd dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();},
- ctx -> backup_primitives_for_benchmark.scalarvectEqualAdd(ctx.a,
ctx.bval, ctx.cScalar,0, 0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();},
+ ctx -> BenchmarkPrimitives.scalarvectEqualAdd(ctx.a, ctx.bval,
ctx.cScalar,0, 0,ctx.len),
ctx -> LibSpoofPrimitives.vectEqualAdd(ctx.a, ctx.bval,ctx.cVector,
0, 0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -202,7 +202,7 @@ public enum BenchCase {
"vectEqualWrite2 dense",
OutKind.ARRAY_DOUBLE,
ctx -> {ctx.initDenseA(); ctx.initbval();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectEqualWrite(ctx.a, ctx.bval,
0,ctx.len),
+ ctx -> ctx.cScalar = BenchmarkPrimitives.scalarvectEqualWrite(ctx.a,
ctx.bval, 0,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectEqualWrite(ctx.a,
ctx.bval, 0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -212,8 +212,8 @@ public enum BenchCase {
VECT_LESS_ADD(
"vectLessAdd dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();},
- ctx -> backup_primitives_for_benchmark.scalarvectLessAdd(ctx.a,
ctx.bval, ctx.cScalar,0, 0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();},
+ ctx -> BenchmarkPrimitives.scalarvectLessAdd(ctx.a, ctx.bval,
ctx.cScalar,0, 0,ctx.len),
ctx -> LibSpoofPrimitives.vectLessAdd(ctx.a, ctx.bval,ctx.cVector, 0,
0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -224,7 +224,7 @@ public enum BenchCase {
"vectLessWrite dense",
OutKind.ARRAY_DOUBLE,
ctx -> {ctx.initDenseA(); ctx.initbval();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectLessWrite(ctx.a, ctx.bval, 0
,ctx.len),
+ ctx -> ctx.cScalar = BenchmarkPrimitives.scalarvectLessWrite(ctx.a,
ctx.bval, 0 ,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectLessWrite(ctx.a,
ctx.bval, 0, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -235,7 +235,7 @@ public enum BenchCase {
"vectLessWrite2 dense",
OutKind.ARRAY_DOUBLE,
ctx -> {ctx.initDenseA(); ctx.initDenseB(); ctx.initbval();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectLessWrite(ctx.a, ctx.b, 0, 0
,ctx.len),
+ ctx -> ctx.cScalar = BenchmarkPrimitives.scalarvectLessWrite(ctx.a,
ctx.b, 0, 0 ,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectLessWrite(ctx.a, ctx.b,
0, 0, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -245,8 +245,8 @@ public enum BenchCase {
VECT_LESSEQUAL_ADD(
"vectLessequalAdd dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();},
- ctx -> backup_primitives_for_benchmark.scalarvectLessequalAdd(ctx.a,
ctx.bval, ctx.cScalar,0, 0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();},
+ ctx -> BenchmarkPrimitives.scalarvectLessequalAdd(ctx.a, ctx.bval,
ctx.cScalar,0, 0,ctx.len),
ctx -> LibSpoofPrimitives.vectLessequalAdd(ctx.a,
ctx.bval,ctx.cVector, 0, 0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -257,7 +257,7 @@ public enum BenchCase {
"vectLessequalWrite dense",
OutKind.ARRAY_DOUBLE,
ctx -> {ctx.initDenseA(); ctx.initbval();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectLessequalWrite(ctx.a, ctx.bval, 0
,ctx.len),
+ ctx -> ctx.cScalar =
BenchmarkPrimitives.scalarvectLessequalWrite(ctx.a, ctx.bval, 0 ,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectLessequalWrite(ctx.a,
ctx.bval, 0, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -268,7 +268,7 @@ public enum BenchCase {
"vectLessequalWrite2 dense",
OutKind.ARRAY_DOUBLE,
ctx -> {ctx.initDenseA(); ctx.initDenseB();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectLessequalWrite(ctx.a, ctx.b, 0, 0
,ctx.len),
+ ctx -> ctx.cScalar =
BenchmarkPrimitives.scalarvectLessequalWrite(ctx.a, ctx.b, 0, 0 ,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectLessequalWrite(ctx.a,
ctx.b, 0, 0, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -279,8 +279,8 @@ public enum BenchCase {
VECT_GREATER_ADD(
"vectGreaterAdd dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); ctx.initbval();},
- ctx -> backup_primitives_for_benchmark.scalarvectGreaterAdd(ctx.a,
ctx.bval, ctx.cScalar,0, 0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); ctx.initbval();},
+ ctx -> BenchmarkPrimitives.scalarvectGreaterAdd(ctx.a, ctx.bval,
ctx.cScalar,0, 0,ctx.len),
ctx -> LibSpoofPrimitives.vectGreaterAdd(ctx.a, ctx.bval,ctx.cVector,
0, 0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -291,7 +291,7 @@ public enum BenchCase {
"vectGreaterWrite dense",
OutKind.ARRAY_DOUBLE,
ctx -> {ctx.initDenseA(); ctx.initbval();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectGreaterWrite(ctx.a, ctx.bval, 0
,ctx.len),
+ ctx -> ctx.cScalar =
BenchmarkPrimitives.scalarvectGreaterWrite(ctx.a, ctx.bval, 0 ,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectGreaterWrite(ctx.a,
ctx.bval, 0, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -302,7 +302,7 @@ public enum BenchCase {
"vectGreaterWrite2 dense",
OutKind.ARRAY_DOUBLE,
ctx -> {ctx.initDenseA(); ctx.initDenseB();},
- ctx -> ctx.cScalar =
backup_primitives_for_benchmark.scalarvectGreaterWrite(ctx.a, ctx.b, 0, 0
,ctx.len),
+ ctx -> ctx.cScalar =
BenchmarkPrimitives.scalarvectGreaterWrite(ctx.a, ctx.b, 0, 0 ,ctx.len),
ctx -> ctx.cVector = LibSpoofPrimitives.vectGreaterWrite(ctx.a,
ctx.b, 0, 0, ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
@@ -315,8 +315,8 @@ public enum BenchCase {
VECT_Mult2_ADD(
"vectMult2Add dense",
OutKind.ARRAY_DOUBLE,
- ctx -> {ctx.initDenseAandC_mutable(); },
- ctx -> backup_primitives_for_benchmark.scalarvectMult2Add(ctx.a,
ctx.cScalar,0, 0,ctx.len),
+ ctx -> {ctx.initDenseACMutable(); },
+ ctx -> BenchmarkPrimitives.scalarvectMult2Add(ctx.a, ctx.cScalar,0,
0,ctx.len),
ctx -> LibSpoofPrimitives.vectMult2Add(ctx.a, ctx.cVector, 0,
0,ctx.len),
ctx -> {
ctx.maxDiff = BenchUtil.maxAbsDiff(ctx.cScalar, ctx.cVector);
diff --git
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/BenchUtil.java
b/src/test/java/org/apache/sysds/performance/vectprimitives/BenchUtil.java
similarity index 97%
rename from
src/test/java/org/apache/sysds/performance/primitives_vector_api/BenchUtil.java
rename to
src/test/java/org/apache/sysds/performance/vectprimitives/BenchUtil.java
index bbf0f5031f..6a90f0945a 100644
---
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/BenchUtil.java
+++ b/src/test/java/org/apache/sysds/performance/vectprimitives/BenchUtil.java
@@ -18,7 +18,7 @@
*/
-package org.apache.sysds.performance.primitives_vector_api;
+package org.apache.sysds.performance.vectprimitives;
public class BenchUtil {
@@ -51,7 +51,7 @@ public class BenchUtil {
return args[i + 1];
return def;
}
-
+
public static double maxAbsDiff(double[] a, double[] b) {
double m = 0;
for (int i = 0; i < a.length; i++)
@@ -63,7 +63,7 @@ public class BenchUtil {
double nsScalar, double nsVector,
double scalarRes, double vectorRes,
boolean ok) {
-
+
double speedup = nsScalar / nsVector;
System.out.printf("%s | scalar %.1f ns | vector %.1f ns |
speedup %.3fx | " +
"s=%.6g v=%.6g | %s%n",
@@ -80,5 +80,4 @@ public class BenchUtil {
"maxDiff=%.6g | %s%n",
name, nsScalar, nsVector, speedup, maxDiff, ok ? "OK" : "FAIL");
}
- }
-
\ No newline at end of file
+}
diff --git
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/backup_primitives_for_benchmark.java
b/src/test/java/org/apache/sysds/performance/vectprimitives/BenchmarkPrimitives.java
similarity index 99%
rename from
src/test/java/org/apache/sysds/performance/primitives_vector_api/backup_primitives_for_benchmark.java
rename to
src/test/java/org/apache/sysds/performance/vectprimitives/BenchmarkPrimitives.java
index 17cb093f97..417f4f3f24 100644
---
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/backup_primitives_for_benchmark.java
+++
b/src/test/java/org/apache/sysds/performance/vectprimitives/BenchmarkPrimitives.java
@@ -18,7 +18,7 @@
*/
-package org.apache.sysds.performance.primitives_vector_api;
+package org.apache.sysds.performance.vectprimitives;
import org.apache.sysds.runtime.matrix.data.LibMatrixMult;
@@ -32,7 +32,7 @@ import jdk.incubator.vector.VectorSpecies;
import jdk.incubator.vector.VectorMask;
-public class backup_primitives_for_benchmark {
+public class BenchmarkPrimitives {
// Vector API initializations
private static final VectorSpecies<Double> SPECIES =
DoubleVector.SPECIES_PREFERRED;
@@ -538,7 +538,7 @@ public class backup_primitives_for_benchmark {
}
// not in use: vector api implementation slower than scalar loop version
- public static double[] vectNotequalWrite_vector_api(double[] a,
double[] b, int ai, int bi, int len) {
+ public static double[] vectNotequalWriteVectorAPI(double[] a, double[]
b, int ai, int bi, int len) {
double[] c = allocVector(len, false);
final DoubleVector ones = DoubleVector.broadcast(SPECIES, 1.0);
final DoubleVector zeros = DoubleVector.zero(SPECIES);
diff --git
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/Ctx.java
b/src/test/java/org/apache/sysds/performance/vectprimitives/Ctx.java
similarity index 95%
rename from
src/test/java/org/apache/sysds/performance/primitives_vector_api/Ctx.java
rename to src/test/java/org/apache/sysds/performance/vectprimitives/Ctx.java
index 4fc1a15de0..560e314133 100644
--- a/src/test/java/org/apache/sysds/performance/primitives_vector_api/Ctx.java
+++ b/src/test/java/org/apache/sysds/performance/vectprimitives/Ctx.java
@@ -18,7 +18,7 @@
*/
-package org.apache.sysds.performance.primitives_vector_api;
+package org.apache.sysds.performance.vectprimitives;
public class Ctx {
public int len;
@@ -61,7 +61,7 @@ public class Ctx {
for (int i = 0; i < len; i++) b[i] = ((i % 10) + 1);
}
- void initDenseAandC_mutable() {
+ void initDenseACMutable() {
initDenseADiv();
cInit = new double[len];
for (int i = 0; i < len; i++) cInit[i] = (i % 10) - 5;
diff --git
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/PrimitivePerfSuite.java
b/src/test/java/org/apache/sysds/performance/vectprimitives/PrimitivePerfSuite.java
similarity index 97%
rename from
src/test/java/org/apache/sysds/performance/primitives_vector_api/PrimitivePerfSuite.java
rename to
src/test/java/org/apache/sysds/performance/vectprimitives/PrimitivePerfSuite.java
index 340b50ba8f..386afd4fd6 100644
---
a/src/test/java/org/apache/sysds/performance/primitives_vector_api/PrimitivePerfSuite.java
+++
b/src/test/java/org/apache/sysds/performance/vectprimitives/PrimitivePerfSuite.java
@@ -18,7 +18,7 @@
*/
-package org.apache.sysds.performance.primitives_vector_api;
+package org.apache.sysds.performance.vectprimitives;
public class PrimitivePerfSuite {
diff --git
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/DDCLZW/ColGroupDDCLZWTest.java
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/DDCLZW/ColGroupDDCLZWTest.java
index 311826f5e7..81b9c2c557 100644
---
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/DDCLZW/ColGroupDDCLZWTest.java
+++
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/DDCLZW/ColGroupDDCLZWTest.java
@@ -300,7 +300,6 @@ public class ColGroupDDCLZWTest {
double[] dictValues = new double[] {42.0};
Dictionary dict = Dictionary.create(dictValues);
- int[] src = new int[] {0, 0, 0, 0};
AMapToData data = MapToFactory.create(4, 1);
for(int i = 0; i < 4; i++) {
data.set(i, 0);
diff --git
a/src/test/java/org/apache/sysds/test/component/ooc/cache/OOCLRUCacheSchedulerTest.java
b/src/test/java/org/apache/sysds/test/component/ooc/cache/OOCLRUCacheSchedulerTest.java
index bdd75c1411..2741c10bdb 100644
---
a/src/test/java/org/apache/sysds/test/component/ooc/cache/OOCLRUCacheSchedulerTest.java
+++
b/src/test/java/org/apache/sysds/test/component/ooc/cache/OOCLRUCacheSchedulerTest.java
@@ -86,7 +86,7 @@ public class OOCLRUCacheSchedulerTest {
@Test
public void testDeferredReadSingleBlock() throws Exception {
BlockKey key = new BlockKey(1, 1);
- BlockEntry entry = putColdSourceBacked(key);
+ putColdSourceBacked(key);
Assert.assertEquals(0, _scheduler.getCacheSize());
CompletableFuture<BlockEntry> future = _scheduler.request(key);
diff --git
a/src/test/java/org/apache/sysds/test/functions/ooc/MatrixMatrixBinaryMultiplicationTest.java
b/src/test/java/org/apache/sysds/test/functions/ooc/MatrixMatrixBinaryMultiplicationTest.java
index 23f7451916..1e5233cc89 100644
---
a/src/test/java/org/apache/sysds/test/functions/ooc/MatrixMatrixBinaryMultiplicationTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/ooc/MatrixMatrixBinaryMultiplicationTest.java
@@ -122,6 +122,7 @@ public class MatrixMatrixBinaryMultiplicationTest extends
AutomatedTestBase {
}
}
+ @SuppressWarnings("unused")
private static double[][] readMatrix(String fname, Types.FileFormat
fmt, long rows, long cols, int brows, int bcols )
throws IOException
{
