You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by ni...@apache.org on 2018/10/14 19:18:17 UTC
[09/11] systemml git commit: [SYSTEMML-2496] Skip MapReduce tests as
it is in maintenance mode
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultLimitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultLimitTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultLimitTest.java
index 3ac6bc3..16ee1df 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultLimitTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultLimitTest.java
@@ -19,10 +19,10 @@
package org.apache.sysml.test.integration.functions.binary.matrix;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -57,8 +57,9 @@ public class MapMultLimitTest extends AutomatedTestBase
public void testMapMultLimit()
{
- RUNTIME_PLATFORM rtold = rtplatform;
- rtplatform = RUNTIME_PLATFORM.HADOOP;
+ RUNTIME_PLATFORM rtold = setRuntimePlatform(ExecType.MR);
+ if(shouldSkipTest())
+ return;
try
{
@@ -91,7 +92,7 @@ public class MapMultLimitTest extends AutomatedTestBase
// Expected 3 jobs: 1 Reblock, 2 MapMults
runTest(true, exceptionExpected, null, 3);
//System.out.println("#Jobs: " + Statistics.getNoOfExecutedMRJobs() + ", " + Statistics.getNoOfCompiledMRJobs());
- Assert.assertTrue(Statistics.getNoOfExecutedMRJobs()==3);
+ assertTrue(Statistics.getNoOfExecutedMRJobs()==3);
}
finally
{
@@ -99,4 +100,4 @@ public class MapMultLimitTest extends AutomatedTestBase
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
index 60e97e0..e02d0c1 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
@@ -53,6 +53,9 @@ public class MatrixMultiplicationTest extends AutomatedTestBase
@Test
public void testMatrixMultiplication() {
+ if(shouldSkipTest())
+ return;
+
int m = 20;
int n = 20;
int k = 20;
@@ -80,6 +83,9 @@ public class MatrixMultiplicationTest extends AutomatedTestBase
@Test
public void testSparseMatrixMultiplication() {
+ if(shouldSkipTest())
+ return;
+
int m = 40;
int n = 10;
int k = 30;
@@ -107,6 +113,9 @@ public class MatrixMultiplicationTest extends AutomatedTestBase
@Test
public void testWrongDimensions() {
+ if(shouldSkipTest())
+ return;
+
int m = 6;
int n1 = 8;
int n2 = 10;
@@ -128,6 +137,9 @@ public class MatrixMultiplicationTest extends AutomatedTestBase
@Test
public void testAMultASpecial1() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
@@ -151,6 +163,9 @@ public class MatrixMultiplicationTest extends AutomatedTestBase
@Test
public void testAMultBSpecial2() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixVectorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixVectorTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixVectorTest.java
index acc0355..79bd463 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixVectorTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixVectorTest.java
@@ -122,9 +122,10 @@ public class MatrixVectorTest extends AutomatedTestBase
private void runMatrixVectorMultiplicationTest( int cols, RUNTIME_PLATFORM rt, boolean sparse )
{
-
- RUNTIME_PLATFORM rtold = rtplatform;
- rtplatform = rt;
+
+ RUNTIME_PLATFORM rtold = setRuntimePlatform(rt);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/OuterProductTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/OuterProductTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/OuterProductTest.java
index 07fb55c..87df166 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/OuterProductTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/OuterProductTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.binary.matrix;
import java.util.HashMap;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLScript;
@@ -75,19 +74,11 @@ public class OuterProductTest extends AutomatedTestBase
{
//setup exec type, rows, cols
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
-
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
+
try
{
getAndLoadTestConfiguration(TEST_NAME);
@@ -116,7 +107,7 @@ public class OuterProductTest extends AutomatedTestBase
//TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R");
Double dmlret = dmlfile.get(new CellIndex(1,1));
Double compare = computeMinOuterProduct(A, B, rows, cols);
- Assert.assertEquals("Wrong result value.", compare, dmlret);
+ assertEquals("Wrong result value.", compare, dmlret);
int expectedNumCompiled = 4; //REBLOCK, MMRJ, GMR, GMR write
int expectedNumExecuted = 4; //REBLOCK, MMRJ, GMR, GMR write
@@ -159,4 +150,4 @@ public class OuterProductTest extends AutomatedTestBase
return min;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/QuantileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/QuantileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/QuantileTest.java
index bd470e7..06dda78 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/QuantileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/QuantileTest.java
@@ -214,17 +214,11 @@ public class QuantileTest extends AutomatedTestBase
private void runQuantileTest( String TEST_NAME, double p, boolean sparse, ExecType et)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
+
try
{
@@ -255,4 +249,4 @@ public class QuantileTest extends AutomatedTestBase
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarAdditionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
index cc21622..b488b39 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
@@ -53,6 +53,8 @@ public class ScalarAdditionTest extends AutomatedTestBase
@Test
public void testIntConst() {
+ if(shouldSkipTest())
+ return;
int rows = 10;
int cols = 10;
int summand = 2;
@@ -92,6 +94,9 @@ public class ScalarAdditionTest extends AutomatedTestBase
@Test
public void testIntVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int summand = 2;
@@ -131,6 +136,9 @@ public class ScalarAdditionTest extends AutomatedTestBase
@Test
public void testDoubleConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double summand = 2;
@@ -170,6 +178,9 @@ public class ScalarAdditionTest extends AutomatedTestBase
@Test
public void testDoubleVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double summand = 2;
@@ -209,6 +220,9 @@ public class ScalarAdditionTest extends AutomatedTestBase
@Test
public void testSparse() {
+ if(shouldSkipTest())
+ return;
+
int rows = 100;
int cols = 50;
int summand = 2;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarDivisionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
index 8d901c6..8fdb7a0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
@@ -58,6 +58,9 @@ public class ScalarDivisionTest extends AutomatedTestBase
@Test
public void testIntConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int divisor = 2;
@@ -103,6 +106,9 @@ public class ScalarDivisionTest extends AutomatedTestBase
@Test
public void testIntVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int divisor = 2;
@@ -148,6 +154,9 @@ public class ScalarDivisionTest extends AutomatedTestBase
@Test
public void testDoubleConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double divisor = 2;
@@ -193,6 +202,9 @@ public class ScalarDivisionTest extends AutomatedTestBase
@Test
public void testDoubleVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double divisor = 2;
@@ -238,6 +250,9 @@ public class ScalarDivisionTest extends AutomatedTestBase
@Test
public void testSparse() {
+ if(shouldSkipTest())
+ return;
+
int rows = 100;
int cols = 50;
double divisor = 2;
@@ -283,6 +298,9 @@ public class ScalarDivisionTest extends AutomatedTestBase
@Test
public void testDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double divisor = 0;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarModulusTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarModulusTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarModulusTest.java
index 1f9924b..6263446 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarModulusTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarModulusTest.java
@@ -56,6 +56,9 @@ public class ScalarModulusTest extends AutomatedTestBase
@Test
public void testIntConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int divisor = 20;
@@ -102,6 +105,9 @@ public class ScalarModulusTest extends AutomatedTestBase
@Test
public void testIntVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int divisor = 20;
@@ -148,6 +154,9 @@ public class ScalarModulusTest extends AutomatedTestBase
@Test
public void testDoubleConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int divisor = 20;
@@ -194,6 +203,9 @@ public class ScalarModulusTest extends AutomatedTestBase
@Test
public void testDoubleVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int divisor = 20;
@@ -240,6 +252,9 @@ public class ScalarModulusTest extends AutomatedTestBase
@Test
public void testSparse() {
+ if(shouldSkipTest())
+ return;
+
int rows = 100;
int cols = 50;
int divisor = 20;
@@ -286,6 +301,9 @@ public class ScalarModulusTest extends AutomatedTestBase
@Test
public void testDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int divisor = 0;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
index b7d22f8..bd9a31d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
@@ -55,6 +55,9 @@ public class ScalarMultiplicationTest extends AutomatedTestBase
@Test
public void testIntConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int factor = 2;
@@ -94,6 +97,9 @@ public class ScalarMultiplicationTest extends AutomatedTestBase
@Test
public void testIntVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int factor = 2;
@@ -133,6 +139,9 @@ public class ScalarMultiplicationTest extends AutomatedTestBase
@Test
public void testDoubleConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double factor = 2;
@@ -172,6 +181,9 @@ public class ScalarMultiplicationTest extends AutomatedTestBase
@Test
public void testDoubleVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double factor = 2;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
index 5db8a91..378adcd 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
@@ -52,6 +52,9 @@ public class ScalarSubtractionTest extends AutomatedTestBase
@Test
public void testIntConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int subtrahend = 2;
@@ -97,6 +100,9 @@ public class ScalarSubtractionTest extends AutomatedTestBase
@Test
public void testIntVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int subtrahend = 2;
@@ -142,6 +148,9 @@ public class ScalarSubtractionTest extends AutomatedTestBase
@Test
public void testDoubleConst() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double subtrahend = 2;
@@ -187,6 +196,9 @@ public class ScalarSubtractionTest extends AutomatedTestBase
@Test
public void testDoubleVar() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
double subtrahend = 2;
@@ -232,6 +244,9 @@ public class ScalarSubtractionTest extends AutomatedTestBase
@Test
public void testSparse() {
+ if(shouldSkipTest())
+ return;
+
int rows = 100;
int cols = 50;
int subtrahend = 2;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
index 5bb8090..ad2e9b1 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
@@ -297,17 +297,10 @@ public class TransposeMatrixMultiplicationTest extends AutomatedTestBase
*/
private void runTransposeMatrixMultiplicationTest( boolean sparseM1, boolean sparseM2, ExecType instType, boolean vectorM2, boolean minusM1)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
int rowsA = vectorM2 ? rowsA2 : rowsA1;
int colsA = vectorM2 ? colsA2 : colsA1;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UaggOuterChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
index e031b53..1afe259 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.binary.matrix;
import java.util.HashMap;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -1234,17 +1233,10 @@ public class UaggOuterChainTest extends AutomatedTestBase
*/
private void runBinUaggTest( String testname, Type type, boolean singleBlock, boolean sparse, SumType sumType, boolean bEmptyBlock, ExecType instType)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
@@ -1358,10 +1350,10 @@ public class UaggOuterChainTest extends AutomatedTestBase
//check statistics for right operator in cp and spark
if( instType == ExecType.CP ) {
- Assert.assertTrue("Missing opcode sp_uaggouterchain", Statistics.getCPHeavyHitterOpCodes().contains(UAggOuterChain.OPCODE));
+ assertTrue("Missing opcode sp_uaggouterchain", Statistics.getCPHeavyHitterOpCodes().contains(UAggOuterChain.OPCODE));
}
else if( instType == ExecType.SPARK ) {
- Assert.assertTrue("Missing opcode sp_uaggouterchain",
+ assertTrue("Missing opcode sp_uaggouterchain",
Statistics.getCPHeavyHitterOpCodes().contains(Instruction.SP_INST_PREFIX+UAggOuterChain.OPCODE));
}
}
@@ -1372,4 +1364,4 @@ public class UaggOuterChainTest extends AutomatedTestBase
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
index 229b5d7..edf2459 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
@@ -148,19 +148,10 @@ public class UltraSparseMRMatrixMultiplicationTest extends AutomatedTestBase
*/
private void runMatrixMatrixMultiplicationTest( boolean sparseM1, boolean sparseM2, ExecType instType, boolean rowwise, boolean forcePMMJ)
{
- //setup exec type, rows, cols
-
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
if(forcePMMJ)
AggBinaryOp.FORCED_MMULT_METHOD = MMultMethod.PMM;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
index 2916860..82dced6 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
@@ -119,17 +119,10 @@ public class ZipMMSparkMatrixMultiplicationTest extends AutomatedTestBase
*/
private void runZipMMMatrixMultiplicationTest( boolean sparseM1, boolean sparseM2, ExecType instType, boolean vectorM2)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
//force zipmm execution
MMultMethod methodOld = AggBinaryOp.FORCED_MMULT_METHOD;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
index 51ad7a3..8340e04 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
@@ -750,17 +750,10 @@ public class FullMatrixMatrixCellwiseOperationTest extends AutomatedTestBase
*/
private void runMatrixCellwiseOperationTest( OpType type, SparsityType sparseM1, SparsityType sparseM2, ExecType instType)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
index 2036a15..c738f8b 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
@@ -750,17 +750,10 @@ public class FullMatrixVectorColCellwiseOperationTest extends AutomatedTestBase
*/
private void runMatrixVectorCellwiseOperationTest( OpType type, SparsityType sparseM1, SparsityType sparseM2, ExecType instType)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
index c1fd31c..9182f29 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
@@ -750,17 +750,10 @@ public class FullMatrixVectorRowCellwiseOperationTest extends AutomatedTestBase
*/
private void runMatrixVectorCellwiseOperationTest( OpType type, SparsityType sparseM1, SparsityType sparseM2, ExecType instType)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
index cfa0cec..b9736e0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.binary.matrix_full_cellwise;
import java.util.HashMap;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLScript;
@@ -110,16 +109,10 @@ public class FullMinus1MultTest extends AutomatedTestBase
*/
private void runMinus1MultTest( int posScalar, ExecType instType, boolean rewrites)
{
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
//rewrites
boolean oldFlagRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
@@ -156,9 +149,9 @@ public class FullMinus1MultTest extends AutomatedTestBase
//check generated opcode
if( rewrites ){
if( instType == ExecType.CP )
- Assert.assertTrue("Missing opcode: 1-*", Statistics.getCPHeavyHitterOpCodes().contains("1-*"));
+ assertTrue("Missing opcode: 1-*", Statistics.getCPHeavyHitterOpCodes().contains("1-*"));
else if( instType == ExecType.SPARK )
- Assert.assertTrue("Missing opcode: sp_1-* | sp_map1-*",
+ assertTrue("Missing opcode: sp_1-* | sp_map1-*",
Statistics.getCPHeavyHitterOpCodes().contains("sp_1-*") ||
Statistics.getCPHeavyHitterOpCodes().contains("sp_map1-*"));
}
@@ -170,4 +163,4 @@ public class FullMinus1MultTest extends AutomatedTestBase
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = oldFlagRewrites;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullSortedOuterCompareTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullSortedOuterCompareTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullSortedOuterCompareTest.java
index 72e121a..ca2b672 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullSortedOuterCompareTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullSortedOuterCompareTest.java
@@ -108,17 +108,10 @@ public class FullSortedOuterCompareTest extends AutomatedTestBase
private void runMatrixVectorCellwiseOperationTest( String otype, boolean incr, ExecType et)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
index c72b182..78f474d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
@@ -167,18 +167,10 @@ public class FullVectorVectorCellwiseCompareOperationTest extends AutomatedTestB
*/
private void runMatrixVectorCellwiseOperationTest( OpType type, SparsityType sparseM1, SparsityType sparseM2, ExecType instType)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
String opcode = null;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
index 0ac9ce2..7cce3d6 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
@@ -746,17 +746,10 @@ public class FullVectorVectorCellwiseOperationTest extends AutomatedTestBase
*/
private void runMatrixVectorCellwiseOperationTest( OpType type, SparsityType sparseM1, SparsityType sparseM2, ExecType instType)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
index 933f36f..c1140c6 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
@@ -230,17 +230,10 @@ public class FullDistributedMatrixMultiplicationTest extends AutomatedTestBase
*/
private void runDistributedMatrixMatrixMultiplicationTest( boolean sparseM1, boolean sparseM2, MMultMethod method, ExecType instType)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
MMultMethod methodOld = AggBinaryOp.FORCED_MMULT_METHOD;
AggBinaryOp.FORCED_MMULT_METHOD = method;
@@ -288,4 +281,4 @@ public class FullDistributedMatrixMultiplicationTest extends AutomatedTestBase
AggBinaryOp.FORCED_MMULT_METHOD = methodOld;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
index 1597f32..4373df5 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
@@ -296,8 +296,9 @@ public class FullIntegerDivisionTest extends AutomatedTestBase
private void runIntegerDivisionTest( OpType type, DataType dt1, DataType dt2, boolean sparse, ExecType instType)
{
//rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (instType==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
double sparsity = sparse?sparsity2:sparsity1;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java
index baed332..7b26d34 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java
@@ -522,21 +522,15 @@ public class FullLogicalMatrixTest extends AutomatedTestBase
private void runLogicalTest( Type type, boolean sp1, boolean sp2, ExecType et )
{
+ boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
+
String TEST_NAME = TEST_NAME1;
int rows = rows1;
int cols = cols1;
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
- boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
double sparsityLeft = sp1 ? sparsity2 : sparsity1;
double sparsityRight = sp2 ? sparsity2 : sparsity1;
@@ -580,4 +574,4 @@ public class FullLogicalMatrixTest extends AutomatedTestBase
DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarLeftTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarLeftTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarLeftTest.java
index b5bc217..4a3b733 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarLeftTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarLeftTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
@@ -379,6 +378,10 @@ public class FullLogicalScalarLeftTest extends AutomatedTestBase
private void runLogicalTest( Type type, boolean zero, boolean sparse, ExecType et )
{
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
+
String TEST_NAME = TEST_NAME1;
int rows = rows1;
int cols = cols1;
@@ -389,11 +392,7 @@ public class FullLogicalScalarLeftTest extends AutomatedTestBase
if (TEST_CACHE_ENABLED) {
TEST_CACHE_DIR = type.ordinal() + "_" + constant + "_" + sparsity + "/";
}
-
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (et==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
-
+
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarRightTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarRightTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarRightTest.java
index dcaf398..62c67b0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarRightTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalScalarRightTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
@@ -379,6 +378,10 @@ public class FullLogicalScalarRightTest extends AutomatedTestBase
private void runLogicalTest( Type type, boolean zero, boolean sparse, ExecType et )
{
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
+
String TEST_NAME = TEST_NAME1;
int rows = rows1;
int cols = cols1;
@@ -389,11 +392,7 @@ public class FullLogicalScalarRightTest extends AutomatedTestBase
if (TEST_CACHE_ENABLED) {
TEST_CACHE_DIR = type.ordinal() + "_" + constant + "_" + sparsity + "/";
}
-
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (et==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
-
+
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
index 3145456..9efdd49 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
@@ -254,11 +253,9 @@ public class FullMatrixMultiplicationTest extends AutomatedTestBase
*/
private void runMatrixMatrixMultiplicationTest( boolean sparseM1, boolean sparseM2, ExecType instType)
{
- //setup exec type, rows, cols
-
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (instType==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
@@ -313,11 +310,9 @@ public class FullMatrixMultiplicationTest extends AutomatedTestBase
*/
private void runMatrixVectorMultiplicationTest( boolean sparseM1, ExecType instType)
{
- //setup exec type, rows, cols
-
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (instType==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
@@ -477,4 +472,4 @@ public class FullMatrixMultiplicationTest extends AutomatedTestBase
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelf2Test.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelf2Test.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelf2Test.java
index 491e052..568e9a3 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelf2Test.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelf2Test.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
import java.util.HashMap;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.sysml.api.DMLScript;
@@ -147,16 +146,10 @@ public class FullMatrixMultiplicationTransposeSelf2Test extends AutomatedTestBas
*/
private void runTransposeSelfMatrixMultiplicationTest( MMTSJType type, ExecType instType, boolean sparse )
{
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
if( instType == ExecType.SPARK ) //force tsmm2 to prevent mapmm
AggBinaryOp.FORCED_MMULT_METHOD = MMultMethod.TSMM2;
@@ -201,7 +194,7 @@ public class FullMatrixMultiplicationTransposeSelf2Test extends AutomatedTestBas
//check for compiled tsmm instructions
if( instType == ExecType.SPARK || instType == ExecType.CP ) {
String opcode = (instType==ExecType.SPARK) ? Instruction.SP_INST_PREFIX + "tsmm2" : "tsmm";
- Assert.assertTrue("Missing opcode: "+opcode, Statistics.getCPHeavyHitterOpCodes().contains(opcode) );
+ assertTrue("Missing opcode: "+opcode, Statistics.getCPHeavyHitterOpCodes().contains(opcode) );
}
}
finally {
@@ -210,4 +203,4 @@ public class FullMatrixMultiplicationTransposeSelf2Test extends AutomatedTestBas
rtplatform = platformOld;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
index 5ae480e..99e52d4 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
@@ -162,6 +162,10 @@ public class FullMatrixMultiplicationTransposeSelfTest extends AutomatedTestBase
private void runTransposeSelfMatrixMultiplicationTest( MMTSJType type, ExecType instType, boolean sparse )
{
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
+
//setup exec type, rows, cols
int rows = -1, cols = -1;
String TEST_NAME = null;
@@ -194,10 +198,7 @@ public class FullMatrixMultiplicationTransposeSelfTest extends AutomatedTestBase
if (TEST_CACHE_ENABLED) {
TEST_CACHE_DIR = rows + "_" + cols + "_" + sparsity + "/";
}
-
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (instType==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
+
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
index 538ac1b..7d2dba5 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
@@ -164,16 +164,10 @@ public class FullMatrixMultiplicationUltraSparseTest extends AutomatedTestBase
*/
private void runMatrixMatrixMultiplicationTest( SparsityType sparseM1, SparsityType sparseM2, ExecType instType)
{
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( instType ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
index 0609ca1..f8c497d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.parser.Expression.DataType;
@@ -313,9 +312,9 @@ public class FullMinMaxComparisonTest extends AutomatedTestBase
*/
private void runMinMaxComparisonTest( OpType type, DataType dtM1, DataType dtM2, boolean sparseM1, boolean sparseM2, ExecType instType)
{
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (instType==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
//get the testname
String TEST_NAME = null;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
index 3e0e48d..8a82270 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
@@ -186,8 +186,9 @@ public class FullPowerTest extends AutomatedTestBase
private void runPowerTest( DataType dt1, DataType dt2, boolean sparse, ExecType instType)
{
//rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- rtplatform = (instType==ExecType.MR) ? RUNTIME_PLATFORM.HADOOP : RUNTIME_PLATFORM.HYBRID;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
double sparsity = sparse?sparsity2:sparsity1;
@@ -308,4 +309,4 @@ public class FullPowerTest extends AutomatedTestBase
}
return dmlfile;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/MatrixMultShortLhsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/MatrixMultShortLhsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/MatrixMultShortLhsTest.java
index 985ea6c..040383e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/MatrixMultShortLhsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/MatrixMultShortLhsTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
import java.util.HashMap;
import org.junit.Test;
-
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -72,6 +71,10 @@ public class MatrixMultShortLhsTest extends AutomatedTestBase
private void runMatrixMatrixMultiplicationTest( boolean sparseM1, boolean sparseM2, ExecType instType)
{
+ setRuntimePlatform(instType);
+ if(shouldSkipTest())
+ return;
+
loadTestConfiguration(getTestConfiguration(TEST_NAME));
double sparsityA = sparseM1?sparsity2:sparsity1;
double sparsityB = sparseM2?sparsity2:sparsity1;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AdditionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AdditionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AdditionTest.java
index bacb274..8db863d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AdditionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AdditionTest.java
@@ -67,6 +67,9 @@ public class AdditionTest extends AutomatedTestBase
@Test
public void testConstConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -110,6 +113,9 @@ public class AdditionTest extends AutomatedTestBase
@Test
public void testVarConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -153,6 +159,9 @@ public class AdditionTest extends AutomatedTestBase
@Test
public void testConstVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -196,6 +205,9 @@ public class AdditionTest extends AutomatedTestBase
@Test
public void testVarVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -243,6 +255,9 @@ public class AdditionTest extends AutomatedTestBase
@Test
public void testBoolean() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = availableTestConfigurations.get("BooleanTest");
config.addVariable("op1", "true");
config.addVariable("op2", 1);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AndTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AndTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AndTest.java
index 01b0de3..95f08f8 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AndTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AndTest.java
@@ -40,6 +40,9 @@ public class AndTest extends AutomatedTestBase
@Test
public void testAnd() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration("AndTest");
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/DivisionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/DivisionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/DivisionTest.java
index 1d5a075..98309d8 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/DivisionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/DivisionTest.java
@@ -51,6 +51,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testConstConst() {
+ if(shouldSkipTest())
+ return;
+
double intIntValue1 = 2;
double intIntValue2 = 3;
double intDoubleValue1 = 2;
@@ -94,6 +97,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testVarConst() {
+ if(shouldSkipTest())
+ return;
+
double intIntValue1 = 2;
double intIntValue2 = 3;
double intDoubleValue1 = 2;
@@ -137,6 +143,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testConstVar() {
+ if(shouldSkipTest())
+ return;
+
double intIntValue1 = 2;
double intIntValue2 = 3;
double intDoubleValue1 = 2;
@@ -180,6 +189,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testVarVar() {
+ if(shouldSkipTest())
+ return;
+
double intIntValue1 = 2;
double intIntValue2 = 3;
double intDoubleValue1 = 2;
@@ -227,6 +239,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testPositiveIntegerDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = 5;
double op2 = 0;
@@ -247,6 +262,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testPositiveDoubleDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = 5;
double op2 = 0;
@@ -267,6 +285,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testNegativeDoubleDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = -5;
double op2 = 0;
@@ -287,6 +308,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testNegativeIntegerDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = -5;
double op2 = 0;
@@ -307,6 +331,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testZeroDoubleDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = 0;
double op2 = 0;
@@ -327,6 +354,9 @@ public class DivisionTest extends AutomatedTestBase
@Test
public void testZeroIntegerDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = 0;
double op2 = 0;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/EqualTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/EqualTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/EqualTest.java
index 8b0ef98..86ecb74 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/EqualTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/EqualTest.java
@@ -40,6 +40,9 @@ public class EqualTest extends AutomatedTestBase
@Test
public void testEqual() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration("EqualTest");
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/FullStringComparisonTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
index 57af7e3..0be35bb 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.binary.scalar;
import java.io.IOException;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.runtime.util.MapReduceTool;
@@ -137,6 +136,9 @@ public class FullStringComparisonTest extends AutomatedTestBase
*/
private void runStringComparison( Type type, boolean trueCondition )
{
+ if(shouldSkipTest())
+ return;
+
String TEST_NAME = TEST_NAME1;
String string1 = "abcd";
@@ -163,10 +165,10 @@ public class FullStringComparisonTest extends AutomatedTestBase
//compare result
try {
boolean retCondition = MapReduceTool.readBooleanFromHDFSFile(output("B"));
- Assert.assertEquals(trueCondition, retCondition);
+ assertEquals(trueCondition, retCondition);
}
catch (IOException e) {
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
index 6a68b54..8fb0aa5 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
@@ -40,6 +40,9 @@ public class GreaterThanOrEqualTest extends AutomatedTestBase
@Test
public void testGreaterThanOrEqual() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration("GreaterThanOrEqualTest");
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanTest.java
index 00273a0..05ce7b9 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanTest.java
@@ -42,6 +42,9 @@ public class GreaterThanTest extends AutomatedTestBase
@Test
public void testGreater() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration("GreaterThanTest");
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
index cb3363e..04af7f7 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
@@ -40,6 +40,9 @@ public class LessThanOrEqualTest extends AutomatedTestBase
@Test
public void testLessThanOrEqual() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration("LessThanOrEqualTest");
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanTest.java
index 06b1b9f..2698447 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanTest.java
@@ -43,6 +43,9 @@ public class LessThanTest extends AutomatedTestBase
@Test
public void testLessThan() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration("LessThanTest");
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogarithmTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogarithmTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogarithmTest.java
index f205578..64bbe6f 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogarithmTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogarithmTest.java
@@ -46,6 +46,9 @@ public class LogarithmTest extends AutomatedTestBase
@Test
public void testConstConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java
index 20ccbf4..53f2bff 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java
@@ -149,17 +149,10 @@ public class LogicalTest extends AutomatedTestBase {
public void runLogical(String testname, boolean sparse, ExecType et) {
- //rtplatform for MR
- RUNTIME_PLATFORM platformOld = rtplatform;
- switch( et ){
- case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
- case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
- default: rtplatform = RUNTIME_PLATFORM.HYBRID_SPARK; break;
- }
-
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(et);
+ if(shouldSkipTest())
+ return;
try {
String TEST_NAME = testname;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/ModulusTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/ModulusTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/ModulusTest.java
index 76063a1..4ae2e57 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/ModulusTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/ModulusTest.java
@@ -66,7 +66,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testConstConst() {
-
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = availableTestConfigurations.get("ConstConstTest");
config.addVariable("intintvardeclaration", "");
@@ -98,6 +100,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testVarConst() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = availableTestConfigurations.get("VarConstTest");
config.addVariable("intintvardeclaration", "IntIntVar = " + intIntValue1 + ";");
config.addVariable("intintop1", "IntIntVar");
@@ -127,6 +132,8 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testConstVar() {
+ if(shouldSkipTest())
+ return;
TestConfiguration config = availableTestConfigurations.get("ConstVarTest");
config.addVariable("intintvardeclaration", "IntIntVar = " + intIntValue2 + ";");
@@ -158,6 +165,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testVarVar() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = availableTestConfigurations.get("VarVarTest");
config.addVariable("intintvardeclaration", "IntIntVar1 = " + intIntValue1 + ";" + "IntIntVar2 = "
+ intIntValue2 + ";");
@@ -191,6 +201,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testPositiveIntegerDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = 5;
double op2 = 0;
@@ -211,6 +224,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testPositiveDoubleDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = 5;
double op2 = 0;
@@ -231,6 +247,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testNegativeDoubleDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = -5;
double op2 = 0;
@@ -251,6 +270,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testNegativeIntegerDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = -5;
double op2 = 0;
@@ -271,6 +293,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testZeroDoubleDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = 0;
double op2 = 0;
@@ -291,6 +316,9 @@ public class ModulusTest extends AutomatedTestBase
@Test
public void testZeroIntegerDivisionByZero() {
+ if(shouldSkipTest())
+ return;
+
double op1 = 0;
double op2 = 0;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/MultiplicationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/MultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/MultiplicationTest.java
index fde54eb..fb0ea65 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/MultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/MultiplicationTest.java
@@ -45,6 +45,9 @@ public class MultiplicationTest extends AutomatedTestBase
@Test
public void testConstConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -88,6 +91,9 @@ public class MultiplicationTest extends AutomatedTestBase
@Test
public void testVarConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -131,6 +137,9 @@ public class MultiplicationTest extends AutomatedTestBase
@Test
public void testConstVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -174,6 +183,9 @@ public class MultiplicationTest extends AutomatedTestBase
@Test
public void testVarVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/OrTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/OrTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/OrTest.java
index 3506628..2c5854b 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/OrTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/OrTest.java
@@ -39,6 +39,9 @@ public class OrTest extends AutomatedTestBase
@Test
public void testOr() {
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration("OrTest");
loadTestConfiguration(config);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/PowerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/PowerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/PowerTest.java
index 0a04b47..2c2278b 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/PowerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/PowerTest.java
@@ -45,6 +45,9 @@ public class PowerTest extends AutomatedTestBase
@Test
public void testConstConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -88,6 +91,9 @@ public class PowerTest extends AutomatedTestBase
@Test
public void testVarConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -131,6 +137,9 @@ public class PowerTest extends AutomatedTestBase
@Test
public void testConstVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -174,6 +183,9 @@ public class PowerTest extends AutomatedTestBase
@Test
public void testVarVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/SubtractionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/SubtractionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/SubtractionTest.java
index 2accccf..b343eac 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/SubtractionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/SubtractionTest.java
@@ -55,6 +55,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testTwoMinusOne() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 1;
int intDoubleValue1 = 2;
@@ -98,6 +101,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testConstConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 3;
int intIntValue2 = 2;
int intDoubleValue1 = 3;
@@ -141,6 +147,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testVarConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 3;
int intIntValue2 = 2;
int intDoubleValue1 = 3;
@@ -184,6 +193,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testConstVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 3;
int intIntValue2 = 2;
int intDoubleValue1 = 3;
@@ -227,6 +239,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testVarVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 3;
int intIntValue2 = 2;
int intDoubleValue1 = 3;
@@ -274,6 +289,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testNegativeConstConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -317,6 +335,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testNegativeVarConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -360,6 +381,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testNegativeConstVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -403,6 +427,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testNegativeVarVar() {
+ if(shouldSkipTest())
+ return;
+
int intIntValue1 = 2;
int intIntValue2 = 3;
int intDoubleValue1 = 2;
@@ -450,6 +477,9 @@ public class SubtractionTest extends AutomatedTestBase
@Test
public void testConstConstConst() {
+ if(shouldSkipTest())
+ return;
+
int intIntIntValue1 = 3;
int intIntIntValue2 = 4;
int intIntIntValue3 = 5;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/XorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/XorTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/XorTest.java
index c34ec66..a76e0e1 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/XorTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/XorTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.binary.scalar;
import java.io.IOException;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.runtime.util.MapReduceTool;
@@ -67,6 +66,9 @@ public class XorTest extends AutomatedTestBase
private void runXor( String op1, String op2, boolean trueCondition )
{
+ if(shouldSkipTest())
+ return;
+
String TEST_NAME = TEST_NAME1;
getAndLoadTestConfiguration(TEST_NAME);
@@ -80,10 +82,10 @@ public class XorTest extends AutomatedTestBase
//compare result
try {
boolean retCondition = MapReduceTool.readBooleanFromHDFSFile(output("B"));
- Assert.assertEquals(trueCondition, retCondition);
+ assertEquals(trueCondition, retCondition);
}
catch (IOException e) {
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
}
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/blocks/VariableTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/blocks/VariableTest.java b/src/test/java/org/apache/sysml/test/integration/functions/blocks/VariableTest.java
index 36f3abd..f097630 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/blocks/VariableTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/blocks/VariableTest.java
@@ -64,6 +64,9 @@ public class VariableTest extends AutomatedTestBase
@Test
public void testVariablePassing1()
{
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
@@ -114,6 +117,9 @@ public class VariableTest extends AutomatedTestBase
@Test
public void testVariablePassing2() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int factor = 5;
@@ -148,6 +154,9 @@ public class VariableTest extends AutomatedTestBase
@Test
public void testVariableAnalysis1()
{
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/blocks/WhileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/blocks/WhileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/blocks/WhileTest.java
index a7e69b6..fdcd398 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/blocks/WhileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/blocks/WhileTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.blocks;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
-import org.junit.Assert;
import org.junit.Test;
@@ -53,6 +52,9 @@ public class WhileTest extends AutomatedTestBase
@Test
public void testComputation() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int maxIterations = 3;
@@ -82,6 +84,9 @@ public class WhileTest extends AutomatedTestBase
@Test
public void testCleanUp() {
+ if(shouldSkipTest())
+ return;
+
int rows = 10;
int cols = 10;
int maxIterations = 3;
@@ -97,7 +102,7 @@ public class WhileTest extends AutomatedTestBase
runTest();
- Assert.assertFalse("This process's temp directory was not removed",
+ assertFalse("This process's temp directory was not removed",
checkForProcessLocalTemporaryDir());
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java b/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
index 8e45674..76b0003 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
@@ -19,7 +19,6 @@
package org.apache.sysml.test.integration.functions.caching;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.hops.Hop;
import org.apache.sysml.hops.OptimizerUtils;
@@ -62,6 +61,9 @@ public class CachingPWriteExportTest extends AutomatedTestBase
private void runTestExport( String outputFormat )
{
+ if(shouldSkipTest())
+ return;
+
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
config.addVariable("cols", cols);
@@ -104,6 +106,6 @@ public class CachingPWriteExportTest extends AutomatedTestBase
for( int i=0; i<rows; i++ )
for( int j=0; j<cols; j++ )
if( V[i][j]!=Vp[i][j] )
- Assert.fail("Wrong value i="+i+", j="+j+", value1="+V[i][j]+", value2="+Vp[i][j]);
+ fail("Wrong value i="+i+", j="+j+", value1="+V[i][j]+", value2="+Vp[i][j]);
}
-}
\ No newline at end of file
+}