You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2020/04/09 17:27:02 UTC
[systemml] branch master updated: [MINOR] Fix unnecessarily
detailed test output in tests/functions/misc
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/systemml.git
The following commit(s) were added to refs/heads/master by this push:
new 395b5d0 [MINOR] Fix unnecessarily detailed test output in tests/functions/misc
395b5d0 is described below
commit 395b5d08b75ac0cd71421ac83f7792ff02e2086a
Author: Matthias Boehm <mb...@gmail.com>
AuthorDate: Thu Apr 9 19:25:37 2020 +0200
[MINOR] Fix unnecessarily detailed test output in tests/functions/misc
---
.../functions/misc/ConditionalValidateTest.java | 25 +++++++++++-----------
.../test/functions/misc/ExistsVariableTest.java | 2 +-
.../functions/misc/FunctionInExpressionTest.java | 2 +-
.../test/functions/misc/FunctionInliningTest.java | 2 +-
.../test/functions/misc/FunctionNotFoundTest.java | 2 +-
...nstantFoldingScalarVariablePropagationTest.java | 2 +-
.../test/functions/misc/IPANnzPropagationTest.java | 2 +-
.../test/functions/misc/ListAndStructTest.java | 2 +-
.../sysds/test/functions/misc/PrintMatrixTest.java | 8 ++-----
.../misc/RemoveUnnecessaryCTableTest.java | 2 +-
.../test/functions/misc/RewriteListTsmmCVTest.java | 2 +-
.../misc/RewriteSlicedMatrixMultTest.java | 4 ++--
.../test/functions/misc/SizePropagationTest.java | 2 +-
.../functions/misc/ZeroRowsColsMatrixTest.java | 2 +-
14 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/ConditionalValidateTest.java b/src/test/java/org/apache/sysds/test/functions/misc/ConditionalValidateTest.java
index 7a54652..71282a7 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/ConditionalValidateTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/ConditionalValidateTest.java
@@ -105,14 +105,14 @@ public class ConditionalValidateTest extends AutomatedTestBase
String TEST_NAME = testName;
try
- {
+ {
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
- String HOME = SCRIPT_DIR + TEST_DIR;
- String input = input("Y");
+ String HOME = SCRIPT_DIR + TEST_DIR;
+ String input = input("Y");
- fullDMLScriptName = HOME + TEST_NAME + ".dml";
+ fullDMLScriptName = HOME + TEST_NAME + ".dml";
programArgs = new String[]{"-args", input };
//write input
@@ -124,16 +124,15 @@ public class ConditionalValidateTest extends AutomatedTestBase
HDFSTool.writeMetaDataFile(input+(fileExists?"":"b")+".mtd", ValueType.FP64, mc, OutputInfo.TextCellOutputInfo);
//run tests
- runTest(true, exceptionExpected, DMLException.class, -1);
-
- //cleanup
- HDFSTool.deleteFileIfExistOnHDFS(input);
- HDFSTool.deleteFileIfExistOnHDFS(input+"b");
- HDFSTool.deleteFileIfExistOnHDFS(input+".mtd");
- HDFSTool.deleteFileIfExistOnHDFS(input+"b.mtd");
+ runTest(true, exceptionExpected, DMLException.class, -1);
+
+ //cleanup
+ HDFSTool.deleteFileIfExistOnHDFS(input);
+ HDFSTool.deleteFileIfExistOnHDFS(input+"b");
+ HDFSTool.deleteFileIfExistOnHDFS(input+".mtd");
+ HDFSTool.deleteFileIfExistOnHDFS(input+"b.mtd");
}
- catch(Exception ex)
- {
+ catch(Exception ex) {
throw new RuntimeException(ex);
}
}
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/ExistsVariableTest.java b/src/test/java/org/apache/sysds/test/functions/misc/ExistsVariableTest.java
index 8036dd9..ff32dbe 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/ExistsVariableTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/ExistsVariableTest.java
@@ -68,7 +68,7 @@ public class ExistsVariableTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
String param = pos ? "1" : "0";
fullDMLScriptName = HOME + testName + ".dml";
- programArgs = new String[]{"-explain", "-stats", "-args", param, output("R") };
+ programArgs = new String[]{"-stats", "-args", param, output("R") };
//run script and compare output
runTest(true, false, null, -1);
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/FunctionInExpressionTest.java b/src/test/java/org/apache/sysds/test/functions/misc/FunctionInExpressionTest.java
index 4b5494d..bac9e63 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/FunctionInExpressionTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/FunctionInExpressionTest.java
@@ -87,7 +87,7 @@ public class FunctionInExpressionTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testName + ".dml";
- programArgs = new String[]{"-explain", "-stats", "-args", output("R") };
+ programArgs = new String[]{"-stats", "-args", output("R") };
fullRScriptName = HOME + testName + ".R";
rCmd = getRCmd(expectedDir());
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/FunctionInliningTest.java b/src/test/java/org/apache/sysds/test/functions/misc/FunctionInliningTest.java
index 18388fc..8861d27 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/FunctionInliningTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/FunctionInliningTest.java
@@ -94,7 +94,7 @@ public class FunctionInliningTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testname + ".dml";
- programArgs = new String[] {"-explain","-args",String.valueOf(rows),
+ programArgs = new String[] {"-args",String.valueOf(rows),
String.valueOf(cols), String.valueOf(val), output("Rout") };
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/FunctionNotFoundTest.java b/src/test/java/org/apache/sysds/test/functions/misc/FunctionNotFoundTest.java
index 7add0d9..a58f99d 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/FunctionNotFoundTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/FunctionNotFoundTest.java
@@ -57,7 +57,7 @@ public class FunctionNotFoundTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testName + ".dml";
- programArgs = new String[]{"-explain", "-stats"};
+ programArgs = new String[]{};
//run script and compare output
runTest(true, error, DMLException.class, -1);
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java b/src/test/java/org/apache/sysds/test/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java
index 23931ba..e7868ea 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java
@@ -101,7 +101,7 @@ public class IPAConstantFoldingScalarVariablePropagationTest extends AutomatedTe
loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testname + ".dml";
- programArgs = new String[]{"-stats", "-explain", "recompile_hops"};
+ programArgs = new String[]{"-stats"};
OptimizerUtils.IPA_NUM_REPETITIONS = IPA_SECOND_CHANCE ? 2 : 1;
DMLScript.USE_LOCAL_SPARK_CONFIG = true;
rtplatform = ExecMode.HYBRID;
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/IPANnzPropagationTest.java b/src/test/java/org/apache/sysds/test/functions/misc/IPANnzPropagationTest.java
index d8a0228..a57fee2 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/IPANnzPropagationTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/IPANnzPropagationTest.java
@@ -65,7 +65,7 @@ public class IPANnzPropagationTest extends AutomatedTestBase
loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testname + ".dml";
- programArgs = new String[]{"-stats", "-explain", "recompile_hops"};
+ programArgs = new String[]{"-stats"};
DMLScript.USE_LOCAL_SPARK_CONFIG = true;
rtplatform = ExecMode.HYBRID;
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/ListAndStructTest.java b/src/test/java/org/apache/sysds/test/functions/misc/ListAndStructTest.java
index be091a7..d7426a5 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/ListAndStructTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/ListAndStructTest.java
@@ -171,7 +171,7 @@ public class ListAndStructTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testname + ".dml";
- programArgs = new String[]{ "-stats","-explain","-args", output("R") };
+ programArgs = new String[]{ "-args", output("R") };
fullRScriptName = HOME + testname + ".R";
rCmd = getRCmd(expectedDir());
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/PrintMatrixTest.java b/src/test/java/org/apache/sysds/test/functions/misc/PrintMatrixTest.java
index f02fe9f..9b38e37 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/PrintMatrixTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/PrintMatrixTest.java
@@ -43,10 +43,6 @@ public class PrintMatrixTest extends AutomatedTestBase
runTest( TEST_NAME1, false );
}
- /**
- *
- * @param testName
- */
private void runTest( String testName, boolean exceptionExpected )
{
TestConfiguration config = getTestConfiguration(TEST_NAME1);
@@ -54,9 +50,9 @@ public class PrintMatrixTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME1 + ".dml";
- programArgs = new String[]{"-explain"};
+ programArgs = new String[]{""};
//run tests
- runTest(true, exceptionExpected, DMLException.class, -1);
+ runTest(true, exceptionExpected, DMLException.class, -1);
}
}
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/RemoveUnnecessaryCTableTest.java b/src/test/java/org/apache/sysds/test/functions/misc/RemoveUnnecessaryCTableTest.java
index 09f72b4..179af5d 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/RemoveUnnecessaryCTableTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/RemoveUnnecessaryCTableTest.java
@@ -140,7 +140,7 @@ public class RemoveUnnecessaryCTableTest extends AutomatedTestBase
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = true;
ArrayList<String> programArgsBuilder = new ArrayList<>(
- Arrays.asList("-explain", "-stats", "-args" ));
+ Arrays.asList("-stats", "-args" ));
// Get Matrix Input
if (A != null){
programArgsBuilder.add(input("A"));
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/RewriteListTsmmCVTest.java b/src/test/java/org/apache/sysds/test/functions/misc/RewriteListTsmmCVTest.java
index 525fc15..c5201aa 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/RewriteListTsmmCVTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/RewriteListTsmmCVTest.java
@@ -90,7 +90,7 @@ public class RewriteListTsmmCVTest extends AutomatedTestBase
//lineage tracing with and without reuse
ReuseCacheType reuse = lineage ? ReuseCacheType.REUSE_FULL : ReuseCacheType.NONE;
- programArgs = new String[]{"-explain","recompile_runtime", "-lineage", reuse.name().toLowerCase(),
+ programArgs = new String[]{"-lineage", reuse.name().toLowerCase(),
"-stats","-args", String.valueOf(rows), String.valueOf(cols), output("S") };
fullRScriptName = HOME + testname + ".R";
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/RewriteSlicedMatrixMultTest.java b/src/test/java/org/apache/sysds/test/functions/misc/RewriteSlicedMatrixMultTest.java
index 47471e9..b913dee 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/RewriteSlicedMatrixMultTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/RewriteSlicedMatrixMultTest.java
@@ -91,11 +91,11 @@ public class RewriteSlicedMatrixMultTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testname + ".dml";
- programArgs = new String[]{ "-stats","-args",
+ programArgs = new String[]{ "-args",
input("A"), input("B"), output("R") };
fullRScriptName = HOME + testname + ".R";
- rCmd = getRCmd(inputDir(), expectedDir());
+ rCmd = getRCmd(inputDir(), expectedDir());
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites;
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/SizePropagationTest.java b/src/test/java/org/apache/sysds/test/functions/misc/SizePropagationTest.java
index 127e504..7f4bfb1 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/SizePropagationTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/SizePropagationTest.java
@@ -114,7 +114,7 @@ public class SizePropagationTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testname + ".dml";
- programArgs = new String[]{ "-explain", "hops", "-stats","-args", String.valueOf(N), output("R") };
+ programArgs = new String[]{ "hops", "-stats","-args", String.valueOf(N), output("R") };
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites;
rtplatform = ExecMode.HYBRID;
DMLScript.USE_LOCAL_SPARK_CONFIG = true;
diff --git a/src/test/java/org/apache/sysds/test/functions/misc/ZeroRowsColsMatrixTest.java b/src/test/java/org/apache/sysds/test/functions/misc/ZeroRowsColsMatrixTest.java
index b30d170..6741700 100644
--- a/src/test/java/org/apache/sysds/test/functions/misc/ZeroRowsColsMatrixTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/misc/ZeroRowsColsMatrixTest.java
@@ -180,7 +180,7 @@ public class ZeroRowsColsMatrixTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain","recompile_runtime","-args", String.valueOf(dim),
+ programArgs = new String[]{"-args", String.valueOf(dim),
String.valueOf(emptyRet).toUpperCase(), output("R")};
fullRScriptName = HOME + TEST_NAME +".R";