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:12 UTC
[04/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/misc/SizePropagationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/SizePropagationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/SizePropagationTest.java
index 2a526d3..20b7687 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/SizePropagationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/SizePropagationTest.java
@@ -21,8 +21,6 @@ package org.apache.sysml.test.integration.functions.misc;
import org.junit.Test;
-import org.junit.Assert;
-
import java.util.HashMap;
import org.apache.sysml.api.DMLScript;
@@ -108,7 +106,10 @@ public class SizePropagationTest extends AutomatedTestBase
private void testSizePropagation( String testname, boolean rewrites, int expect ) {
boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
- RUNTIME_PLATFORM oldPlatform = rtplatform;
+ boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
+ if(shouldSkipTest())
+ return;
try {
TestConfiguration config = getTestConfiguration(testname);
@@ -118,17 +119,15 @@ public class SizePropagationTest extends AutomatedTestBase
fullDMLScriptName = HOME + testname + ".dml";
programArgs = new String[]{ "-explain", "hops", "-stats","-args", String.valueOf(N), output("R") };
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites;
- rtplatform = RUNTIME_PLATFORM.HYBRID_SPARK;
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
runTest(true, false, null, -1);
HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("R");
- Assert.assertEquals(new Double(expect), dmlfile.get(new CellIndex(1,1)));
+ assertEquals(new Double(expect), dmlfile.get(new CellIndex(1,1)));
}
finally {
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = oldFlag;
- DMLScript.USE_LOCAL_SPARK_CONFIG = false;
- rtplatform = oldPlatform;
+ DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
+ rtplatform = platformOld;
}
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java
index abc4854..d5cabcf 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java
@@ -244,12 +244,11 @@ public class ToStringTest extends AutomatedTestBase {
}
protected void toStringTestHelper(RUNTIME_PLATFORM platform, String testName, String expectedOutput) {
- RUNTIME_PLATFORM platformOld = rtplatform;
-
- rtplatform = platform;
boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if (rtplatform == RUNTIME_PLATFORM.SPARK)
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+ RUNTIME_PLATFORM platformOld = setRuntimePlatform(platform);
+ if(shouldSkipTest())
+ return;
+
try {
// Create and load test configuration
getAndLoadTestConfiguration(testName);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/UnivariateStatsBasicTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/UnivariateStatsBasicTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/UnivariateStatsBasicTest.java
index 525a92d..26d760a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/UnivariateStatsBasicTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/UnivariateStatsBasicTest.java
@@ -20,7 +20,6 @@
package org.apache.sysml.test.integration.functions.misc;
import org.junit.Test;
-
import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.io.MatrixWriterFactory;
@@ -64,6 +63,10 @@ public class UnivariateStatsBasicTest extends AutomatedTestBase
{
boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
+ if(shouldSkipTest())
+ return;
+
+
try
{
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites;
@@ -96,4 +99,4 @@ public class UnivariateStatsBasicTest extends AutomatedTestBase
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = oldFlag;
}
}
-}
\ 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/misc/ValueTypeAutoCastingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeAutoCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeAutoCastingTest.java
index 4afb1d5..86e0336 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeAutoCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeAutoCastingTest.java
@@ -149,6 +149,8 @@ public class ValueTypeAutoCastingTest extends AutomatedTestBase
private void runTest( String testName, ValueType vt, boolean exceptionExpected )
{
String TEST_NAME = testName;
+ if(shouldSkipTest())
+ return;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeCastingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeCastingTest.java
index 1dd4f05..0e6b1fd 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeCastingTest.java
@@ -19,7 +19,6 @@
package org.apache.sysml.test.integration.functions.misc;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLException;
@@ -131,6 +130,9 @@ public class ValueTypeCastingTest extends AutomatedTestBase
*/
private void runTest( ValueType vtIn, ValueType vtOut, boolean matrixInput, boolean exceptionExpected )
{
+ if(shouldSkipTest())
+ return;
+
String TEST_NAME = null;
switch( vtOut )
{
@@ -184,9 +186,9 @@ public class ValueTypeCastingTest extends AutomatedTestBase
//compare results
String outName = output("R");
switch( vtOut ) {
- case DOUBLE: Assert.assertEquals(inVal, MapReduceTool.readDoubleFromHDFSFile(outName), 1e-16); break;
- case INT: Assert.assertEquals((int) inVal, MapReduceTool.readIntegerFromHDFSFile(outName)); break;
- case BOOLEAN: Assert.assertEquals(inVal!=0, MapReduceTool.readBooleanFromHDFSFile(outName)); break;
+ case DOUBLE: assertEquals(inVal, MapReduceTool.readDoubleFromHDFSFile(outName), 1e-16); break;
+ case INT: assertEquals((int) inVal, MapReduceTool.readIntegerFromHDFSFile(outName)); break;
+ case BOOLEAN: assertEquals(inVal!=0, MapReduceTool.readBooleanFromHDFSFile(outName)); break;
default: //do nothing
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeMatrixScalarBuiltinTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeMatrixScalarBuiltinTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeMatrixScalarBuiltinTest.java
index e2124b5..47df654 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeMatrixScalarBuiltinTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeMatrixScalarBuiltinTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.misc;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
-import org.junit.Assert;
import org.junit.Test;
public class ValueTypeMatrixScalarBuiltinTest extends AutomatedTestBase
@@ -109,6 +108,9 @@ public class ValueTypeMatrixScalarBuiltinTest extends AutomatedTestBase
private void runTest(String testName, ValueType vtIn)
{
+ if(shouldSkipTest())
+ return;
+
loadTestConfiguration(getTestConfiguration(testName));
//setup arguments and run test
@@ -120,7 +122,7 @@ public class ValueTypeMatrixScalarBuiltinTest extends AutomatedTestBase
//check output value type
ValueType vtOut = readDMLMetaDataValueType("R");
- Assert.assertTrue("Wrong output value type: " +
+ assertTrue("Wrong output value type: " +
vtOut.name(), vtOut.equals(ValueType.DOUBLE));
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ZeroRowsColsMatrixTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ZeroRowsColsMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ZeroRowsColsMatrixTest.java
index d4c6a30..a4718bd 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ZeroRowsColsMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ZeroRowsColsMatrixTest.java
@@ -209,16 +209,10 @@ public class ZeroRowsColsMatrixTest extends AutomatedTestBase
private void runEmptyMatrixTest( String testname, boolean rewrites, boolean emptyRet, ExecType et )
{
- 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;
boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameMatrixConversionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameMatrixConversionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameMatrixConversionTest.java
index a446573..594d94e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameMatrixConversionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameMatrixConversionTest.java
@@ -193,7 +193,9 @@ public class DataFrameMatrixConversionTest extends AutomatedTestBase
private void testDataFrameConversion(boolean vector, int cols, boolean dense, boolean unknownDims) {
boolean oldConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
- RUNTIME_PLATFORM oldPlatform = ConfigurationManager.getExecutionMode();
+ RUNTIME_PLATFORM oldPlatform = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
+ if(shouldSkipTest())
+ return;
try
{
@@ -235,11 +237,12 @@ public class DataFrameMatrixConversionTest extends AutomatedTestBase
private void testDataFrameConversionUltraSparse(boolean vector, boolean unknownDims) {
boolean oldConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
- RUNTIME_PLATFORM oldPlatform = ConfigurationManager.getExecutionMode();
+ RUNTIME_PLATFORM oldPlatform = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
+ if(shouldSkipTest())
+ return;
try
{
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
ConfigurationManager.getDMLOptions().setExecutionMode(RUNTIME_PLATFORM.HYBRID_SPARK);
//generate input data and setup metadata
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameRowFrameConversionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameRowFrameConversionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameRowFrameConversionTest.java
index 4d130a7..8a44af3 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameRowFrameConversionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameRowFrameConversionTest.java
@@ -199,11 +199,12 @@ public class DataFrameRowFrameConversionTest extends AutomatedTestBase
private void testDataFrameConversion(ValueType vt, boolean singleColBlock, boolean dense, boolean unknownDims) {
boolean oldConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
- RUNTIME_PLATFORM oldPlatform = ConfigurationManager.getExecutionMode();
+ RUNTIME_PLATFORM oldPlatform = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
+ if(shouldSkipTest())
+ return;
try
{
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
ConfigurationManager.getDMLOptions().setExecutionMode(RUNTIME_PLATFORM.HYBRID_SPARK);
//generate input data and setup metadata
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
index 36fb103..35d8098 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
@@ -249,11 +249,12 @@ public class DataFrameVectorFrameConversionTest extends AutomatedTestBase
private void testDataFrameConversion(ValueType[] schema, boolean containsID, boolean dense, boolean unknownDims) {
boolean oldConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
- RUNTIME_PLATFORM oldPlatform = ConfigurationManager.getExecutionMode();
+ RUNTIME_PLATFORM oldPlatform = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
+ if(shouldSkipTest())
+ return;
try
{
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
ConfigurationManager.getDMLOptions().setExecutionMode(RUNTIME_PLATFORM.HYBRID_SPARK);
//generate input data and setup metadata
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
index f8fbfe0..73d9dd7 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
@@ -36,6 +36,7 @@ import org.apache.spark.sql.types.DataType;
import org.apache.spark.sql.types.DataTypes;
import org.apache.spark.sql.types.StructField;
import org.apache.spark.sql.types.StructType;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.api.mlcontext.FrameFormat;
import org.apache.sysml.api.mlcontext.FrameMetadata;
import org.apache.sysml.api.mlcontext.Matrix;
@@ -237,7 +238,10 @@ public class DataFrameVectorScriptTest extends MLContextTestBase
}
private void testDataFrameScriptInput(ValueType[] schema, boolean containsID, boolean dense, boolean unknownDims) {
-
+ setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
+ if(shouldSkipTest())
+ return;
+
//TODO fix inconsistency ml context vs jmlc register Xf
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java
index 10ccc0b..f2034c0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java
@@ -151,6 +151,8 @@ public class FrameTest extends MLContextTestBase
DMLScript.USE_LOCAL_SPARK_CONFIG = true;
RUNTIME_PLATFORM oldRT = ConfigurationManager.getExecutionMode();
ConfigurationManager.getDMLOptions().setExecutionMode(RUNTIME_PLATFORM.HYBRID_SPARK);
+ if(shouldSkipTest())
+ return;
int rowstart = 234, rowend = 1478, colstart = 125, colend = 568;
int bRows = rowend-rowstart+1, bCols = colend-colstart+1;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
index 97e2fbb..4018497 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
@@ -54,7 +54,6 @@ import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.runtime.util.MapReduceTool;
import org.apache.sysml.test.integration.mlcontext.MLContextTestBase;
import org.apache.sysml.test.utils.TestUtils;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -88,6 +87,11 @@ public class GNMFTest extends MLContextTestBase
@Test
public void testGNMFWithRDMLAndJava() throws IOException, DMLException, ParseException {
+ boolean oldConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
+ RUNTIME_PLATFORM oldRT = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK);
+ if(shouldSkipTest())
+ return;
+
System.out.println("------------ BEGIN " + TEST_NAME + " TEST {" + numRegisteredInputs + ", "
+ numRegisteredOutputs + "} ------------");
this.scriptType = ScriptType.DML;
@@ -143,13 +147,8 @@ public class GNMFTest extends MLContextTestBase
}
}
- boolean oldConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
- RUNTIME_PLATFORM oldRT = ConfigurationManager.getExecutionMode();
-
try
{
- ConfigurationManager.getDMLOptions().setExecutionMode(RUNTIME_PLATFORM.HYBRID_SPARK);
Script script = ScriptFactory.dmlFromFile(fullDMLScriptName);
// set positional argument values
@@ -191,7 +190,7 @@ public class GNMFTest extends MLContextTestBase
if(numRegisteredOutputs >= 2) {
String configStr = ConfigurationManager.getDMLConfig().getConfigInfo();
if(configStr.contains("cp.parallel.ops: true"))
- Assert.fail("Configuration not updated via setConfig");
+ fail("Configuration not updated via setConfig");
}
if(numRegisteredOutputs >= 1) {
@@ -258,4 +257,4 @@ public class GNMFTest extends MLContextTestBase
}
}
-}
\ 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/nary/NaryCBindTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryCBindTest.java b/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryCBindTest.java
index dc4812d..f780f9c 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryCBindTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryCBindTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.nary;
import java.util.HashMap;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLScript;
@@ -137,16 +136,10 @@ public class NaryCBindTest extends AutomatedTestBase
public void runCbindTest(boolean sparse1, boolean sparse2, boolean sparse3, ExecType et)
{
- 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
{
@@ -182,7 +175,7 @@ public class NaryCBindTest extends AutomatedTestBase
TestUtils.compareMatrices(dmlfile, rfile, epsilon, "DML", "R");
//check for spark instructions
- Assert.assertTrue(heavyHittersContainsSubString("sp_cbind")==(et==ExecType.SPARK));
+ assertTrue(heavyHittersContainsSubString("sp_cbind")==(et==ExecType.SPARK));
}
finally {
rtplatform = platformOld;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryMinMaxTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryMinMaxTest.java b/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryMinMaxTest.java
index 3ef29c9..c49e2c9 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryMinMaxTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryMinMaxTest.java
@@ -93,16 +93,10 @@ public class NaryMinMaxTest extends AutomatedTestBase
public void runMinMaxTest(boolean min, boolean sparse, ExecType et)
{
- 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
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryRBindTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryRBindTest.java b/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryRBindTest.java
index 1e51ac9..9083467 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryRBindTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/nary/NaryRBindTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.nary;
import java.util.HashMap;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLScript;
@@ -137,16 +136,10 @@ public class NaryRBindTest extends AutomatedTestBase
public void runRbindTest(boolean sparse1, boolean sparse2, boolean sparse3, ExecType et)
{
- 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
{
@@ -182,7 +175,7 @@ public class NaryRBindTest extends AutomatedTestBase
TestUtils.compareMatrices(dmlfile, rfile, epsilon, "DML", "R");
//check for spark instructions
- Assert.assertTrue(heavyHittersContainsSubString("sp_rbind")==(et==ExecType.SPARK));
+ assertTrue(heavyHittersContainsSubString("sp_rbind")==(et==ExecType.SPARK));
}
finally {
rtplatform = platformOld;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/paramserv/BaseDataPartitionerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/BaseDataPartitionerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/BaseDataPartitionerTest.java
index 2f39c91..cbaedc3 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/BaseDataPartitionerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/BaseDataPartitionerTest.java
@@ -27,12 +27,25 @@ import org.apache.sysml.runtime.controlprogram.paramserv.dp.LocalDataPartitioner
import org.apache.sysml.runtime.controlprogram.paramserv.ParamservUtils;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
import org.apache.sysml.runtime.util.DataConverter;
+import org.junit.Assert;
+import org.junit.internal.ArrayComparisonFailure;
public abstract class BaseDataPartitionerTest {
protected static final int ROW_SIZE = 4000;
protected static final int COL_SIZE = 2000;
protected static final int WORKER_NUM = 4;
+
+
+ public static void assertArrayEquals(double[] expecteds,
+ double[] actuals, double delta) throws ArrayComparisonFailure {
+ Assert.assertArrayEquals(expecteds, actuals, delta);
+ }
+
+ public static void assertEquals(int expected, int actual) {
+ Assert.assertEquals(expected, actual);
+ }
+
protected MatrixBlock[] generateData() {
double[][] df = new double[BaseDataPartitionerTest.ROW_SIZE][BaseDataPartitionerTest.COL_SIZE];
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/paramserv/LocalDataPartitionerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/LocalDataPartitionerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/LocalDataPartitionerTest.java
index 4733406..3a3ab0f 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/LocalDataPartitionerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/LocalDataPartitionerTest.java
@@ -27,7 +27,6 @@ import org.apache.sysml.runtime.controlprogram.paramserv.dp.DataPartitionLocalSc
import org.apache.sysml.runtime.controlprogram.paramserv.ParamservUtils;
import org.apache.sysml.runtime.instructions.InstructionUtils;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
-import org.junit.Assert;
import org.junit.Test;
import scala.Tuple2;
@@ -38,16 +37,16 @@ public class LocalDataPartitionerTest extends BaseDataPartitionerTest {
public void testLocalDataPartitionerDC() {
DataPartitionLocalScheme.Result result = launchLocalDataPartitionerDC();
- Assert.assertEquals(WORKER_NUM, result.pFeatures.size());
- Assert.assertEquals(WORKER_NUM, result.pLabels.size());
+ assertEquals(WORKER_NUM, result.pFeatures.size());
+ assertEquals(WORKER_NUM, result.pLabels.size());
for (int i = 0; i < WORKER_NUM; i++) {
assertDCResult(result, i);
}
}
private void assertDCResult(DataPartitionLocalScheme.Result result, int workerID) {
- Assert.assertArrayEquals(generateExpectedData(workerID * (ROW_SIZE / WORKER_NUM) * COL_SIZE, (workerID + 1) * (ROW_SIZE / WORKER_NUM) * COL_SIZE), result.pFeatures.get(workerID).acquireRead().getDenseBlockValues(), 0);
- Assert.assertArrayEquals(generateExpectedData(workerID * (ROW_SIZE / WORKER_NUM), (workerID + 1) * (ROW_SIZE / WORKER_NUM)), result.pLabels.get(workerID).acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(generateExpectedData(workerID * (ROW_SIZE / WORKER_NUM) * COL_SIZE, (workerID + 1) * (ROW_SIZE / WORKER_NUM) * COL_SIZE), result.pFeatures.get(workerID).acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(generateExpectedData(workerID * (ROW_SIZE / WORKER_NUM), (workerID + 1) * (ROW_SIZE / WORKER_NUM)), result.pLabels.get(workerID).acquireRead().getDenseBlockValues(), 0);
}
@Test
@@ -55,8 +54,8 @@ public class LocalDataPartitionerTest extends BaseDataPartitionerTest {
MatrixBlock[] mbs = generateData();
DataPartitionLocalScheme.Result result = launchLocalDataPartitionerDR(mbs);
- Assert.assertEquals(WORKER_NUM, result.pFeatures.size());
- Assert.assertEquals(WORKER_NUM, result.pLabels.size());
+ assertEquals(WORKER_NUM, result.pFeatures.size());
+ assertEquals(WORKER_NUM, result.pLabels.size());
// Generate the expected data
MatrixBlock perm = ParamservUtils.generatePermutation(ROW_SIZE, ParamservUtils.SEED);
@@ -64,8 +63,8 @@ public class LocalDataPartitionerTest extends BaseDataPartitionerTest {
List<MatrixBlock> els = generateExpectedDataDR(mbs[1], perm);
for (int i = 0; i < WORKER_NUM; i++) {
- Assert.assertArrayEquals(efs.get(i).getDenseBlockValues(), result.pFeatures.get(i).acquireRead().getDenseBlockValues(), 0);
- Assert.assertArrayEquals(els.get(i).getDenseBlockValues(), result.pLabels.get(i).acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(efs.get(i).getDenseBlockValues(), result.pFeatures.get(i).acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(els.get(i).getDenseBlockValues(), result.pLabels.get(i).acquireRead().getDenseBlockValues(), 0);
}
}
@@ -84,8 +83,8 @@ public class LocalDataPartitionerTest extends BaseDataPartitionerTest {
public void testLocalDataPartitionerDRR() {
DataPartitionLocalScheme.Result result = launchLocalDataPartitionerDRR();
- Assert.assertEquals(WORKER_NUM, result.pFeatures.size());
- Assert.assertEquals(WORKER_NUM, result.pLabels.size());
+ assertEquals(WORKER_NUM, result.pFeatures.size());
+ assertEquals(WORKER_NUM, result.pLabels.size());
for (int i = 0; i < WORKER_NUM; i++) {
assertDRRResult(result, i);
}
@@ -93,8 +92,8 @@ public class LocalDataPartitionerTest extends BaseDataPartitionerTest {
private void assertDRRResult(DataPartitionLocalScheme.Result result, int workerID) {
Tuple2<double[], double[]> expected = generateExpectedData(workerID, WORKER_NUM, ROW_SIZE / WORKER_NUM);
- Assert.assertArrayEquals(expected._1, result.pFeatures.get(workerID).acquireRead().getDenseBlockValues(), 0);
- Assert.assertArrayEquals(expected._2, result.pLabels.get(workerID).acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(expected._1, result.pFeatures.get(workerID).acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(expected._2, result.pLabels.get(workerID).acquireRead().getDenseBlockValues(), 0);
}
private Tuple2<double[], double[]> generateExpectedData(int start, int step, int rowSize) {
@@ -116,12 +115,12 @@ public class LocalDataPartitionerTest extends BaseDataPartitionerTest {
ParamservUtils.SEED = System.nanoTime();
DataPartitionLocalScheme.Result result = launchLocalDataPartitionerOR();
- Assert.assertEquals(WORKER_NUM, result.pFeatures.size());
- Assert.assertEquals(WORKER_NUM, result.pLabels.size());
+ assertEquals(WORKER_NUM, result.pFeatures.size());
+ assertEquals(WORKER_NUM, result.pLabels.size());
for (int i = 0; i < WORKER_NUM; i++) {
Tuple2<MatrixBlock, MatrixBlock> expected = generateExpectedDataOR(i);
- Assert.assertArrayEquals(expected._1.getDenseBlockValues(), result.pFeatures.get(i).acquireRead().getDenseBlockValues(), 0);
- Assert.assertArrayEquals(expected._2.getDenseBlockValues(), result.pLabels.get(i).acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(expected._1.getDenseBlockValues(), result.pFeatures.get(i).acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(expected._2.getDenseBlockValues(), result.pLabels.get(i).acquireRead().getDenseBlockValues(), 0);
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/paramserv/ParamservSparkNNTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/ParamservSparkNNTest.java b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/ParamservSparkNNTest.java
index 915ae3a..5742f31 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/ParamservSparkNNTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/ParamservSparkNNTest.java
@@ -79,9 +79,9 @@ public class ParamservSparkNNTest extends AutomatedTestBase {
private void internalRunDMLTest(String testname, boolean exceptionExpected, Class<?> expectedException,
String errMessage) {
- DMLScript.RUNTIME_PLATFORM oldRtplatform = AutomatedTestBase.rtplatform;
+ DMLScript.RUNTIME_PLATFORM oldRtplatform = rtplatform;
boolean oldUseLocalSparkConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
- AutomatedTestBase.rtplatform = DMLScript.RUNTIME_PLATFORM.HYBRID_SPARK;
+ rtplatform = DMLScript.RUNTIME_PLATFORM.HYBRID_SPARK;
DMLScript.USE_LOCAL_SPARK_CONFIG = true;
try {
@@ -91,7 +91,7 @@ public class ParamservSparkNNTest extends AutomatedTestBase {
fullDMLScriptName = HOME + testname + ".dml";
runTest(true, exceptionExpected, expectedException, errMessage, -1);
} finally {
- AutomatedTestBase.rtplatform = oldRtplatform;
+ rtplatform = oldRtplatform;
DMLScript.USE_LOCAL_SPARK_CONFIG = oldUseLocalSparkConfig;
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SerializationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SerializationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SerializationTest.java
index 64d6492..a924032 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SerializationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SerializationTest.java
@@ -29,8 +29,22 @@ import org.apache.sysml.runtime.util.DataConverter;
import org.apache.sysml.runtime.util.ProgramConverter;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.internal.ArrayComparisonFailure;
public class SerializationTest {
+
+ public static void assertArrayEquals(double[] expecteds,
+ double[] actuals, double delta) throws ArrayComparisonFailure {
+ Assert.assertArrayEquals(expecteds, actuals, delta);
+ }
+
+ public static void assertEquals(Object expected, Object actual) {
+ Assert.assertEquals(expected, actual);
+ }
+
+ public static void assertEquals(long expected, long actual) {
+ Assert.assertEquals(expected, actual);
+ }
@Test
public void serializeUnnamedListObject() {
@@ -44,9 +58,9 @@ public class SerializationTest {
MatrixObject actualMO1 = (MatrixObject) actualLO.slice(0);
MatrixObject actualMO2 = (MatrixObject) actualLO.slice(1);
IntObject actualIO = (IntObject) actualLO.slice(2);
- Assert.assertArrayEquals(mo1.acquireRead().getDenseBlockValues(), actualMO1.acquireRead().getDenseBlockValues(), 0);
- Assert.assertArrayEquals(mo2.acquireRead().getDenseBlockValues(), actualMO2.acquireRead().getDenseBlockValues(), 0);
- Assert.assertEquals(io.getLongValue(), actualIO.getLongValue());
+ assertArrayEquals(mo1.acquireRead().getDenseBlockValues(), actualMO1.acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(mo2.acquireRead().getDenseBlockValues(), actualMO2.acquireRead().getDenseBlockValues(), 0);
+ assertEquals(io.getLongValue(), actualIO.getLongValue());
}
@Test
@@ -62,10 +76,10 @@ public class SerializationTest {
MatrixObject actualMO1 = (MatrixObject) actualLO.slice(0);
MatrixObject actualMO2 = (MatrixObject) actualLO.slice(1);
IntObject actualIO = (IntObject) actualLO.slice(2);
- Assert.assertEquals(lo.getNames(), actualLO.getNames());
- Assert.assertArrayEquals(mo1.acquireRead().getDenseBlockValues(), actualMO1.acquireRead().getDenseBlockValues(), 0);
- Assert.assertArrayEquals(mo2.acquireRead().getDenseBlockValues(), actualMO2.acquireRead().getDenseBlockValues(), 0);
- Assert.assertEquals(io.getLongValue(), actualIO.getLongValue());
+ assertEquals(lo.getNames(), actualLO.getNames());
+ assertArrayEquals(mo1.acquireRead().getDenseBlockValues(), actualMO1.acquireRead().getDenseBlockValues(), 0);
+ assertArrayEquals(mo2.acquireRead().getDenseBlockValues(), actualMO2.acquireRead().getDenseBlockValues(), 0);
+ assertEquals(io.getLongValue(), actualIO.getLongValue());
}
public static MatrixObject generateDummyMatrix(int size) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SparkDataPartitionerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SparkDataPartitionerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SparkDataPartitionerTest.java
index 2928e06..4055b92 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SparkDataPartitionerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/paramserv/SparkDataPartitionerTest.java
@@ -30,7 +30,6 @@ import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
import org.apache.sysml.runtime.controlprogram.paramserv.dp.DataPartitionLocalScheme;
import org.apache.sysml.runtime.controlprogram.paramserv.ParamservUtils;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
-import org.junit.Assert;
import org.junit.Test;
import scala.Tuple2;
@@ -61,8 +60,8 @@ public class SparkDataPartitionerTest extends BaseDataPartitionerTest {
private void assertResult(DataPartitionLocalScheme.Result local, Map<Integer, Tuple2<MatrixBlock, MatrixBlock>> spark) {
IntStream.range(0, WORKER_NUM).forEach(w -> {
- Assert.assertArrayEquals(local.pFeatures.get(w).acquireRead().getDenseBlockValues(), spark.get(w)._1.getDenseBlockValues(), 0);
- Assert.assertArrayEquals(local.pLabels.get(w).acquireRead().getDenseBlockValues(), spark.get(w)._2.getDenseBlockValues(), 0);
+ assertArrayEquals(local.pFeatures.get(w).acquireRead().getDenseBlockValues(), spark.get(w)._1.getDenseBlockValues(), 0);
+ assertArrayEquals(local.pLabels.get(w).acquireRead().getDenseBlockValues(), spark.get(w)._2.getDenseBlockValues(), 0);
});
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ForLoopPredicateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ForLoopPredicateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ForLoopPredicateTest.java
index 115b4e8..2f596ea 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ForLoopPredicateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ForLoopPredicateTest.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -148,6 +148,8 @@ public class ForLoopPredicateTest extends AutomatedTestBase
*/
private void runForPredicateTest( int testNum, boolean intScalar )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
+
String TEST_NAME = null;
switch( testNum )
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAccumulatorResultMergeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAccumulatorResultMergeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAccumulatorResultMergeTest.java
index 3ce5f73..dbac42f 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAccumulatorResultMergeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAccumulatorResultMergeTest.java
@@ -113,6 +113,7 @@ public class ParForAccumulatorResultMergeTest extends AutomatedTestBase
private void runParForAccumulatorResultMergeTest( String test, boolean init, boolean sparse, ExecType et )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
RUNTIME_PLATFORM platformOld = rtplatform;
switch( et ) {
case CP: rtplatform = RUNTIME_PLATFORM.SINGLE_NODE; break;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
index 40f5a1b..49368de 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
@@ -22,7 +22,7 @@ package org.apache.sysml.test.integration.functions.parfor;
import java.util.HashMap;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.lops.Lop;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -114,6 +114,7 @@ public class ParForAdversarialLiteralsTest extends AutomatedTestBase
@SuppressWarnings("deprecation")
private void runLiteralTest( String testName )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
String TEST_NAME = testName;
TestConfiguration config = getTestConfiguration(TEST_NAME);
config.addVariable("rows", rows);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForBlockwiseDataPartitioningTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForBlockwiseDataPartitioningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForBlockwiseDataPartitioningTest.java
index 29a6f97..a435157 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForBlockwiseDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForBlockwiseDataPartitioningTest.java
@@ -180,6 +180,7 @@ public class ParForBlockwiseDataPartitioningTest extends AutomatedTestBase
private void runParForDataPartitioningTest( String testname, PDataPartitioner partitioner, PExecMode mode, boolean sparse )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
RUNTIME_PLATFORM oldRT = rtplatform;
boolean oldUseSparkConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
boolean oldDynRecompile = CompilerConfig.FLAG_DYN_RECOMPILE;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
index 31a22bf..e651620 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
@@ -279,6 +279,7 @@ public class ParForColwiseDataPartitioningTest extends AutomatedTestBase
*/
private void runParForDataPartitioningTest( PDataPartitioner partitioner, PExecMode mode, boolean small, boolean sparse, boolean multiParts )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
RUNTIME_PLATFORM oldRT = rtplatform;
boolean oldUseSparkConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionExecuteTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionExecuteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionExecuteTest.java
index 80c7568..0489ed8 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionExecuteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionExecuteTest.java
@@ -92,6 +92,7 @@ public class ParForDataPartitionExecuteTest extends AutomatedTestBase
private void runFusedDataPartitionExecuteTest(boolean sparse, boolean row, ExecType et)
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
RUNTIME_PLATFORM platformOld = rtplatform;
switch( et ){
case MR: rtplatform = RUNTIME_PLATFORM.HYBRID; break;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
index db5f066..8c44a56 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
@@ -22,7 +22,7 @@ package org.apache.sysml.test.integration.functions.parfor;
import java.util.HashMap;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
@@ -112,6 +112,7 @@ public class ParForDataPartitionLeftIndexingTest extends AutomatedTestBase
*/
private void runParForDataPartitionLeftindexingTest( boolean colwise, boolean sparse, ExecType et )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
//force MR leftindexing via very small memory budget
long oldmem = InfrastructureAnalyzer.getLocalMaxMemory();
if(et==ExecType.MR) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
index 50c2ef2..b1ffa64 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
@@ -24,6 +24,7 @@ import java.io.FileReader;
import java.util.HashMap;
import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.conf.ConfigurationManager;
import org.apache.sysml.conf.DMLConfig;
import org.apache.sysml.parser.DMLProgram;
@@ -329,6 +330,7 @@ public class ParForDependencyAnalysisTest extends AutomatedTestBase
public void testDependencyAnalysis54d() { runTest("parfor54d.dml", true); }
private void runTest( String scriptFilename, boolean expectedException ) {
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
boolean raisedException = false;
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForFunctionSerializationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
index 9f53f9f..8880f77 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
@@ -22,7 +22,7 @@ package org.apache.sysml.test.integration.functions.parfor;
import java.util.HashMap;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -66,6 +66,7 @@ public class ParForFunctionSerializationTest extends AutomatedTestBase
private void runFunctionTest( int testNum )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
String TEST_NAME = null;
switch( testNum )
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForListResultVarsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForListResultVarsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForListResultVarsTest.java
index 681ba60..e1e67f1 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForListResultVarsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForListResultVarsTest.java
@@ -21,7 +21,7 @@ package org.apache.sysml.test.integration.functions.parfor;
import org.junit.Assert;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -49,6 +49,7 @@ public class ParForListResultVarsTest extends AutomatedTestBase
}
private void runListResultVarTest(String testName, int rows, int cols) {
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
loadTestConfiguration(getTestConfiguration(testName));
String HOME = SCRIPT_DIR + TEST_DIR;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
index e82ef90..8381876 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
@@ -22,7 +22,7 @@ package org.apache.sysml.test.integration.functions.parfor;
import java.util.HashMap;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.hops.Hop;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -72,6 +72,7 @@ public class ParForMultipleDataPartitioningTest extends AutomatedTestBase
*/
private void runParForDataPartitioningTest( boolean equiSchemes )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
//script
int scriptNum = -1;
if( equiSchemes )
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
index 8d8c815..8099d8d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map.Entry;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -84,6 +84,7 @@ public class ParForNaNResultMergeTest extends AutomatedTestBase
*/
private void runParForNaNResultMergeTest( String test, boolean sparse )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
//script
String TEST_NAME = test;
int xrow = sparse ? 1 : rows;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
index 4d2c3c8..3eb853e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -87,6 +87,7 @@ public class ParForParallelRemoteResultMergeTest extends AutomatedTestBase
*/
private void runParallelRemoteResultMerge( String test_name, boolean sparse )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
//inst exec type, influenced via rows
String TEST_NAME = test_name;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
index f12dbcb..524ebb9 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
@@ -131,6 +131,7 @@ public class ParForRepeatedOptimizationTest extends AutomatedTestBase
*/
private void runParForRepeatedOptTest( boolean reusePartitionedData, boolean update, boolean changedDim, ExecType et, int numExpectedMR )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
RUNTIME_PLATFORM platformOld = rtplatform;
double memfactorOld = OptimizerUtils.MEM_UTIL_FACTOR;
boolean reuseOld = ParForProgramBlock.ALLOW_REUSE_PARTITION_VARS;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
index c541fa2..4a67a7b 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -65,6 +66,7 @@ public class ParForReplaceThreadIDRecompileTest extends AutomatedTestBase
*/
private void runThreadIDReplaceTest( String TEST_NAME, boolean recompile )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
boolean flag = CompilerConfig.FLAG_DYN_RECOMPILE;
try
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
index 9c5968b..acd5f20 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
@@ -279,6 +279,7 @@ public class ParForRowwiseDataPartitioningTest extends AutomatedTestBase
*/
private void runParForDataPartitioningTest( PDataPartitioner partitioner, PExecMode mode, boolean small, boolean sparse, boolean multiParts )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
RUNTIME_PLATFORM oldRT = rtplatform;
boolean oldUseSparkConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
index 9ce7da3..567d82e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
@@ -22,7 +22,7 @@ package org.apache.sysml.test.integration.functions.parfor;
import java.util.HashMap;
import org.junit.Test;
-
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -182,6 +182,7 @@ public class ParForRulebasedOptimizerTest extends AutomatedTestBase
private void runParForOptimizerTest( int scriptNum, boolean largeRows, boolean largeCols, boolean timebasedOpt )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
//find right rows and cols configuration
int rows=-1, cols=-1;
if( largeRows )
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
index 22197bf..4eeae02 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
@@ -124,6 +124,7 @@ public class ParForSerialRemoteResultMergeTest extends AutomatedTestBase
*/
private void runParallelRemoteResultMerge( String test_name, boolean sparse )
{
+ rtplatform = RUNTIME_PLATFORM.HYBRID; // Set hybrid as the default rtplaform for the parfor package
RUNTIME_PLATFORM oldRT = rtplatform;
boolean oldUseSparkConfig = DMLScript.USE_LOCAL_SPARK_CONFIG;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest1.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest1.java b/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest1.java
index 48a6f86..afe4380 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest1.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest1.java
@@ -19,7 +19,6 @@
package org.apache.sysml.test.integration.functions.piggybacking;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
@@ -82,8 +81,9 @@ public class PiggybackingTest1 extends AutomatedTestBase
@Test
public void testDistCacheBug_mvmult()
{
- RUNTIME_PLATFORM rtold = rtplatform;
- rtplatform = RUNTIME_PLATFORM.HADOOP;
+ RUNTIME_PLATFORM rtold = setRuntimePlatform(RUNTIME_PLATFORM.HADOOP);
+ if(shouldSkipTest())
+ return;
try
{
@@ -123,7 +123,9 @@ public class PiggybackingTest1 extends AutomatedTestBase
@Test
public void testDistCacheBug_append()
{
-
+ if(shouldSkipTest())
+ return;
+
RUNTIME_PLATFORM rtold = rtplatform;
rtplatform = RUNTIME_PLATFORM.HADOOP;
@@ -140,10 +142,12 @@ public class PiggybackingTest1 extends AutomatedTestBase
runTest(true, exceptionExpected, null, numMRJobs);
Double expected = 1120.0;
- Double output = TestUtils.readDMLScalarFromHDFS(OUT_FILE).get(new CellIndex(1,1));
- Assert.assertEquals("Values not equal: " + output + "!=" + expected, output, expected);
+ if(!shouldSkipTest()) {
+ Double output = TestUtils.readDMLScalarFromHDFS(OUT_FILE).get(new CellIndex(1,1));
+ assertEquals("Values not equal: " + output + "!=" + expected, output, expected);
+ }
rtplatform = rtold;
}
-}
\ 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/piggybacking/PiggybackingTest2.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest2.java b/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest2.java
index f1a6305..dca195b 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest2.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest2.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.piggybacking;
import java.util.HashMap;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
@@ -54,26 +53,28 @@ public class PiggybackingTest2 extends AutomatedTestBase
public void testPiggybacking_iqm()
{
- RUNTIME_PLATFORM rtold = rtplatform;
+ if(!shouldSkipTest()) {
+ RUNTIME_PLATFORM rtold = rtplatform;
+
+ // bug can be reproduced only when exec mode is HADOOP
+ rtplatform = RUNTIME_PLATFORM.HADOOP;
+
+ TestConfiguration config = getTestConfiguration(TEST_NAME);
+ loadTestConfiguration(config);
+
+ String HOME = SCRIPT_DIR + TEST_DIR;
+ fullDMLScriptName = HOME + TEST_NAME + ".dml";
+ programArgs = new String[]{"-args", output(config.getOutputFiles()[0]) };
+
+ boolean exceptionExpected = false;
+ runTest(true, exceptionExpected, null, -1);
- // bug can be reproduced only when exec mode is HADOOP
- rtplatform = RUNTIME_PLATFORM.HADOOP;
-
- TestConfiguration config = getTestConfiguration(TEST_NAME);
- loadTestConfiguration(config);
-
- String HOME = SCRIPT_DIR + TEST_DIR;
- fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-args", output(config.getOutputFiles()[0]) };
-
- boolean exceptionExpected = false;
- runTest(true, exceptionExpected, null, -1);
-
- HashMap<CellIndex, Double> d = TestUtils.readDMLScalarFromHDFS(output(config.getOutputFiles()[0]));
-
- Assert.assertEquals(d.get(new CellIndex(1,1)), Double.valueOf(1.0), 1e-10);
-
- rtplatform = rtold;
+ HashMap<CellIndex, Double> d = TestUtils.readDMLScalarFromHDFS(output(config.getOutputFiles()[0]));
+
+ assertEquals(d.get(new CellIndex(1,1)), Double.valueOf(1.0), 1e-10);
+
+ rtplatform = rtold;
+ }
}
-}
\ 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/quaternary/RewritesWeightedSigmoidTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
index 76028fd..c759a00 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.quaternary;
import java.util.HashMap;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -122,16 +121,10 @@ public class RewritesWeightedSigmoidTest extends AutomatedTestBase
*/
private void runRewriteWeightedSigmoidTest( boolean sparse, boolean rewrites, 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;
boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites;
@@ -176,9 +169,9 @@ public class RewritesWeightedSigmoidTest extends AutomatedTestBase
//check statistics for right operator in cp
if( instType == ExecType.CP )
- Assert.assertTrue(!Statistics.getCPHeavyHitterOpCodes().contains(WeightedSigmoid.OPCODE_CP));
+ assertTrue(!Statistics.getCPHeavyHitterOpCodes().contains(WeightedSigmoid.OPCODE_CP));
else if( instType == ExecType.SPARK )
- Assert.assertTrue(!Statistics.getCPHeavyHitterOpCodes().contains(Instruction.SP_INST_PREFIX+WeightedSigmoid.OPCODE));
+ assertTrue(!Statistics.getCPHeavyHitterOpCodes().contains(Instruction.SP_INST_PREFIX+WeightedSigmoid.OPCODE));
}
finally
{
@@ -187,4 +180,4 @@ public class RewritesWeightedSigmoidTest extends AutomatedTestBase
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewritesOld;
}
}
-}
\ 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/quaternary/WeightedCrossEntropyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
index 84055b4..faeefa0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.quaternary;
import java.util.HashMap;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -180,16 +179,10 @@ public class WeightedCrossEntropyTest extends AutomatedTestBase
*/
private void runWeightedCrossEntropyTest( String testname, boolean sparse, boolean rewrites, boolean rep, 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;
boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
boolean forceOld = QuaternaryOp.FORCE_REPLICATION;
@@ -242,9 +235,9 @@ public class WeightedCrossEntropyTest extends AutomatedTestBase
//check statistics for right operator in cp
if( instType == ExecType.CP && rewrites )
- Assert.assertTrue("Missing opcode wcemm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedCrossEntropy.OPCODE_CP));
+ assertTrue("Missing opcode wcemm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedCrossEntropy.OPCODE_CP));
else if( instType == ExecType.SPARK && rewrites ) {
- Assert.assertTrue("Missing opcode sp_wcemm",
+ assertTrue("Missing opcode sp_wcemm",
!rep && Statistics.getCPHeavyHitterOpCodes().contains(Instruction.SP_INST_PREFIX+WeightedCrossEntropy.OPCODE)
|| rep && Statistics.getCPHeavyHitterOpCodes().contains(Instruction.SP_INST_PREFIX+WeightedCrossEntropyR.OPCODE) );
}
@@ -257,4 +250,4 @@ public class WeightedCrossEntropyTest extends AutomatedTestBase
QuaternaryOp.FORCE_REPLICATION = forceOld;
}
}
-}
\ 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/quaternary/WeightedDivMatrixMultTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
index a94eb61..5226814 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.quaternary;
import java.util.HashMap;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -580,16 +579,10 @@ public class WeightedDivMatrixMultTest extends AutomatedTestBase
*/
private void runWeightedDivMMTest( String testname, boolean sparse, boolean rewrites, boolean rep, 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;
boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
boolean forceOld = QuaternaryOp.FORCE_REPLICATION;
@@ -644,12 +637,12 @@ public class WeightedDivMatrixMultTest extends AutomatedTestBase
//check statistics for right operator in cp and spark
if( instType == ExecType.CP && rewrites ) {
- Assert.assertTrue("Missing opcode wdivmm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedDivMM.OPCODE_CP));
+ assertTrue("Missing opcode wdivmm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedDivMM.OPCODE_CP));
}
else if( instType == ExecType.SPARK && rewrites ) {
boolean reduce = rep || testname.equals(TEST_NAME8) || testname.equals(TEST_NAME9);
String opcode = Instruction.SP_INST_PREFIX + ((reduce)?WeightedDivMMR.OPCODE:WeightedDivMM.OPCODE);
- Assert.assertTrue("Missing opcode sp_wdivmm", Statistics.getCPHeavyHitterOpCodes().contains(opcode) );
+ assertTrue("Missing opcode sp_wdivmm", Statistics.getCPHeavyHitterOpCodes().contains(opcode) );
}
}
finally {
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSigmoidTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSigmoidTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSigmoidTest.java
index 81605ff..3d76a8e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSigmoidTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSigmoidTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.quaternary;
import java.util.HashMap;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -454,16 +453,10 @@ public class WeightedSigmoidTest extends AutomatedTestBase
*/
private void runMLUnaryBuiltinTest( String testname, boolean sparse, boolean rewrites, boolean rep, 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;
boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
boolean forceOld = QuaternaryOp.FORCE_REPLICATION;
@@ -514,7 +507,7 @@ public class WeightedSigmoidTest extends AutomatedTestBase
//check statistics for right operator in cp
if( instType == ExecType.CP && rewrites )
- Assert.assertTrue(Statistics.getCPHeavyHitterOpCodes().contains(WeightedSigmoid.OPCODE_CP));
+ assertTrue(Statistics.getCPHeavyHitterOpCodes().contains(WeightedSigmoid.OPCODE_CP));
}
finally
{
@@ -524,4 +517,4 @@ public class WeightedSigmoidTest extends AutomatedTestBase
QuaternaryOp.FORCE_REPLICATION = forceOld;
}
}
-}
\ 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/quaternary/WeightedSquaredLossTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSquaredLossTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
index 0caba7e..c21b9ec 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.quaternary;
import java.util.HashMap;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -456,16 +455,10 @@ public class WeightedSquaredLossTest extends AutomatedTestBase
*/
private void runMLUnaryBuiltinTest( String testname, boolean sparse, boolean rewrites, boolean rep, 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;
boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
boolean forceOld = QuaternaryOp.FORCE_REPLICATION;
@@ -520,11 +513,11 @@ public class WeightedSquaredLossTest extends AutomatedTestBase
//check statistics for right operator in cp
if( instType == ExecType.CP && rewrites )
- Assert.assertTrue("Rewrite not applied.",Statistics.getCPHeavyHitterOpCodes().contains(WeightedSquaredLoss.OPCODE_CP));
+ assertTrue("Rewrite not applied.",Statistics.getCPHeavyHitterOpCodes().contains(WeightedSquaredLoss.OPCODE_CP));
else if( instType == ExecType.SPARK && rewrites ){
boolean noWeights = testname.equals(TEST_NAME3) || testname.equals(TEST_NAME6) || testname.equals(TEST_NAME7);
String opcode = Instruction.SP_INST_PREFIX+((rep || !noWeights)?WeightedSquaredLossR.OPCODE : WeightedSquaredLoss.OPCODE);
- Assert.assertTrue("Rewrite not applied.",Statistics.getCPHeavyHitterOpCodes().contains(opcode));
+ assertTrue("Rewrite not applied.",Statistics.getCPHeavyHitterOpCodes().contains(opcode));
}
}
finally
@@ -535,4 +528,4 @@ public class WeightedSquaredLossTest extends AutomatedTestBase
QuaternaryOp.FORCE_REPLICATION = forceOld;
}
}
-}
\ 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/quaternary/WeightedUnaryMatrixMultTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java
index e4b1c1e..ac2cf94 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.quaternary;
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;
@@ -234,16 +233,10 @@ public class WeightedUnaryMatrixMultTest extends AutomatedTestBase
*/
private void runWeightedUnaryMMTest( String testname, boolean sparse, boolean rewrites, boolean rep, 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;
boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
boolean forceOld = QuaternaryOp.FORCE_REPLICATION;
@@ -294,11 +287,11 @@ public class WeightedUnaryMatrixMultTest extends AutomatedTestBase
//check statistics for right operator in cp and spark
if( instType == ExecType.CP && rewrites ) {
- Assert.assertTrue("Missing opcode wumm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedUnaryMM.OPCODE_CP));
+ assertTrue("Missing opcode wumm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedUnaryMM.OPCODE_CP));
}
else if( instType == ExecType.SPARK && rewrites ) {
String opcode = Instruction.SP_INST_PREFIX + ((rep)?WeightedUnaryMMR.OPCODE:WeightedUnaryMM.OPCODE);
- Assert.assertTrue("Missing opcode sp_wumm", Statistics.getCPHeavyHitterOpCodes().contains(opcode) );
+ assertTrue("Missing opcode sp_wumm", Statistics.getCPHeavyHitterOpCodes().contains(opcode) );
}
}
finally
@@ -309,4 +302,4 @@ public class WeightedUnaryMatrixMultTest extends AutomatedTestBase
QuaternaryOp.FORCE_REPLICATION = forceOld;
}
}
-}
\ 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/recompile/BranchRemovalTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java
index 2af9ffe..ce67ced 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java
@@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.recompile;
import java.util.HashMap;
import org.junit.Test;
-
import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -103,6 +102,9 @@ public class BranchRemovalTest extends AutomatedTestBase
*/
private void runBranchRemovalTest( boolean condition, boolean branchRemoval, boolean IPA )
{
+ if(shouldSkipTest())
+ return;
+
boolean oldFlagBranchRemoval = OptimizerUtils.ALLOW_BRANCH_REMOVAL;
boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS;
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
index 0f34622..6fbec69 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.recompile;
import java.util.HashMap;
import org.junit.Test;
-
import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.io.FileFormatPropertiesCSV;
@@ -93,6 +92,9 @@ public class CSVReadUnknownSizeTest extends AutomatedTestBase {
*/
private void runCSVReadUnknownSizeTest( boolean splitDags, boolean rewrites )
{
+ if(shouldSkipTest())
+ return;
+
boolean oldFlagSplit = OptimizerUtils.ALLOW_SPLIT_HOP_DAGS;
boolean oldFlagRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
@@ -159,4 +161,4 @@ public class CSVReadUnknownSizeTest 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/recompile/FunctionRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
index 60f263f..4aea669 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
@@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.recompile;
import java.util.HashMap;
-import org.junit.Assert;
import org.junit.Test;
import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.hops.OptimizerUtils;
@@ -71,6 +70,9 @@ public class FunctionRecompileTest extends AutomatedTestBase
private void runFunctionTest( boolean recompile, boolean IPA )
{
+ if(shouldSkipTest())
+ return;
+
boolean oldFlagRecompile = CompilerConfig.FLAG_DYN_RECOMPILE;
boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS;
@@ -105,7 +107,7 @@ public class FunctionRecompileTest extends AutomatedTestBase
int expectNumCompiled = -1;
if( IPA ) expectNumCompiled = 1; //reblock
else expectNumCompiled = 5; //reblock, GMR,GMR,GMR,GMR (last two should piggybacked)
- Assert.assertEquals("Unexpected number of compiled MR jobs.",
+ assertEquals("Unexpected number of compiled MR jobs.",
expectNumCompiled, Statistics.getNoOfCompiledMRJobs());
//CHECK executed MR jobs
@@ -113,7 +115,7 @@ public class FunctionRecompileTest extends AutomatedTestBase
if( recompile ) expectNumExecuted = 0;
else if( IPA ) expectNumExecuted = 1; //reblock
else expectNumExecuted = 41; //reblock, 10*(GMR,GMR,GMR, GMR) (last two should piggybacked)
- Assert.assertEquals("Unexpected number of executed MR jobs.",
+ assertEquals("Unexpected number of executed MR jobs.",
expectNumExecuted, Statistics.getNoOfExecutedMRJobs());
//compare matrices