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 b292d3b [MINOR] Cleanup repo (merge issue, cla name conflict, tests)
b292d3b is described below
commit b292d3b9bda00641e34c125b562c83621423698a
Author: Matthias Boehm <[email protected]>
AuthorDate: Sat Mar 20 17:27:33 2021 +0100
[MINOR] Cleanup repo (merge issue, cla name conflict, tests)
* With SYSTEMDS-2841, a merge conflict affecting isNaN and isNA has been
introduced and is now fixed
* The compression framework used private classes with identical names
but lower caps, which led to file name conflicts on Windows
* Additional cleanups of tests (output buffering, seeds)
---
.../java/org/apache/sysds/common/Builtins.java | 4 ++--
.../runtime/compress/lib/CLALibLeftMultBy.java | 6 +++---
.../builtin/BuiltinErrorHandlingTest.java | 1 -
.../builtin/BuiltinFactorizationTest.java | 21 +++++++++---------
.../builtin/BuiltinGaussianClassifierTest.java | 1 -
.../builtin/BuiltinSplitBalancedTest.java | 1 -
.../test/functions/misc/FunctionNamespaceTest.java | 2 --
.../test/functions/misc/ScalarAssignmentTest.java | 25 ++++++----------------
.../test/functions/pipelines/CleaningTest.java | 1 -
9 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/src/main/java/org/apache/sysds/common/Builtins.java
b/src/main/java/org/apache/sysds/common/Builtins.java
index e649f40..6610661 100644
--- a/src/main/java/org/apache/sysds/common/Builtins.java
+++ b/src/main/java/org/apache/sysds/common/Builtins.java
@@ -140,8 +140,8 @@ public enum Builtins {
INTERSECT("intersect", true),
INVERSE("inv", "inverse", false),
IQM("interQuartileMean", false),
- ISNA("is.na", false),
- ISNAN("is.nan", false),
+ ISNA("is.na", "isNA", false),
+ ISNAN("is.nan", "isNaN", false),
ISINF("is.infinite", false),
KM("km", true),
KMEANS("kmeans", true),
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibLeftMultBy.java
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibLeftMultBy.java
index 3ef03f3..15812a2 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibLeftMultBy.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibLeftMultBy.java
@@ -197,7 +197,7 @@ public class CLALibLeftMultBy {
colGroups.size(),
false));
else {
int row =
thatCGs.get(i).getColIndices()[0];
- tasks.add(new
leftMultByCompressedTransposedMatrixTask(colGroups, thatCGs, ret, v, thatV, row,
+ tasks.add(new
LeftMultByCompressedTransposedMatrixTask2(colGroups, thatCGs, ret, v, thatV,
row,
row + 1, overlapping,
1));
}
}
@@ -868,7 +868,7 @@ public class CLALibLeftMultBy {
}
}
- private static class leftMultByCompressedTransposedMatrixTask
implements Callable<Object> {
+ private static class LeftMultByCompressedTransposedMatrixTask2
implements Callable<Object> {
private final List<AColGroup> _groups;
private final List<AColGroup> _thatGroups;
private final MatrixBlock _ret;
@@ -879,7 +879,7 @@ public class CLALibLeftMultBy {
private final boolean _overlapping;
private final int _extraThreads;
- protected
leftMultByCompressedTransposedMatrixTask(List<AColGroup> thisGroups,
List<AColGroup> thatGroups,
+ protected
LeftMultByCompressedTransposedMatrixTask2(List<AColGroup> thisGroups,
List<AColGroup> thatGroups,
MatrixBlock ret, Pair<Integer, int[]> v, Pair<Integer,
int[]> thatV, int rl, int ru, boolean overlapping,
int extraThreads) {
_groups = thisGroups;
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinErrorHandlingTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinErrorHandlingTest.java
index 49a57f5..8ebc25d 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinErrorHandlingTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinErrorHandlingTest.java
@@ -63,7 +63,6 @@ public class BuiltinErrorHandlingTest extends
AutomatedTestBase {
double[][] X = getRandomMatrix(10, 5, 0, 1, 0.8, -1);
writeInputMatrixWithMTD("X", X, true);
- setOutputBuffering(true);
runTest(true, true, LanguageException.class, "typo", -1);
}
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinFactorizationTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinFactorizationTest.java
index 1da15bb..99e9219 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinFactorizationTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinFactorizationTest.java
@@ -59,17 +59,18 @@ public class BuiltinFactorizationTest extends
AutomatedTestBase
public void testGNMFNoRewritesCP() {
runFactorizationTest(TEST_NAME1, false, ExecType.CP);
}
-
- @Test
- public void testGNMFRewritesSpark() {
- runFactorizationTest(TEST_NAME1, true, ExecType.SPARK);
- }
- @Test
- public void testGNMFNoRewritesSpark() {
- runFactorizationTest(TEST_NAME1, false, ExecType.SPARK);
- }
-
+// Note: too expensive in forced spark mode (lazy evaluation across iterations)
+// @Test
+// public void testGNMFRewritesSpark() {
+// runFactorizationTest(TEST_NAME1, true, ExecType.SPARK);
+// }
+//
+// @Test
+// public void testGNMFNoRewritesSpark() {
+// runFactorizationTest(TEST_NAME1, false, ExecType.SPARK);
+// }
+//
@Test
public void testPNMFRewritesCP() {
runFactorizationTest(TEST_NAME2, true, ExecType.CP);
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 593cb5a..3325c98 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
@@ -84,7 +84,6 @@ public class BuiltinGaussianClassifierTest extends
AutomatedTestBase
@SuppressWarnings("unused")
public void testGaussianClassifier(int rows, int cols, double sparsity,
int classes)
{
- setOutputBuffering(true);
loadTestConfiguration(getTestConfiguration(TEST_NAME));
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSplitBalancedTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSplitBalancedTest.java
index 7f47495..67b1132 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSplitBalancedTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSplitBalancedTest.java
@@ -66,7 +66,6 @@ public class BuiltinSplitBalancedTest extends
AutomatedTestBase {
ExecMode platformOld = setExecMode(instType);
try {
- setOutputBuffering(true);
loadTestConfiguration(getTestConfiguration(TEST_NAME));
String HOME = SCRIPT_DIR + TEST_DIR;
diff --git
a/src/test/java/org/apache/sysds/test/functions/misc/FunctionNamespaceTest.java
b/src/test/java/org/apache/sysds/test/functions/misc/FunctionNamespaceTest.java
index b76b954..e8b016b 100644
---
a/src/test/java/org/apache/sysds/test/functions/misc/FunctionNamespaceTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/misc/FunctionNamespaceTest.java
@@ -187,7 +187,6 @@ public class FunctionNamespaceTest extends AutomatedTestBase
private void runFunctionNoInliningNamespaceTest(String TEST_NAME,
boolean IPA)
{
- setOutputBuffering(true);
boolean origIPA =
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS;
getAndLoadTestConfiguration(TEST_NAME);
@@ -230,6 +229,5 @@ public class FunctionNamespaceTest extends AutomatedTestBase
System.setErr(originalStdErr);
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS =
origIPA;
}
- setOutputBuffering(false);
}
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/misc/ScalarAssignmentTest.java
b/src/test/java/org/apache/sysds/test/functions/misc/ScalarAssignmentTest.java
index b118bd8..23f8a89 100644
---
a/src/test/java/org/apache/sysds/test/functions/misc/ScalarAssignmentTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/misc/ScalarAssignmentTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
public class ScalarAssignmentTest extends AutomatedTestBase
{
-
private final static String TEST_NAME1 = "ForScalarAssignmentTest";
private final static String TEST_NAME2 = "ParForScalarAssignmentTest";
private final static String TEST_NAME3 = "WhileScalarAssignmentTest";
@@ -148,15 +147,7 @@ public class ScalarAssignmentTest extends AutomatedTestBase
runScalarAssignmentTest(ControlFlowConstruct.IFELSE,
ValueType.BOOLEAN);
}
-
- /**
- *
- * @param cfc
- * @param vt
- */
- public void runScalarAssignmentTest( ControlFlowConstruct cfc,
ValueType vt )
- {
- setOutputBuffering(true);
+ public void runScalarAssignmentTest( ControlFlowConstruct cfc,
ValueType vt ) {
String TEST_NAME = null;
switch( cfc )
{
@@ -167,8 +158,7 @@ public class ScalarAssignmentTest extends AutomatedTestBase
}
Object value = null;
- switch( vt )
- {
+ switch( vt ) {
case INT64: value = Integer.valueOf(7); break;
case FP64: value = Double.valueOf(7.7); break;
case STRING: value = "This is a test!"; break;
@@ -176,19 +166,18 @@ public class ScalarAssignmentTest extends
AutomatedTestBase
default: //do nothing
}
- TestConfiguration config = getTestConfiguration(TEST_NAME);
+ TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
-
- String RI_HOME = SCRIPT_DIR + TEST_DIR;
+
+ String RI_HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = RI_HOME + TEST_NAME + ".dml";
programArgs = new String[]{"-args", value.toString() };
fullRScriptName = RI_HOME + TEST_NAME + ".R";
rCmd = getRCmd(inputDir(), expectedDir());
- boolean exceptionExpected = (cfc==ControlFlowConstruct.PARFOR)? true :
false; //dependency analysis
- int expectedNumberOfJobs = -1;
+ boolean exceptionExpected = (cfc==ControlFlowConstruct.PARFOR)?
true : false; //dependency analysis
+ int expectedNumberOfJobs = -1;
runTest(true, exceptionExpected, LanguageException.class,
expectedNumberOfJobs);
- setOutputBuffering(false);
}
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/pipelines/CleaningTest.java
b/src/test/java/org/apache/sysds/test/functions/pipelines/CleaningTest.java
index 2d9eed7..829ca65 100644
--- a/src/test/java/org/apache/sysds/test/functions/pipelines/CleaningTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/pipelines/CleaningTest.java
@@ -68,7 +68,6 @@ public class CleaningTest extends AutomatedTestBase {
private void runFindPipelineTest(Double sample, int topk, int
resources, int crossfold,
boolean weightedAccuracy, Types.ExecMode et) {
- setOutputBuffering(true);
String HOME = SCRIPT_DIR+"scripts/" ;
Types.ExecMode modeOld = setExecMode(et);
try {
