This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new 4b37482 [MINOR] Cleanup repository (imports, tabs formatting, unused,
conflicts)
4b37482 is described below
commit 4b374821e1eccceabfd4aa34f0432f3c40283f5f
Author: Matthias Boehm <[email protected]>
AuthorDate: Sat Mar 20 01:02:34 2021 +0100
[MINOR] Cleanup repository (imports, tabs formatting, unused, conflicts)
---
src/main/cuda/ext/jitify | 1 -
.../sysds/hops/ipa/InterProceduralAnalysis.java | 2 +-
.../sysds/runtime/codegen/SpoofCUDACellwise.java | 3 +-
.../sysds/runtime/codegen/SpoofCUDARowwise.java | 1 +
.../runtime/compress/CompressedMatrixBlock.java | 2 +-
.../sysds/runtime/compress/colgroup/AColGroup.java | 2 +-
.../sysds/runtime/compress/utils/IntIntMap.java | 4 +-
.../spark/ParameterizedBuiltinSPInstruction.java | 4 +-
.../transform/tokenize/TokenizerPostHash.java | 242 ++++++++++-----------
.../transform/tokenize/TokenizerPostPosition.java | 208 +++++++++---------
.../apache/sysds/runtime/util/UtilFunctions.java | 13 --
.../compress/colgroup/genOffsetOLETest.java | 137 ++++++------
.../component/matrix/TransposeInplaceTest.java | 163 +++++++-------
.../builtin/BuiltinBayesianOptimisationTest.java | 14 +-
.../functions/builtin/BuiltinCorrectTyposTest.java | 4 +-
.../functions/builtin/BuiltinDecisionTreeTest.java | 3 +-
.../test/functions/builtin/BuiltinEMATest.java | 6 +-
.../builtin/BuiltinGaussianClassifierTest.java | 1 +
.../functions/builtin/BuiltinSherlockTest.java | 187 ++++++++--------
.../primitives/FederatedCovarianceTest.java | 2 +-
.../transform/EncoderSerializationTest.java | 2 +-
21 files changed, 491 insertions(+), 510 deletions(-)
diff --git a/src/main/cuda/ext/jitify b/src/main/cuda/ext/jitify
deleted file mode 160000
index fdd570c..0000000
--- a/src/main/cuda/ext/jitify
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fdd570c55d59f28b6f7c20acd5f46cf359999585
diff --git
a/src/main/java/org/apache/sysds/hops/ipa/InterProceduralAnalysis.java
b/src/main/java/org/apache/sysds/hops/ipa/InterProceduralAnalysis.java
index 14556cb..e1c9a44 100644
--- a/src/main/java/org/apache/sysds/hops/ipa/InterProceduralAnalysis.java
+++ b/src/main/java/org/apache/sysds/hops/ipa/InterProceduralAnalysis.java
@@ -117,7 +117,7 @@ public class InterProceduralAnalysis
_sb = null;
_fgraph = new FunctionCallGraph(dmlp);
- //create order list of IPA passes
+ //create ordered list of IPA passes
_passes = new ArrayList<>();
_passes.add(new IPAPassRemoveUnusedFunctions());
_passes.add(new IPAPassFlagFunctionsRecompileOnce());
diff --git
a/src/main/java/org/apache/sysds/runtime/codegen/SpoofCUDACellwise.java
b/src/main/java/org/apache/sysds/runtime/codegen/SpoofCUDACellwise.java
index 4ea153c..0510941 100644
--- a/src/main/java/org/apache/sysds/runtime/codegen/SpoofCUDACellwise.java
+++ b/src/main/java/org/apache/sysds/runtime/codegen/SpoofCUDACellwise.java
@@ -34,6 +34,7 @@ import org.apache.sysds.runtime.matrix.data.LibMatrixCUDA;
import java.util.ArrayList;
public class SpoofCUDACellwise extends SpoofCellwise implements
SpoofCUDAOperator {
+ private static final long serialVersionUID = -5255791443086948200L;
private static final Log LOG =
LogFactory.getLog(SpoofCUDACellwise.class.getName());
private final int ID;
private final PrecisionProxy call;
@@ -130,7 +131,7 @@ public class SpoofCUDACellwise extends SpoofCellwise
implements SpoofCUDAOperato
return out_obj;
}
- private boolean inputIsEmpty(GPUObject g) {
+ private static boolean inputIsEmpty(GPUObject g) {
return g.getDensePointer() == null &&
g.getSparseMatrixCudaPointer() == null;
}
diff --git
a/src/main/java/org/apache/sysds/runtime/codegen/SpoofCUDARowwise.java
b/src/main/java/org/apache/sysds/runtime/codegen/SpoofCUDARowwise.java
index 2f1b537..b5686c7 100644
--- a/src/main/java/org/apache/sysds/runtime/codegen/SpoofCUDARowwise.java
+++ b/src/main/java/org/apache/sysds/runtime/codegen/SpoofCUDARowwise.java
@@ -33,6 +33,7 @@ import org.apache.sysds.runtime.matrix.data.LibMatrixCUDA;
import java.util.ArrayList;
public class SpoofCUDARowwise extends SpoofRowwise implements
SpoofCUDAOperator {
+ private static final long serialVersionUID = 3080001135814944399L;
private static final Log LOG =
LogFactory.getLog(SpoofCUDARowwise.class.getName());
private final int ID;
private final PrecisionProxy call;
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/CompressedMatrixBlock.java
b/src/main/java/org/apache/sysds/runtime/compress/CompressedMatrixBlock.java
index 5dc44d1..d7801d9 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/CompressedMatrixBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/CompressedMatrixBlock.java
@@ -1290,7 +1290,7 @@ public class CompressedMatrixBlock extends MatrixBlock {
}
- private CompressedMatrixBlock checkType(MatrixValue thatValue) {
+ private static CompressedMatrixBlock checkType(MatrixValue thatValue) {
if(thatValue == null || !(thatValue instanceof
CompressedMatrixBlock)) {
throw new DMLRuntimeException("Invalid call to copy,
requre a compressed MatrixBlock to copy to");
}
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java
index 33e9d11..19b38e2 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java
@@ -65,7 +65,7 @@ public abstract class AColGroup implements Serializable {
public enum ColGroupType {
UNCOMPRESSED, RLE, OLE, DDC, CONST, EMPTY, SDC, SDCSingle,
SDCSingleZeros, SDCZeros;
- public CompressionType getSuperType(ColGroupType c) {
+ public static CompressionType getSuperType(ColGroupType c) {
switch(c) {
case RLE:
return CompressionType.RLE;
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/utils/IntIntMap.java
b/src/main/java/org/apache/sysds/runtime/compress/utils/IntIntMap.java
index 932281b..ef0d52a 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/utils/IntIntMap.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/utils/IntIntMap.java
@@ -200,12 +200,12 @@ public class IntIntMap {
}
}
- private int phiMix(final int x) {
+ private static int phiMix(final int x) {
final int h = x * INT_PHI;
return h ^ (h >> 16);
}
- private long nextPowerOfTwo(int x) {
+ private static long nextPowerOfTwo(int x) {
if(x == 0)
return 1;
x--;
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
index 89abc9d..1add866 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
@@ -821,11 +821,9 @@ public class ParameterizedBuiltinSPInstruction extends
ComputationSPInstruction
private static final long serialVersionUID =
-8788298032616522019L;
private Tokenizer _tokenizer = null;
- private int _blen = -1;
-
+
public RDDTokenizeFunction(Tokenizer tokenizer, int blen) {
_tokenizer = tokenizer;
- _blen = blen;
}
@Override
diff --git
a/src/main/java/org/apache/sysds/runtime/transform/tokenize/TokenizerPostHash.java
b/src/main/java/org/apache/sysds/runtime/transform/tokenize/TokenizerPostHash.java
index f19bdb8..dc64538 100644
---
a/src/main/java/org/apache/sysds/runtime/transform/tokenize/TokenizerPostHash.java
+++
b/src/main/java/org/apache/sysds/runtime/transform/tokenize/TokenizerPostHash.java
@@ -35,125 +35,125 @@ import java.util.stream.Collectors;
public class TokenizerPostHash implements TokenizerPost{
- private static final long serialVersionUID = 4763889041868044668L;
- private final Params params;
- private final int numIdCols;
- private final int maxTokens;
- private final boolean wideFormat;
-
- static class Params implements Serializable {
-
- private static final long serialVersionUID = -256069061414241795L;
-
- public int num_features = 1048576; // 2^20
-
- public Params(JSONObject json) throws JSONException {
- if (json != null && json.has("num_features")) {
- this.num_features = json.getInt("num_features");
- }
- }
- }
-
- public TokenizerPostHash(JSONObject params, int numIdCols, int maxTokens,
boolean wideFormat) throws JSONException {
- this.params = new Params(params);
- this.numIdCols = numIdCols;
- this.maxTokens = maxTokens;
- this.wideFormat = wideFormat;
- }
-
- @Override
- public FrameBlock tokenizePost(List<Tokenizer.DocumentToTokens> tl,
FrameBlock out) {
- for (Tokenizer.DocumentToTokens docToToken: tl) {
- List<Object> keys = docToToken.keys;
- List<Tokenizer.Token> tokenList = docToToken.tokens;
- // Transform to hashes
- List<Integer> hashList = tokenList.stream().map(token ->
token.textToken.hashCode() %
- params.num_features).collect(Collectors.toList());
- // Counting the hashes
- Map<Integer, Long> hashCounts =
hashList.stream().collect(Collectors.groupingBy(Function.identity(),
- Collectors.counting()));
- // Sorted by hash
- Map<Integer, Long> sortedHashes = new TreeMap<>(hashCounts);
-
- if (wideFormat) {
- this.appendTokensWide(keys, sortedHashes, out);
- } else {
- this.appendTokensLong(keys, sortedHashes, out);
- }
- }
-
- return out;
- }
-
- private void appendTokensLong(List<Object> keys, Map<Integer, Long>
sortedHashes, FrameBlock out) {
- int numTokens = 0;
- for (Map.Entry<Integer, Long> hashCount: sortedHashes.entrySet()) {
- if (numTokens >= maxTokens) {
- break;
- }
- // Create a row per token
- int hash = hashCount.getKey() + 1;
- long count = hashCount.getValue();
- List<Object> rowList = new ArrayList<>(keys);
- rowList.add((long) hash);
- rowList.add(count);
- Object[] row = new Object[rowList.size()];
- rowList.toArray(row);
- out.appendRow(row);
- numTokens++;
- }
- }
-
- private void appendTokensWide(List<Object> keys, Map<Integer, Long>
sortedHashes, FrameBlock out) {
- // Create one row with keys as prefix
- List<Object> rowList = new ArrayList<>(keys);
-
- for (int tokenPos = 0; tokenPos < maxTokens; tokenPos++) {
- long positionHash = sortedHashes.getOrDefault(tokenPos, 0L);
- rowList.add(positionHash);
- }
- Object[] row = new Object[rowList.size()];
- rowList.toArray(row);
- out.appendRow(row);
- }
-
- @Override
- public Types.ValueType[] getOutSchema() {
- if (wideFormat) {
- return getOutSchemaWide(numIdCols, maxTokens);
- } else {
- return getOutSchemaLong(numIdCols);
- }
- }
-
- private Types.ValueType[] getOutSchemaWide(int numIdCols, int maxTokens) {
- Types.ValueType[] schema = new Types.ValueType[numIdCols + maxTokens];
- int i = 0;
- for (; i < numIdCols; i++) {
- schema[i] = Types.ValueType.STRING;
- }
- for (int j = 0; j < maxTokens; j++, i++) {
- schema[i] = Types.ValueType.INT64;
- }
- return schema;
- }
-
- private Types.ValueType[] getOutSchemaLong(int numIdCols) {
- Types.ValueType[] schema = UtilFunctions.nCopies(numIdCols +
2,Types.ValueType.STRING );
- schema[numIdCols] = Types.ValueType.INT64;
- schema[numIdCols+1] = Types.ValueType.INT64;
- return schema;
- }
-
- public long getNumRows(long inRows) {
- if (wideFormat) {
- return inRows;
- } else {
- return inRows * maxTokens;
- }
- }
-
- public long getNumCols() {
- return this.getOutSchema().length;
- }
+ private static final long serialVersionUID = 4763889041868044668L;
+ private final Params params;
+ private final int numIdCols;
+ private final int maxTokens;
+ private final boolean wideFormat;
+
+ static class Params implements Serializable {
+
+ private static final long serialVersionUID =
-256069061414241795L;
+
+ public int num_features = 1048576; // 2^20
+
+ public Params(JSONObject json) throws JSONException {
+ if (json != null && json.has("num_features")) {
+ this.num_features = json.getInt("num_features");
+ }
+ }
+ }
+
+ public TokenizerPostHash(JSONObject params, int numIdCols, int
maxTokens, boolean wideFormat) throws JSONException {
+ this.params = new Params(params);
+ this.numIdCols = numIdCols;
+ this.maxTokens = maxTokens;
+ this.wideFormat = wideFormat;
+ }
+
+ @Override
+ public FrameBlock tokenizePost(List<Tokenizer.DocumentToTokens> tl,
FrameBlock out) {
+ for (Tokenizer.DocumentToTokens docToToken: tl) {
+ List<Object> keys = docToToken.keys;
+ List<Tokenizer.Token> tokenList = docToToken.tokens;
+ // Transform to hashes
+ List<Integer> hashList = tokenList.stream().map(token
-> token.textToken.hashCode() %
+
params.num_features).collect(Collectors.toList());
+ // Counting the hashes
+ Map<Integer, Long> hashCounts =
hashList.stream().collect(Collectors.groupingBy(Function.identity(),
+ Collectors.counting()));
+ // Sorted by hash
+ Map<Integer, Long> sortedHashes = new
TreeMap<>(hashCounts);
+
+ if (wideFormat) {
+ this.appendTokensWide(keys, sortedHashes, out);
+ } else {
+ this.appendTokensLong(keys, sortedHashes, out);
+ }
+ }
+
+ return out;
+ }
+
+ private void appendTokensLong(List<Object> keys, Map<Integer, Long>
sortedHashes, FrameBlock out) {
+ int numTokens = 0;
+ for (Map.Entry<Integer, Long> hashCount:
sortedHashes.entrySet()) {
+ if (numTokens >= maxTokens) {
+ break;
+ }
+ // Create a row per token
+ int hash = hashCount.getKey() + 1;
+ long count = hashCount.getValue();
+ List<Object> rowList = new ArrayList<>(keys);
+ rowList.add((long) hash);
+ rowList.add(count);
+ Object[] row = new Object[rowList.size()];
+ rowList.toArray(row);
+ out.appendRow(row);
+ numTokens++;
+ }
+ }
+
+ private void appendTokensWide(List<Object> keys, Map<Integer, Long>
sortedHashes, FrameBlock out) {
+ // Create one row with keys as prefix
+ List<Object> rowList = new ArrayList<>(keys);
+
+ for (int tokenPos = 0; tokenPos < maxTokens; tokenPos++) {
+ long positionHash = sortedHashes.getOrDefault(tokenPos,
0L);
+ rowList.add(positionHash);
+ }
+ Object[] row = new Object[rowList.size()];
+ rowList.toArray(row);
+ out.appendRow(row);
+ }
+
+ @Override
+ public Types.ValueType[] getOutSchema() {
+ if (wideFormat) {
+ return getOutSchemaWide(numIdCols, maxTokens);
+ } else {
+ return getOutSchemaLong(numIdCols);
+ }
+ }
+
+ private static Types.ValueType[] getOutSchemaWide(int numIdCols, int
maxTokens) {
+ Types.ValueType[] schema = new Types.ValueType[numIdCols +
maxTokens];
+ int i = 0;
+ for (; i < numIdCols; i++) {
+ schema[i] = Types.ValueType.STRING;
+ }
+ for (int j = 0; j < maxTokens; j++, i++) {
+ schema[i] = Types.ValueType.INT64;
+ }
+ return schema;
+ }
+
+ private static Types.ValueType[] getOutSchemaLong(int numIdCols) {
+ Types.ValueType[] schema = UtilFunctions.nCopies(numIdCols +
2,Types.ValueType.STRING );
+ schema[numIdCols] = Types.ValueType.INT64;
+ schema[numIdCols+1] = Types.ValueType.INT64;
+ return schema;
+ }
+
+ public long getNumRows(long inRows) {
+ if (wideFormat) {
+ return inRows;
+ } else {
+ return inRows * maxTokens;
+ }
+ }
+
+ public long getNumCols() {
+ return this.getOutSchema().length;
+ }
}
diff --git
a/src/main/java/org/apache/sysds/runtime/transform/tokenize/TokenizerPostPosition.java
b/src/main/java/org/apache/sysds/runtime/transform/tokenize/TokenizerPostPosition.java
index 4451f08..64a24aa 100644
---
a/src/main/java/org/apache/sysds/runtime/transform/tokenize/TokenizerPostPosition.java
+++
b/src/main/java/org/apache/sysds/runtime/transform/tokenize/TokenizerPostPosition.java
@@ -30,108 +30,108 @@ import java.util.List;
public class TokenizerPostPosition implements TokenizerPost{
- private static final long serialVersionUID = 3563407270742660830L;
- private final int numIdCols;
- private final int maxTokens;
- private final boolean wideFormat;
-
- public TokenizerPostPosition(JSONObject params, int numIdCols, int
maxTokens, boolean wideFormat) {
- // No configurable params yet
- this.numIdCols = numIdCols;
- this.maxTokens = maxTokens;
- this.wideFormat = wideFormat;
- }
-
- @Override
- public FrameBlock tokenizePost(List<Tokenizer.DocumentToTokens> tl,
FrameBlock out) {
- for (Tokenizer.DocumentToTokens docToToken: tl) {
- List<Object> keys = docToToken.keys;
- List<Tokenizer.Token> tokenList = docToToken.tokens;
-
- if (wideFormat) {
- this.appendTokensWide(keys, tokenList, out);
- } else {
- this.appendTokensLong(keys, tokenList, out);
- }
- }
-
- return out;
- }
-
- public void appendTokensLong(List<Object> keys, List<Tokenizer.Token>
tokenList, FrameBlock out) {
- int numTokens = 0;
- for (Tokenizer.Token token: tokenList) {
- if (numTokens >= maxTokens) {
- break;
- }
- // Create a row per token
- List<Object> rowList = new ArrayList<>(keys);
- // Convert to 1-based index for DML
- rowList.add(token.startIndex + 1);
- rowList.add(token.textToken);
- Object[] row = new Object[rowList.size()];
- rowList.toArray(row);
- out.appendRow(row);
- numTokens++;
- }
- }
-
- public void appendTokensWide(List<Object> keys, List<Tokenizer.Token>
tokenList, FrameBlock out) {
- // Create one row with keys as prefix
- List<Object> rowList = new ArrayList<>(keys);
-
- int numTokens = 0;
- for (Tokenizer.Token token: tokenList) {
- if (numTokens >= maxTokens) {
- break;
- }
- rowList.add(token.textToken);
- numTokens++;
- }
- // Remaining positions need to be filled with empty tokens
- for (; numTokens < maxTokens; numTokens++) {
- rowList.add("");
- }
- Object[] row = new Object[rowList.size()];
- rowList.toArray(row);
- out.appendRow(row);
- }
-
- @Override
- public Types.ValueType[] getOutSchema() {
- if (wideFormat) {
- return getOutSchemaWide(numIdCols, maxTokens);
- } else {
- return getOutSchemaLong(numIdCols);
- }
-
- }
-
- private Types.ValueType[] getOutSchemaWide(int numIdCols, int maxTokens) {
- Types.ValueType[] schema = UtilFunctions.nCopies(numIdCols +
maxTokens,Types.ValueType.STRING );
- return schema;
- }
-
- private Types.ValueType[] getOutSchemaLong(int numIdCols) {
- Types.ValueType[] schema = new Types.ValueType[numIdCols + 2];
- int i = 0;
- for (; i < numIdCols; i++) {
- schema[i] = Types.ValueType.STRING;
- }
- schema[i] = Types.ValueType.INT64;
- schema[i+1] = Types.ValueType.STRING;
- return schema;
- }
-
- public long getNumRows(long inRows) {
- if (wideFormat) {
- return inRows;
- } else {
- return inRows * maxTokens;
- }
- }
-
- public long getNumCols() {
- return this.getOutSchema().length;
- }
+ private static final long serialVersionUID = 3563407270742660830L;
+ private final int numIdCols;
+ private final int maxTokens;
+ private final boolean wideFormat;
+
+ public TokenizerPostPosition(JSONObject params, int numIdCols, int
maxTokens, boolean wideFormat) {
+ // No configurable params yet
+ this.numIdCols = numIdCols;
+ this.maxTokens = maxTokens;
+ this.wideFormat = wideFormat;
+ }
+
+ @Override
+ public FrameBlock tokenizePost(List<Tokenizer.DocumentToTokens> tl,
FrameBlock out) {
+ for (Tokenizer.DocumentToTokens docToToken: tl) {
+ List<Object> keys = docToToken.keys;
+ List<Tokenizer.Token> tokenList = docToToken.tokens;
+
+ if (wideFormat) {
+ this.appendTokensWide(keys, tokenList, out);
+ } else {
+ this.appendTokensLong(keys, tokenList, out);
+ }
+ }
+
+ return out;
+ }
+
+ public void appendTokensLong(List<Object> keys, List<Tokenizer.Token>
tokenList, FrameBlock out) {
+ int numTokens = 0;
+ for (Tokenizer.Token token: tokenList) {
+ if (numTokens >= maxTokens) {
+ break;
+ }
+ // Create a row per token
+ List<Object> rowList = new ArrayList<>(keys);
+ // Convert to 1-based index for DML
+ rowList.add(token.startIndex + 1);
+ rowList.add(token.textToken);
+ Object[] row = new Object[rowList.size()];
+ rowList.toArray(row);
+ out.appendRow(row);
+ numTokens++;
+ }
+ }
+
+ public void appendTokensWide(List<Object> keys, List<Tokenizer.Token>
tokenList, FrameBlock out) {
+ // Create one row with keys as prefix
+ List<Object> rowList = new ArrayList<>(keys);
+
+ int numTokens = 0;
+ for (Tokenizer.Token token: tokenList) {
+ if (numTokens >= maxTokens) {
+ break;
+ }
+ rowList.add(token.textToken);
+ numTokens++;
+ }
+ // Remaining positions need to be filled with empty tokens
+ for (; numTokens < maxTokens; numTokens++) {
+ rowList.add("");
+ }
+ Object[] row = new Object[rowList.size()];
+ rowList.toArray(row);
+ out.appendRow(row);
+ }
+
+ @Override
+ public Types.ValueType[] getOutSchema() {
+ if (wideFormat) {
+ return getOutSchemaWide(numIdCols, maxTokens);
+ } else {
+ return getOutSchemaLong(numIdCols);
+ }
+
+ }
+
+ private static Types.ValueType[] getOutSchemaWide(int numIdCols, int
maxTokens) {
+ Types.ValueType[] schema = UtilFunctions.nCopies(numIdCols +
maxTokens,Types.ValueType.STRING );
+ return schema;
+ }
+
+ private static Types.ValueType[] getOutSchemaLong(int numIdCols) {
+ Types.ValueType[] schema = new Types.ValueType[numIdCols + 2];
+ int i = 0;
+ for (; i < numIdCols; i++) {
+ schema[i] = Types.ValueType.STRING;
+ }
+ schema[i] = Types.ValueType.INT64;
+ schema[i+1] = Types.ValueType.STRING;
+ return schema;
+ }
+
+ public long getNumRows(long inRows) {
+ if (wideFormat) {
+ return inRows;
+ } else {
+ return inRows * maxTokens;
+ }
+ }
+
+ public long getNumCols() {
+ return this.getOutSchema().length;
+ }
}
diff --git a/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
b/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
index b9a43d4..1439fd2 100644
--- a/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
+++ b/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
@@ -863,19 +863,6 @@ public class UtilFunctions {
.map(DATE_FORMATS::get).orElseThrow(() -> new
NullPointerException("Unknown date format."));
}
- public static FrameBlock getSplittedString (String input) {
- //Frame f = new Frame();
- String[] string_array = input.split("'[ ]*,[ ]*'");
- ValueType[] schema = new ValueType[string_array.length];
- for(int i=0; i< string_array.length; i++)
- schema[i] = ValueType.STRING;
- FrameBlock fb = new FrameBlock(schema);
- fb.appendRow(string_array);
- List<String>r = Arrays.asList(string_array);
- System.out.println("converted FrameBlock: " + fb.toString());
- return fb;//.subList(0,2);
- }
-
public static String[] getSplittedStringAsArray (String input) {
//Frame f = new Frame();
String[] string_array = input.split("'[ ]*,[ ]*'");
diff --git
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/genOffsetOLETest.java
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/genOffsetOLETest.java
index 439bc04..838d89c 100644
---
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/genOffsetOLETest.java
+++
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/genOffsetOLETest.java
@@ -28,81 +28,80 @@ import org.junit.Test;
public class genOffsetOLETest {
- @Test
- public void testEmpty() {
- int[] offsets = new int[0];
- int len = 0;
- ColGroupOLE.genOffsetBitmap(offsets, len);
- }
+ @Test
+ public void testEmpty() {
+ int[] offsets = new int[0];
+ int len = 0;
+ ColGroupOLE.genOffsetBitmap(offsets, len);
+ }
- @Test
- public void testSingleElement_01() {
- int[] offsets = new int[1];
- int len = 1;
- offsets[0] = 5;
- char[] res = ColGroupOLE.genOffsetBitmap(offsets, len);
- assertArrayEquals(new char[] {1, 5}, res);
- }
+ @Test
+ public void testSingleElement_01() {
+ int[] offsets = new int[1];
+ int len = 1;
+ offsets[0] = 5;
+ char[] res = ColGroupOLE.genOffsetBitmap(offsets, len);
+ assertArrayEquals(new char[] {1, 5}, res);
+ }
- @Test
- public void testSingleElement_02() {
- int[] offsets = new int[1];
- int len = 1;
- offsets[0] = 65535;
- int[] res = conv(ColGroupOLE.genOffsetBitmap(offsets, len));
- assertArrayEquals(new int[] {0, 1, 0}, res);
- }
+ @Test
+ public void testSingleElement_02() {
+ int[] offsets = new int[1];
+ int len = 1;
+ offsets[0] = 65535;
+ int[] res = conv(ColGroupOLE.genOffsetBitmap(offsets, len));
+ assertArrayEquals(new int[] {0, 1, 0}, res);
+ }
- @Test
- public void testSingleElement_03() {
- int[] offsets = new int[1];
- int len = 1;
- offsets[0] = 65536;
- int[] res = conv(ColGroupOLE.genOffsetBitmap(offsets, len));
- assertArrayEquals(new int[] {0, 1, 1}, res);
- }
+ @Test
+ public void testSingleElement_03() {
+ int[] offsets = new int[1];
+ int len = 1;
+ offsets[0] = 65536;
+ int[] res = conv(ColGroupOLE.genOffsetBitmap(offsets, len));
+ assertArrayEquals(new int[] {0, 1, 1}, res);
+ }
- @Test
- public void testSingleElement_04() {
- int[] offsets = new int[1];
- int len = 1;
- offsets[0] = 65534;
- char[] res = ColGroupOLE.genOffsetBitmap(offsets, len);
- assertArrayEquals(new char[] {1, 65534}, res);
- }
+ @Test
+ public void testSingleElement_04() {
+ int[] offsets = new int[1];
+ int len = 1;
+ offsets[0] = 65534;
+ char[] res = ColGroupOLE.genOffsetBitmap(offsets, len);
+ assertArrayEquals(new char[] {1, 65534}, res);
+ }
- @Test
- public void testTwoElements_01() {
- int[] offsets = new int[2];
- int len = 2;
- offsets[0] = 0;
- offsets[1] = 65536;
- int[] res = conv(ColGroupOLE.genOffsetBitmap(offsets, len));
- assertArrayEquals(new int[] {1, 0, 1, 1}, res);
- }
+ @Test
+ public void testTwoElements_01() {
+ int[] offsets = new int[2];
+ int len = 2;
+ offsets[0] = 0;
+ offsets[1] = 65536;
+ int[] res = conv(ColGroupOLE.genOffsetBitmap(offsets, len));
+ assertArrayEquals(new int[] {1, 0, 1, 1}, res);
+ }
- @Test
- public void testTwoElements_02() {
- int[] offsets = new int[2];
- int len = 2;
- offsets[0] = 65536;
- offsets[1] = 65536 + 1;
- int[] res = conv(ColGroupOLE.genOffsetBitmap(offsets, len));
- assertArrayEquals(new int[] {0, 2, 1, 2}, res);
- }
+ @Test
+ public void testTwoElements_02() {
+ int[] offsets = new int[2];
+ int len = 2;
+ offsets[0] = 65536;
+ offsets[1] = 65536 + 1;
+ int[] res = conv(ColGroupOLE.genOffsetBitmap(offsets, len));
+ assertArrayEquals(new int[] {0, 2, 1, 2}, res);
+ }
- @Test
- public void encodeChar() {
- char v = (char) (CompressionSettings.BITMAP_BLOCK_SZ %
(CompressionSettings.BITMAP_BLOCK_SZ));
- assertEquals(0, (int) v);
- }
-
- private int[] conv(char[] i) {
- int[] o = new int[i.length];
- int k = 0;
- for(char ii : i)
- o[k++] = ii;
- return o;
- }
+ @Test
+ public void encodeChar() {
+ char v = (char) (CompressionSettings.BITMAP_BLOCK_SZ %
(CompressionSettings.BITMAP_BLOCK_SZ));
+ assertEquals(0, (int) v);
+ }
+ private static int[] conv(char[] i) {
+ int[] o = new int[i.length];
+ int k = 0;
+ for(char ii : i)
+ o[k++] = ii;
+ return o;
+ }
}
diff --git
a/src/test/java/org/apache/sysds/test/component/matrix/TransposeInplaceTest.java
b/src/test/java/org/apache/sysds/test/component/matrix/TransposeInplaceTest.java
index e79de17..212f08f 100644
---
a/src/test/java/org/apache/sysds/test/component/matrix/TransposeInplaceTest.java
+++
b/src/test/java/org/apache/sysds/test/component/matrix/TransposeInplaceTest.java
@@ -39,95 +39,94 @@ import org.junit.runners.Parameterized.Parameters;
@RunWith(value = Parameterized.class)
@net.jcip.annotations.NotThreadSafe
public class TransposeInplaceTest {
- protected static final Log LOG =
LogFactory.getLog(TransposeInplaceTest.class.getName());
+ protected static final Log LOG =
LogFactory.getLog(TransposeInplaceTest.class.getName());
- @Parameters
- public static Collection<Object[]> data() {
- ArrayList<Object[]> tests = new ArrayList<>();
-
- tests.add(genIncMatrix(4, 8));
- tests.add(genIncMatrix(8, 4));
- tests.add(genIncMatrix(4, 12));
- tests.add(genIncMatrix(4, 16));
- tests.add(genIncMatrix(12, 4));
- tests.add(genIncMatrix(12, 56));
- // tests.add(genIncMatrix(3, 6));
- // tests.add(genIncMatrix(2, 5));
- // tests.add(genIncMatrix(2, 10));
- // tests.add(genIncMatrix(4, 6));
- // tests.add(genIncMatrix(13, 51));
- // tests.add(genIncMatrix(30000, 290));
-
- // tests.add(genIncMatrix(80, 40));
- // tests.add(genIncMatrix(40, 20));
- // tests.add(genIncMatrix(30000, 30));
- // tests.add(genIncMatrix(30000, 300));
- // tests.add(genIncMatrix(100000, 5000));
- // tests.add(genIncMatrix(300, 28));
- // tests.add(genIncMatrix(30, 300000));
-
+ @Parameters
+ public static Collection<Object[]> data() {
+ ArrayList<Object[]> tests = new ArrayList<>();
+
+ tests.add(genIncMatrix(4, 8));
+ tests.add(genIncMatrix(8, 4));
+ tests.add(genIncMatrix(4, 12));
+ tests.add(genIncMatrix(4, 16));
+ tests.add(genIncMatrix(12, 4));
+ tests.add(genIncMatrix(12, 56));
+ // tests.add(genIncMatrix(3, 6));
+ // tests.add(genIncMatrix(2, 5));
+ // tests.add(genIncMatrix(2, 10));
+ // tests.add(genIncMatrix(4, 6));
+ // tests.add(genIncMatrix(13, 51));
+ // tests.add(genIncMatrix(30000, 290));
+
+ // tests.add(genIncMatrix(80, 40));
+ // tests.add(genIncMatrix(40, 20));
+ // tests.add(genIncMatrix(30000, 30));
+ // tests.add(genIncMatrix(30000, 300));
+ // tests.add(genIncMatrix(100000, 5000));
+ // tests.add(genIncMatrix(300, 28));
+ // tests.add(genIncMatrix(30, 300000));
+
- return tests;
- }
+ return tests;
+ }
- @Parameterized.Parameter
- public MatrixBlock in;
- @Parameterized.Parameter(1)
- public int[][] org;
+ @Parameterized.Parameter
+ public MatrixBlock in;
+ @Parameterized.Parameter(1)
+ public int[][] org;
- private static ReorgOperator opP = new
ReorgOperator(SwapIndex.getSwapIndexFnObject(), 16);
- private static ReorgOperator op = new
ReorgOperator(SwapIndex.getSwapIndexFnObject(), 1);
+ private static ReorgOperator opP = new
ReorgOperator(SwapIndex.getSwapIndexFnObject(), 16);
+ //private static ReorgOperator op = new
ReorgOperator(SwapIndex.getSwapIndexFnObject(), 1);
- private int rep = 2;
- @Test
- public void testEstimation() {
- // for (int i = 0; i < rep; i++){
+ private int rep = 2;
+ @Test
+ public void testEstimation() {
+ // for (int i = 0; i < rep; i++){
- // LibMatrixReorg.reorgInPlace(in, op);
- // Assert.assertEquals(in.quickGetValue(i%2, 1- i%2), org[1][0],
0.00001);
- // }
- // for (int i = 0; i < rep; i++){
- // in = LibMatrixReorg.reorg(in,new
MatrixBlock(in.getNumColumns(), in.getNumRows(), false), op);
- // }
- try{
-
- Timing time = new Timing(true);
- // for (int i = 0; i < rep; i++){
- // in = LibMatrixReorg.reorg(in,new
MatrixBlock(in.getNumColumns(), in.getNumRows(), false), opP);
- // }
-
- // System.out.println("duplicate avg: "+(time.stop() / rep)+"
ms.");
- // time = new Timing(true);
- for (int i = 0; i < rep; i++){
- LibMatrixReorg.reorgInPlace(in, opP);
- // LOG.error(in);
- // LOG.error(in.slice(0, 3, 0, 3, null));
- Assert.assertEquals(org[1][0],in.quickGetValue(i%2, 1- i%2),
0.00001);
- }
-
- System.out.println("in place avg: "+(time.stop() / rep)+" ms.");
-
- } catch(Exception e){
- e.printStackTrace();
- }
- // very small test only verifying one cell...
- }
+ // LibMatrixReorg.reorgInPlace(in, op);
+ // Assert.assertEquals(in.quickGetValue(i%2, 1- i%2),
org[1][0], 0.00001);
+ // }
+ // for (int i = 0; i < rep; i++){
+ // in = LibMatrixReorg.reorg(in,new
MatrixBlock(in.getNumColumns(), in.getNumRows(), false), op);
+ // }
+ try{
+
+ Timing time = new Timing(true);
+ // for (int i = 0; i < rep; i++){
+ // in = LibMatrixReorg.reorg(in,new
MatrixBlock(in.getNumColumns(), in.getNumRows(), false), opP);
+ // }
+
+ // System.out.println("duplicate avg: "+(time.stop() /
rep)+" ms.");
+ // time = new Timing(true);
+ for (int i = 0; i < rep; i++){
+ LibMatrixReorg.reorgInPlace(in, opP);
+ // LOG.error(in);
+ // LOG.error(in.slice(0, 3, 0, 3, null));
+
Assert.assertEquals(org[1][0],in.quickGetValue(i%2, 1- i%2), 0.00001);
+ }
+
+ System.out.println("in place avg: "+(time.stop() /
rep)+" ms.");
+
+ } catch(Exception e){
+ e.printStackTrace();
+ }
+ // very small test only verifying one cell...
+ }
-
+
- private static MatrixBlock gen(int[][] v) {
- return DataConverter.convertToMatrixBlock(v);
- }
+ private static MatrixBlock gen(int[][] v) {
+ return DataConverter.convertToMatrixBlock(v);
+ }
- private static Object[] genIncMatrix(int rows, int cols ){
- int[][] ret = new int[rows][cols];
- int x = 0;
- for (int i = 0; i< rows; i ++){
- for (int j = 0; j < cols; j++){
- ret[i][j] = x++;
- }
- }
-
- return new Object[]{gen(ret), ret};
- }
+ private static Object[] genIncMatrix(int rows, int cols ){
+ int[][] ret = new int[rows][cols];
+ int x = 0;
+ for (int i = 0; i< rows; i ++){
+ for (int j = 0; j < cols; j++){
+ ret[i][j] = x++;
+ }
+ }
+ return new Object[]{gen(ret), ret};
+ }
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinBayesianOptimisationTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinBayesianOptimisationTest.java
index ba4d211..02745fb 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinBayesianOptimisationTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinBayesianOptimisationTest.java
@@ -33,21 +33,19 @@ public class BuiltinBayesianOptimisationTest extends
AutomatedTestBase {
private final static String TEST_NAME = "bayesianOptimization";
private final static String TEST_DIR = "functions/builtin/";
- private final static String TEST_CLASS_DIR = TEST_DIR +
BuiltinBayesianOptimisationTest.class.getSimpleName() + "/";
-
private final static int rows = 300;
private final static int cols = 200;
@Override
public void setUp()
{
- addTestConfiguration(TEST_DIR, TEST_NAME);
+ addTestConfiguration(TEST_DIR, TEST_NAME);
}
- @Test
- public void bayesianOptimisationMLMinimisationTest() {
+ @Test
+ public void bayesianOptimisationMLMinimisationTest() {
testBayesianOptimization("TRUE", 10, ExecType.CP);
- }
+ }
@Test
public void bayesianOptimisationMLMaximizationTest() {
@@ -60,7 +58,7 @@ public class BuiltinBayesianOptimisationTest extends
AutomatedTestBase {
}
- public void testBayesianOptimization(String minimize, int iter, ExecType
exec) {
+ public void testBayesianOptimization(String minimize, int iter,
ExecType exec) {
ExecMode modeOld = setExecMode(exec);
@@ -82,6 +80,6 @@ public class BuiltinBayesianOptimisationTest extends
AutomatedTestBase {
finally {
resetExecMode(modeOld);
}
- }
+ }
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinCorrectTyposTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinCorrectTyposTest.java
index f2c7b14..41d5187 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinCorrectTyposTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinCorrectTyposTest.java
@@ -127,7 +127,7 @@ public class BuiltinCorrectTyposTest extends
AutomatedTestBase
}
private static void initFrameData(FrameBlock frame, FrameBlock
verificationFrame, String decapitalize) {
- List<Integer> bins = new ArrayList<Integer>();
+ List<Integer> bins = new ArrayList<>();
String[] correctStrings = getCorrectData(numberDataPoints,
bins);
String[] corruptedStrings;
if (corruptData) {
@@ -150,7 +150,7 @@ public class BuiltinCorrectTyposTest extends
AutomatedTestBase
String[] allCountries = new String[] {"Austria", "Belarus",
"Denmark", "Germany", "Italy", "Liechtenstein"};
- List<String> chosenCountries = new ArrayList<String>();
+ List<String> chosenCountries = new ArrayList<>();
int remainingDataPoints = numberDataPoints;
bins.add(0);
for (int i = 0; i < allCountries.length-1; i++) {
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinDecisionTreeTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinDecisionTreeTest.java
index 6520f1b..8e9bcd9 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinDecisionTreeTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinDecisionTreeTest.java
@@ -73,8 +73,7 @@ public class BuiltinDecisionTreeTest extends
AutomatedTestBase {
runTest(true, false, null, -1);
HashMap<MatrixValue.CellIndex, Double> actual_M =
readDMLMatrixFromOutputDir("M");
- HashMap<MatrixValue.CellIndex, Double> expected_M = new
HashMap<MatrixValue.CellIndex, Double>();
-
+ HashMap<MatrixValue.CellIndex, Double> expected_M = new
HashMap<>();
expected_M.put(new MatrixValue.CellIndex(1, 1), 1.0);
expected_M.put(new MatrixValue.CellIndex(1, 3), 3.0);
expected_M.put(new MatrixValue.CellIndex(3, 1), 2.0);
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinEMATest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinEMATest.java
index 8ca4782..c240196 100644
--- a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinEMATest.java
+++ b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinEMATest.java
@@ -166,14 +166,10 @@ public class BuiltinEMATest extends AutomatedTestBase {
runTest(f, ExecType.CP, 100, "triple", 4, 0.5, 0.5, 0.5,
na_ma_ref, e);
}
- private double calcRMSE(Double[] list1, Double[] list2) {
+ private static double calcRMSE(Double[] list1, Double[] list2) {
double sum = 0;
-
for(int i =0; i< list1.length; i++)
- {
sum += Math.pow(list1[i] - list2[i], 2);
- }
-
return Math.sqrt(sum / list1.length);
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGaussianClassifierTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGaussianClassifierTest.java
index a6da9b6..593cb5a 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGaussianClassifierTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGaussianClassifierTest.java
@@ -81,6 +81,7 @@ public class BuiltinGaussianClassifierTest extends
AutomatedTestBase
testGaussianClassifier(80, 30, 0.3, 10);
}
+ @SuppressWarnings("unused")
public void testGaussianClassifier(int rows, int cols, double sparsity,
int classes)
{
setOutputBuffering(true);
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSherlockTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSherlockTest.java
index e1ba245..15ae05d 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSherlockTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSherlockTest.java
@@ -30,100 +30,103 @@ import java.util.HashMap;
import java.util.List;
public class BuiltinSherlockTest extends AutomatedTestBase {
- private final static String TEST_NAME = "sherlock";
- private final static String TEST_DIR = "functions/builtin/";
- private final static String TEST_CLASS_DIR = TEST_DIR +
BuiltinSherlockTest.class.getSimpleName() + "/";
+ private final static String TEST_NAME = "sherlock";
+ private final static String TEST_DIR = "functions/builtin/";
+ private final static String TEST_CLASS_DIR = TEST_DIR +
BuiltinSherlockTest.class.getSimpleName() + "/";
- @Override public void setUp() {
- TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_CLASS_DIR,
TEST_NAME, new String[] {"B"}));
- }
+ @Override
+ public void setUp() {
+ TestUtils.clearAssertionInformation();
+ addTestConfiguration(TEST_NAME, new
TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] {"B"}));
+ }
- @Test public void testSherlock() {
- runtestSherlock();
- }
+ @Test
+ public void testSherlock() {
+ runtestSherlock();
+ }
- private void runtestSherlock() {
- loadTestConfiguration(getTestConfiguration(TEST_NAME));
- String HOME = SCRIPT_DIR + TEST_DIR;
- fullDMLScriptName = HOME + TEST_NAME + ".dml";
+ @SuppressWarnings("unused")
+ private void runtestSherlock() {
+ loadTestConfiguration(getTestConfiguration(TEST_NAME));
+ String HOME = SCRIPT_DIR + TEST_DIR;
+ fullDMLScriptName = HOME + TEST_NAME + ".dml";
- List<String> proArgs = new ArrayList<>();
- proArgs.add("-exec");
- proArgs.add(" singlenode");
- proArgs.add("-nvargs");
- proArgs.add("X=" + input("X"));
- proArgs.add("Y=" + input("Y"));
-
- proArgs.add("cW1=" + output("cW1"));
- proArgs.add("cb1=" + output("cb1"));
- proArgs.add("cW2=" + output("cW2"));
- proArgs.add("cb2=" + output("cb2"));
- proArgs.add("cW3=" + output("cW3"));
- proArgs.add("cb3=" + output("cb3"));
- proArgs.add("wW1=" + output("wW1"));
- proArgs.add("wb1=" + output("wb1"));
- proArgs.add("wW2=" + output("wW2"));
- proArgs.add("wb2=" + output("wb2"));
- proArgs.add("wW3=" + output("wW3"));
- proArgs.add("wb3=" + output("wb3"));
- proArgs.add("pW1=" + output("pW1"));
- proArgs.add("pb1=" + output("pb1"));
- proArgs.add("pW2=" + output("pW2"));
- proArgs.add("pb2=" + output("pb2"));
- proArgs.add("pW3=" + output("pW3"));
- proArgs.add("pb3=" + output("pb3"));
- proArgs.add("sW1=" + output("sW1"));
- proArgs.add("sb1=" + output("sb1"));
- proArgs.add("sW2=" + output("sW2"));
- proArgs.add("sb2=" + output("sb2"));
- proArgs.add("sW3=" + output("sW3"));
- proArgs.add("sb3=" + output("sb3"));
- proArgs.add("fW1=" + output("fW1"));
- proArgs.add("fb1=" + output("fb1"));
- proArgs.add("fW2=" + output("fW2"));
- proArgs.add("fb2=" + output("fb2"));
- proArgs.add("fW3=" + output("fW3"));
- proArgs.add("fb3=" + output("fb3"));
- programArgs = proArgs.toArray(new String[proArgs.size()]);
-
- double[][] X = getRandomMatrix(256, 1588, 0, 3, 0.9, 7);
- double[][] Y = getRandomMatrix(256, 78, 0, 1, 0.9, 7);
-
- writeInputMatrixWithMTD("X", X, true);
- writeInputMatrixWithMTD("Y", Y, true);
- runTest(true, EXCEPTION_NOT_EXPECTED, null, -1);
-
- //compare expected results
- HashMap<MatrixValue.CellIndex, Double> cW1 =
readDMLMatrixFromOutputDir("cW1");
- HashMap<MatrixValue.CellIndex, Double> cb1 =
readDMLMatrixFromOutputDir("cb1");
- HashMap<MatrixValue.CellIndex, Double> cW2 =
readDMLMatrixFromOutputDir("cW2");
- HashMap<MatrixValue.CellIndex, Double> cb2 =
readDMLMatrixFromOutputDir("cb2");
- HashMap<MatrixValue.CellIndex, Double> cW3 =
readDMLMatrixFromOutputDir("cW3");
- HashMap<MatrixValue.CellIndex, Double> cb3 =
readDMLMatrixFromOutputDir("cb3");
- HashMap<MatrixValue.CellIndex, Double> wW1 =
readDMLMatrixFromOutputDir("wW1");
- HashMap<MatrixValue.CellIndex, Double> wb1 =
readDMLMatrixFromOutputDir("wb1");
- HashMap<MatrixValue.CellIndex, Double> wW2 =
readDMLMatrixFromOutputDir("wW2");
- HashMap<MatrixValue.CellIndex, Double> wb2 =
readDMLMatrixFromOutputDir("wb2");
- HashMap<MatrixValue.CellIndex, Double> wW3 =
readDMLMatrixFromOutputDir("wW3");
- HashMap<MatrixValue.CellIndex, Double> wb3 =
readDMLMatrixFromOutputDir("wb3");
- HashMap<MatrixValue.CellIndex, Double> pW1 =
readDMLMatrixFromOutputDir("pW1");
- HashMap<MatrixValue.CellIndex, Double> pb1 =
readDMLMatrixFromOutputDir("pb1");
- HashMap<MatrixValue.CellIndex, Double> pW2 =
readDMLMatrixFromOutputDir("pW2");
- HashMap<MatrixValue.CellIndex, Double> pb2 =
readDMLMatrixFromOutputDir("pb2");
- HashMap<MatrixValue.CellIndex, Double> pW3 =
readDMLMatrixFromOutputDir("pW3");
- HashMap<MatrixValue.CellIndex, Double> pb3 =
readDMLMatrixFromOutputDir("pb3");
- HashMap<MatrixValue.CellIndex, Double> sW1 =
readDMLMatrixFromOutputDir("sW1");
- HashMap<MatrixValue.CellIndex, Double> sb1 =
readDMLMatrixFromOutputDir("sb1");
- HashMap<MatrixValue.CellIndex, Double> sW2 =
readDMLMatrixFromOutputDir("sW2");
- HashMap<MatrixValue.CellIndex, Double> sb2 =
readDMLMatrixFromOutputDir("sb2");
- HashMap<MatrixValue.CellIndex, Double> sW3 =
readDMLMatrixFromOutputDir("sW3");
- HashMap<MatrixValue.CellIndex, Double> sb3 =
readDMLMatrixFromOutputDir("sb3");
- HashMap<MatrixValue.CellIndex, Double> fW1 =
readDMLMatrixFromOutputDir("fW1");
- HashMap<MatrixValue.CellIndex, Double> fb1 =
readDMLMatrixFromOutputDir("fb1");
- HashMap<MatrixValue.CellIndex, Double> fW2 =
readDMLMatrixFromOutputDir("fW2");
- HashMap<MatrixValue.CellIndex, Double> fb2 =
readDMLMatrixFromOutputDir("fb2");
- HashMap<MatrixValue.CellIndex, Double> fW3 =
readDMLMatrixFromOutputDir("fW3");
- HashMap<MatrixValue.CellIndex, Double> fb3 =
readDMLMatrixFromOutputDir("fb3");
- }
+ List<String> proArgs = new ArrayList<>();
+ proArgs.add("-exec");
+ proArgs.add(" singlenode");
+ proArgs.add("-nvargs");
+ proArgs.add("X=" + input("X"));
+ proArgs.add("Y=" + input("Y"));
+
+ proArgs.add("cW1=" + output("cW1"));
+ proArgs.add("cb1=" + output("cb1"));
+ proArgs.add("cW2=" + output("cW2"));
+ proArgs.add("cb2=" + output("cb2"));
+ proArgs.add("cW3=" + output("cW3"));
+ proArgs.add("cb3=" + output("cb3"));
+ proArgs.add("wW1=" + output("wW1"));
+ proArgs.add("wb1=" + output("wb1"));
+ proArgs.add("wW2=" + output("wW2"));
+ proArgs.add("wb2=" + output("wb2"));
+ proArgs.add("wW3=" + output("wW3"));
+ proArgs.add("wb3=" + output("wb3"));
+ proArgs.add("pW1=" + output("pW1"));
+ proArgs.add("pb1=" + output("pb1"));
+ proArgs.add("pW2=" + output("pW2"));
+ proArgs.add("pb2=" + output("pb2"));
+ proArgs.add("pW3=" + output("pW3"));
+ proArgs.add("pb3=" + output("pb3"));
+ proArgs.add("sW1=" + output("sW1"));
+ proArgs.add("sb1=" + output("sb1"));
+ proArgs.add("sW2=" + output("sW2"));
+ proArgs.add("sb2=" + output("sb2"));
+ proArgs.add("sW3=" + output("sW3"));
+ proArgs.add("sb3=" + output("sb3"));
+ proArgs.add("fW1=" + output("fW1"));
+ proArgs.add("fb1=" + output("fb1"));
+ proArgs.add("fW2=" + output("fW2"));
+ proArgs.add("fb2=" + output("fb2"));
+ proArgs.add("fW3=" + output("fW3"));
+ proArgs.add("fb3=" + output("fb3"));
+ programArgs = proArgs.toArray(new String[proArgs.size()]);
+
+ double[][] X = getRandomMatrix(256, 1588, 0, 3, 0.9, 7);
+ double[][] Y = getRandomMatrix(256, 78, 0, 1, 0.9, 7);
+
+ writeInputMatrixWithMTD("X", X, true);
+ writeInputMatrixWithMTD("Y", Y, true);
+ runTest(true, EXCEPTION_NOT_EXPECTED, null, -1);
+
+ //compare expected results
+ HashMap<MatrixValue.CellIndex, Double> cW1 =
readDMLMatrixFromOutputDir("cW1");
+ HashMap<MatrixValue.CellIndex, Double> cb1 =
readDMLMatrixFromOutputDir("cb1");
+ HashMap<MatrixValue.CellIndex, Double> cW2 =
readDMLMatrixFromOutputDir("cW2");
+ HashMap<MatrixValue.CellIndex, Double> cb2 =
readDMLMatrixFromOutputDir("cb2");
+ HashMap<MatrixValue.CellIndex, Double> cW3 =
readDMLMatrixFromOutputDir("cW3");
+ HashMap<MatrixValue.CellIndex, Double> cb3 =
readDMLMatrixFromOutputDir("cb3");
+ HashMap<MatrixValue.CellIndex, Double> wW1 =
readDMLMatrixFromOutputDir("wW1");
+ HashMap<MatrixValue.CellIndex, Double> wb1 =
readDMLMatrixFromOutputDir("wb1");
+ HashMap<MatrixValue.CellIndex, Double> wW2 =
readDMLMatrixFromOutputDir("wW2");
+ HashMap<MatrixValue.CellIndex, Double> wb2 =
readDMLMatrixFromOutputDir("wb2");
+ HashMap<MatrixValue.CellIndex, Double> wW3 =
readDMLMatrixFromOutputDir("wW3");
+ HashMap<MatrixValue.CellIndex, Double> wb3 =
readDMLMatrixFromOutputDir("wb3");
+ HashMap<MatrixValue.CellIndex, Double> pW1 =
readDMLMatrixFromOutputDir("pW1");
+ HashMap<MatrixValue.CellIndex, Double> pb1 =
readDMLMatrixFromOutputDir("pb1");
+ HashMap<MatrixValue.CellIndex, Double> pW2 =
readDMLMatrixFromOutputDir("pW2");
+ HashMap<MatrixValue.CellIndex, Double> pb2 =
readDMLMatrixFromOutputDir("pb2");
+ HashMap<MatrixValue.CellIndex, Double> pW3 =
readDMLMatrixFromOutputDir("pW3");
+ HashMap<MatrixValue.CellIndex, Double> pb3 =
readDMLMatrixFromOutputDir("pb3");
+ HashMap<MatrixValue.CellIndex, Double> sW1 =
readDMLMatrixFromOutputDir("sW1");
+ HashMap<MatrixValue.CellIndex, Double> sb1 =
readDMLMatrixFromOutputDir("sb1");
+ HashMap<MatrixValue.CellIndex, Double> sW2 =
readDMLMatrixFromOutputDir("sW2");
+ HashMap<MatrixValue.CellIndex, Double> sb2 =
readDMLMatrixFromOutputDir("sb2");
+ HashMap<MatrixValue.CellIndex, Double> sW3 =
readDMLMatrixFromOutputDir("sW3");
+ HashMap<MatrixValue.CellIndex, Double> sb3 =
readDMLMatrixFromOutputDir("sb3");
+ HashMap<MatrixValue.CellIndex, Double> fW1 =
readDMLMatrixFromOutputDir("fW1");
+ HashMap<MatrixValue.CellIndex, Double> fb1 =
readDMLMatrixFromOutputDir("fb1");
+ HashMap<MatrixValue.CellIndex, Double> fW2 =
readDMLMatrixFromOutputDir("fW2");
+ HashMap<MatrixValue.CellIndex, Double> fb2 =
readDMLMatrixFromOutputDir("fb2");
+ HashMap<MatrixValue.CellIndex, Double> fW3 =
readDMLMatrixFromOutputDir("fW3");
+ HashMap<MatrixValue.CellIndex, Double> fb3 =
readDMLMatrixFromOutputDir("fb3");
+ }
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedCovarianceTest.java
b/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedCovarianceTest.java
index 557341a..ce23c17 100644
---
a/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedCovarianceTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedCovarianceTest.java
@@ -82,7 +82,7 @@ public class FederatedCovarianceTest extends
AutomatedTestBase {
String HOME = SCRIPT_DIR + TEST_DIR;
// write input matrices
- int r = r = rows / 4;
+ int r = rows / 4;
int c = cols;
// empty script name because we don't execute any script, just
start the worker
diff --git
a/src/test/java/org/apache/sysds/test/functions/transform/EncoderSerializationTest.java
b/src/test/java/org/apache/sysds/test/functions/transform/EncoderSerializationTest.java
index 324c575..5cff0b0 100644
---
a/src/test/java/org/apache/sysds/test/functions/transform/EncoderSerializationTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/transform/EncoderSerializationTest.java
@@ -117,7 +117,7 @@ public class EncoderSerializationTest extends
AutomatedTestBase
}
}
- private Encoder serializeDeserialize(Encoder encoderIn) {
+ private static Encoder serializeDeserialize(Encoder encoderIn) {
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
