This is an automated email from the ASF dual-hosted git repository.
baunsgaard 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 3b0d7e6e45 [MINOR] Fix compile warnings
3b0d7e6e45 is described below
commit 3b0d7e6e455654c75e20b892ffcf2599bf0b214a
Author: Sebastian Baunsgaard <[email protected]>
AuthorDate: Thu Sep 7 14:23:16 2023 +0200
[MINOR] Fix compile warnings
---
.../cp/MultiReturnBuiltinCPInstruction.java | 17 ++++++++++-------
.../MultiReturnParameterizedBuiltinCPInstruction.java | 15 +++++++++------
.../instructions/cp/ParamservBuiltinCPInstruction.java | 6 +++---
.../apache/sysds/runtime/iogen/FormatIdentifyer.java | 14 +++++++-------
4 files changed, 29 insertions(+), 23 deletions(-)
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
index 46111b915f..0e3a0faf56 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
@@ -129,13 +129,16 @@ public class MultiReturnBuiltinCPInstruction extends
ComputationCPInstruction {
return false;
}
+ private abstract class PP extends Pair<String,LineageItem>{};
+
@Override
- @SuppressWarnings({"rawtypes", "unchecked"})
- public Pair[] getLineageItems(ExecutionContext ec) {
- LineageItem[] inputLineage = LineageItemUtils.getLineage(ec,
input1,input2,input3);
- ArrayList<Pair> items = new ArrayList<>();
- for (CPOperand out : _outputs)
- items.add(Pair.of(out.getName(), new
LineageItem(getOpcode(), inputLineage)));
- return items.toArray(new Pair[items.size()]);
+ public Pair<String, LineageItem>[] getLineageItems(ExecutionContext ec)
{
+ LineageItem[] inputLineage = LineageItemUtils.getLineage(ec,
input1, input2, input3);
+ final Pair<String,LineageItem>[] ret = new PP[_outputs.size()];
+ for(int i = 0; i < _outputs.size(); i++){
+ CPOperand out = _outputs.get(i);
+ ret[i] = Pair.of(out.getName(), new
LineageItem(getOpcode(), inputLineage));
+ }
+ return ret;
}
}
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java
index 487e6d833e..8b52ef5687 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java
@@ -103,13 +103,16 @@ public class MultiReturnParameterizedBuiltinCPInstruction
extends ComputationCPI
return false;
}
+ private abstract class PP extends Pair<String,LineageItem>{};
+
@Override
- @SuppressWarnings({"rawtypes", "unchecked"})
- public Pair[] getLineageItems(ExecutionContext ec) {
+ public Pair<String, LineageItem>[] getLineageItems(ExecutionContext ec)
{
LineageItem[] inputLineage = LineageItemUtils.getLineage(ec,
input1, input2, input3);
- ArrayList<Pair> items = new ArrayList<>();
- for(CPOperand out : _outputs)
- items.add(Pair.of(out.getName(), new
LineageItem(getOpcode(), inputLineage)));
- return items.toArray(new Pair[0]);
+ final Pair<String,LineageItem>[] ret = new PP[_outputs.size()];
+ for(int i = 0; i < _outputs.size(); i++){
+ CPOperand out = _outputs.get(i);
+ ret[i] = Pair.of(out.getName(), new
LineageItem(getOpcode(), inputLineage));
+ }
+ return ret;
}
}
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
index 229d216437..ad8cbdf4dd 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
@@ -237,7 +237,7 @@ public class ParamservBuiltinCPInstruction extends
ParameterizedBuiltinCPInstruc
}
}
- if (DMLScript.STATISTICS)
+ if (tSetup != null)
ParamServStatistics.accSetupTime((long) tSetup.stop());
try {
@@ -335,7 +335,7 @@ public class ParamservBuiltinCPInstruction extends
ParameterizedBuiltinCPInstruc
getFrequency(), getEpochs(), getBatchSize(), program,
isLocal, clsMap, sec.getSparkContext().getConf(),
server.getPort(), aSetup, aWorker, aUpdate, aIndex,
aGrad, aRPC, aBatch, aEpoch, nbatches, modelAvg);
- if (DMLScript.STATISTICS)
+ if (tSetup != null)
ParamServStatistics.accSetupTime((long) tSetup.stop());
MatrixObject features =
sec.getMatrixObject(getParam(PS_FEATURES));
@@ -411,7 +411,7 @@ public class ParamservBuiltinCPInstruction extends
ParameterizedBuiltinCPInstruc
PSScheme scheme = getScheme();
partitionLocally(scheme, ec, workers);
- if (DMLScript.STATISTICS)
+ if (tSetup != null)
ParamServStatistics.accSetupTime((long) tSetup.stop());
if (LOG.isDebugEnabled()) {
diff --git a/src/main/java/org/apache/sysds/runtime/iogen/FormatIdentifyer.java
b/src/main/java/org/apache/sysds/runtime/iogen/FormatIdentifyer.java
index 95a12516fd..bdfceac99f 100644
--- a/src/main/java/org/apache/sysds/runtime/iogen/FormatIdentifyer.java
+++ b/src/main/java/org/apache/sysds/runtime/iogen/FormatIdentifyer.java
@@ -1629,18 +1629,18 @@ public class FormatIdentifyer {
orderedKeys.add(sbToken.reverse().toString());
keysList.add(orderedKeys);
- ArrayList<ArrayList<String>>[] fullList = new
ArrayList[keysList.size()];
+ ArrayList<ArrayList<ArrayList<String>>> fullList = new
ArrayList<>(keysList.size());
for(int i = 0; i < keysList.size() - 1; i++)
- fullList[i] = selfPropagate(keysList.get(i));
+ fullList.set(i, selfPropagate(keysList.get(i)));
ArrayList<ArrayList<String>> tmpLastKey = new ArrayList<>();
tmpLastKey.add(keysList.get(keysList.size() - 1));
- fullList[keysList.size() - 1] = tmpLastKey;
+ fullList.set(keysList.size() - 1, tmpLastKey);
- ArrayList<ArrayList<String>> candidates = fullList[0];
+ ArrayList<ArrayList<String>> candidates = fullList.get(0);
for(int i = 1; i < keysList.size(); i++) {
- if(candidates.size() * fullList[i].size() > 500000) {
+ if(candidates.size() * fullList.get(i).size() > 500000)
{
ArrayList<ArrayList<String>> tmpCandidates =
new ArrayList<>();
for(ArrayList<String> tmpList : candidates) {
ArrayList<String> tmpRemainList = new
ArrayList<>();
@@ -1658,10 +1658,10 @@ public class FormatIdentifyer {
tmp.add(update.get(j));
}
candidates.add(tmp);
- candidates = cartesianProduct(candidates,
fullList[i]);
+ candidates = cartesianProduct(candidates,
fullList.get(i));
}
else
- candidates = cartesianProduct(candidates,
fullList[i]);
+ candidates = cartesianProduct(candidates,
fullList.get(i));
}
Pair<ArrayList<String>, Boolean> update =
checkPattern(candidates, prefixes);
if(update.getValue())
