[MINOR] Fix robustness lineage tests (less explain/print/lineage output)
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/FullReusePerfTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/FullReusePerfTest.java
index efa1fb9..c9a8724 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/FullReusePerfTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/FullReusePerfTest.java
@@ -81,7 +81,6 @@
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add("reuse_full");
- proArgs.add("-explain");
proArgs.add("-args");
proArgs.add(input("X"));
proArgs.add(output("X"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/FunctionFullReuseTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/FunctionFullReuseTest.java
index 46a69b4..a2626ff 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/FunctionFullReuseTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/FunctionFullReuseTest.java
@@ -106,7 +106,6 @@
List<String> proArgs = new ArrayList<>();
proArgs.add("-stats");
proArgs.add("-lineage");
- proArgs.add("-explain");
proArgs.add("-args");
proArgs.add(output("X"));
programArgs = proArgs.toArray(new String[proArgs.size()]);
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageCodegenTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageCodegenTest.java
index cf46a90..6f57adc 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageCodegenTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageCodegenTest.java
@@ -87,7 +87,6 @@
getAndLoadTestConfiguration(testname);
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add(ReuseCacheType.REUSE_FULL.name().toLowerCase());
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageMLContextTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageMLContextTest.java
index 2e3203f..9ff0020 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageMLContextTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageMLContextTest.java
@@ -47,7 +47,7 @@
Script script = dml(
"print('sum: '+sum(M+M));"
- +"print(lineage(M+M));"
+ + "print(lineage(M+M));"
).in("M", javaRDD, mm);
setExpectedStdOut("sum: 30.0");
@@ -68,7 +68,8 @@
Script script = dml(
"print('sum: '+sum(M+M));"
- +"print(lineage(M+M));"
+ + "s = lineage(M+M);"
+ +"if( sum(M) < 0 ) print(s);"
).in("M", javaRDD, mm);
setExpectedStdOut("sum: 30.0");
@@ -90,7 +91,8 @@
Script script = dml(
"print('sum: '+sum(M+M));"
- +"print(lineage(M+M));"
+ + "s = lineage(M+M);"
+ +"if( sum(M) < 0 ) print(s);"
).in("M", javaRDD, mm);
ml.setLineage(ReuseCacheType.REUSE_FULL);
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageRewriteTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageRewriteTest.java
index 8b34e0e..3960448 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageRewriteTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageRewriteTest.java
@@ -113,7 +113,6 @@
getAndLoadTestConfiguration(testname);
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add("-args");
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceBuiltinTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceBuiltinTest.java
index ebb0a0e..03b7587 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceBuiltinTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceBuiltinTest.java
@@ -67,7 +67,6 @@
getAndLoadTestConfiguration(testname);
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-args");
proArgs.add(input("X"));
proArgs.add(output("R"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceDedupTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceDedupTest.java
index 96a8407..d04a419 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceDedupTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceDedupTest.java
@@ -149,7 +149,6 @@
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add("dedup");
- proArgs.add("-explain");
proArgs.add("-args");
proArgs.add(input("X"));
proArgs.add(output("R"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceEqualsTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceEqualsTest.java
index fb76a43..5e71484 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceEqualsTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceEqualsTest.java
@@ -79,7 +79,6 @@
proArgs.add("-stats");
proArgs.add("-lineage");
-// proArgs.add("-explain");
proArgs.add("-args");
proArgs.add(input("M"));
proArgs.add(output("X"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceExecSparkTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceExecSparkTest.java
index b5510b4..d4f6f53 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceExecSparkTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceExecSparkTest.java
@@ -91,7 +91,6 @@
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add("-args");
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceExecTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceExecTest.java
index 913add5..b2c2b1f 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceExecTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceExecTest.java
@@ -103,7 +103,6 @@
getAndLoadTestConfiguration(testname);
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-lineage");
proArgs.add("-args");
proArgs.add(input("X"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceFunctionTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceFunctionTest.java
index 6f86164..1aedb7b 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceFunctionTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceFunctionTest.java
@@ -74,7 +74,6 @@
getAndLoadTestConfiguration(testname);
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-lineage");
proArgs.add("-args");
proArgs.add(input("X"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceParforTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceParforTest.java
index b3e0d73..e796825 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceParforTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceParforTest.java
@@ -149,7 +149,6 @@
getAndLoadTestConfiguration(testname);
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-lineage");
proArgs.add("-args");
proArgs.add(output("R"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceRandomSparkTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceRandomSparkTest.java
index 004d930..55efd89 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceRandomSparkTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceRandomSparkTest.java
@@ -72,7 +72,6 @@
proArgs.add("-stats");
proArgs.add("-lineage");
- proArgs.add("-explain");
proArgs.add("-args");
proArgs.add(output("X"));
proArgs.add(output("Y"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceRandomTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceRandomTest.java
index fb2361f..7d96696 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceRandomTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceRandomTest.java
@@ -66,7 +66,6 @@
proArgs.add("-stats");
proArgs.add("-lineage");
- proArgs.add("-explain");
proArgs.add("-args");
proArgs.add(output("X"));
proArgs.add(output("Y"));
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceSparkTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceSparkTest.java
index 0a1bbed..86bda1e 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceSparkTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/LineageTraceSparkTest.java
@@ -106,7 +106,6 @@
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add("-args");
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/SBFullReuseTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/SBFullReuseTest.java
index cabc349..50cd711 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/SBFullReuseTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/SBFullReuseTest.java
@@ -95,7 +95,6 @@
// With lineage-based reuse enabled
proArgs.clear();
proArgs.add("-stats");
- proArgs.add("-explain");
proArgs.add("-lineage");
proArgs.add(ReuseCacheType.REUSE_MULTILEVEL.name().toLowerCase());
proArgs.add("-args");
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/UnmarkLoopDepVarsTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/UnmarkLoopDepVarsTest.java
index 81ca540..9558ee9 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/UnmarkLoopDepVarsTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/UnmarkLoopDepVarsTest.java
@@ -57,7 +57,6 @@
getAndLoadTestConfiguration(UnmarkLoopDepVarsTest.TEST_NAME1);
List<String> proArgs = new ArrayList<>();
- proArgs.add("-explain");
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add("-args");
@@ -71,7 +70,6 @@
HashMap<MatrixValue.CellIndex, Double> R_orig = readDMLMatrixFromHDFS("Res");
proArgs.clear();
- proArgs.add("-explain");
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add(ReuseCacheType.REUSE_FULL.name().toLowerCase());
@@ -92,4 +90,4 @@
Recompiler.reinitRecompiler();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/scripts/functions/lineage/FullReusePerf1.dml b/src/test/scripts/functions/lineage/FullReusePerf1.dml
index b92857a..4cbc91a 100644
--- a/src/test/scripts/functions/lineage/FullReusePerf1.dml
+++ b/src/test/scripts/functions/lineage/FullReusePerf1.dml
@@ -24,12 +24,12 @@
for(i in 2:ncol(X)){
A = t(tmp) %*% tmp;
- while(FALSE) {}
- print(sum(A));
+ if(sum(A) == NaN)
+ print(sum(A));
tmp = cbind(tmp, X[,i]);
A = t(tmp) %*% tmp;
- while(FALSE) {}
- print(sum(A));
+ if(sum(A) == NaN)
+ print(sum(A));
}
# repeat the loop to test read from local FS
@@ -38,12 +38,12 @@
for(i in 2:ncol(X)){
A = t(tmp) %*% tmp;
- while(FALSE) {}
- print(sum(A));
+ if(sum(A) == NaN)
+ print(sum(A));
tmp = cbind(tmp, X[,i]);
A = t(tmp) %*% tmp;
- while(FALSE) {}
- print(sum(A));
+ if(sum(A) == NaN)
+ print(sum(A));
}
write(A, $2, format="text");
diff --git a/src/test/scripts/functions/lineage/FullReusePerf2.dml b/src/test/scripts/functions/lineage/FullReusePerf2.dml
index 5179645..b16f5b2 100644
--- a/src/test/scripts/functions/lineage/FullReusePerf2.dml
+++ b/src/test/scripts/functions/lineage/FullReusePerf2.dml
@@ -24,12 +24,12 @@
for(i in (ncol(X)-1):1){
A = t(tmp) %*% tmp;
- while (FALSE) {}
- print(sum(A));
+ if(sum(A) == NaN)
+ print(sum(A));
tmp = X[,1:i];
A = t(tmp) %*% tmp;
- while (FALSE) {}
- print(sum(A));
+ if(sum(A) == NaN)
+ print(sum(A));
}
# repeat the loop to test read from local FS
@@ -38,12 +38,12 @@
for(i in (ncol(X)-1):1){
A = t(tmp) %*% tmp;
- while (FALSE) {}
- print(sum(A));
+ if(sum(A) == NaN)
+ print(sum(A));
tmp = X[,1:i];
A = t(tmp) %*% tmp;
- while (FALSE) {}
- print(sum(A));
+ if(sum(A) == NaN)
+ print(sum(A));
}
write(A, $2, format="text");
