http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInExpressionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInExpressionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInExpressionTest.java index ad7aecc..867899b 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInExpressionTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInExpressionTest.java @@ -20,7 +20,6 @@ package org.apache.sysml.test.integration.functions.misc; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; import org.apache.sysml.test.integration.AutomatedTestBase; @@ -82,6 +81,9 @@ public class FunctionInExpressionTest extends AutomatedTestBase private void runFunInExpressionTest( String testName ) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testName); loadTestConfiguration(config); @@ -97,6 +99,6 @@ public class FunctionInExpressionTest extends AutomatedTestBase //compare results double val = readDMLMatrixFromHDFS("R").get(new CellIndex(1,1)); - Assert.assertTrue("Wrong result: 7 vs "+val, Math.abs(val-7)<Math.pow(10, -13)); + assertTrue("Wrong result: 7 vs "+val, Math.abs(val-7)<Math.pow(10, -13)); } }
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInliningTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInliningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInliningTest.java index 0605c02..6d230fa 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInliningTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInliningTest.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.hops.OptimizerUtils; @@ -93,6 +92,8 @@ public class FunctionInliningTest extends AutomatedTestBase private void runInliningTest( String testname, boolean IPA ) { boolean oldIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS; + if(shouldSkipTest()) + return; try { @@ -111,22 +112,23 @@ public class FunctionInliningTest extends AutomatedTestBase //compare output double ret = MapReduceTool.readDoubleFromHDFSFile(output("Rout")); - Assert.assertEquals(Double.valueOf(rows*cols*val*6), Double.valueOf(ret)); + assertEquals(Double.valueOf(rows*cols*val*6), Double.valueOf(ret)); //compiled MR jobs - int expectNumCompiled = IPA ? 0 : (testname.equals(TEST_NAME1)?2: //2GMR in foo1 and foo2 (not removed w/o IPA) - (testname.equals(TEST_NAME2)?4: //3GMR in foo1 and foo2, 1GMR for subsequent sum - 5 )); //5GMR in foo1-foo5 (not removed w/o IPA) - Assert.assertEquals("Unexpected number of compiled MR jobs.", +// int expectNumCompiled = IPA ? 0 : (testname.equals(TEST_NAME1)?2: //2GMR in foo1 and foo2 (not removed w/o IPA) +// (testname.equals(TEST_NAME2)?4: //3GMR in foo1 and foo2, 1GMR for subsequent sum +// 5 )); //5GMR in foo1-foo5 (not removed w/o IPA) + int expectNumCompiled = 0; + assertEquals("Unexpected number of compiled MR jobs.", expectNumCompiled, Statistics.getNoOfCompiledMRJobs()); //check executed MR jobs int expectNumExecuted = 0; //executed jobs should always be 0 due to dynamic recompilation - Assert.assertEquals("Unexpected number of executed MR jobs.", expectNumExecuted, Statistics.getNoOfExecutedMRJobs()); + assertEquals("Unexpected number of executed MR jobs.", expectNumExecuted, Statistics.getNoOfExecutedMRJobs()); } catch(Exception ex) { - Assert.fail("Failed to run test: "+ex.getMessage()); + fail("Failed to run test: "+ex.getMessage()); } finally { @@ -134,4 +136,4 @@ public class FunctionInliningTest 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/misc/FunctionNamespaceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionNamespaceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionNamespaceTest.java index e2fc718..f8938dc 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionNamespaceTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionNamespaceTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.misc; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLException; import org.apache.sysml.hops.OptimizerUtils; @@ -281,6 +280,8 @@ public class FunctionNamespaceTest extends AutomatedTestBase private void runFunctionNamespaceTest(String TEST_NAME, ScriptType scriptType) { getAndLoadTestConfiguration(TEST_NAME); + if(shouldSkipTest()) + return; fullDMLScriptName = SCRIPT_DIR + TEST_DIR + TEST_NAME + "." + scriptType.toString().toLowerCase(); programArgs = (ScriptType.PYDML == scriptType) ? new String[]{"-python"} : new String[]{}; @@ -310,19 +311,19 @@ public class FunctionNamespaceTest extends AutomatedTestBase { if (!stdErrString.contains("Namespace Conflict")) { - Assert.fail("Expected parse issue not detected."); + fail("Expected parse issue not detected."); } } else if (TEST_NAME13.equals(TEST_NAME)) { if (stdErrString != null && !stdErrString.contains("Function Name Conflict")) { - Assert.fail("Expected parse issue not detected."); + fail("Expected parse issue not detected."); } } else { - Assert.fail("Unexpected parse error or DML script error: " + stdErrString); + fail("Unexpected parse error or DML script error: " + stdErrString); } } } @@ -330,7 +331,7 @@ public class FunctionNamespaceTest extends AutomatedTestBase catch (Exception e) { e.printStackTrace(origStdErr); - Assert.fail("Unexpected exception: " + e); + fail("Unexpected exception: " + e); } finally { @@ -367,26 +368,26 @@ public class FunctionNamespaceTest extends AutomatedTestBase //compare output double ret = MapReduceTool.readDoubleFromHDFSFile(output("Rout")); - Assert.assertEquals(Double.valueOf(rows*cols*val*6), Double.valueOf(ret)); + assertEquals(Double.valueOf(rows*cols*val*6), Double.valueOf(ret)); //compiled MR jobs - int expectNumCompiled = IPA ? 0 : 4; - Assert.assertEquals("Unexpected number of compiled MR jobs.", expectNumCompiled, Statistics.getNoOfCompiledMRJobs()); + int expectNumCompiled = 0; // IPA ? 0 : 4; + assertEquals("Unexpected number of compiled MR jobs.", expectNumCompiled, Statistics.getNoOfCompiledMRJobs()); //check executed MR jobs (should always be 0 due to dynamic recompilation) int expectNumExecuted = 0; - Assert.assertEquals("Unexpected number of executed MR jobs.", expectNumExecuted, Statistics.getNoOfExecutedMRJobs()); + assertEquals("Unexpected number of executed MR jobs.", expectNumExecuted, Statistics.getNoOfExecutedMRJobs()); String stdErrString = baos.toString(); if (stdErrString != null && stdErrString.length() > 0) { - Assert.fail("Unexpected parse error or DML script error: " + stdErrString); + fail("Unexpected parse error or DML script error: " + stdErrString); } } catch (Exception e) { e.printStackTrace(originalStdErr); - Assert.fail("Unexpected exception: " + e); + fail("Unexpected exception: " + e); } finally { @@ -394,4 +395,4 @@ public class FunctionNamespaceTest extends AutomatedTestBase OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = origIPA; } } -} \ 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/FunctionNotFoundTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionNotFoundTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionNotFoundTest.java index 9605c2b..8e81a6a 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionNotFoundTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionNotFoundTest.java @@ -52,6 +52,9 @@ public class FunctionNotFoundTest extends AutomatedTestBase } private void runFunctionNotFoundTest(String testName, boolean error) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testName); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionPotpourriTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionPotpourriTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionPotpourriTest.java index f1ce7b0..67e6071 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionPotpourriTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionPotpourriTest.java @@ -20,7 +20,6 @@ package org.apache.sysml.test.integration.functions.misc; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLException; import org.apache.sysml.test.integration.AutomatedTestBase; @@ -182,6 +181,9 @@ public class FunctionPotpourriTest extends AutomatedTestBase } private void runFunctionTest(String testName, boolean error) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testName); loadTestConfiguration(config); @@ -193,6 +195,6 @@ public class FunctionPotpourriTest extends AutomatedTestBase //run script and compare output runTest(true, error, DMLException.class, -1); if( testName.equals(TEST_NAME18) ) - Assert.assertTrue(heavyHittersContainsString("print")); + assertTrue(heavyHittersContainsString("print")); } } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionReturnTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionReturnTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionReturnTest.java index b83ac39..3d2d564 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionReturnTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionReturnTest.java @@ -59,6 +59,9 @@ public class FunctionReturnTest extends AutomatedTestBase } private void runFunctionReturnTest( String testname, boolean IPA ) { + if(shouldSkipTest()) + return; + boolean oldIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS; OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA; try { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java index 51d049d..f3b7881 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAConstantFoldingScalarVariablePropagationTest.java @@ -92,7 +92,9 @@ public class IPAConstantFoldingScalarVariablePropagationTest extends AutomatedTe // Save old settings int oldIPANumRep = OptimizerUtils.IPA_NUM_REPETITIONS; boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - RUNTIME_PLATFORM platformOld = rtplatform; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK); + if(shouldSkipTest()) + return; try { @@ -103,8 +105,6 @@ public class IPAConstantFoldingScalarVariablePropagationTest extends AutomatedTe fullDMLScriptName = HOME + testname + ".dml"; programArgs = new String[]{"-stats", "-explain", "recompile_hops"}; OptimizerUtils.IPA_NUM_REPETITIONS = IPA_SECOND_CHANCE ? 2 : 1; - DMLScript.USE_LOCAL_SPARK_CONFIG = true; - rtplatform = RUNTIME_PLATFORM.HYBRID_SPARK; // Run test runTest(true, false, null, -1); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/IPADeadCodeEliminationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPADeadCodeEliminationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPADeadCodeEliminationTest.java index 3afe992..37ce872 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPADeadCodeEliminationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPADeadCodeEliminationTest.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.hops.OptimizerUtils; @@ -89,6 +88,8 @@ public class IPADeadCodeEliminationTest extends AutomatedTestBase private void runIPALiteralReplacementTest( String testname, boolean IPA ) { boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS; + if(shouldSkipTest()) + return; try { TestConfiguration config = getTestConfiguration(testname); @@ -100,9 +101,9 @@ public class IPADeadCodeEliminationTest extends AutomatedTestBase runTest(true, false, null, -1); if( IPA && !testname.equals(TEST_NAME4) ) //check for applied dead code removal - Assert.assertTrue(!heavyHittersContainsString("uak+")); + assertTrue(!heavyHittersContainsString("uak+")); if( testname.equals(TEST_NAME4) ) - Assert.assertTrue(heavyHittersContainsString("uak+")); + assertTrue(heavyHittersContainsString("uak+")); } finally { OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAFunctionInliningTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAFunctionInliningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAFunctionInliningTest.java index 8e22c5d..a1259c2 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAFunctionInliningTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAFunctionInliningTest.java @@ -20,7 +20,6 @@ package org.apache.sysml.test.integration.functions.misc; -import org.junit.Assert; import org.junit.Test; import org.apache.commons.lang.ArrayUtils; import org.apache.sysml.hops.OptimizerUtils; @@ -116,6 +115,8 @@ public class IPAFunctionInliningTest extends AutomatedTestBase private void runIPAFunInlineTest( String testName, boolean IPA ) { boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS; + if(shouldSkipTest()) + return; try { @@ -137,17 +138,17 @@ public class IPAFunctionInliningTest extends AutomatedTestBase //compare results if( !testName.equals(TEST_NAME6) ) { double val = readDMLMatrixFromHDFS("R").get(new CellIndex(1,1)); - Assert.assertTrue("Wrong result: 7 vs "+val, Math.abs(val-7)<Math.pow(10, -14)); + assertTrue("Wrong result: 7 vs "+val, Math.abs(val-7)<Math.pow(10, -14)); } //compare inlined functions boolean inlined = ( IPA && ArrayUtils.contains( new String[]{TEST_NAME1, TEST_NAME2, TEST_NAME3, TEST_NAME6}, testName)); - Assert.assertTrue("Unexpected function call: "+inlined, !heavyHittersContainsSubString("foo")==inlined); + assertTrue("Unexpected function call: "+inlined, !heavyHittersContainsSubString("foo")==inlined); //check for incorrect operation replication if( testName.equals(TEST_NAME6) ) - Assert.assertTrue(Statistics.getCPHeavyHitterCount("print")==1); + assertTrue(Statistics.getCPHeavyHitterCount("print")==1); } finally { OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/IPALiteralReplacementTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPALiteralReplacementTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPALiteralReplacementTest.java index 52b2bc8..7e1fed5 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPALiteralReplacementTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPALiteralReplacementTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.misc; 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; @@ -81,6 +80,9 @@ public class IPALiteralReplacementTest extends AutomatedTestBase */ private void runIPALiteralReplacementTest( String testname, boolean IPA ) { + if(shouldSkipTest()) + return; + boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS; try @@ -109,4 +111,4 @@ public class IPALiteralReplacementTest extends AutomatedTestBase OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA; } } -} \ 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/IPANnzPropagationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPANnzPropagationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPANnzPropagationTest.java index 2809ecf..a3c3cdb 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPANnzPropagationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPANnzPropagationTest.java @@ -56,7 +56,9 @@ public class IPANnzPropagationTest extends AutomatedTestBase { // Save old settings boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - RUNTIME_PLATFORM platformOld = rtplatform; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(RUNTIME_PLATFORM.HYBRID_SPARK); + if(shouldSkipTest()) + return; try { @@ -66,8 +68,6 @@ public class IPANnzPropagationTest extends AutomatedTestBase String HOME = SCRIPT_DIR + TEST_DIR; fullDMLScriptName = HOME + testname + ".dml"; programArgs = new String[]{"-stats", "-explain", "recompile_hops"}; - DMLScript.USE_LOCAL_SPARK_CONFIG = true; - rtplatform = RUNTIME_PLATFORM.HYBRID_SPARK; runTest(true, false, null, -1); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarRecursionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarRecursionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarRecursionTest.java index c8127f0..84f52f2 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarRecursionTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarRecursionTest.java @@ -43,6 +43,9 @@ public class IPAScalarRecursionTest extends AutomatedTestBase @Test public void testScalarRecursion() { + if(shouldSkipTest()) + return; + String TEST_NAME = TEST_NAME1; try http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarVariablePropagationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarVariablePropagationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarVariablePropagationTest.java index 1ad1f8b..7a32b2a 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarVariablePropagationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarVariablePropagationTest.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.hops.OptimizerUtils; import org.apache.sysml.lops.WeightedCrossEntropy; @@ -62,6 +61,8 @@ public class IPAScalarVariablePropagationTest extends AutomatedTestBase private void runIPAScalarVariablePropagationTest( String testname, boolean IPA ) { boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS; + if(shouldSkipTest()) + return; try { @@ -79,11 +80,11 @@ public class IPAScalarVariablePropagationTest extends AutomatedTestBase //check for applied rewrites (in both cases, we expect the rewrites to happen: // - without IPA it should be marked for recompilation and recompiled per iteration // - with IPA the scalar rank should be directly propagated into the function - Assert.assertTrue("Missing opcode wdivmm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedDivMM.OPCODE_CP)); - Assert.assertTrue("Missing opcode wcemm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedCrossEntropy.OPCODE_CP)); + assertTrue("Missing opcode wdivmm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedDivMM.OPCODE_CP)); + assertTrue("Missing opcode wcemm", Statistics.getCPHeavyHitterOpCodes().contains(WeightedCrossEntropy.OPCODE_CP)); } finally { OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA; } } -} \ 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/IPAUnknownRecursionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAUnknownRecursionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAUnknownRecursionTest.java index 0d47db9..5cb1a04 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAUnknownRecursionTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAUnknownRecursionTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.misc; 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; @@ -64,6 +63,9 @@ public class IPAUnknownRecursionTest extends AutomatedTestBase */ private void runIPAUnknownRecursionTest( boolean IPA ) { + if(shouldSkipTest()) + return; + boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS; try http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/IfTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/IfTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IfTest.java index 08deba4..7688f10 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/IfTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IfTest.java @@ -85,6 +85,9 @@ public class IfTest extends AutomatedTestBase private void runTest( String testName, int val ) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testName); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidBuiltinFunctionCallTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidBuiltinFunctionCallTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidBuiltinFunctionCallTest.java index f755752..f3c68d7 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidBuiltinFunctionCallTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidBuiltinFunctionCallTest.java @@ -45,6 +45,9 @@ public class InvalidBuiltinFunctionCallTest extends AutomatedTestBase private void runTest( String testName, boolean expected ) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testName); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java index f851894..2507ed5 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionAssignmentTest.java @@ -65,6 +65,9 @@ public class InvalidFunctionAssignmentTest extends AutomatedTestBase } private void runTest( String testName, boolean exceptionExpected ) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testName); loadTestConfiguration(config); 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/misc/InvalidFunctionSignatureTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionSignatureTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionSignatureTest.java index b76fdd7..6db7bc7 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionSignatureTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionSignatureTest.java @@ -57,6 +57,9 @@ public class InvalidFunctionSignatureTest extends AutomatedTestBase */ private void runTest( String testName, boolean exceptionExpected ) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testName); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ListAndStructTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ListAndStructTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ListAndStructTest.java index 45eeca6..21e4432 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ListAndStructTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ListAndStructTest.java @@ -19,7 +19,6 @@ package org.apache.sysml.test.integration.functions.misc; -import org.junit.Assert; import org.junit.Test; import java.util.HashMap; @@ -165,6 +164,8 @@ public class ListAndStructTest extends AutomatedTestBase private void runListStructTest(String testname, boolean rewrites) { boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; + if(shouldSkipTest()) + return; try { TestConfiguration config = getTestConfiguration(testname); @@ -185,11 +186,11 @@ public class ListAndStructTest extends AutomatedTestBase //compare matrices HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("R"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("R"); - Assert.assertEquals(dmlfile.get(new CellIndex(1,1)), rfile.get(new CellIndex(1,1))); + assertEquals(dmlfile.get(new CellIndex(1,1)), rfile.get(new CellIndex(1,1))); //check for properly compiled CP operations - Assert.assertTrue(Statistics.getNoOfExecutedMRJobs()==0); - Assert.assertTrue(Statistics.getNoOfExecutedSPInst()==0); + assertTrue(Statistics.getNoOfExecutedMRJobs()==0); + assertTrue(Statistics.getNoOfExecutedSPInst()==0); } finally { OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = oldFlag; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/LongOverflowTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/LongOverflowTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/LongOverflowTest.java index 23f4a6c..69b572c 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/LongOverflowTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/LongOverflowTest.java @@ -94,6 +94,8 @@ public class LongOverflowTest extends AutomatedTestBase private void runOverflowTest( String testscript, boolean error ) { String TEST_NAME = testscript; + 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/NegativeLoopIncrementsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/NegativeLoopIncrementsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/NegativeLoopIncrementsTest.java index c464401..0606fa6 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/NegativeLoopIncrementsTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/NegativeLoopIncrementsTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.misc; import java.util.HashMap; import org.junit.Test; - import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; import org.apache.sysml.test.integration.AutomatedTestBase; @@ -98,6 +97,9 @@ public class NegativeLoopIncrementsTest extends AutomatedTestBase */ private void runNegativeLoopIncrementsTest( String testname, boolean vect, boolean multiStep ) { + if(shouldSkipTest()) + return; + String TEST_NAME = testname; TestConfiguration config = getTestConfiguration(TEST_NAME); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolStringTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolStringTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolStringTest.java index 21c6f01..5f28d03 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolStringTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolStringTest.java @@ -71,6 +71,8 @@ public class NrowNcolStringTest extends AutomatedTestBase private void runNxxStringTest( String testName ) { 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/NrowNcolUnknownCSVReadTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java index 07ed705..87050fd 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java @@ -81,12 +81,12 @@ public class NrowNcolUnknownCSVReadTest extends AutomatedTestBase private void runNxxUnkownCSVTest( String testName ) { String TEST_NAME = testName; - RUNTIME_PLATFORM oldplatform = rtplatform; + RUNTIME_PLATFORM oldplatform = setRuntimePlatform(RUNTIME_PLATFORM.SINGLE_NODE); + if(shouldSkipTest()) + return; try { - rtplatform = RUNTIME_PLATFORM.SINGLE_NODE; - //test configuration getAndLoadTestConfiguration(TEST_NAME); 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/misc/OuterTableExpandTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/OuterTableExpandTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/OuterTableExpandTest.java index 2c09850..c93654d 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/OuterTableExpandTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/OuterTableExpandTest.java @@ -208,17 +208,10 @@ public class OuterTableExpandTest extends AutomatedTestBase */ private void runOuterTableTest( String testname, boolean sparse, boolean left, 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 { @@ -270,4 +263,4 @@ public class OuterTableExpandTest 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/misc/PrintExpressionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintExpressionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintExpressionTest.java index 4922a3b..fcf4966 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintExpressionTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintExpressionTest.java @@ -71,6 +71,9 @@ public class PrintExpressionTest extends AutomatedTestBase */ private void runPrintExpressionTest( String testname, boolean rewrites ) { + if(shouldSkipTest()) + return; + String TEST_NAME = testname; TestConfiguration config = getTestConfiguration(TEST_NAME); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintMatrixTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintMatrixTest.java index 574c0a5..38c8f18 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintMatrixTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintMatrixTest.java @@ -50,6 +50,9 @@ public class PrintMatrixTest extends AutomatedTestBase */ private void runTest( String testName, boolean exceptionExpected ) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(TEST_NAME1); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ReadAfterWriteTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ReadAfterWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ReadAfterWriteTest.java index df56aa2..c622e39 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ReadAfterWriteTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ReadAfterWriteTest.java @@ -107,6 +107,8 @@ public class ReadAfterWriteTest extends AutomatedTestBase private void runReadAfterWriteTest( String testName, boolean positive ) { 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/RewriteBinaryMV2OuterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteBinaryMV2OuterTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteBinaryMV2OuterTest.java index 61a7b85..d67bbec 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteBinaryMV2OuterTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteBinaryMV2OuterTest.java @@ -19,7 +19,6 @@ package org.apache.sysml.test.integration.functions.misc; -import org.junit.Assert; import org.junit.Test; import java.util.HashMap; @@ -88,6 +87,8 @@ public class RewriteBinaryMV2OuterTest extends AutomatedTestBase private void testRewriteBinaryMV2Outer(String opcode, boolean rewrites) { boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; + if(shouldSkipTest()) + return; try { @@ -121,7 +122,7 @@ public class RewriteBinaryMV2OuterTest extends AutomatedTestBase //check for applied rewrites if( rewrites ) - Assert.assertTrue(!heavyHittersContainsSubString("ba+*")); + assertTrue(!heavyHittersContainsSubString("ba+*")); } finally { OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = oldFlag; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCSETransposeScalarTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCSETransposeScalarTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCSETransposeScalarTest.java index 61daf38..dd58d68 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCSETransposeScalarTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCSETransposeScalarTest.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.hops.OptimizerUtils; import org.apache.sysml.test.integration.AutomatedTestBase; @@ -76,6 +75,9 @@ public class RewriteCSETransposeScalarTest extends AutomatedTestBase */ private void testRewriteCSETransposeScalar( String testname, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites; @@ -94,8 +96,8 @@ public class RewriteCSETransposeScalarTest extends AutomatedTestBase //compare output double ret = TestUtils.readDMLScalar(output("R")); - Assert.assertEquals("Wrong result, expected: "+(rows*cols), new Double(rows*cols), new Double(ret)); - Assert.assertEquals(new Long(rewrites?1:2), new Long(Statistics.getCPHeavyHitterCount("r'"))); + assertEquals("Wrong result, expected: "+(rows*cols), new Double(rows*cols), new Double(ret)); + assertEquals(new Long(rewrites?1:2), new Long(Statistics.getCPHeavyHitterCount("r'"))); } finally { OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewritesOld; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java index 838fbb1..cf2c7a3 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.misc; import org.junit.Test; -import org.junit.Assert; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.test.integration.AutomatedTestBase; @@ -121,16 +120,15 @@ public class RewriteCTableToRExpandTest extends AutomatedTestBase private void testRewriteCTableRExpand( String testname, CropType type ) { + boolean unknownTests = ( testname.equals(TEST_NAME5) || testname.equals(TEST_NAME6) ); + RUNTIME_PLATFORM platformOld = setRuntimePlatform(unknownTests ? RUNTIME_PLATFORM.SINGLE_NODE : rtplatform); + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testname); loadTestConfiguration(config); int outDim = maxVal + ((type==CropType.CROP) ? -7 : 7); - boolean unknownTests = ( testname.equals(TEST_NAME5) || testname.equals(TEST_NAME6) ); - - - RUNTIME_PLATFORM platformOld = rtplatform; - if( unknownTests ) - rtplatform = RUNTIME_PLATFORM.SINGLE_NODE; try { @@ -158,7 +156,7 @@ public class RewriteCTableToRExpandTest extends AutomatedTestBase checkDMLMetaDataFile("R", new MatrixCharacteristics(rrows, rcols, 1, 1)); //check for applied rewrite - Assert.assertEquals(Boolean.valueOf(testname.equals(TEST_NAME1) + assertEquals(Boolean.valueOf(testname.equals(TEST_NAME1) || testname.equals(TEST_NAME2) || unknownTests), Boolean.valueOf(heavyHittersContainsSubString("rexpand"))); } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationAllTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationAllTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationAllTest.java index bd80194..06d1dfa 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationAllTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationAllTest.java @@ -29,7 +29,6 @@ import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; import org.apache.sysml.test.utils.TestUtils; -import org.junit.Assert; import org.junit.Test; /** @@ -74,16 +73,10 @@ public class RewriteElementwiseMultChainOptimizationAllTest extends AutomatedTes private void testRewriteMatrixMultChainOp(String testname, boolean rewrites, 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_SUM_PRODUCT_REWRITES; OptimizerUtils.ALLOW_SUM_PRODUCT_REWRITES = rewrites; @@ -122,7 +115,7 @@ public class RewriteElementwiseMultChainOptimizationAllTest extends AutomatedTes //check for presence of power operator, if we did a rewrite if( rewrites ) { - Assert.assertTrue(heavyHittersContainsSubString("^2")); + assertTrue(heavyHittersContainsSubString("^2")); } } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationTest.java index dd8c0f0..989f16d 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteElementwiseMultChainOptimizationTest.java @@ -29,7 +29,6 @@ import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; import org.apache.sysml.test.utils.TestUtils; -import org.junit.Assert; import org.junit.Test; /** @@ -73,16 +72,10 @@ public class RewriteElementwiseMultChainOptimizationTest extends AutomatedTestBa private void testRewriteMatrixMultChainOp(String testname, boolean rewrites, 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_SUM_PRODUCT_REWRITES; OptimizerUtils.ALLOW_SUM_PRODUCT_REWRITES = rewrites; @@ -115,7 +108,7 @@ public class RewriteElementwiseMultChainOptimizationTest extends AutomatedTestBa //check for presence of power operator, if we did a rewrite if( rewrites ) { - Assert.assertTrue(heavyHittersContainsSubString("^2")); + assertTrue(heavyHittersContainsSubString("^2")); } } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteEliminateAggregatesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteEliminateAggregatesTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteEliminateAggregatesTest.java index 3092867..fdebf39 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteEliminateAggregatesTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteEliminateAggregatesTest.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.hops.OptimizerUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; @@ -93,6 +92,9 @@ public class RewriteEliminateAggregatesTest extends AutomatedTestBase private void testRewriteEliminateAggregate(int type, boolean rewrites) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try @@ -125,7 +127,7 @@ public class RewriteEliminateAggregatesTest extends AutomatedTestBase //check for applied rewrites if( rewrites ) { - Assert.assertEquals(type==5, + assertEquals(type==5, heavyHittersContainsSubString("uar", "uac")); } } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldMinMaxTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldMinMaxTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldMinMaxTest.java index 65c2a3e..2fa5e61 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldMinMaxTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldMinMaxTest.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.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -71,16 +70,10 @@ public class RewriteFoldMinMaxTest extends AutomatedTestBase private void testRewriteFoldMinMax( String testname, boolean rewrites, 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 oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; @@ -99,11 +92,11 @@ public class RewriteFoldMinMaxTest extends AutomatedTestBase //compare matrices Double ret = readDMLMatrixFromHDFS("R").get(new CellIndex(1,1)); - Assert.assertEquals("Wrong result", new Double(5*rows*cols), ret); + assertEquals("Wrong result", new Double(5*rows*cols), ret); //check for applied rewrites if( rewrites ) { - Assert.assertTrue(!heavyHittersContainsString("min") && !heavyHittersContainsString("max") + assertTrue(!heavyHittersContainsString("min") && !heavyHittersContainsString("max") && (!testname.equals(TEST_NAME1) || Statistics.getCPHeavyHitterCount("nmin") == 1) && (!testname.equals(TEST_NAME2) || Statistics.getCPHeavyHitterCount("nmax") == 1)); } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldRCBindTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldRCBindTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldRCBindTest.java index 476f573..f0ba468 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldRCBindTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFoldRCBindTest.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.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -71,16 +70,10 @@ public class RewriteFoldRCBindTest extends AutomatedTestBase private void testRewriteFoldRCBind( String testname, boolean rewrites, 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 oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; @@ -99,11 +92,11 @@ public class RewriteFoldRCBindTest extends AutomatedTestBase //compare matrices Double ret = readDMLMatrixFromHDFS("R").get(new CellIndex(1,1)); - Assert.assertEquals("Wrong result", new Double(5*rows*cols), ret); + assertEquals("Wrong result", new Double(5*rows*cols), ret); //check for applied rewrites if( rewrites ) { - Assert.assertTrue(!heavyHittersContainsString("append") + assertTrue(!heavyHittersContainsString("append") && Statistics.getCPHeavyHitterCount("cbind") <= 1 && Statistics.getCPHeavyHitterCount("rbind") <= 1); } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFuseBinaryOpChainTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFuseBinaryOpChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFuseBinaryOpChainTest.java index f1d2a6a..2da32f0 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFuseBinaryOpChainTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFuseBinaryOpChainTest.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.misc; import java.util.HashMap; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -169,16 +168,10 @@ public class RewriteFuseBinaryOpChainTest extends AutomatedTestBase @SuppressWarnings("unused") private void testFuseBinaryChain( String testname, 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; @@ -201,7 +194,7 @@ public class RewriteFuseBinaryOpChainTest extends AutomatedTestBase //compare matrices HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("S"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("S"); - Assert.assertTrue(TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R")); + assertTrue(TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R")); //check for applies rewrites if( rewrites && instType!=ExecType.MR ) { @@ -213,9 +206,9 @@ public class RewriteFuseBinaryOpChainTest extends AutomatedTestBase String opcode = (testname.equals(TEST_NAME1)||testname.equals(TEST_NAME3)) ? prefix+"+*" : prefix+"-*"; if( testname.equals(TEST_NAME4) ) - Assert.assertFalse("Rewrite applied.", heavyHittersContainsSubString(opcode)); + assertFalse("Rewrite applied.", heavyHittersContainsSubString(opcode)); else - Assert.assertTrue("Rewrite not applied.", heavyHittersContainsSubString(opcode)); + assertTrue("Rewrite not applied.", heavyHittersContainsSubString(opcode)); } } finally @@ -226,4 +219,4 @@ public class RewriteFuseBinaryOpChainTest 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/misc/RewriteFusedRandTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFusedRandTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFusedRandTest.java index 9257538..663d978 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFusedRandTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteFusedRandTest.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.hops.OptimizerUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; @@ -102,6 +101,9 @@ public class RewriteFusedRandTest extends AutomatedTestBase private void testRewriteFusedRand( String testname, String pdf, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -120,16 +122,16 @@ public class RewriteFusedRandTest extends AutomatedTestBase //compare matrices Double ret = readDMLMatrixFromHDFS("R").get(new CellIndex(1,1)); if( testname.equals(TEST_NAME1) ) - Assert.assertEquals("Wrong result", new Double(rows), ret); + assertEquals("Wrong result", new Double(rows), ret); else if( testname.equals(TEST_NAME2) ) - Assert.assertEquals("Wrong result", new Double(Math.pow(rows*cols, 2)), ret); + assertEquals("Wrong result", new Double(Math.pow(rows*cols, 2)), ret); else if( testname.equals(TEST_NAME3) ) - Assert.assertEquals("Wrong result", new Double(Math.pow(rows*cols, 2)), ret); + assertEquals("Wrong result", new Double(Math.pow(rows*cols, 2)), ret); //check for applied rewrites if( rewrites ) { boolean expected = testname.equals(TEST_NAME2) || pdf.equals("uniform"); - Assert.assertTrue(expected == (!heavyHittersContainsString("+") + assertTrue(expected == (!heavyHittersContainsString("+") && !heavyHittersContainsString("*"))); } } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteHoistingLoopInvariantOpsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteHoistingLoopInvariantOpsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteHoistingLoopInvariantOpsTest.java index 2a28ae7..aae2a81 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteHoistingLoopInvariantOpsTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteHoistingLoopInvariantOpsTest.java @@ -30,7 +30,6 @@ import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; import org.apache.sysml.test.utils.TestUtils; import org.apache.sysml.utils.Statistics; -import org.junit.Assert; import org.junit.Test; public class RewriteHoistingLoopInvariantOpsTest extends AutomatedTestBase @@ -76,16 +75,10 @@ public class RewriteHoistingLoopInvariantOpsTest extends AutomatedTestBase private void testRewriteCodeMotion(String testname, boolean rewrites, 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_CODE_MOTION; OptimizerUtils.ALLOW_CODE_MOTION = rewrites; @@ -115,8 +108,8 @@ public class RewriteHoistingLoopInvariantOpsTest extends AutomatedTestBase TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); //check applied code motion rewrites (moved sum and - from 10 to 1) - Assert.assertEquals(rewrites?1:10, Statistics.getCPHeavyHitterCount("uak+")); - Assert.assertEquals(rewrites?1:10, Statistics.getCPHeavyHitterCount("-")); + assertEquals(rewrites?1:10, Statistics.getCPHeavyHitterCount("uak+")); + assertEquals(rewrites?1:10, Statistics.getCPHeavyHitterCount("-")); } finally { OptimizerUtils.ALLOW_CODE_MOTION = rewritesOld; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIfElseTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIfElseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIfElseTest.java index 53ee5c7..471630b 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIfElseTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIfElseTest.java @@ -32,7 +32,6 @@ import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; import org.apache.sysml.test.utils.TestUtils; import org.apache.sysml.utils.Statistics; -import org.junit.Assert; import org.junit.Test; public class RewriteIfElseTest extends AutomatedTestBase @@ -135,16 +134,10 @@ public class RewriteIfElseTest extends AutomatedTestBase private void testRewriteIfElse(String testname, boolean pred, boolean rewrites, 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; @@ -175,12 +168,12 @@ public class RewriteIfElseTest extends AutomatedTestBase //compare matrices HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("R"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("R"); - Assert.assertTrue(TestUtils.compareMatrices(dmlfile, rfile, Math.pow(10,-10), "Stat-DML", "Stat-R")); + assertTrue(TestUtils.compareMatrices(dmlfile, rfile, Math.pow(10,-10), "Stat-DML", "Stat-R")); //check for presence of power operator, if we did a rewrite if( rewrites ) { String opcode = et==ExecType.SPARK ? Instruction.SP_INST_PREFIX + "rand" : "rand"; - Assert.assertTrue(heavyHittersContainsString(opcode) && Statistics.getCPHeavyHitterCount(opcode)==1); + assertTrue(heavyHittersContainsString(opcode) && Statistics.getCPHeavyHitterCount(opcode)==1); } } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIndexingVectorizationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIndexingVectorizationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIndexingVectorizationTest.java index 9331ded..0abbda1 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIndexingVectorizationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteIndexingVectorizationTest.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.hops.OptimizerUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; @@ -69,6 +68,9 @@ public class RewriteIndexingVectorizationTest extends AutomatedTestBase private void testRewriteIndexingVectorization(String testname, boolean vectorize) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_AUTO_VECTORIZATION; try @@ -91,12 +93,12 @@ public class RewriteIndexingVectorizationTest extends AutomatedTestBase //compare output double ret = readDMLMatrixFromHDFS("R").get(new CellIndex(1,1)); - Assert.assertTrue(ret == (711*5)); + assertTrue(ret == (711*5)); //check for applied rewrite int expected = vectorize ? 1 : 5; - Assert.assertTrue(Statistics.getCPHeavyHitterCount("rightIndex")==expected+1); - Assert.assertTrue(Statistics.getCPHeavyHitterCount("leftIndex")==expected); + assertTrue(Statistics.getCPHeavyHitterCount("rightIndex")==expected+1); + assertTrue(Statistics.getCPHeavyHitterCount("leftIndex")==expected); } finally { OptimizerUtils.ALLOW_AUTO_VECTORIZATION = oldFlag; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteLoopVectorization.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteLoopVectorization.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteLoopVectorization.java index 97632b1..5aa935e 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteLoopVectorization.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteLoopVectorization.java @@ -75,6 +75,9 @@ public class RewriteLoopVectorization extends AutomatedTestBase */ private void testRewriteLoopVectorizationSum( String testname, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try @@ -103,4 +106,4 @@ public class RewriteLoopVectorization 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/RewriteMatrixMultChainOptTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMatrixMultChainOptTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMatrixMultChainOptTest.java index bbe5c3d..964630f 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMatrixMultChainOptTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMatrixMultChainOptTest.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.misc; import java.util.HashMap; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -70,16 +69,10 @@ public class RewriteMatrixMultChainOptTest extends AutomatedTestBase private void testRewriteMatrixMultChainOp(String testname, boolean rewrites, 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; @@ -113,7 +106,7 @@ public class RewriteMatrixMultChainOptTest extends AutomatedTestBase //check for correct matrix multiplication order, which also allows //the compilation of mmchain operators if( rewrites ) { - Assert.assertTrue(heavyHittersContainsSubString("mmchain") + assertTrue(heavyHittersContainsSubString("mmchain") || heavyHittersContainsSubString("sp_mapmmchain")); } } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMergeBlocksTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMergeBlocksTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMergeBlocksTest.java index 6f84ea7..5b774de 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMergeBlocksTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteMergeBlocksTest.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.misc; import java.util.HashMap; import org.junit.Test; -import org.junit.Assert; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; @@ -80,6 +79,9 @@ public class RewriteMergeBlocksTest extends AutomatedTestBase private void testRewriteMerge(String testname, boolean expectedMerge) { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration(testname); loadTestConfiguration(config); @@ -97,7 +99,7 @@ public class RewriteMergeBlocksTest extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("R"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("R"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(expectedMerge == + assertTrue(expectedMerge == heavyHittersContainsSubString("mmchain")); } } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteNNIssueTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteNNIssueTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteNNIssueTest.java index 55c440b..aaacdcd 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteNNIssueTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteNNIssueTest.java @@ -56,6 +56,9 @@ public class RewriteNNIssueTest extends AutomatedTestBase private void runNNIssueTest(boolean rewrites) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumBinaryMult.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumBinaryMult.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumBinaryMult.java index bd821b1..feb1f6b 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumBinaryMult.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumBinaryMult.java @@ -75,6 +75,9 @@ public class RewritePushdownSumBinaryMult extends AutomatedTestBase */ private void testRewritePushdownSumBinaryMult( String testname, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try @@ -103,4 +106,4 @@ public class RewritePushdownSumBinaryMult 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/RewritePushdownSumOnBinaryTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumOnBinaryTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumOnBinaryTest.java index dec4670..6e1d9bf 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumOnBinaryTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownSumOnBinaryTest.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.misc; import java.util.HashMap; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.hops.OptimizerUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; @@ -67,6 +66,9 @@ public class RewritePushdownSumOnBinaryTest extends AutomatedTestBase */ private void testRewritePushdownSumOnBinary( String testname, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -85,12 +87,12 @@ public class RewritePushdownSumOnBinaryTest extends AutomatedTestBase //compare matrices long expect = Math.round(0.5*rows); HashMap<CellIndex, Double> dmlfile1 = readDMLScalarFromHDFS("R1"); - Assert.assertEquals("Wrong result R1, expected: "+expect, expect, Math.round(dmlfile1.get(new CellIndex(1,1)))); + assertEquals("Wrong result R1, expected: "+expect, expect, Math.round(dmlfile1.get(new CellIndex(1,1)))); HashMap<CellIndex, Double> dmlfile2 = readDMLScalarFromHDFS("R2"); - Assert.assertEquals("Wrong result R2, expected: "+expect, expect, Math.round(dmlfile2.get(new CellIndex(1,1)))); + assertEquals("Wrong result R2, expected: "+expect, expect, Math.round(dmlfile2.get(new CellIndex(1,1)))); } finally { 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/RewritePushdownUaggTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownUaggTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownUaggTest.java index 84547ba..74a88a9 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownUaggTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewritePushdownUaggTest.java @@ -21,9 +21,7 @@ package org.apache.sysml.test.integration.functions.misc; import java.util.HashMap; -import org.junit.Assert; 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 +101,9 @@ public class RewritePushdownUaggTest extends AutomatedTestBase private void testRewritePushdownUagg( String testname, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try @@ -144,11 +145,11 @@ public class RewritePushdownUaggTest extends AutomatedTestBase String gpuCheck = "gpu_" + check; boolean containsOpcode = Statistics.getCPHeavyHitterOpCodes().contains(check) || Statistics.getCPHeavyHitterOpCodes().contains(gpuCheck); - Assert.assertTrue( "Missing opcode: "+check, containsOpcode); + assertTrue( "Missing opcode: "+check, containsOpcode); } finally { 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/RewriteRemoveComparisonChainsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteRemoveComparisonChainsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteRemoveComparisonChainsTest.java index 43fd4f9..6a11617 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteRemoveComparisonChainsTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteRemoveComparisonChainsTest.java @@ -19,9 +19,7 @@ package org.apache.sysml.test.integration.functions.misc; -import org.junit.Assert; import org.junit.Test; - import org.apache.sysml.hops.OptimizerUtils; import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; @@ -83,6 +81,9 @@ public class RewriteRemoveComparisonChainsTest extends AutomatedTestBase private void runComparisonChainTest( String op, int compare, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -95,9 +96,9 @@ public class RewriteRemoveComparisonChainsTest extends AutomatedTestBase runTest(true, false, null, -1); //check for applied rewrites - Assert.assertEquals(rewrites, heavyHittersContainsString("uaggouterchain")); + assertEquals(rewrites, heavyHittersContainsString("uaggouterchain")); if( compare == 1 && rewrites ) - Assert.assertTrue(!heavyHittersContainsString("==")); + assertTrue(!heavyHittersContainsString("==")); } finally { OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = oldFlag; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java index 51ad19f..70e00d8 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java @@ -21,9 +21,7 @@ package org.apache.sysml.test.integration.functions.misc; import java.util.HashMap; -import org.junit.Assert; 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; @@ -87,6 +85,9 @@ public class RewriteSimplifyRowColSumMVMultTest extends AutomatedTestBase */ private void testRewriteRowColSumsMVMult( String testname, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try @@ -118,11 +119,11 @@ public class RewriteSimplifyRowColSumMVMultTest extends AutomatedTestBase String gpuBa = "gpu_ba+*"; String ba = "ba+*"; boolean isMatmultPresent = Statistics.getCPHeavyHitterOpCodes().contains(ba) || Statistics.getCPHeavyHitterOpCodes().contains(gpuBa); - Assert.assertTrue( isMatmultPresent == rewrites ); + assertTrue( isMatmultPresent == rewrites ); } finally { 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/RewriteSlicedMatrixMultTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java index 3db5c6d..7db88c8 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.misc; 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; @@ -83,6 +82,9 @@ public class RewriteSlicedMatrixMultTest extends AutomatedTestBase */ private void testRewriteSlicedMatrixMult( String testname, boolean sparse, boolean rewrites ) { + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try @@ -121,4 +123,4 @@ public class RewriteSlicedMatrixMultTest 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/ScalarAssignmentTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarAssignmentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarAssignmentTest.java index 950be65..6d1f527 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarAssignmentTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarAssignmentTest.java @@ -157,6 +157,9 @@ public class ScalarAssignmentTest extends AutomatedTestBase */ public void runScalarAssignmentTest( ControlFlowConstruct cfc, ValueType vt ) { + if(shouldSkipTest()) + return; + String TEST_NAME = null; switch( cfc ) { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarFunctionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarFunctionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarFunctionTest.java index 2db3ef4..da9c32c 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarFunctionTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarFunctionTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.misc; import java.util.HashMap; import org.junit.Test; - import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; import org.apache.sysml.test.integration.AutomatedTestBase; @@ -69,6 +68,9 @@ public class ScalarFunctionTest extends AutomatedTestBase */ private void runScalarFunctionTest( String testname ) { + if(shouldSkipTest()) + return; + String TEST_NAME = testname; TestConfiguration config = getTestConfiguration(TEST_NAME); loadTestConfiguration(config); @@ -93,4 +95,4 @@ public class ScalarFunctionTest extends AutomatedTestBase checkDMLMetaDataFile("R", new MatrixCharacteristics(1,1,1,1)); } -} \ 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/ScalarMatrixUnaryBinaryTermTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarMatrixUnaryBinaryTermTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarMatrixUnaryBinaryTermTest.java index eb4758c..6867131 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarMatrixUnaryBinaryTermTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarMatrixUnaryBinaryTermTest.java @@ -20,7 +20,6 @@ package org.apache.sysml.test.integration.functions.misc; import org.junit.Test; - import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; import org.apache.sysml.test.utils.TestUtils; @@ -39,6 +38,10 @@ public class ScalarMatrixUnaryBinaryTermTest extends AutomatedTestBase @Test public void testTerm1() { + if(shouldSkipTest()) + return; + + int rows = 5, cols = 5; 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/misc/ScalarToMatrixInLoopTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarToMatrixInLoopTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarToMatrixInLoopTest.java index 6df8a01..407ebe4 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarToMatrixInLoopTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarToMatrixInLoopTest.java @@ -20,7 +20,6 @@ package org.apache.sysml.test.integration.functions.misc; import org.junit.Test; - import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.test.integration.TestConfiguration; @@ -38,6 +37,9 @@ public class ScalarToMatrixInLoopTest extends AutomatedTestBase @Test public void testScalarToMatrixInLoop() { + if(shouldSkipTest()) + return; + int rows = 5, cols = 5; 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/misc/SetWorkingDirTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/SetWorkingDirTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/SetWorkingDirTest.java index 1df56da..b165854 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/SetWorkingDirTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/SetWorkingDirTest.java @@ -19,8 +19,6 @@ package org.apache.sysml.test.integration.functions.misc; -import static org.junit.Assert.fail; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -96,6 +94,10 @@ public class SetWorkingDirTest extends AutomatedTestBase { */ private void runTest(String testName, boolean fileMissingTest, ScriptType scriptType) { + if(shouldSkipTest()) + return; + + // construct source filenames of dml scripts String dir = SCRIPT_DIR + TEST_DIR; String nameCall = testName + "." + scriptType.lowerCase();
