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:11 UTC
[29/50] [abbrv] incubator-systemml git commit: [SYSML-362] Enable
unit tests in functions.unary.matrix to run in parallel
[SYSML-362] Enable unit tests in functions.unary.matrix to run in parallel
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/b5b05209
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/b5b05209
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/b5b05209
Branch: refs/heads/master
Commit: b5b05209ede67ff1bf4eb9b9c400b1b58bcad4a1
Parents: 743f30c
Author: Glenn Weidner <gw...@us.ibm.com>
Authored: Wed Nov 4 08:09:00 2015 -0300
Committer: Luciano Resende <lr...@apache.org>
Committed: Wed Nov 4 08:09:00 2015 -0300
----------------------------------------------------------------------
pom.xml | 2 +
.../dml/test/integration/AutomatedTestBase.java | 32 +++++++++++---
.../functions/unary/matrix/ACosTest.java | 7 +--
.../functions/unary/matrix/ASinTest.java | 7 +--
.../functions/unary/matrix/ATanTest.java | 7 +--
.../functions/unary/matrix/AbsTest.java | 7 +--
.../unary/matrix/CastAsScalarTest.java | 3 +-
.../functions/unary/matrix/CosTest.java | 7 +--
.../functions/unary/matrix/DiagTest.java | 5 ++-
.../unary/matrix/EigenFactorizeTest.java | 20 +++------
.../functions/unary/matrix/FullCummaxTest.java | 15 +++----
.../functions/unary/matrix/FullCumminTest.java | 15 +++----
.../functions/unary/matrix/FullCumprodTest.java | 15 +++----
.../functions/unary/matrix/FullCumsumTest.java | 15 +++----
.../unary/matrix/FullSelectPosTest.java | 18 ++++----
.../functions/unary/matrix/IQMTest.java | 14 +++---
.../functions/unary/matrix/LUFactorizeTest.java | 14 ++----
.../unary/matrix/MLUnaryBuiltinTest.java | 19 ++++----
.../unary/matrix/MatrixInverseTest.java | 23 +++-------
.../functions/unary/matrix/MinusTest.java | 19 +++-----
.../functions/unary/matrix/NegationTest.java | 7 +--
.../functions/unary/matrix/PrintTest.java | 17 +++-----
.../functions/unary/matrix/QRSolverTest.java | 31 +++++--------
.../functions/unary/matrix/RemoveEmptyTest.java | 46 +++++++-------------
.../functions/unary/matrix/ReplaceTest.java | 43 ++++++++----------
.../functions/unary/matrix/RoundTest.java | 27 +++++-------
.../functions/unary/matrix/SinTest.java | 7 +--
.../functions/unary/matrix/SqrtTest.java | 7 +--
.../functions/unary/matrix/TanTest.java | 7 +--
.../functions/unary/matrix/TransposeTest.java | 3 +-
30 files changed, 203 insertions(+), 256 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8bb7b8d..c6c2715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -355,11 +355,13 @@
<include>**/integration/functions/binary/matrix_full_other/*Test.java</include>
<include>**/integration/functions/binary/matrix_full_cellwise/*Test.java</include>
+ <include>**/integration/functions/unary/matrix/*Test.java</include>
</includes>
<excludes>
<exclude>**/integration/functions/binary/matrix_full_other/*Suite.java</exclude>
<exclude>**/integration/functions/binary/matrix_full_cellwise/*Suite.java</exclude>
+ <exclude>**/integration/functions/unary/matrix/*Suite.java</exclude>
<exclude>**/slowtest/**</exclude>
</excludes>
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/AutomatedTestBase.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/AutomatedTestBase.java b/src/test/java/com/ibm/bi/dml/test/integration/AutomatedTestBase.java
index 93e8d1e..1a60b0b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/AutomatedTestBase.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/AutomatedTestBase.java
@@ -127,7 +127,7 @@ public abstract class AutomatedTestBase
/**
* Script source directory for .dml and .r files only
- * (SCRIPT_TARGET_DIR for generated test data artifacts).
+ * (TEST_DATA_DIR for generated test data artifacts).
*/
protected static final String SCRIPT_DIR = "./src/test/scripts/";
protected static final String INPUT_DIR = "in/";
@@ -174,6 +174,7 @@ public abstract class AutomatedTestBase
protected String fullRScriptName;
protected static String baseDirectory;
+ protected static String sourceDirectory;
protected HashMap<String, TestConfiguration> availableTestConfigurations;
/* For testing in the old way */
@@ -767,9 +768,11 @@ public abstract class AutomatedTestBase
if (testDirectory != null) {
if (isTargetTestDirectory(testDirectory)) {
baseDirectory = TEST_DATA_DIR + testDirectory;
+ sourceDirectory = SCRIPT_DIR + getSourceDirectory(testDirectory);
}
else {
baseDirectory = SCRIPT_DIR + testDirectory;
+ sourceDirectory = baseDirectory;
}
}
@@ -879,7 +882,7 @@ public abstract class AutomatedTestBase
*/
protected void runRScript(boolean newWay) {
- String executionFile = baseDirectory + selectedTest + ".R";
+ String executionFile = sourceDirectory + selectedTest + ".R";
// *** HACK ALERT *** HACK ALERT *** HACK ALERT ***
// Some of the R scripts will fail if the "expected" directory doesn't exist.
@@ -917,7 +920,7 @@ public abstract class AutomatedTestBase
}
}
if( !newWay ) {
- ParameterBuilder.setVariablesInScript(baseDirectory, selectedTest + ".R", testVariables);
+ ParameterBuilder.setVariablesInScript(sourceDirectory, selectedTest + ".R", testVariables);
}
if (cacheDir.length() > 0)
@@ -1078,11 +1081,11 @@ public abstract class AutomatedTestBase
*/
protected void runTest(boolean newWay, boolean exceptionExpected, Class<?> expectedException, int maxMRJobs) {
- String executionFile = baseDirectory + selectedTest + ".dml";
+ String executionFile = sourceDirectory + selectedTest + ".dml";
if( !newWay ) {
executionFile = executionFile + "t";
- ParameterBuilder.setVariablesInScript(baseDirectory, selectedTest + ".dml", testVariables);
+ ParameterBuilder.setVariablesInScript(sourceDirectory, selectedTest + ".dml", testVariables);
}
//cleanup scratch folder (prevent side effect between tests)
@@ -1412,8 +1415,8 @@ public abstract class AutomatedTestBase
TestUtils.clearDirectory(baseDirectory + OUTPUT_DIR);
TestUtils.removeHDFSFiles(expectedFiles.toArray(new String[expectedFiles.size()]));
TestUtils.clearDirectory(baseDirectory + EXPECTED_DIR);
- TestUtils.removeFiles(new String[] { baseDirectory + selectedTest + ".dmlt" });
- TestUtils.removeFiles(new String[] { baseDirectory + selectedTest + ".Rt" });
+ TestUtils.removeFiles(new String[] { sourceDirectory + selectedTest + ".dmlt" });
+ TestUtils.removeFiles(new String[] { sourceDirectory + selectedTest + ".Rt" });
}
TestUtils.clearAssertionInformation();
@@ -1603,4 +1606,19 @@ public abstract class AutomatedTestBase
cacheDir += "/";
}
}
+
+ private String getSourceDirectory(String testDirectory) {
+ String sourceDirectory = "";
+
+ if (null != testDirectory)
+ {
+ if (testDirectory.endsWith("/"))
+ {
+ testDirectory = testDirectory.substring(0, testDirectory.length() - "/".length());
+ }
+ sourceDirectory = testDirectory.substring(0, testDirectory.lastIndexOf("/") + "/".length());
+ }
+
+ return sourceDirectory;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ACosTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ACosTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ACosTest.java
index c1a7e3d..42353b3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ACosTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ACosTest.java
@@ -29,17 +29,18 @@ public class ACosTest extends AutomatedTestBase
{
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + ACosTest.class.getSimpleName() + "/";
private static final double EPS = 1e-14;
@Override
public void setUp() {
TestUtils.clearAssertionInformation();
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "ACosTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ACosTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeTest",
- new TestConfiguration(TEST_DIR, "ACosTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ACosTest", new String[] { "vector", "matrix" }));
addTestConfiguration("RandomTest",
- new TestConfiguration(TEST_DIR, "ACosTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ACosTest", new String[] { "vector", "matrix" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ASinTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ASinTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ASinTest.java
index 89b919c..c4fbbc0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ASinTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ASinTest.java
@@ -28,16 +28,17 @@ public class ASinTest extends AutomatedTestBase
{
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + ASinTest.class.getSimpleName() + "/";
private static final double EPS = 1e-14;
@Override
public void setUp() {
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "ASinTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ASinTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeTest",
- new TestConfiguration(TEST_DIR, "ASinTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ASinTest", new String[] { "vector", "matrix" }));
addTestConfiguration("RandomTest",
- new TestConfiguration(TEST_DIR, "ASinTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ASinTest", new String[] { "vector", "matrix" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ATanTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ATanTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ATanTest.java
index ac361c2..908026a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ATanTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ATanTest.java
@@ -29,17 +29,18 @@ public class ATanTest extends AutomatedTestBase
{
private static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + ATanTest.class.getSimpleName() + "/";
@Override
public void setUp() {
TestUtils.clearAssertionInformation();
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "ATanTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ATanTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeTest",
- new TestConfiguration(TEST_DIR, "ATanTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ATanTest", new String[] { "vector", "matrix" }));
addTestConfiguration("RandomTest",
- new TestConfiguration(TEST_DIR, "ATanTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "ATanTest", new String[] { "vector", "matrix" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/AbsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/AbsTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/AbsTest.java
index c7d89c1..055afbf 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/AbsTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/AbsTest.java
@@ -29,15 +29,16 @@ public class AbsTest extends AutomatedTestBase
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + AbsTest.class.getSimpleName() + "/";
@Override
public void setUp() {
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "AbsTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "AbsTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeTest",
- new TestConfiguration(TEST_DIR, "AbsTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "AbsTest", new String[] { "vector", "matrix" }));
addTestConfiguration("RandomTest",
- new TestConfiguration(TEST_DIR, "AbsTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "AbsTest", new String[] { "vector", "matrix" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CastAsScalarTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CastAsScalarTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CastAsScalarTest.java
index 52c1d20..a36930b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CastAsScalarTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CastAsScalarTest.java
@@ -29,12 +29,13 @@ public class CastAsScalarTest extends AutomatedTestBase
{
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + CastAsScalarTest.class.getSimpleName() + "/";
private final static String TEST_GENERAL = "General";
@Override
public void setUp() {
- addTestConfiguration(TEST_GENERAL, new TestConfiguration(TEST_DIR, "CastAsScalarTest", new String[] { "b" }));
+ addTestConfiguration(TEST_GENERAL, new TestConfiguration(TEST_CLASS_DIR, "CastAsScalarTest", new String[] { "b" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CosTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CosTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CosTest.java
index e106bfa..06c21cf 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CosTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CosTest.java
@@ -28,16 +28,17 @@ public class CosTest extends AutomatedTestBase
{
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + CosTest.class.getSimpleName() + "/";
private static final double EPS = 1e-14;
@Override
public void setUp() {
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "CosTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "CosTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeTest",
- new TestConfiguration(TEST_DIR, "CosTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "CosTest", new String[] { "vector", "matrix" }));
addTestConfiguration("RandomTest",
- new TestConfiguration(TEST_DIR, "CosTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "CosTest", new String[] { "vector", "matrix" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/DiagTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/DiagTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/DiagTest.java
index 2dbdbed..a2368f0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/DiagTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/DiagTest.java
@@ -41,15 +41,16 @@ public class DiagTest extends AutomatedTestBase
{
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + DiagTest.class.getSimpleName() + "/";
@Override
public void setUp() {
// positive tests
- addTestConfiguration("DiagTest", new TestConfiguration(TEST_DIR, "DiagTest", new String[] { "b", "d" }));
+ addTestConfiguration("DiagTest", new TestConfiguration(TEST_CLASS_DIR, "DiagTest", new String[] { "b", "d" }));
// negative tests
- addTestConfiguration("WrongDimensionsTest", new TestConfiguration(TEST_DIR, "DiagSingleTest",
+ addTestConfiguration("WrongDimensionsTest", new TestConfiguration(TEST_CLASS_DIR, "DiagSingleTest",
new String[] { "b" }));
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/EigenFactorizeTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
index a0dafe0..75d2e57 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
@@ -29,6 +29,7 @@ public class EigenFactorizeTest extends AutomatedTestBase
private final static String TEST_NAME1 = "eigen";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + EigenFactorizeTest.class.getSimpleName() + "/";
private final static int rows1 = 500;
private final static int rows2 = 1000;
@@ -40,12 +41,8 @@ public class EigenFactorizeTest extends AutomatedTestBase
{
addTestConfiguration(
TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1,
new String[] { "D" }) );
-
- // *** GENERATE data ONCE, and use it FOR ALL tests involving w/ different platforms
- // Therefore, data generation is done in setUp() method.
-
}
@Test
@@ -105,15 +102,12 @@ public class EigenFactorizeTest extends AutomatedTestBase
try
{
- TestConfiguration config = getTestConfiguration(TEST_NAME1);
+ getAndLoadTestConfiguration(TEST_NAME1);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME1 + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "A" ,
- Integer.toString(numEigenValuesToEvaluate),
- HOME + OUTPUT_DIR + "D" };
-
- loadTestConfiguration(config);
+ programArgs = new String[]{"-args", input("A"),
+ Integer.toString(numEigenValuesToEvaluate), output("D") };
double[][] A = getRandomMatrix(rows, rows, 0, 1, sparsity, 10);
MatrixCharacteristics mc = new MatrixCharacteristics(rows, rows, -1, -1, -1);
@@ -121,9 +115,9 @@ public class EigenFactorizeTest extends AutomatedTestBase
// Expected matrix = 1x1 zero matrix
double[][] D = new double[numEigenValuesToEvaluate][1];
- //D[0][0] = 0.0;
- for(int i=0; i < numEigenValuesToEvaluate; i++)
+ for(int i=0; i < numEigenValuesToEvaluate; i++) {
D[i][0] = 0.0;
+ }
writeExpectedMatrix("D", D);
boolean exceptionExpected = false;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCummaxTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCummaxTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCummaxTest.java
index 5e91d89..b0d9572 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCummaxTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCummaxTest.java
@@ -38,9 +38,9 @@ import com.ibm.bi.dml.utils.Statistics;
*/
public class FullCummaxTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "Cummax";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + FullCummaxTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -58,7 +58,7 @@ public class FullCummaxTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_DIR, TEST_NAME,new String[]{"B"}));
+ addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"B"}));
}
@Test
@@ -241,18 +241,15 @@ public class FullCummaxTest extends AutomatedTestBase
int rows = (type==InputType.ROW_VECTOR) ? 1 : rowsMatrix;
double sparsity = (sparse) ? spSparse : spDense;
- 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 + "A",
- HOME + OUTPUT_DIR + "B" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-explain", "-args", input("A"), output("B") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] A = getRandomMatrix(rows, cols, -0.05, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumminTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumminTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumminTest.java
index 9236600..2456974 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumminTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumminTest.java
@@ -38,9 +38,9 @@ import com.ibm.bi.dml.utils.Statistics;
*/
public class FullCumminTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "Cummin";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + FullCumminTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -58,7 +58,7 @@ public class FullCumminTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_DIR, TEST_NAME,new String[]{"B"}));
+ addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"B"}));
}
@Test
@@ -241,18 +241,15 @@ public class FullCumminTest extends AutomatedTestBase
int rows = (type==InputType.ROW_VECTOR) ? 1 : rowsMatrix;
double sparsity = (sparse) ? spSparse : spDense;
- 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 + "A",
- HOME + OUTPUT_DIR + "B" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-explain", "-args", input("A"), output("B") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] A = getRandomMatrix(rows, cols, -0.05, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumprodTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumprodTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumprodTest.java
index 3d2060a..2bc93b4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumprodTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumprodTest.java
@@ -38,9 +38,9 @@ import com.ibm.bi.dml.utils.Statistics;
*/
public class FullCumprodTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "Cumprod";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + FullCumprodTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -58,7 +58,7 @@ public class FullCumprodTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_DIR, TEST_NAME,new String[]{"B"}));
+ addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"B"}));
}
@@ -242,18 +242,15 @@ public class FullCumprodTest extends AutomatedTestBase
int rows = (type==InputType.ROW_VECTOR) ? 1 : rowsMatrix;
double sparsity = (sparse) ? spSparse : spDense;
- 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 + "A",
- HOME + OUTPUT_DIR + "B" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-explain", "-args", input("A"), output("B") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] A = getRandomMatrix(rows, cols, 0.99, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumsumTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumsumTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumsumTest.java
index a4c9a40..7d5f633 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumsumTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumsumTest.java
@@ -38,9 +38,9 @@ import com.ibm.bi.dml.utils.Statistics;
*/
public class FullCumsumTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "Cumsum";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + FullCumsumTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -58,7 +58,7 @@ public class FullCumsumTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_DIR, TEST_NAME,new String[]{"B"}));
+ addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"B"}));
}
@Test
@@ -240,18 +240,15 @@ public class FullCumsumTest extends AutomatedTestBase
int rows = (type==InputType.ROW_VECTOR) ? 1 : rowsMatrix;
double sparsity = (sparse) ? spSparse : spDense;
- 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 + "A",
- HOME + OUTPUT_DIR + "B" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-explain", "-args", input("A"), output("B") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] A = getRandomMatrix(rows, cols, -0.05, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullSelectPosTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullSelectPosTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullSelectPosTest.java
index 842b080..0c10938 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullSelectPosTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullSelectPosTest.java
@@ -39,9 +39,9 @@ import com.ibm.bi.dml.utils.Statistics;
*/
public class FullSelectPosTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "SelPos";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + FullSelectPosTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -54,7 +54,7 @@ public class FullSelectPosTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_DIR, TEST_NAME,new String[]{"B"}));
+ addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"B"}));
}
@Test
@@ -145,19 +145,17 @@ public class FullSelectPosTest extends AutomatedTestBase
{
double sparsity = (sparse) ? spSparse : spDense;
- 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[]{"-stats", "-args", //stats required for opcode check
- HOME + INPUT_DIR + "A",
- HOME + OUTPUT_DIR + "B" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
- loadTestConfiguration(config);
+ //stats parameter required for opcode check
+ programArgs = new String[]{"-stats", "-args", input("A"), output("B") };
+
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] A = getRandomMatrix(rows, cols, -1, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/IQMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/IQMTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/IQMTest.java
index b50556f..9dc03e9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/IQMTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/IQMTest.java
@@ -41,6 +41,7 @@ public class IQMTest extends AutomatedTestBase
};
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + IQMTest.class.getSimpleName() + "/";
private final static String[] datasets
= {
@@ -78,7 +79,7 @@ public class IQMTest extends AutomatedTestBase
@Override
public void setUp() {
- availableTestConfigurations.put(TEST_TYPE.IQM.scriptName, new TestConfiguration(TEST_DIR,TEST_TYPE.IQM.scriptName, new String[] { "iqmFile", "iqmWtFile" }));
+ availableTestConfigurations.put(TEST_TYPE.IQM.scriptName, new TestConfiguration(TEST_CLASS_DIR, TEST_TYPE.IQM.scriptName, new String[] { "iqmFile", "iqmWtFile" }));
}
@Test
@@ -261,14 +262,15 @@ public class IQMTest extends AutomatedTestBase
config.addVariable("rows", rows);
config.addVariable("cols", 1);
+ 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.scriptName + ".dml";
- String outFile=HOME + OUTPUT_DIR + "iqmFile", wtOutFile=HOME + OUTPUT_DIR + "iqmWtFile";
- programArgs = new String[]{"-args", dataString, weightsString, Integer.toString(rows),
- outFile, wtOutFile };
-
- loadTestConfiguration(config);
+ String outFile = output("iqmFile");
+ String wtOutFile = output("iqmWtFile");
+ programArgs = new String[]{"-args", dataString, weightsString, Integer.toString(rows),
+ outFile, wtOutFile };
runTest(true, false, null, -1);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/LUFactorizeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/LUFactorizeTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/LUFactorizeTest.java
index 9571223..31680ad 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/LUFactorizeTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/LUFactorizeTest.java
@@ -29,6 +29,7 @@ public class LUFactorizeTest extends AutomatedTestBase
private final static String TEST_NAME1 = "lu";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + LUFactorizeTest.class.getSimpleName() + "/";
private final static int rows1 = 500;
private final static int rows2 = 2500;
@@ -39,12 +40,8 @@ public class LUFactorizeTest extends AutomatedTestBase
{
addTestConfiguration(
TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1,
new String[] { "D" }) );
-
- // *** GENERATE data ONCE, and use it FOR ALL tests involving w/ different platforms
- // Therefore, data generation is done in setUp() method.
-
}
@Test
@@ -104,14 +101,11 @@ public class LUFactorizeTest extends AutomatedTestBase
try
{
- TestConfiguration config = getTestConfiguration(TEST_NAME1);
+ getAndLoadTestConfiguration(TEST_NAME1);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME1 + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "A" ,
- HOME + OUTPUT_DIR + "D" };
-
- loadTestConfiguration(config);
+ programArgs = new String[]{"-args", input("A"), output("D") };
double[][] A = getRandomMatrix(rows, rows, 0, 1, sparsity, 10);
MatrixCharacteristics mc = new MatrixCharacteristics(rows, rows, -1, -1, -1);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
index b6e0964..0113420 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
@@ -37,11 +37,11 @@ import com.ibm.bi.dml.utils.Statistics;
*/
public class MLUnaryBuiltinTest extends AutomatedTestBase
{
-
private final static String TEST_NAME1 = "SProp";
private final static String TEST_NAME2 = "Sigmoid";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + MLUnaryBuiltinTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
@@ -58,8 +58,10 @@ public class MLUnaryBuiltinTest extends AutomatedTestBase
@Override
public void setUp()
{
- 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"}));
}
@@ -237,18 +239,15 @@ public class MLUnaryBuiltinTest extends AutomatedTestBase
double sparsity = (sparse) ? spSparse : spDense;
String TEST_NAME = testname;
- 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[]{"-stats", "-args", HOME + INPUT_DIR + "A",
- HOME + OUTPUT_DIR + "B" };
- fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-stats", "-args", input("A"), output("B") };
- loadTestConfiguration(config);
+ fullRScriptName = HOME + TEST_NAME + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset
double[][] A = getRandomMatrix(rows, cols, -0.05, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MatrixInverseTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MatrixInverseTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MatrixInverseTest.java
index 6c9cdbb..1ff8df7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MatrixInverseTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MatrixInverseTest.java
@@ -26,9 +26,9 @@ import com.ibm.bi.dml.test.integration.TestConfiguration;
public class MatrixInverseTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "Inverse";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + MatrixInverseTest.class.getSimpleName() + "/";
private final static int rows = 1001;
private final static int cols = 1001;
@@ -37,27 +37,21 @@ public class MatrixInverseTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME,
- new TestConfiguration(TEST_DIR, TEST_NAME,
- new String[] { "AI" }) );
+ addTestConfiguration(TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "AI" }) );
// *** GENERATE data ONCE, and use it FOR ALL tests involving w/ different platforms
// Therefore, data generation is done in setUp() method.
- TestConfiguration config = getTestConfiguration(TEST_NAME);
+ TestConfiguration config = getAndLoadTestConfiguration(TEST_NAME);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "A" ,
- HOME + OUTPUT_DIR + config.getOutputFiles()[0] };
+ programArgs = new String[]{"-args", input("A"), output(config.getOutputFiles()[0]) };
fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + "A.mtx" + " " +
- HOME + EXPECTED_DIR + config.getOutputFiles()[0];
-
- loadTestConfiguration(config);
+ rCmd = "Rscript" + " " + fullRScriptName + " " + input("A.mtx") + " " +
+ expected(config.getOutputFiles()[0]);
double[][] A = getRandomMatrix(rows, cols, 0, 1, sparsity, 10);
MatrixCharacteristics mc = new MatrixCharacteristics(rows, cols, -1, -1, -1);
@@ -103,7 +97,4 @@ public class MatrixInverseTest extends AutomatedTestBase
rtplatform = rtold;
}
-
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MinusTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MinusTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MinusTest.java
index 8f1f3a9..62d6dea 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MinusTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MinusTest.java
@@ -30,9 +30,9 @@ import com.ibm.bi.dml.test.utils.TestUtils;
public class MinusTest extends AutomatedTestBase
{
-
private final static String TEST_NAME1 = "Minus";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + MinusTest.class.getSimpleName() + "/";
private final static int rows = 1501;
private final static int cols = 2502;
@@ -45,10 +45,8 @@ public class MinusTest extends AutomatedTestBase
{
TestUtils.clearAssertionInformation();
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
- new String[] { "Y" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "Y" }) );
}
@Test
@@ -113,14 +111,11 @@ public class MinusTest extends AutomatedTestBase
/* 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 + "X" ,
- String.valueOf(rows),
- String.valueOf(cols),
- HOME + OUTPUT_DIR + "Y" };
- fullRScriptName = HOME + TEST_NAME1 + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-args",
+ input("X"), String.valueOf(rows), String.valueOf(cols), output("Y") };
+ fullRScriptName = HOME + TEST_NAME1 + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
double sparsity = sparse ? sparsitySparse : sparsityDense;
double[][] X = getRandomMatrix(rows, cols, 0, 1, sparsity, 7);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/NegationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/NegationTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/NegationTest.java
index 8e59eda..f2f1a94 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/NegationTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/NegationTest.java
@@ -28,15 +28,16 @@ public class NegationTest extends AutomatedTestBase
{
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + NegationTest.class.getSimpleName() + "/";
@Override
public void setUp() {
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "NegationTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "NegationTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeTest",
- new TestConfiguration(TEST_DIR, "NegationTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "NegationTest", new String[] { "vector", "matrix" }));
addTestConfiguration("RandomTest",
- new TestConfiguration(TEST_DIR, "NegationTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "NegationTest", new String[] { "vector", "matrix" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/PrintTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/PrintTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/PrintTest.java
index 1ed680c..f9f56bc 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/PrintTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/PrintTest.java
@@ -24,10 +24,9 @@ import com.ibm.bi.dml.test.integration.TestConfiguration;
public class PrintTest extends AutomatedTestBase
{
-
-
private final static String TEST_NAME = "PrintTest";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + PrintTest.class.getSimpleName() + "/";
//note: (1) even number of rows/cols required, (2) same dims because controlled via exec platform
private final static int rows = 10;
@@ -36,10 +35,8 @@ public class PrintTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME,
- new TestConfiguration(TEST_DIR, TEST_NAME,
- new String[] { "V" }) );
+ addTestConfiguration(TEST_NAME,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "V" }) );
}
@Test
@@ -55,14 +52,12 @@ public class PrintTest extends AutomatedTestBase
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 + "X" ,
- String.valueOf(rows),
- String.valueOf(cols) };
-
- loadTestConfiguration(config);
+ programArgs = new String[]{"-args", input("X"), String.valueOf(rows), String.valueOf(cols) };
double[][] X = getRandomMatrix(rows, cols, 0, 1, 1.0, 7);
writeInputMatrix("X", X, true);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/QRSolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/QRSolverTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/QRSolverTest.java
index c6be338..dfade92 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/QRSolverTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/QRSolverTest.java
@@ -26,9 +26,9 @@ import com.ibm.bi.dml.test.integration.TestConfiguration;
public class QRSolverTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "QRsolve";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + QRSolverTest.class.getSimpleName() + "/";
private final static int rows = 1500;
private final static int cols = 50;
@@ -52,29 +52,22 @@ public class QRSolverTest 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" }) );
// *** GENERATE data ONCE, and use it FOR ALL tests involving w/ different platforms
// Therefore, data generation is done in setUp() method.
- TestConfiguration config = getTestConfiguration(TEST_NAME);
+ TestConfiguration config = getAndLoadTestConfiguration(TEST_NAME);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "A" ,
- HOME + INPUT_DIR + "y",
- HOME + OUTPUT_DIR + config.getOutputFiles()[0] };
+ programArgs = new String[]{"-args", input("A"), input("y"),
+ output(config.getOutputFiles()[0]) };
fullRScriptName = HOME + TEST_NAME + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + "A.mtx" + " " +
- HOME + INPUT_DIR + "y.mtx" + " " +
- HOME + EXPECTED_DIR + config.getOutputFiles()[0];
-
- loadTestConfiguration(config);
+ rCmd = "Rscript" + " " + fullRScriptName + " " + input("A.mtx") + " " +
+ input("y.mtx") + " " + expected(config.getOutputFiles()[0]);
double[][] A = getRandomMatrix(rows, cols, 0, 1, sparsity, 10);
MatrixCharacteristics mc = new MatrixCharacteristics(rows, cols, -1, -1, -1);
@@ -111,8 +104,7 @@ public class QRSolverTest extends AutomatedTestBase
}
private void runTestQRSolve( RUNTIME_PLATFORM rt)
- {
-
+ {
RUNTIME_PLATFORM rtold = rtplatform;
rtplatform = rt;
@@ -123,8 +115,5 @@ public class QRSolverTest extends AutomatedTestBase
compareResultsWithR(1e-5);
rtplatform = rtold;
- }
-
-
-
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RemoveEmptyTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
index 0b21b23..afe9fb3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
@@ -29,12 +29,12 @@ import com.ibm.bi.dml.test.integration.TestConfiguration;
public class RemoveEmptyTest extends AutomatedTestBase
{
-
private final static String TEST_NAME1 = "removeEmpty1";
private final static String TEST_NAME2 = "removeEmpty2";
private final static String TEST_NAME3 = "removeEmpty3";
private final static String TEST_NAME4 = "removeEmpty4";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + RemoveEmptyTest.class.getSimpleName() + "/";
private final static int _rows = 3500;
private final static int _cols = 2500;
@@ -45,22 +45,14 @@ public class RemoveEmptyTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1,
- new String[] { "V" }) );
- addTestConfiguration(
- TEST_NAME2,
- new TestConfiguration(TEST_DIR, TEST_NAME2,
- new String[] { "V" }) );
- addTestConfiguration(
- TEST_NAME3,
- new TestConfiguration(TEST_DIR, TEST_NAME3,
- new String[] { "V" }) );
- addTestConfiguration(
- TEST_NAME4,
- new TestConfiguration(TEST_DIR, TEST_NAME4,
- new String[] { "V" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "V" }) );
+ addTestConfiguration(TEST_NAME2,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "V" }) );
+ addTestConfiguration(TEST_NAME3,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "V" }) );
+ addTestConfiguration(TEST_NAME4,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4, new String[] { "V" }) );
}
@Test
@@ -471,29 +463,23 @@ public class RemoveEmptyTest extends AutomatedTestBase
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";
if (!bSelectIndex) {
if(!testname.equals(TEST_NAME3))
- programArgs = new String[]{"-explain", "-args", HOME + INPUT_DIR + "V" ,
- margin,
- HOME + OUTPUT_DIR + "V" };
+ programArgs = new String[]{"-explain", "-args", input("V"),
+ margin, output("V") };
else
- programArgs = new String[]{"-explain", "-args", HOME + INPUT_DIR + "V" ,
- String.valueOf(rows),
- String.valueOf(cols),
- margin,
- HOME + OUTPUT_DIR + "V" };
+ programArgs = new String[]{"-explain", "-args", input("V"),
+ String.valueOf(rows), String.valueOf(cols), margin, output("V") };
}
else
- programArgs = new String[]{"-explain", "-args", HOME + INPUT_DIR + "V" ,
- HOME + INPUT_DIR + "I" ,
- margin,
- HOME + OUTPUT_DIR + "V" };
+ programArgs = new String[]{"-explain", "-args", input("V"), input("I"),
+ margin, output("V") };
- loadTestConfiguration(config);
if( cols==1 ) //test3 (removeEmpty-diag)
createInputVector(margin, rows, sparsity, bSelectIndex);
else //test1/test2 (general case)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ReplaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ReplaceTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ReplaceTest.java
index c2b2f90..b679a20 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ReplaceTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ReplaceTest.java
@@ -34,7 +34,6 @@ import com.ibm.bi.dml.utils.Statistics;
public class ReplaceTest extends AutomatedTestBase
{
-
private final static String TEST_NAME1 = "replace_value";
private final static String TEST_NAME2 = "replace_NaN";
private final static String TEST_NAME3 = "replace_Infinity";
@@ -42,6 +41,7 @@ public class ReplaceTest extends AutomatedTestBase
private final static String TEST_NAME5 = "replace_maxmin";
private final static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + ReplaceTest.class.getSimpleName() + "/";
private final static int rows = 1577;
private final static int cols = 37;
@@ -52,23 +52,17 @@ public class ReplaceTest extends AutomatedTestBase
@Override
public void setUp()
{
- addTestConfiguration(
- TEST_NAME1,
- new TestConfiguration(TEST_DIR, TEST_NAME1, new String[] { "C" }) );
- addTestConfiguration(
- TEST_NAME2,
- new TestConfiguration(TEST_DIR, TEST_NAME2, new String[] { "C" }) );
- addTestConfiguration(
- TEST_NAME3,
- new TestConfiguration(TEST_DIR, TEST_NAME3, new String[] { "C" }) );
- addTestConfiguration(
- TEST_NAME4,
- new TestConfiguration(TEST_DIR, TEST_NAME4, new String[] { "C" }) );
- addTestConfiguration(
- TEST_NAME5,
- new TestConfiguration(TEST_DIR, TEST_NAME5, new String[] { "C" }) );
+ addTestConfiguration(TEST_NAME1,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "C" }) );
+ addTestConfiguration(TEST_NAME2,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "C" }) );
+ addTestConfiguration(TEST_NAME3,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "C" }) );
+ addTestConfiguration(TEST_NAME4,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME4, new String[] { "C" }) );
+ addTestConfiguration(TEST_NAME5,
+ new TestConfiguration(TEST_CLASS_DIR, TEST_NAME5, new String[] { "C" }) );
}
-
@Test
public void testReplaceZeroDenseCP()
@@ -319,19 +313,16 @@ public class ReplaceTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(test);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
+ loadTestConfiguration(config);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + test + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "A" ,
- String.valueOf(rows),
- String.valueOf(cols),
- HOME + OUTPUT_DIR + "C",
- String.valueOf(pattern) }; //only respected for TEST_NAME1
- fullRScriptName = HOME + test + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + pattern + " " + HOME + EXPECTED_DIR;
+ programArgs = new String[]{"-args", input("A"), String.valueOf(rows), String.valueOf(cols),
+ output("C"), String.valueOf(pattern) }; //only respected for TEST_NAME1
- loadTestConfiguration(config);
+ fullRScriptName = HOME + test + ".R";
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " +
+ pattern + " " + expectedDir();
double[][] A = getRandomMatrix(rows, cols, 0, 1, sparsity, 7);
replaceRandom(A, rows, cols, pattern, 10);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RoundTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RoundTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RoundTest.java
index 0e8885d..1ccd7b5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RoundTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RoundTest.java
@@ -41,7 +41,8 @@ public class RoundTest extends AutomatedTestBase
};
private final static String TEST_DIR = "functions/unary/matrix/";
-
+ private static final String TEST_CLASS_DIR = TEST_DIR + RoundTest.class.getSimpleName() + "/";
+
private final static int rows1 = 200;
private final static int cols1 = 200;
private final static int rows2 = 1500;
@@ -52,9 +53,9 @@ public class RoundTest extends AutomatedTestBase
@Override
public void setUp() {
- addTestConfiguration(TEST_TYPE.ROUND.scriptName, new TestConfiguration(TEST_DIR, TEST_TYPE.ROUND.scriptName, new String[] { "R" }));
- addTestConfiguration(TEST_TYPE.FLOOR.scriptName, new TestConfiguration(TEST_DIR, TEST_TYPE.FLOOR.scriptName, new String[] { "R" }));
- addTestConfiguration(TEST_TYPE.CEIL.scriptName, new TestConfiguration(TEST_DIR, TEST_TYPE.CEIL.scriptName, new String[] { "R" }));
+ addTestConfiguration(TEST_TYPE.ROUND.scriptName, new TestConfiguration(TEST_CLASS_DIR, TEST_TYPE.ROUND.scriptName, new String[] { "R" }));
+ addTestConfiguration(TEST_TYPE.FLOOR.scriptName, new TestConfiguration(TEST_CLASS_DIR, TEST_TYPE.FLOOR.scriptName, new String[] { "R" }));
+ addTestConfiguration(TEST_TYPE.CEIL.scriptName, new TestConfiguration(TEST_CLASS_DIR, TEST_TYPE.CEIL.scriptName, new String[] { "R" }));
}
@Test
@@ -466,30 +467,24 @@ public class RoundTest extends AutomatedTestBase
TestConfiguration config = getTestConfiguration(test.scriptName);
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.scriptName + ".dml";
- programArgs = new String[]{"-args", HOME + INPUT_DIR + "math" ,
- //Integer.toString(rows),
- //Integer.toString(cols),
- //Double.toString(sparsity),
- HOME + OUTPUT_DIR + "R" };
+ programArgs = new String[]{"-args", input("math"), output("R") };
fullRScriptName = HOME + test.scriptName + ".R";
- rCmd = "Rscript" + " " + fullRScriptName + " " + HOME + INPUT_DIR + " " + HOME + EXPECTED_DIR;
-
- loadTestConfiguration(config);
+ rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
long seed = System.nanoTime();
- double[][] matrix = getRandomMatrix(rows, cols, 10, 20, sparsity, seed);
+ double[][] matrix = getRandomMatrix(rows, cols, 10, 20, sparsity, seed);
writeInputMatrixWithMTD("math", matrix, true);
runTest(true, false, null, -1);
runRScript(true);
-
- TestUtils.compareDMLHDFSFileWithRFile(HOME + EXPECTED_DIR + "R", HOME + OUTPUT_DIR + "R", 1e-9);
+ TestUtils.compareDMLHDFSFileWithRFile(expected("R"), output("R"), 1e-9);
}
finally
{
@@ -497,6 +492,4 @@ public class RoundTest extends AutomatedTestBase
rtplatform = rtOld;
}
}
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SinTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SinTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SinTest.java
index d7f809e..a984e0a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SinTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SinTest.java
@@ -28,16 +28,17 @@ public class SinTest extends AutomatedTestBase
{
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + SinTest.class.getSimpleName() + "/";
private static final double EPS = 1e-14;
@Override
public void setUp() {
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "SinTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "SinTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeTest",
- new TestConfiguration(TEST_DIR, "SinTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "SinTest", new String[] { "vector", "matrix" }));
addTestConfiguration("RandomTest",
- new TestConfiguration(TEST_DIR, "SinTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "SinTest", new String[] { "vector", "matrix" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SqrtTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SqrtTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SqrtTest.java
index 0cb88bf..173c382 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SqrtTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SqrtTest.java
@@ -30,16 +30,17 @@ public class SqrtTest extends AutomatedTestBase
{
private static String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + SqrtTest.class.getSimpleName() + "/";
@Override
public void setUp() {
TestUtils.clearAssertionInformation();
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "SqrtTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "SqrtTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeVectorTest",
- new TestConfiguration(TEST_DIR, "SqrtSingleTest", new String[] { "out" }));
+ new TestConfiguration(TEST_CLASS_DIR, "SqrtSingleTest", new String[] { "out" }));
addTestConfiguration("NegativeMatrixTest",
- new TestConfiguration(TEST_DIR, "SqrtSingleTest", new String[] { "out" }));
+ new TestConfiguration(TEST_CLASS_DIR, "SqrtSingleTest", new String[] { "out" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TanTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TanTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TanTest.java
index 8120d25..18eead2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TanTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TanTest.java
@@ -28,16 +28,17 @@ public class TanTest extends AutomatedTestBase
{
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + TanTest.class.getSimpleName() + "/";
private static final double EPS = 1e-14;
@Override
public void setUp() {
addTestConfiguration("PositiveTest",
- new TestConfiguration(TEST_DIR, "TanTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "TanTest", new String[] { "vector", "matrix" }));
addTestConfiguration("NegativeTest",
- new TestConfiguration(TEST_DIR, "TanTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "TanTest", new String[] { "vector", "matrix" }));
addTestConfiguration("RandomTest",
- new TestConfiguration(TEST_DIR, "TanTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR, "TanTest", new String[] { "vector", "matrix" }));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b5b05209/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TransposeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TransposeTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TransposeTest.java
index 1e22343..9628f5a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TransposeTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TransposeTest.java
@@ -29,12 +29,13 @@ public class TransposeTest extends AutomatedTestBase
{
private static final String TEST_DIR = "functions/unary/matrix/";
+ private static final String TEST_CLASS_DIR = TEST_DIR + TransposeTest.class.getSimpleName() + "/";
@Override
public void setUp() {
TestUtils.clearAssertionInformation();
addTestConfiguration("TransposeTest",
- new TestConfiguration(TEST_DIR,"TransposeTest", new String[] { "vector", "matrix" }));
+ new TestConfiguration(TEST_CLASS_DIR,"TransposeTest", new String[] { "vector", "matrix" }));
}
@Test