You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by lr...@apache.org on 2015/11/19 21:47:26 UTC
[44/50] [abbrv] incubator-systemml git commit: [SYSML-312] Refactor
unit tests
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForNaNResultMergeTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
index 86d7605..fa89235 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
@@ -33,6 +33,7 @@ public class ParForNaNResultMergeTest extends AutomatedTestBase
private final static String TEST_DIR = "functions/parfor/";
private final static String TEST_NAME1 = "parfor_NaN1";
private final static String TEST_NAME2 = "parfor_NaN2";
+ private final static String TEST_CLASS_DIR = TEST_DIR + ParForNaNResultMergeTest.class.getSimpleName() + "/";
private final static double eps = 0;
@@ -43,8 +44,8 @@ public class ParForNaNResultMergeTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1, new String[] { "R" }) );
- addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2, new String[] { "R" }) );
+ addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "R" }) );
+ addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "R" }) );
}
@Test
@@ -88,18 +89,16 @@ public class ParForNaNResultMergeTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
programArgs = new String[]{"-args",
- String.valueOf(rows),
- String.valueOf(xrow),
- HOME + OUTPUT_DIR + "R" };
+ String.valueOf(rows), String.valueOf(xrow), output("R") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
- String.valueOf(rows) + " " + String.valueOf(xrow) + " " + HOME + EXPECTED_DIR;
-
- loadTestConfiguration(config);
+ String.valueOf(rows) + " " + String.valueOf(xrow) + " " + expectedDir();
//run tests
runTest(true, false, null, -1);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
index b39f045..be49f9d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
@@ -35,6 +35,7 @@ public class ParForParallelRemoteResultMergeTest extends AutomatedTestBase
private final static String TEST_NAME1 = "parfor_pr_resultmerge2";
private final static String TEST_NAME2 = "parfor_pr_resultmerge32";
private final static String TEST_DIR = "functions/parfor/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + ParForParallelRemoteResultMergeTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
private final static int rows = 1100;
@@ -47,14 +48,10 @@ public class ParForParallelRemoteResultMergeTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
- new String[] { "R" }) );
- addTestConfiguration(
- TEST_NAME2,
- new TestConfiguration(TEST_DIR, TEST_NAME2,
- new String[] { "R" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "R" }) );
+ addTestConfiguration(TEST_NAME2,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "R" }) );
}
@Test
@@ -82,7 +79,6 @@ public class ParForParallelRemoteResultMergeTest extends AutomatedTestBase
{
runParallelRemoteResultMerge(TEST_NAME2, true);
}
-
/**
@@ -100,19 +96,16 @@ public class ParForParallelRemoteResultMergeTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "V" ,
- Integer.toString(rows),
- Integer.toString(cols),
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-args", input("V"),
+ Integer.toString(rows), Integer.toString(cols), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
long seed = System.nanoTime();
double sparsity = -1;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
index f44ccc4..4427d7f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
@@ -41,6 +41,7 @@ public class ParForRepeatedOptimizationTest extends AutomatedTestBase
private final static String TEST_NAME2 = "parfor_repeatedopt2";
private final static String TEST_NAME3 = "parfor_repeatedopt3";
private final static String TEST_DIR = "functions/parfor/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + ParForRepeatedOptimizationTest.class.getSimpleName() + "/";
private final static double eps = 1e-8;
private final static int rows = 1000000;
@@ -50,9 +51,9 @@ public class ParForRepeatedOptimizationTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration( TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1, new String[]{"R"}) );
- addTestConfiguration( TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2, new String[]{"R"}) );
- addTestConfiguration( TEST_NAME3, new TestConfiguration(TEST_DIR, TEST_NAME3, new String[]{"R"}) );
+ addTestConfiguration( TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[]{"R"}) );
+ addTestConfiguration( TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[]{"R"}) );
+ addTestConfiguration( TEST_NAME3, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[]{"R"}) );
}
@@ -119,6 +120,7 @@ public class ParForRepeatedOptimizationTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
try
{
@@ -128,16 +130,14 @@ public class ParForRepeatedOptimizationTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-stats","-args", HOME + INPUT_DIR + "V" ,
- Integer.toString(rows),
- Integer.toString(cols),
- HOME + OUTPUT_DIR + "R",
- Integer.toString((update||changedDim)?1:0)};
+ programArgs = new String[]{"-stats","-args", input("V"),
+ Integer.toString(rows), Integer.toString(cols),
+ output("R"),
+ Integer.toString((update||changedDim)?1:0)};
+
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR + " " + Integer.toString((update||changedDim)?1:0);
-
- loadTestConfiguration(config);
+ inputDir() + " " + expectedDir() + " " + Integer.toString((update||changedDim)?1:0);
double[][] V = getRandomMatrix(rows, cols, 0, 1, sparsity, 7);
writeInputMatrix("V", V, true);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
index a30e7ce..06da6e1 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
@@ -34,14 +34,15 @@ public class ParForReplaceThreadIDRecompileTest extends AutomatedTestBase
private final static String TEST_DIR = "functions/parfor/";
private final static String TEST_NAME1 = "parfor_threadid_recompile1"; //for
- private final static String TEST_NAME2 = "parfor_threadid_recompile2"; //parfor
+ private final static String TEST_NAME2 = "parfor_threadid_recompile2"; //parfor
+ private final static String TEST_CLASS_DIR = TEST_DIR + ParForReplaceThreadIDRecompileTest.class.getSimpleName() + "/";
@Override
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1, new String[] { "B" }));
- addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2, new String[] { "B" }));
+ addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "B" }));
+ addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "B" }));
}
@Test
@@ -69,19 +70,18 @@ public class ParForReplaceThreadIDRecompileTest extends AutomatedTestBase
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
// This is for running the junit test the new way, i.e., construct the arguments directly
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "A" ,
- HOME + OUTPUT_DIR + "B" };
+ programArgs = new String[]{"-args", input("A"), output("B") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
- loadTestConfiguration(config);
double[][] A = new double[][]{{2.0},{3.0}};
writeInputMatrixWithMTD("A", A, false);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
index c546f9b..4b705aa 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
@@ -36,6 +36,7 @@ public class ParForRowwiseDataPartitioningTest extends AutomatedTestBase
private final static String TEST_NAME = "parfor_rdatapartitioning";
private final static String TEST_DIR = "functions/parfor/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + ParForRowwiseDataPartitioningTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
private final static int rows1 = (int)Hop.CPThreshold+1;
@@ -50,10 +51,9 @@ public class ParForRowwiseDataPartitioningTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME,
- new TestConfiguration(TEST_DIR, TEST_NAME,
- new String[] { "Rout" }) ); //TODO this specification is not intuitive
+ addTestConfiguration(TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,
+ new String[] { "Rout" }) ); //TODO this specification is not intuitive
}
@@ -331,19 +331,16 @@ public class ParForRowwiseDataPartitioningTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + scriptNum + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "V" ,
- Integer.toString(rows),
- Integer.toString(cols),
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + (multiParts?"6":"") + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-args", input("V"),
+ Integer.toString(rows), Integer.toString(cols), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + (multiParts?"6":"") + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
long seed = System.nanoTime();
double sparsity = -1;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
index f645763..99c9ff2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
@@ -33,6 +33,7 @@ public class ParForRulebasedOptimizerTest extends AutomatedTestBase
private final static String TEST_NAME2 = "parfor_optimizer2";
private final static String TEST_NAME3 = "parfor_optimizer3";
private final static String TEST_DIR = "functions/parfor/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + ParForRulebasedOptimizerTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -54,18 +55,12 @@ public class ParForRulebasedOptimizerTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
- new String[] { "Rout" }) );
- addTestConfiguration(
- TEST_NAME2,
- new TestConfiguration(TEST_DIR, TEST_NAME2,
- new String[] { "Rout" }) );
- addTestConfiguration(
- TEST_NAME3,
- new TestConfiguration(TEST_DIR, TEST_NAME3,
- new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME2,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME3,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "Rout" }) );
}
@@ -201,29 +196,27 @@ public class ParForRulebasedOptimizerTest extends AutomatedTestBase
}
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
if( scriptNum==1 )
{
- programArgs = new String[]{ "-args", HOME + INPUT_DIR + "V" ,
- Integer.toString(rows),
- Integer.toString(cols),
- HOME + OUTPUT_DIR + "R" };
+ programArgs = new String[]{ "-args", input("V"),
+ Integer.toString(rows), Integer.toString(cols),
+ output("R") };
+
rCmd = "Rscript" + " " + HOME + TEST_NAME1 + ".R" + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ inputDir() + " " + expectedDir();
}
else if( scriptNum==3 )
{
- programArgs = new String[]{ "-args", HOME + INPUT_DIR + "V" ,
- Integer.toString(rows),
- Integer.toString(cols),
- Integer.toString(cols/2),
- HOME + OUTPUT_DIR + "R" };
+ programArgs = new String[]{ "-args", input("V"),
+ Integer.toString(rows), Integer.toString(cols),
+ Integer.toString(cols/2),
+ output("R") };
+
rCmd = "Rscript" + " " + HOME + TEST_NAME3 + ".R" + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ inputDir() + " " + expectedDir();
}
-
-
- loadTestConfiguration(config);
long seed = System.nanoTime();
double[][] V = getRandomMatrix(rows, cols, 0, 1, sparsity, seed);
@@ -245,28 +238,24 @@ public class ParForRulebasedOptimizerTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME2);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME2 + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "D" ,
- HOME + INPUT_DIR + "S1" ,
- HOME + INPUT_DIR + "S2" ,
- HOME + INPUT_DIR + "K1" ,
- HOME + INPUT_DIR + "K2" ,
- HOME + OUTPUT_DIR + "bivarstats",
- Integer.toString(rows),
- Integer.toString(cols),
- Integer.toString(cols),
- Integer.toString(cols*cols),
- Integer.toString(7)
- };
-
-
+ programArgs = new String[]{"-args",
+ input("D"),
+ input("S1"), input("S2"),
+ input("K1"), input("K2"),
+ output("bivarstats"),
+ Integer.toString(rows),
+ Integer.toString(cols),
+ Integer.toString(cols),
+ Integer.toString(cols*cols),
+ Integer.toString(7) };
+
rCmd = "Rscript" + " " + HOME + TEST_NAME2 + ".R" + " " +
- HOME + INPUT_DIR + " " + Integer.toString(7) + " " + HOME + EXPECTED_DIR;
-
- loadTestConfiguration(config);
+ inputDir() + " " + Integer.toString(7) + " " + expectedDir();
//generate actual dataset
double[][] D = getRandomMatrix(rows, cols, 1, 7, 1.0, 7777);
@@ -296,8 +285,7 @@ public class ParForRulebasedOptimizerTest extends AutomatedTestBase
K2[0][i] = Dkind[(int)S2[0][i]-1];
}
writeInputMatrix("K1", K1, true);
- writeInputMatrix("K2", K2, true);
-
+ writeInputMatrix("K2", K2, true);
boolean exceptionExpected = false;
runTest(true, exceptionExpected, null, -1);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
index 5a548d3..009f8d0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
@@ -39,6 +39,7 @@ public class ParForSerialRemoteResultMergeTest extends AutomatedTestBase
private final static String TEST_NAME4 = "parfor_pr_resultmerge1d"; //Spark w/ compare
private final static String TEST_DIR = "functions/parfor/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + ParForSerialRemoteResultMergeTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
private final static int rows = 1100;
@@ -51,21 +52,17 @@ public class ParForSerialRemoteResultMergeTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1,
- new String[] { "R" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "R" }) );
- addTestConfiguration(
- TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2,
- new String[] { "R" }) );
+ addTestConfiguration(TEST_NAME2,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "R" }) );
- addTestConfiguration(
- TEST_NAME3, new TestConfiguration(TEST_DIR, TEST_NAME3,
- new String[] { "R" }) );
+ addTestConfiguration(TEST_NAME3,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "R" }) );
- addTestConfiguration(
- TEST_NAME4, new TestConfiguration(TEST_DIR, TEST_NAME4,
- new String[] { "R" }) );
+ addTestConfiguration(TEST_NAME4,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4, new String[] { "R" }) );
}
@Test
@@ -142,19 +139,16 @@ public class ParForSerialRemoteResultMergeTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "V" ,
- Integer.toString(rows),
- Integer.toString(cols),
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-args", input("V"),
+ Integer.toString(rows), Integer.toString(cols), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
long seed = System.nanoTime();
double sparsity = -1;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
index 55b2574..87647bc 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
@@ -44,6 +44,7 @@ public class RewritesWeightedSigmoidTest extends AutomatedTestBase
private final static String TEST_NAME = "RewriteWeightedSigmoid";
private final static String TEST_DIR = "functions/quaternary/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + RewritesWeightedSigmoidTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -57,7 +58,7 @@ public class RewritesWeightedSigmoidTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_DIR, TEST_NAME,new String[]{"C"}));
+ addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"C"}));
}
@Test
@@ -118,20 +119,16 @@ public class RewritesWeightedSigmoidTest extends AutomatedTestBase
double sparsity = (sparse) ? spSparse : spDense;
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
// This is for running the junit test the new way, i.e., construct the arguments directly
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-stats", "-explain", "runtime",
- "-args",
- HOME + INPUT_DIR + "A",
- HOME + INPUT_DIR + "B",
- HOME + OUTPUT_DIR + "C" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-stats", "-explain", "runtime", "-args",
+ input("A"), input("B"), output("C") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] A = getRandomMatrix(rows1, rank, 0, 1, 1.0, 213);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
index 47fa9f1..757c29f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
@@ -45,6 +45,7 @@ public class WeightedCrossEntropyTest extends AutomatedTestBase
{
private final static String TEST_NAME = "WeightedCeMM";
private final static String TEST_DIR = "functions/quaternary/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + WeightedCrossEntropyTest.class.getSimpleName() + "/";
private final static double eps = 1e-6;
@@ -58,7 +59,7 @@ public class WeightedCrossEntropyTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_DIR, TEST_NAME,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"R"}));
}
@@ -136,21 +137,16 @@ public class WeightedCrossEntropyTest extends AutomatedTestBase
String TEST_NAME = testname;
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
// This is for running the junit test the new way, i.e., construct the arguments directly
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-stats", "-explain", "runtime",
- "-args",
- HOME + INPUT_DIR + "X",
- HOME + INPUT_DIR + "U",
- HOME + INPUT_DIR + "V",
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-stats", "-explain", "runtime", "-args",
+ input("X"), input("U"), input("V"), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] X = getRandomMatrix(rows, cols, 0, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
index 046a47d..c20f7f6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
@@ -51,6 +51,7 @@ public class WeightedDivMatrixMultTest extends AutomatedTestBase
private final static String TEST_NAME6 = "WeightedDivMMMultMinusLeft";
private final static String TEST_NAME7 = "WeightedDivMMMultMinusRight";
private final static String TEST_DIR = "functions/quaternary/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + WeightedDivMatrixMultTest.class.getSimpleName() + "/";
private final static double eps = 1e-6;
@@ -64,13 +65,13 @@ public class WeightedDivMatrixMultTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME1,new TestConfiguration(TEST_DIR, TEST_NAME1,new String[]{"R"}));
- addTestConfiguration(TEST_NAME2,new TestConfiguration(TEST_DIR, TEST_NAME2,new String[]{"R"}));
- addTestConfiguration(TEST_NAME3,new TestConfiguration(TEST_DIR, TEST_NAME3,new String[]{"R"}));
- addTestConfiguration(TEST_NAME4,new TestConfiguration(TEST_DIR, TEST_NAME4,new String[]{"R"}));
- addTestConfiguration(TEST_NAME5,new TestConfiguration(TEST_DIR, TEST_NAME5,new String[]{"R"}));
- addTestConfiguration(TEST_NAME6,new TestConfiguration(TEST_DIR, TEST_NAME6,new String[]{"R"}));
- addTestConfiguration(TEST_NAME7,new TestConfiguration(TEST_DIR, TEST_NAME7,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME1,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME2,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME3,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME4,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME5,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME5,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME6,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME6,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME7,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME7,new String[]{"R"}));
}
@@ -447,21 +448,16 @@ public class WeightedDivMatrixMultTest extends AutomatedTestBase
String TEST_NAME = testname;
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
// This is for running the junit test the new way, i.e., construct the arguments directly
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-stats", "-explain", "runtime",
- "-args",
- HOME + INPUT_DIR + "W",
- HOME + INPUT_DIR + "U",
- HOME + INPUT_DIR + "V",
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-stats", "-explain", "runtime", "-args",
+ input("W"), input("U"), input("V"), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] W = getRandomMatrix(rows, cols, 0, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSigmoidTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSigmoidTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSigmoidTest.java
index 660a72b..814f1b0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSigmoidTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSigmoidTest.java
@@ -48,6 +48,7 @@ public class WeightedSigmoidTest extends AutomatedTestBase
private final static String TEST_NAME4 = "WeightedSigmoidP4";
private final static String TEST_DIR = "functions/quaternary/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + WeightedSigmoidTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -61,10 +62,10 @@ public class WeightedSigmoidTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME1,new TestConfiguration(TEST_DIR, TEST_NAME1,new String[]{"R"}));
- addTestConfiguration(TEST_NAME2,new TestConfiguration(TEST_DIR, TEST_NAME2,new String[]{"R"}));
- addTestConfiguration(TEST_NAME3,new TestConfiguration(TEST_DIR, TEST_NAME3,new String[]{"R"}));
- addTestConfiguration(TEST_NAME4,new TestConfiguration(TEST_DIR, TEST_NAME4,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME1,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME2,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME3,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3,new String[]{"R"}));
+ addTestConfiguration(TEST_NAME4,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4,new String[]{"R"}));
}
@@ -455,22 +456,16 @@ public class WeightedSigmoidTest extends AutomatedTestBase
String TEST_NAME = testname;
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
// This is for running the junit test the new way, i.e., construct the arguments directly
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-stats", "-explain", "runtime",
- "-args",
- HOME + INPUT_DIR + "X",
- HOME + INPUT_DIR + "U",
- HOME + INPUT_DIR + "V",
- HOME + INPUT_DIR + "W",
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-stats", "-explain", "runtime", "-args",
+ input("X"), input("U"), input("V"), input("W"), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] X = getRandomMatrix(rows, cols, 0, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSquaredLossTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
index 72c5c3e..b0eabe8 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
@@ -52,6 +52,7 @@ public class WeightedSquaredLossTest extends AutomatedTestBase
private final static String TEST_NAME7 = "WeightedSquaredLossPostNz";
private final static String TEST_DIR = "functions/quaternary/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + WeightedSquaredLossTest.class.getSimpleName() + "/";
private final static double eps = 1e-6;
@@ -64,13 +65,13 @@ public class WeightedSquaredLossTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1, new String[]{"R"}));
- addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2, new String[]{"R"}));
- addTestConfiguration(TEST_NAME3, new TestConfiguration(TEST_DIR, TEST_NAME3, new String[]{"R"}));
- addTestConfiguration(TEST_NAME4, new TestConfiguration(TEST_DIR, TEST_NAME4, new String[]{"R"}));
- addTestConfiguration(TEST_NAME5, new TestConfiguration(TEST_DIR, TEST_NAME5, new String[]{"R"}));
- addTestConfiguration(TEST_NAME6, new TestConfiguration(TEST_DIR, TEST_NAME6, new String[]{"R"}));
- addTestConfiguration(TEST_NAME7, new TestConfiguration(TEST_DIR, TEST_NAME7, new String[]{"R"}));
+ addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[]{"R"}));
+ addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[]{"R"}));
+ addTestConfiguration(TEST_NAME3, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[]{"R"}));
+ addTestConfiguration(TEST_NAME4, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4, new String[]{"R"}));
+ addTestConfiguration(TEST_NAME5, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME5, new String[]{"R"}));
+ addTestConfiguration(TEST_NAME6, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME6, new String[]{"R"}));
+ addTestConfiguration(TEST_NAME7, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME7, new String[]{"R"}));
}
@@ -457,22 +458,16 @@ public class WeightedSquaredLossTest extends AutomatedTestBase
String TEST_NAME = testname;
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
// This is for running the junit test the new way, i.e., construct the arguments directly
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-stats", "-explain", "runtime",
- "-args",
- HOME + INPUT_DIR + "X",
- HOME + INPUT_DIR + "U",
- HOME + INPUT_DIR + "V",
- HOME + INPUT_DIR + "W",
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-stats", "-explain", "runtime", "-args",
+ input("X"), input("U"), input("V"), input("W"), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] X = getRandomMatrix(rows, cols, 0, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/BranchRemovalTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/BranchRemovalTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/BranchRemovalTest.java
index c278944..d8b61fd 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/BranchRemovalTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/BranchRemovalTest.java
@@ -32,6 +32,7 @@ public class BranchRemovalTest extends AutomatedTestBase
private final static String TEST_NAME = "if_branch_removal";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + BranchRemovalTest.class.getSimpleName() + "/";
private final static int rows = 10;
private final static int cols = 15;
@@ -40,12 +41,9 @@ public class BranchRemovalTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME,
- new TestConfiguration(TEST_DIR, TEST_NAME,
- new String[] { "X" }) );
+ addTestConfiguration(TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "X" }) );
}
-
@Test
@@ -110,25 +108,23 @@ public class BranchRemovalTest extends AutomatedTestBase
//boolean oldFlagRand1 = OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE;
//boolean oldFlagRand3 = OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION;
-
int val = (condition?1:0);
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args",HOME + INPUT_DIR + "X",
- Integer.toString(rows),
- Integer.toString(cols),
- Integer.toString(val),
- HOME + OUTPUT_DIR + "X" };
+ programArgs = new String[]{"-args", input("X"),
+ Integer.toString(rows), Integer.toString(cols),
+ Integer.toString(val), output("X") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + val + " " + HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ inputDir() + " " + val + " " + expectedDir();
OptimizerUtils.ALLOW_BRANCH_REMOVAL = branchRemoval;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
@@ -136,7 +132,6 @@ public class BranchRemovalTest extends AutomatedTestBase
//disable rand specific recompile
//OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE = false;
//OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = false;
-
double[][] V = getRandomMatrix(rows, cols, -1, 1, 1.0d, 7);
writeInputMatrix("X", V, true);
@@ -157,7 +152,6 @@ public class BranchRemovalTest extends AutomatedTestBase
else if( branchRemoval ){
expectedNumCompiled = 3; //reblock, GMR (append), write
}
-
checkNumCompiledMRJobs(expectedNumCompiled);
checkNumExecutedMRJobs(expectedNumExecuted);
@@ -167,7 +161,6 @@ public class BranchRemovalTest extends AutomatedTestBase
OptimizerUtils.ALLOW_BRANCH_REMOVAL = oldFlagBranchRemoval;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA;
-
//OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE = oldFlagRand1;
//OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = oldFlagRand3;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
index 83bafbf..4f5eedb 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
@@ -37,6 +37,7 @@ public class CSVReadUnknownSizeTest extends AutomatedTestBase {
private final static String TEST_NAME = "csv_read_unknown";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + CSVReadUnknownSizeTest.class.getSimpleName() + "/";
private final static int rows = 10;
private final static int cols = 15;
@@ -58,9 +59,8 @@ public class CSVReadUnknownSizeTest extends AutomatedTestBase {
@Override
public void setUp() {
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_DIR,
- TEST_NAME, new String[] { "X" }));
- setOutAndExpectedDeletionDisabled(true);
+ addTestConfiguration(TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "X" }));
}
@Test
@@ -96,17 +96,15 @@ public class CSVReadUnknownSizeTest extends AutomatedTestBase {
try
{
- TestConfiguration config = getTestConfiguration(TEST_NAME);
+ getAndLoadTestConfiguration(TEST_NAME);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain","-args",HOME + INPUT_DIR + "X",
- HOME + OUTPUT_DIR + "R" };
+ programArgs = new String[]{"-explain", "-args", input("X"), output("R") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
OptimizerUtils.ALLOW_SPLIT_HOP_DAGS = splitDags;
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites;
@@ -115,12 +113,11 @@ public class CSVReadUnknownSizeTest extends AutomatedTestBase {
MatrixBlock mb = DataConverter.convertToMatrixBlock(X);
MatrixCharacteristics mc = new MatrixCharacteristics(rows, cols, 1000, 1000);
CSVFileFormatProperties fprop = new CSVFileFormatProperties();
- DataConverter.writeMatrixToHDFS(mb, HOME + INPUT_DIR + "X", OutputInfo.CSVOutputInfo, mc, -1, fprop);
+ DataConverter.writeMatrixToHDFS(mb, input("X"), OutputInfo.CSVOutputInfo, mc, -1, fprop);
mc.set(-1, -1, -1, -1);
- MapReduceTool.writeMetaDataFile(HOME + INPUT_DIR + "X.mtd", ValueType.DOUBLE, mc, OutputInfo.CSVOutputInfo, fprop);
+ MapReduceTool.writeMetaDataFile(input("X.mtd"), ValueType.DOUBLE, mc, OutputInfo.CSVOutputInfo, fprop);
runTest(true, false, null, -1);
-
//compare matrices
HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("R");
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/FunctionRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/FunctionRecompileTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/FunctionRecompileTest.java
index 3710ca0..ab159ed 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/FunctionRecompileTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/FunctionRecompileTest.java
@@ -35,6 +35,7 @@ public class FunctionRecompileTest extends AutomatedTestBase
private final static String TEST_NAME1 = "funct_recompile";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + FunctionRecompileTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
private final static int rows = 20;
@@ -46,10 +47,8 @@ public class FunctionRecompileTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
- new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "Rout" }) );
}
@Test
@@ -63,7 +62,6 @@ public class FunctionRecompileTest extends AutomatedTestBase
{
runFunctionTest(false, true);
}
-
@Test
public void testFunctionWithRecompileWithoutIPA()
@@ -88,19 +86,16 @@ public class FunctionRecompileTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME1);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME1 + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "V" ,
- Integer.toString(rows),
- Integer.toString(cols),
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME1 + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-args", input("V"),
+ Integer.toString(rows), Integer.toString(cols), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME1 + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
long seed = System.nanoTime();
double[][] V = getRandomMatrix(rows, cols, 0, 1, sparsity, seed);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
index c3b9cb3..8e507ba 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
@@ -32,6 +32,7 @@ public class IPAAssignConstantPropagationTest extends AutomatedTestBase
private final static String TEST_NAME = "constant_propagation_sb";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + IPAAssignConstantPropagationTest.class.getSimpleName() + "/";
private final static int rows = 10;
private final static int cols = 15;
@@ -41,7 +42,8 @@ public class IPAAssignConstantPropagationTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration( TEST_NAME, new TestConfiguration(TEST_DIR, TEST_NAME, new String[] { "X" }) );
+ addTestConfiguration( TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "X" }) );
}
@@ -85,17 +87,16 @@ public class IPAAssignConstantPropagationTest extends AutomatedTestBase
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain","-args", Integer.toString(rows),
- Integer.toString(cols),
- HOME + OUTPUT_DIR + "X" };
+ programArgs = new String[]{"-explain","-args",
+ Integer.toString(rows), Integer.toString(cols), output("X") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
- Integer.toString(rows) + " " + Integer.toString(cols) + " " +
- HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ Integer.toString(rows) + " " + Integer.toString(cols) + " " + expectedDir();
OptimizerUtils.ALLOW_BRANCH_REMOVAL = branchRemoval;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAComplexAppendTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAComplexAppendTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAComplexAppendTest.java
index 3d9b664..ee993b3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAComplexAppendTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAComplexAppendTest.java
@@ -37,6 +37,7 @@ public class IPAComplexAppendTest extends AutomatedTestBase
private final static String TEST_NAME = "append_nnz";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + IPAComplexAppendTest.class.getSimpleName() + "/";
private final static int rows = 300000;
private final static int cols = 1000;
@@ -46,9 +47,9 @@ public class IPAComplexAppendTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration( TEST_NAME, new TestConfiguration(TEST_DIR, TEST_NAME, new String[] { "Y" }) );
+ addTestConfiguration( TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "Y" }) );
}
-
@Test
@@ -97,26 +98,20 @@ public class IPAComplexAppendTest extends AutomatedTestBase
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args",
- HOME + OUTPUT_DIR + "X" };
-
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + EXPECTED_DIR + " " + HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ programArgs = new String[]{"-args", output("X") };
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites;
-
//generate input data
MatrixBlock mb = MatrixBlock.randOperations(rows, cols, OptimizerUtils.getSparsity(rows, cols, nnz), -1, 1, "uniform", 7);
MatrixCharacteristics mc1 = new MatrixCharacteristics(rows,cols,1000,1000,nnz);
- DataConverter.writeMatrixToHDFS(mb, HOME + OUTPUT_DIR + "X", OutputInfo.BinaryBlockOutputInfo, mc1);
- MapReduceTool.writeMetaDataFile(HOME + OUTPUT_DIR + "X.mtd", ValueType.DOUBLE, mc1, OutputInfo.BinaryBlockOutputInfo);
+ DataConverter.writeMatrixToHDFS(mb, output("X"), OutputInfo.BinaryBlockOutputInfo, mc1);
+ MapReduceTool.writeMetaDataFile(output("X.mtd"), ValueType.DOUBLE, mc1, OutputInfo.BinaryBlockOutputInfo);
//run test
runTest(true, false, null, -1);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAConstantPropagationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAConstantPropagationTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAConstantPropagationTest.java
index 4359e04..2728215 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAConstantPropagationTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAConstantPropagationTest.java
@@ -33,6 +33,7 @@ public class IPAConstantPropagationTest extends AutomatedTestBase
private final static String TEST_NAME1 = "constant_propagation_if";
private final static String TEST_NAME2 = "constant_propagation_while";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + IPAConstantPropagationTest.class.getSimpleName() + "/";
private final static int rows = 10;
private final static int cols = 15;
@@ -41,10 +42,9 @@ public class IPAConstantPropagationTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration( TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1, new String[] { "X" }) );
- addTestConfiguration( TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2, new String[] { "X" }) );
+ addTestConfiguration( TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "X" }) );
+ addTestConfiguration( TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "X" }) );
}
-
@Test
@@ -111,17 +111,16 @@ public class IPAConstantPropagationTest extends AutomatedTestBase
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain","-args", Integer.toString(rows),
- Integer.toString(cols),
- HOME + OUTPUT_DIR + "X" };
+ programArgs = new String[]{"-explain","-args",
+ Integer.toString(rows), Integer.toString(cols), output("X") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
- Integer.toString(rows) + " " + Integer.toString(cols) + " " +
- HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ Integer.toString(rows) + " " + Integer.toString(cols) + " " + expectedDir();
OptimizerUtils.ALLOW_BRANCH_REMOVAL = branchRemoval;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
index d744851..b1b14ba 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
@@ -37,6 +37,8 @@ public class IPAPropagationSizeMultipleFunctionsTest extends AutomatedTestBase
private final static String TEST_NAME5 = "multiple_function_calls5";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR +
+ IPAPropagationSizeMultipleFunctionsTest.class.getSimpleName() + "/";
private final static int rows = 10;
private final static int cols = 15;
@@ -46,13 +48,12 @@ public class IPAPropagationSizeMultipleFunctionsTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration( TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1, new String[] { "R" }) );
- addTestConfiguration( TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2, new String[] { "R" }) );
- addTestConfiguration( TEST_NAME3, new TestConfiguration(TEST_DIR, TEST_NAME3, new String[] { "R" }) );
- addTestConfiguration( TEST_NAME4, new TestConfiguration(TEST_DIR, TEST_NAME4, new String[] { "R" }) );
- addTestConfiguration( TEST_NAME5, new TestConfiguration(TEST_DIR, TEST_NAME5, new String[] { "R" }) );
+ addTestConfiguration( TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "R" }) );
+ addTestConfiguration( TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "R" }) );
+ addTestConfiguration( TEST_NAME3, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "R" }) );
+ addTestConfiguration( TEST_NAME4, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4, new String[] { "R" }) );
+ addTestConfiguration( TEST_NAME5, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME5, new String[] { "R" }) );
}
-
@Test
@@ -116,7 +117,6 @@ public class IPAPropagationSizeMultipleFunctionsTest extends AutomatedTestBase
}
-
/**
*
* @param condition
@@ -130,18 +130,15 @@ public class IPAPropagationSizeMultipleFunctionsTest extends AutomatedTestBase
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain","-args",
- HOME + INPUT_DIR + "V",
- HOME + OUTPUT_DIR + "R" };
+ programArgs = new String[]{"-explain","-args", input("V"), output("R") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
- loadTestConfiguration(config);
-
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
//generate input data
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
index 89d130a..cfa0f1f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
@@ -35,12 +35,14 @@ public class LiteralReplaceCastScalarReadTest extends AutomatedTestBase
private final static String TEST_NAME = "LiteralReplaceCastScalar";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR +
+ LiteralReplaceCastScalarReadTest.class.getSimpleName() + "/";
@Override
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_DIR, TEST_NAME, new String[] { "R" }));
+ addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "R" }));
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/MultipleReadsIPATest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/MultipleReadsIPATest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/MultipleReadsIPATest.java
index ded88b1..9408f8b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/MultipleReadsIPATest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/MultipleReadsIPATest.java
@@ -35,6 +35,7 @@ public class MultipleReadsIPATest extends AutomatedTestBase
private final static String TEST_NAME = "multiple_reads";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + MultipleReadsIPATest.class.getSimpleName() + "/";
private final static int rows1 = 10;
private final static int cols1 = 11;
@@ -44,12 +45,9 @@ public class MultipleReadsIPATest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME,
- new TestConfiguration(TEST_DIR, TEST_NAME,
- new String[] { "X" }) );
+ addTestConfiguration(TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "X" }) );
}
-
@Test
@@ -90,21 +88,21 @@ public class MultipleReadsIPATest extends AutomatedTestBase
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args",HOME + INPUT_DIR + "X1",
- Integer.toString(rows1),
- Integer.toString(cols1),
- HOME + INPUT_DIR + "X2",
- Integer.toString(rows2),
- Integer.toString(cols2),
- HOME + OUTPUT_DIR + "X" };
+ programArgs = new String[]{"-args",input("X1"),
+ Integer.toString(rows1),
+ Integer.toString(cols1),
+ input("X2"),
+ Integer.toString(rows2),
+ Integer.toString(cols2),
+ output("X") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
rtplatform = (et==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/PredicateRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/PredicateRecompileTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/PredicateRecompileTest.java
index b1fe306..4a7b05b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/PredicateRecompileTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/PredicateRecompileTest.java
@@ -36,6 +36,7 @@ public class PredicateRecompileTest extends AutomatedTestBase
private final static String TEST_NAME3 = "for_recompile";
private final static String TEST_NAME4 = "parfor_recompile";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + PredicateRecompileTest.class.getSimpleName() + "/";
private final static int rows = 10;
private final static int cols = 15;
@@ -45,22 +46,14 @@ public class PredicateRecompileTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
- new String[] { "Rout" }) );
- addTestConfiguration(
- TEST_NAME2,
- new TestConfiguration(TEST_DIR, TEST_NAME2,
- new String[] { "Rout" }) );
- addTestConfiguration(
- TEST_NAME3,
- new TestConfiguration(TEST_DIR, TEST_NAME3,
- new String[] { "Rout" }) );
- addTestConfiguration(
- TEST_NAME4,
- new TestConfiguration(TEST_DIR, TEST_NAME4,
- new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME2,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME3,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME4,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4, new String[] { "Rout" }) );
}
@Test
@@ -295,18 +288,16 @@ public class PredicateRecompileTest extends AutomatedTestBase
try
{
TestConfiguration config = getTestConfiguration(testname);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testname + ".dml";
- programArgs = new String[]{"-args",Integer.toString(rows),
- Integer.toString(cols),
- Integer.toString(val),
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + testname + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ programArgs = new String[]{"-args",
+ Integer.toString(rows),
+ Integer.toString(cols),
+ Integer.toString(val),
+ output("R") };
OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
OptimizerUtils.ALLOW_SIZE_EXPRESSION_EVALUATION = evalExpr;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandJobRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandJobRecompileTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandJobRecompileTest.java
index 7b378e9..60936fa 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandJobRecompileTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandJobRecompileTest.java
@@ -32,6 +32,7 @@ public class RandJobRecompileTest extends AutomatedTestBase
private final static String TEST_NAME = "grpagg_rand_recompile";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + RandJobRecompileTest.class.getSimpleName() + "/";
private final static int rows = 27;
private final static int cols = 2;
@@ -44,12 +45,9 @@ public class RandJobRecompileTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(
- TEST_NAME,
- new TestConfiguration(TEST_DIR, TEST_NAME,
- new String[] { "Z" }) );
+ addTestConfiguration(TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "Z" }) );
}
-
@Test
@@ -75,17 +73,15 @@ public class RandJobRecompileTest extends AutomatedTestBase
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args",HOME + INPUT_DIR + "X",
- Integer.toString(rows),
- HOME + OUTPUT_DIR + "Z" };
+ programArgs = new String[]{"-args", input("X"), Integer.toString(rows), output("Z") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = estSizeEval;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandRecompileTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandRecompileTest.java
index 0fd7df8..ee50c2f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandRecompileTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandRecompileTest.java
@@ -32,6 +32,7 @@ public class RandRecompileTest extends AutomatedTestBase
private final static String TEST_NAME2 = "rand_recompile2"; //nrow
private final static String TEST_NAME3 = "rand_recompile3"; //ncol
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + RandRecompileTest.class.getSimpleName() + "/";
private final static int rows = 200;
private final static int cols = 200;
@@ -39,15 +40,12 @@ public class RandRecompileTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1, new String[]{} ));
- addTestConfiguration(
- TEST_NAME2,
- new TestConfiguration(TEST_DIR, TEST_NAME2, new String[]{} ));
- addTestConfiguration(
- TEST_NAME3,
- new TestConfiguration(TEST_DIR, TEST_NAME3, new String[]{} ));
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[]{} ));
+ addTestConfiguration(TEST_NAME2,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[]{} ));
+ addTestConfiguration(TEST_NAME3,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[]{} ));
}
@Test
@@ -120,20 +118,18 @@ public class RandRecompileTest extends AutomatedTestBase
boolean oldFlagRand2 = OptimizerUtils.ALLOW_BRANCH_REMOVAL;
boolean oldFlagRand3 = OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION;
-
try
{
TestConfiguration config = getTestConfiguration(testName);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testName + ".dml";
programArgs = new String[]{"-args", Integer.toString(rows), Integer.toString(cols) };
- loadTestConfiguration(config);
-
OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
@@ -142,7 +138,6 @@ public class RandRecompileTest extends AutomatedTestBase
OptimizerUtils.ALLOW_BRANCH_REMOVAL = false;
OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = false;
-
boolean exceptionExpected = false;
runTest(true, exceptionExpected, null, -1);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
index b2fdabd..19a5071 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
@@ -30,10 +30,11 @@ import com.ibm.bi.dml.utils.Statistics;
public class RandSizeExpressionEvalTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "rand_size_expr_eval";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR +
+ RandSizeExpressionEvalTest.class.getSimpleName() + "/";
private final static int rows = 14;
private final static int cols = 14;
@@ -41,7 +42,7 @@ public class RandSizeExpressionEvalTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration( TEST_NAME, new TestConfiguration(TEST_DIR, TEST_NAME, new String[]{} ));
+ addTestConfiguration( TEST_NAME, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[]{} ));
}
@Test
@@ -70,20 +71,18 @@ public class RandSizeExpressionEvalTest extends AutomatedTestBase
boolean oldFlagRand1 = OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE;
boolean oldFlagRand2 = OptimizerUtils.ALLOW_BRANCH_REMOVAL;
boolean oldFlagRand3 = OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION;
-
-
+
try
{
TestConfiguration config = getTestConfiguration(testName);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testName + ".dml";
- programArgs = new String[]{"-args", Integer.toString(rows), Integer.toString(cols), HOME + OUTPUT_DIR + "R" };
-
- loadTestConfiguration(config);
+ programArgs = new String[]{"-args", Integer.toString(rows), Integer.toString(cols), output("R") };
OptimizerUtils.ALLOW_SIZE_EXPRESSION_EVALUATION = evalExpr;
OptimizerUtils.ALLOW_CONSTANT_FOLDING = constFold;
@@ -92,8 +91,7 @@ public class RandSizeExpressionEvalTest extends AutomatedTestBase
OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE = false;
OptimizerUtils.ALLOW_BRANCH_REMOVAL = false;
OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = false;
-
-
+
boolean exceptionExpected = false;
runTest(true, exceptionExpected, null, -1);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/ReblockRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/ReblockRecompileTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/ReblockRecompileTest.java
index a15990f..c542094 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/ReblockRecompileTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/ReblockRecompileTest.java
@@ -37,12 +37,12 @@ import com.ibm.bi.dml.utils.Statistics;
public class ReblockRecompileTest extends AutomatedTestBase
{
-
private final static String TEST_NAME1 = "rblk_recompile1";
private final static String TEST_NAME2 = "rblk_recompile2";
private final static String TEST_NAME3 = "rblk_recompile3";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + ReblockRecompileTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
private final static int rows = 20;
@@ -51,18 +51,12 @@ public class ReblockRecompileTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
- new String[] { "Rout" }) );
- addTestConfiguration(
- TEST_NAME2,
- new TestConfiguration(TEST_DIR, TEST_NAME2,
- new String[] { "Rout" }) );
- addTestConfiguration(
- TEST_NAME3,
- new TestConfiguration(TEST_DIR, TEST_NAME3,
- new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME2,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "Rout" }) );
+ addTestConfiguration(TEST_NAME3,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "Rout" }) );
}
@Test
@@ -95,18 +89,15 @@ public class ReblockRecompileTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
+ loadTestConfiguration(config);
/* This is for running the junit test the new way, i.e., construct the arguments directly */
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "V" ,
- Integer.toString(rows),
- HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-args", input("V"), Integer.toString(rows), output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
long seed = System.nanoTime();
double[][] V = getRandomMatrix(rows, 1, 1, 5, 1.0d, seed);
@@ -114,7 +105,7 @@ public class ReblockRecompileTest extends AutomatedTestBase
//cleanup previous executions
try {
- MapReduceTool.deleteFileIfExistOnHDFS(HOME + OUTPUT_DIR + "R" );
+ MapReduceTool.deleteFileIfExistOnHDFS(output("R"));
} catch (IOException e1){}
boolean exceptionExpected = false;
@@ -127,7 +118,7 @@ public class ReblockRecompileTest extends AutomatedTestBase
//compare matrices
try
{
- MatrixBlock mo = DataConverter.readMatrixFromHDFS(HOME + OUTPUT_DIR+"R", InputInfo.BinaryBlockInputInfo, rows, 1, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize);
+ MatrixBlock mo = DataConverter.readMatrixFromHDFS(output("R"), InputInfo.BinaryBlockInputInfo, rows, 1, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize);
HashMap<CellIndex, Double> dmlfile = new HashMap<CellIndex,Double>();
for( int i=0; i<mo.getNumRows(); i++ )
for( int j=0; j<mo.getNumColumns(); j++ )
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
index 03e9740..8c0db05 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
@@ -42,6 +42,7 @@ public class RemoveEmptyPotpourriTest extends AutomatedTestBase
private final static String TEST_NAME4 = "remove_empty_potpourri4";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + RemoveEmptyPotpourriTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -49,10 +50,10 @@ public class RemoveEmptyPotpourriTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_DIR, TEST_NAME1, new String[] { "R" }));
- addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_DIR, TEST_NAME2, new String[] { "R" }));
- addTestConfiguration(TEST_NAME3, new TestConfiguration(TEST_DIR, TEST_NAME3, new String[] { "R" }));
- addTestConfiguration(TEST_NAME4, new TestConfiguration(TEST_DIR, TEST_NAME4, new String[] { "R" }));
+ addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "R" }));
+ addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "R" }));
+ addTestConfiguration(TEST_NAME3, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "R" }));
+ addTestConfiguration(TEST_NAME4, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4, new String[] { "R" }));
}
@Test
@@ -102,7 +103,7 @@ public class RemoveEmptyPotpourriTest extends AutomatedTestBase
*/
private void runRemoveEmptyTest( String TEST_NAME, boolean rewrite )
{
- TestConfiguration config = getTestConfiguration(TEST_NAME);
+ getAndLoadTestConfiguration(TEST_NAME);
boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
try
@@ -111,11 +112,10 @@ public class RemoveEmptyPotpourriTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
//note: stats required for runtime check of rewrite
- programArgs = new String[]{"-explain","-args", HOME + OUTPUT_DIR + "R" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-explain","-args", output("R") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + expectedDir();
runTest(true, false, null, -1);
runRScript(true);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44a718e3/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
index 660a715..60a7ff7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
@@ -43,6 +43,7 @@ public class RemoveEmptyRecompileTest extends AutomatedTestBase
private final static String TEST_NAME = "remove_empty_recompile";
private final static String TEST_DIR = "functions/recompile/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + RemoveEmptyRecompileTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
private final static int rows = 20;
@@ -70,7 +71,7 @@ public class RemoveEmptyRecompileTest extends AutomatedTestBase
public void setUp()
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_DIR, TEST_NAME, new String[] { "R" }));
+ addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "R" }));
}
@@ -245,6 +246,7 @@ public class RemoveEmptyRecompileTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
//IPA always disabled to force recompile
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = false;
@@ -253,14 +255,12 @@ public class RemoveEmptyRecompileTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
//note: stats required for runtime check of rewrite
- programArgs = new String[]{"-explain","-stats","-args", HOME + INPUT_DIR + "X" ,
- Integer.toString(type.ordinal()),
- HOME + OUTPUT_DIR + "R" };
+ programArgs = new String[]{"-explain","-stats","-args",
+ input("X"), Integer.toString(type.ordinal()), output("R") };
+
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + Integer.toString(type.ordinal()) + " " + HOME + EXPECTED_DIR;
-
- loadTestConfiguration(config);
+ inputDir() + " " + Integer.toString(type.ordinal()) + " " + expectedDir();
long seed = System.nanoTime();
double[][] X = getRandomMatrix(rows, cols, 0, empty?0:1, sparsity, seed);