http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/APICodegenTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/APICodegenTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/APICodegenTest.java index fcd2326..4e94993 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/APICodegenTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/APICodegenTest.java @@ -36,7 +36,6 @@ import org.apache.sysml.runtime.util.DataConverter; import org.apache.sysml.test.integration.AutomatedTestBase; import org.apache.sysml.utils.Statistics; import org.junit.After; -import org.junit.Assert; import org.junit.Test; @@ -67,6 +66,9 @@ public class APICodegenTest extends AutomatedTestBase private void runMLContextParforDatasetTest(boolean jmlc) { + if(shouldSkipTest()) + return; + try { double[][] X = getRandomMatrix(rows, cols, -10, 10, sparsity, 76543); MatrixBlock mX = DataConverter.convertToMatrixBlock(X); @@ -107,7 +109,7 @@ public class APICodegenTest extends AutomatedTestBase } //check for generated operator - Assert.assertTrue(heavyHittersContainsSubString("spoofRA")); + assertTrue(heavyHittersContainsSubString("spoofRA")); } catch(Exception ex) { throw new RuntimeException(ex);
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanComparisonTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanComparisonTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanComparisonTest.java index 0b85fae..084e560 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanComparisonTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanComparisonTest.java @@ -19,7 +19,6 @@ package org.apache.sysml.test.integration.functions.codegen; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.hops.DataOp; import org.apache.sysml.hops.Hop; @@ -58,140 +57,168 @@ public class CPlanComparisonTest extends AutomatedTestBase @Test public void testEqualLiteral() { + if(shouldSkipTest()) + return; CNodeData c1 = new CNodeData(new LiteralOp(7), 0, 0, DataType.SCALAR); CNodeData c2 = new CNodeData(new LiteralOp(7), 0, 0, DataType.SCALAR); - Assert.assertEquals(c1.hashCode(), c2.hashCode()); - Assert.assertEquals(c1, c2); + assertEquals(c1.hashCode(), c2.hashCode()); + assertEquals(c1, c2); c1.setLiteral(true); c2.setLiteral(true); - Assert.assertEquals(c1.hashCode(), c2.hashCode()); - Assert.assertEquals(c1, c2); + assertEquals(c1.hashCode(), c2.hashCode()); + assertEquals(c1, c2); c1.setStrictEquals(true); c2.setStrictEquals(true); - Assert.assertEquals(c1.hashCode(), c2.hashCode()); - Assert.assertEquals(c1, c2); + assertEquals(c1.hashCode(), c2.hashCode()); + assertEquals(c1, c2); } @Test public void testNotEqualLiteral() { + if(shouldSkipTest()) + return; CNodeData c1 = new CNodeData(new LiteralOp(7), 0, 0, DataType.SCALAR); CNodeData c2 = new CNodeData(new LiteralOp(3), 0, 0, DataType.SCALAR); - Assert.assertNotEquals(c1.hashCode(), c2.hashCode()); - Assert.assertNotEquals(c1, c2); + assertNotEquals(c1.hashCode(), c2.hashCode()); + assertNotEquals(c1, c2); c1.setLiteral(true); c2.setLiteral(true); - Assert.assertNotEquals(c1.hashCode(), c2.hashCode()); - Assert.assertNotEquals(c1, c2); + assertNotEquals(c1.hashCode(), c2.hashCode()); + assertNotEquals(c1, c2); c1.setStrictEquals(true); c2.setStrictEquals(true); - Assert.assertNotEquals(c1.hashCode(), c2.hashCode()); - Assert.assertNotEquals(c1, c2); + assertNotEquals(c1.hashCode(), c2.hashCode()); + assertNotEquals(c1, c2); } @Test public void testEqualMatrixDataNode() { + if(shouldSkipTest()) + return; Hop data = createDataOp(DataType.MATRIX); CNode c1 = new CNodeData(data); CNode c2 = new CNodeData(data); - Assert.assertEquals(c1.hashCode(), c2.hashCode()); - Assert.assertEquals(c1, c2); + assertEquals(c1.hashCode(), c2.hashCode()); + assertEquals(c1, c2); } @Test public void testNotEqualDataTypeDataNode() { - Assert.assertNotEquals( + if(shouldSkipTest()) + return; + assertNotEquals( createCNodeData(DataType.MATRIX), createCNodeData(DataType.SCALAR)); } @Test public void testEqualUnaryNodes() { + if(shouldSkipTest()) + return; CNode c0 = createCNodeData(DataType.MATRIX); CNode c1 = new CNodeUnary(c0, UnaryType.EXP); CNode c2 = new CNodeUnary(c0, UnaryType.EXP); - Assert.assertEquals(c1.hashCode(), c2.hashCode()); - Assert.assertEquals(c1, c2); + assertEquals(c1.hashCode(), c2.hashCode()); + assertEquals(c1, c2); } @Test public void testNotEqualUnaryNodes() { + if(shouldSkipTest()) + return; CNode c0 = createCNodeData(DataType.MATRIX); CNode c1 = new CNodeUnary(c0, UnaryType.EXP); CNode c2 = new CNodeUnary(c0, UnaryType.LOG); - Assert.assertNotEquals(c1, c2); + assertNotEquals(c1, c2); } @Test public void testEqualBinaryNodes() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.SCALAR); CNode bin1 = new CNodeBinary(c1, c2, BinType.PLUS); CNode bin2 = new CNodeBinary(c1, c2, BinType.PLUS); - Assert.assertEquals(bin1.hashCode(), bin2.hashCode()); - Assert.assertEquals(bin1, bin2); + assertEquals(bin1.hashCode(), bin2.hashCode()); + assertEquals(bin1, bin2); } @Test public void testNotEqualBinaryNodes() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.SCALAR); - Assert.assertNotEquals( + assertNotEquals( new CNodeBinary(c1, c2, BinType.PLUS), new CNodeBinary(c1, c2, BinType.MULT)); } @Test public void testEqualTernaryNodes() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.SCALAR); CNode c3 = createCNodeData(DataType.MATRIX); CNode ter1 = new CNodeTernary(c1, c2, c3, TernaryType.MINUS_MULT); CNode ter2 = new CNodeTernary(c1, c2, c3, TernaryType.MINUS_MULT); - Assert.assertEquals(ter1.hashCode(), ter2.hashCode()); - Assert.assertEquals(ter1, ter2); + assertEquals(ter1.hashCode(), ter2.hashCode()); + assertEquals(ter1, ter2); } @Test public void testNotEqualTernaryNodes() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.SCALAR); CNode c3 = createCNodeData(DataType.MATRIX); CNode ter1 = new CNodeTernary(c1, c2, c3, TernaryType.MINUS_MULT); CNode ter2 = new CNodeTernary(c1, c2, c3, TernaryType.PLUS_MULT); - Assert.assertNotEquals(ter1, ter2); + assertNotEquals(ter1, ter2); } @Test public void testNotEqualUnaryBinaryNodes() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.SCALAR); CNode un1 = new CNodeUnary(c1, UnaryType.ABS); CNode bin2 = new CNodeBinary(c1, c2, BinType.DIV); - Assert.assertNotEquals(un1, bin2); + assertNotEquals(un1, bin2); } @Test public void testNotEqualUnaryTernaryNodes() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.SCALAR); CNode c3 = createCNodeData(DataType.MATRIX); CNode un1 = new CNodeUnary(c1, UnaryType.ABS); CNode ter2 = new CNodeTernary(c1, c2, c3, TernaryType.PLUS_MULT); - Assert.assertNotEquals(un1, ter2); + assertNotEquals(un1, ter2); } @Test public void testNotEqualBinaryTernaryNodes() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.SCALAR); CNode c3 = createCNodeData(DataType.MATRIX); CNode un1 = new CNodeBinary(c1, c2, BinType.EQUAL); CNode ter2 = new CNodeTernary(c1, c2, c3, TernaryType.PLUS_MULT); - Assert.assertNotEquals(un1, ter2); + assertNotEquals(un1, ter2); } @Test public void testNotEqualBinaryDAG1() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.MATRIX); CNode c3 = createCNodeData(DataType.SCALAR); @@ -201,11 +228,13 @@ public class CPlanComparisonTest extends AutomatedTestBase //DAG 1b: (c1*c2)*c1 CNode b1b = new CNodeBinary(c1, c2, BinType.MULT); CNode b2b = new CNodeBinary(b1b, c1, BinType.MULT); - Assert.assertNotEquals(b2a, b2b); + assertNotEquals(b2a, b2b); } @Test public void testNotEqualBinaryDAG2() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.MATRIX); CNode c3 = createCNodeData(DataType.MATRIX); @@ -215,11 +244,13 @@ public class CPlanComparisonTest extends AutomatedTestBase //DAG 2b: (c1*c2)*c1 CNode b1b = new CNodeBinary(c1, c2, BinType.MULT); CNode b2b = new CNodeBinary(b1b, c1, BinType.MULT); - Assert.assertNotEquals(b2a, b2b); + assertNotEquals(b2a, b2b); } @Test public void testNotEqualBinaryDAG3() { + if(shouldSkipTest()) + return; CNode c1 = createCNodeData(DataType.MATRIX); CNode c2 = createCNodeData(DataType.MATRIX); CNode c3 = createCNodeData(DataType.MATRIX); @@ -231,7 +262,7 @@ public class CPlanComparisonTest extends AutomatedTestBase CNode b1b = new CNodeBinary(c1, c2, BinType.PLUS); CNode b2b = new CNodeBinary(c3, c3, BinType.PLUS); CNode b3b = new CNodeBinary(b1b, b2b, BinType.MULT); - Assert.assertNotEquals(b3a, b3b); + assertNotEquals(b3a, b3b); } private CNode createCNodeData(DataType dt) { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanVectorPrimitivesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanVectorPrimitivesTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanVectorPrimitivesTest.java index 562005e..a0f53f2 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanVectorPrimitivesTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CPlanVectorPrimitivesTest.java @@ -718,8 +718,11 @@ public class CPlanVectorPrimitivesTest extends AutomatedTestBase } @SuppressWarnings("incomplete-switch") - private static void testVectorAggPrimitive(UnaryType aggtype, InputType type1) + private void testVectorAggPrimitive(UnaryType aggtype, InputType type1) { + if(shouldSkipTest()) + return; + try { //generate input data double sparsity = (type1 == InputType.VECTOR_DENSE) ? sparsity1 : sparsity2; @@ -758,8 +761,11 @@ public class CPlanVectorPrimitivesTest extends AutomatedTestBase } } - private static void testVectorUnaryPrimitive(UnaryType utype, InputType type1) + private void testVectorUnaryPrimitive(UnaryType utype, InputType type1) { + if(shouldSkipTest()) + return; + try { //generate input data double sparsity = (type1 == InputType.VECTOR_DENSE) ? sparsity1 : sparsity2; @@ -795,7 +801,7 @@ public class CPlanVectorPrimitivesTest extends AutomatedTestBase } private static void testVectorBinaryPrimitive(BinType bintype, InputType type1, InputType type2) - { + { try { //generate input data (scalar later derived if needed) double sparsityA = (type1 == InputType.VECTOR_DENSE) ? sparsity1 : sparsity2; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/CellwiseTmplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CellwiseTmplTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CellwiseTmplTest.java index a37ddcc..926b25e 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CellwiseTmplTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CellwiseTmplTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -463,21 +462,15 @@ public class CellwiseTmplTest extends AutomatedTestBase } private void testCodegenIntegration( String testname, boolean rewrites, ExecType instType ) - { - boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - String oldTestConf = TEST_CONF; - 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_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(instType); + if(shouldSkipTest()) + return; + boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; + String oldTestConf = TEST_CONF; + if( testname.equals(TEST_NAME9) ) TEST_CONF = TEST_CONF6; @@ -514,24 +507,24 @@ public class CellwiseTmplTest extends AutomatedTestBase if( !(rewrites && (testname.equals(TEST_NAME2) || testname.equals(TEST_NAME19))) && !testname.equals(TEST_NAME27) ) - Assert.assertTrue(heavyHittersContainsSubString( + assertTrue(heavyHittersContainsSubString( "spoofCell", "sp_spoofCell", "spoofMA", "sp_spoofMA")); if( testname.equals(TEST_NAME7) ) //ensure matrix mult is fused - Assert.assertTrue(!heavyHittersContainsSubString("tsmm")); + assertTrue(!heavyHittersContainsSubString("tsmm")); else if( testname.equals(TEST_NAME10) ) //ensure min/max is fused - Assert.assertTrue(!heavyHittersContainsSubString("uamin","uamax")); + assertTrue(!heavyHittersContainsSubString("uamin","uamax")); else if( testname.equals(TEST_NAME11) ) //ensure replace is fused - Assert.assertTrue(!heavyHittersContainsSubString("replace")); + assertTrue(!heavyHittersContainsSubString("replace")); else if( testname.equals(TEST_NAME15) ) - Assert.assertTrue(!heavyHittersContainsSubString("uacmin")); + assertTrue(!heavyHittersContainsSubString("uacmin")); else if( testname.equals(TEST_NAME16) ) - Assert.assertTrue(!heavyHittersContainsSubString("uack+")); + assertTrue(!heavyHittersContainsSubString("uack+")); else if( testname.equals(TEST_NAME17) ) - Assert.assertTrue(!heavyHittersContainsSubString("xor")); + assertTrue(!heavyHittersContainsSubString("xor")); else if( testname.equals(TEST_NAME22) ) - Assert.assertTrue(!heavyHittersContainsSubString("seq")); + assertTrue(!heavyHittersContainsSubString("seq")); else if( testname.equals(TEST_NAME23) || testname.equals(TEST_NAME24) ) - Assert.assertTrue(!heavyHittersContainsSubString("min","nmin")); + assertTrue(!heavyHittersContainsSubString("min","nmin")); } finally { rtplatform = platformOld; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedCellwiseTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedCellwiseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedCellwiseTest.java index 5530686..d13ffac 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedCellwiseTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedCellwiseTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -381,18 +380,12 @@ public class CompressedCellwiseTest extends AutomatedTestBase private void testCompressedCellwise(String testname, SparsityType stype, ValueType vtype, ExecType et) { - boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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 oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = true; @@ -432,9 +425,9 @@ public class CompressedCellwiseTest 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(heavyHittersContainsSubString("spoofCell") + assertTrue(heavyHittersContainsSubString("spoofCell") || heavyHittersContainsSubString("sp_spoofCell")); - Assert.assertTrue(heavyHittersContainsSubString("compress") + assertTrue(heavyHittersContainsSubString("compress") || heavyHittersContainsSubString("sp_compress")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedMultiAggregateTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedMultiAggregateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedMultiAggregateTest.java index 82f6178..dc89ddb 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedMultiAggregateTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedMultiAggregateTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -255,17 +254,12 @@ public class CompressedMultiAggregateTest extends AutomatedTestBase private void testCompressedMultiAggregate(String testname, SparsityType stype, ValueType vtype, ExecType et) { - boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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 oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -306,9 +300,9 @@ public class CompressedMultiAggregateTest 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(heavyHittersContainsSubString("spoofMA") + assertTrue(heavyHittersContainsSubString("spoofMA") || heavyHittersContainsSubString("sp_spoofMA")); - Assert.assertTrue(heavyHittersContainsSubString("compress") + assertTrue(heavyHittersContainsSubString("compress") || heavyHittersContainsSubString("sp_compress")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedOuterProductTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedOuterProductTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedOuterProductTest.java index a40b0b7..85d6134 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedOuterProductTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedOuterProductTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -190,17 +189,12 @@ public class CompressedOuterProductTest extends AutomatedTestBase private void testCompressedCompressedOuterProduct(String testname, SparsityType stype, ValueType vtype, ExecType et) { - boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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 oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -241,9 +235,9 @@ public class CompressedOuterProductTest 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(heavyHittersContainsSubString("spoofOP", 4) + assertTrue(heavyHittersContainsSubString("spoofOP", 4) || heavyHittersContainsSubString("sp_spoofOP", 4)); - Assert.assertTrue(heavyHittersContainsSubString("compress") + assertTrue(heavyHittersContainsSubString("compress") || heavyHittersContainsSubString("sp_compress")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateLargeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateLargeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateLargeTest.java index 13f99cc..55142c8 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateLargeTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateLargeTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -191,18 +190,13 @@ public class CompressedRowAggregateLargeTest extends AutomatedTestBase private void testCompressedRowAggregate(String testname, SparsityType stype, ValueType vtype, ExecType et) { - boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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; + boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(et); + if(shouldSkipTest()) + return; + + boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = true; @@ -242,9 +236,9 @@ public class CompressedRowAggregateLargeTest 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(heavyHittersContainsSubString("spoofRA", 2) + assertTrue(heavyHittersContainsSubString("spoofRA", 2) || heavyHittersContainsSubString("sp_spoofRA", 2)); - Assert.assertTrue(heavyHittersContainsSubString("compress") + assertTrue(heavyHittersContainsSubString("compress") || heavyHittersContainsSubString("sp_compress")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateTest.java index 330dd47..ca85418 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/CompressedRowAggregateTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -190,17 +189,12 @@ public class CompressedRowAggregateTest extends AutomatedTestBase private void testCompressedRowAggregate(String testname, SparsityType stype, ValueType vtype, ExecType et) { - boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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 oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -241,9 +235,9 @@ public class CompressedRowAggregateTest 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(heavyHittersContainsSubString("spoofRA", 2) + assertTrue(heavyHittersContainsSubString("spoofRA", 2) || heavyHittersContainsSubString("sp_spoofRA", 2)); - Assert.assertTrue(heavyHittersContainsSubString("compress") + assertTrue(heavyHittersContainsSubString("compress") || heavyHittersContainsSubString("sp_compress")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/DAGCellwiseTmplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/DAGCellwiseTmplTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/DAGCellwiseTmplTest.java index c638216..5226613 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/DAGCellwiseTmplTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/DAGCellwiseTmplTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -115,19 +114,13 @@ public class DAGCellwiseTmplTest extends AutomatedTestBase } private void testCodegenIntegration( String testname, boolean rewrites, boolean vector, ExecType instType ) - { - boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_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(instType); + if(shouldSkipTest()) + return; + + boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { TestConfiguration config = getTestConfiguration(testname); @@ -152,7 +145,7 @@ public class DAGCellwiseTmplTest extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("S"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("S"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoofCell") + assertTrue(heavyHittersContainsSubString("spoofCell") || heavyHittersContainsSubString("sp_spoofCell")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/MiscPatternTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/MiscPatternTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/MiscPatternTest.java index b2dfc10..adf1036 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/MiscPatternTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/MiscPatternTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -117,17 +116,12 @@ public class MiscPatternTest extends AutomatedTestBase private void testCodegenIntegration( String testname, boolean rewrites, ExecType instType ) { - boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_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(instType); + if(shouldSkipTest()) + return; + + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -150,18 +144,18 @@ public class MiscPatternTest extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("S"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("S"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoof") + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); //ensure correct optimizer decisions if( testname.equals(TEST_NAME1) ) - Assert.assertTrue(!heavyHittersContainsSubString("spoofCell") + assertTrue(!heavyHittersContainsSubString("spoofCell") && !heavyHittersContainsSubString("sp_spoofCell")); else if( testname.equals(TEST_NAME2) ) - Assert.assertTrue(!heavyHittersContainsSubString("spoof", 2) + assertTrue(!heavyHittersContainsSubString("spoof", 2) && !heavyHittersContainsSubString("sp_spoof", 2)); else if( testname.equals(TEST_NAME3) || testname.equals(TEST_NAME4) ) - Assert.assertTrue(heavyHittersContainsSubString("spoofOP", "sp+spoofOP") + assertTrue(heavyHittersContainsSubString("spoofOP", "sp+spoofOP") && !heavyHittersContainsSubString("ba+*")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/MultiAggTmplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/MultiAggTmplTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/MultiAggTmplTest.java index 07a4396..71963b0 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/MultiAggTmplTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/MultiAggTmplTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -165,18 +164,12 @@ public class MultiAggTmplTest extends AutomatedTestBase private void testCodegenIntegration( String testname, boolean rewrites, ExecType instType ) { - boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_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(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { TestConfiguration config = getTestConfiguration(testname); @@ -198,7 +191,7 @@ public class MultiAggTmplTest extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("S"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("S"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoofMA") + assertTrue(heavyHittersContainsSubString("spoofMA") || heavyHittersContainsSubString("sp_spoofMA")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/OuterProdTmplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/OuterProdTmplTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/OuterProdTmplTest.java index 9a656b7..53ab9b1 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/OuterProdTmplTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/OuterProdTmplTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -188,17 +187,12 @@ public class OuterProdTmplTest extends AutomatedTestBase private void testCodegenIntegration( String testname, boolean rewrites, ExecType instType ) { - boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_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(instType); + if(shouldSkipTest()) + return; + + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -223,13 +217,13 @@ public class OuterProdTmplTest extends AutomatedTestBase TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); if( testname.equals(TEST_NAME8) ) - Assert.assertTrue(!(heavyHittersContainsSubString("spoofOP") + assertTrue(!(heavyHittersContainsSubString("spoofOP") || heavyHittersContainsSubString("sp_spoofOP"))); else if( !rewrites ) { - Assert.assertTrue(heavyHittersContainsSubString("spoofOP") + assertTrue(heavyHittersContainsSubString("spoofOP") || heavyHittersContainsSubString("sp_spoofOP")); if( testname.equals(TEST_NAME9) ) - Assert.assertTrue(!heavyHittersContainsSubString("!=")); + assertTrue(!heavyHittersContainsSubString("!=")); } } finally { @@ -289,10 +283,10 @@ public class OuterProdTmplTest extends AutomatedTestBase } if( testname.equals(TEST_NAME8) ) - Assert.assertTrue(!(heavyHittersContainsSubString("spoofOP") + assertTrue(!(heavyHittersContainsSubString("spoofOP") || heavyHittersContainsSubString("sp_spoofOP"))); else if( !rewrites ) - Assert.assertTrue(heavyHittersContainsSubString("spoofOP") + assertTrue(heavyHittersContainsSubString("spoofOP") || heavyHittersContainsSubString("sp_spoofOP")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowAggTmplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowAggTmplTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowAggTmplTest.java index 2360092..d7984db 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowAggTmplTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowAggTmplTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -789,19 +788,14 @@ public class RowAggTmplTest extends AutomatedTestBase } private void testCodegenIntegration( String testname, boolean rewrites, ExecType instType ) - { - boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_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(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; + try { TestConfiguration config = getTestConfiguration(testname); @@ -823,37 +817,37 @@ public class RowAggTmplTest extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("S"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("S"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoofRA") + assertTrue(heavyHittersContainsSubString("spoofRA") || heavyHittersContainsSubString("sp_spoofRA")); //ensure full aggregates for certain patterns if( testname.equals(TEST_NAME15) ) - Assert.assertTrue(!heavyHittersContainsSubString("uark+")); + assertTrue(!heavyHittersContainsSubString("uark+")); if( testname.equals(TEST_NAME17) ) - Assert.assertTrue(!heavyHittersContainsSubString(RightIndex.OPCODE)); + assertTrue(!heavyHittersContainsSubString(RightIndex.OPCODE)); if( testname.equals(TEST_NAME28) || testname.equals(TEST_NAME45) ) - Assert.assertTrue(!heavyHittersContainsSubString("spoofRA", 2) + assertTrue(!heavyHittersContainsSubString("spoofRA", 2) && !heavyHittersContainsSubString("sp_spoofRA", 2)); if( testname.equals(TEST_NAME30) ) - Assert.assertTrue(!heavyHittersContainsSubString("spoofRA", 2) + assertTrue(!heavyHittersContainsSubString("spoofRA", 2) && !heavyHittersContainsSubString(RightIndex.OPCODE)); if( testname.equals(TEST_NAME31) ) - Assert.assertTrue(!heavyHittersContainsSubString("spoofRA", 2)); + assertTrue(!heavyHittersContainsSubString("spoofRA", 2)); if( testname.equals(TEST_NAME35) ) - Assert.assertTrue(!heavyHittersContainsSubString("spoofRA", 2) + assertTrue(!heavyHittersContainsSubString("spoofRA", 2) && !heavyHittersContainsSubString("cbind")); if( testname.equals(TEST_NAME36) ) - Assert.assertTrue(!heavyHittersContainsSubString("xor")); + assertTrue(!heavyHittersContainsSubString("xor")); if( testname.equals(TEST_NAME41) ) - Assert.assertTrue(!heavyHittersContainsSubString("seq")); + assertTrue(!heavyHittersContainsSubString("seq")); if( testname.equals(TEST_NAME42) ) - Assert.assertTrue(!heavyHittersContainsSubString("min","nmin") + assertTrue(!heavyHittersContainsSubString("min","nmin") && !heavyHittersContainsSubString("spoof", 2)); if( testname.equals(TEST_NAME44) ) - Assert.assertTrue(!heavyHittersContainsSubString("maxpooling") + assertTrue(!heavyHittersContainsSubString("maxpooling") && !heavyHittersContainsSubString("spoof", 2)); if( testname.equals(TEST_NAME46) ) - Assert.assertTrue(!heavyHittersContainsSubString("conv2d") + assertTrue(!heavyHittersContainsSubString("conv2d") && !heavyHittersContainsSubString("spoof", 2)); } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowConv2DOperationsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowConv2DOperationsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowConv2DOperationsTest.java index 46e10a3..15eae59 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowConv2DOperationsTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowConv2DOperationsTest.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; public class RowConv2DOperationsTest extends AutomatedTestBase @@ -72,20 +71,17 @@ public class RowConv2DOperationsTest extends AutomatedTestBase public void runConv2DTest(String testname, boolean rewrites, int imgSize, int numImg, int numChannels, int numFilters, int filterSize, int stride, int pad, boolean sparse1, boolean sparse2, ExecType et) { - boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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; + try { + + String sparseVal1 = String.valueOf(sparse1).toUpperCase(); String sparseVal2 = String.valueOf(sparse2).toUpperCase(); TestConfiguration config = getTestConfiguration(testname); @@ -112,7 +108,7 @@ public class RowConv2DOperationsTest extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("B"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("B"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoofRA") + assertTrue(heavyHittersContainsSubString("spoofRA") || heavyHittersContainsSubString("sp_spoofRA")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowVectorComparisonTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowVectorComparisonTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowVectorComparisonTest.java index 84e0b17..e812a7d 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowVectorComparisonTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/RowVectorComparisonTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -123,18 +122,12 @@ public class RowVectorComparisonTest extends AutomatedTestBase private void testCodegenIntegration( String testname, boolean rewrites, ExecType instType ) { - boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_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(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { TestConfiguration config = getTestConfiguration(testname); @@ -156,7 +149,7 @@ public class RowVectorComparisonTest 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(heavyHittersContainsSubString("spoofRA") + assertTrue(heavyHittersContainsSubString("spoofRA") || heavyHittersContainsSubString("sp_spoofRA")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/SparseSideInputTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/SparseSideInputTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/SparseSideInputTest.java index aa91db1..3e61f57 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/SparseSideInputTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/SparseSideInputTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -141,17 +140,12 @@ public class SparseSideInputTest extends AutomatedTestBase private void testCodegenIntegration( String testname, boolean compress, ExecType instType ) { - boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_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(instType); + if(shouldSkipTest()) + return; + + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; try { @@ -183,7 +177,7 @@ public class SparseSideInputTest 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(heavyHittersContainsSubString("spoof") + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegen/SumProductChainTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegen/SumProductChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/codegen/SumProductChainTest.java index e74f6cc..e33e656 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegen/SumProductChainTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegen/SumProductChainTest.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegen; import java.io.File; 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; @@ -100,16 +99,10 @@ public class SumProductChainTest extends AutomatedTestBase private void testSumProductChain(String testname, boolean vectors, boolean sparse, boolean rewrites, ExecType instType) { boolean oldRewrites = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_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(instType); + if(shouldSkipTest()) + return; try { @@ -141,7 +134,7 @@ public class SumProductChainTest extends AutomatedTestBase HashMap<CellIndex, Double> rfile = readRMatrixFromFS("R"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); if( vectors || !sparse ) - Assert.assertTrue(heavyHittersContainsSubString("spoofCell") + assertTrue(heavyHittersContainsSubString("spoofCell") || heavyHittersContainsSubString("sp_spoofCell")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmAutoEncoder.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmAutoEncoder.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmAutoEncoder.java index e02e044..fa17701 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmAutoEncoder.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmAutoEncoder.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -170,19 +169,12 @@ public class AlgorithmAutoEncoder extends AutomatedTestBase private void runAutoEncoderTest(int batchsize, boolean sparse, boolean rewrites, ExecType instType, TestType testType) { boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } - - currentTestType = testType; - 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(instType); + if(shouldSkipTest()) + return; + currentTestType = testType; try { String TEST_NAME = TEST_NAME1; @@ -206,7 +198,7 @@ public class AlgorithmAutoEncoder extends AutomatedTestBase runTest(true, false, null, -1); //TODO R script - Assert.assertTrue(heavyHittersContainsSubString("spoof") + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmDatagen.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmDatagen.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmDatagen.java index d77f478..dd960b7 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmDatagen.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmDatagen.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -228,15 +227,12 @@ public class AlgorithmDatagen extends AutomatedTestBase private void runStepwiseTest( DatagenType type, boolean sparse, boolean rewrites, ExecType instType, TestType testType) { boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - RUNTIME_PLATFORM platformOld = rtplatform; - switch( instType ){ - case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break; - default: rtplatform = RUNTIME_PLATFORM.HYBRID_SPARK; break; - } - currentTestType = testType; 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(instType); + if(shouldSkipTest()) + return; + + currentTestType = testType; OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = rewrites; @@ -263,7 +259,7 @@ public class AlgorithmDatagen extends AutomatedTestBase runTest(true, false, null, -1); - Assert.assertTrue(heavyHittersContainsSubString("spoof") + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmGLM.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmGLM.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmGLM.java index 0acecc7..b084c1d 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmGLM.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmGLM.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -285,16 +284,12 @@ public class AlgorithmGLM extends AutomatedTestBase private void runGLMTest( GLMType type, boolean rewrites, boolean sparse, ExecType instType, TestType testType) { boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } - currentTestType = testType; 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(instType); + if(shouldSkipTest()) + return; + + currentTestType = testType; try { @@ -341,7 +336,7 @@ public class AlgorithmGLM extends AutomatedTestBase //HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("w"); //HashMap<CellIndex, Double> rfile = readRMatrixFromFS("w"); //TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { rtplatform = platformOld; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmKMeans.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmKMeans.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmKMeans.java index f1930ba..468fd89 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmKMeans.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmKMeans.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -308,17 +307,13 @@ public class AlgorithmKMeans extends AutomatedTestBase private void runKMeansTest( String testname, boolean rewrites, boolean sparse, int centroids, int runs, ExecType instType, TestType testType) { boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } - currentTestType = testType; 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(instType); + if(shouldSkipTest()) + return; + + currentTestType = testType; + try { String TEST_NAME = testname; @@ -341,8 +336,8 @@ public class AlgorithmKMeans extends AutomatedTestBase runTest(true, false, null, -1); - Assert.assertTrue(heavyHittersContainsSubString("spoofCell") || heavyHittersContainsSubString("sp_spoofCell")); - Assert.assertTrue(heavyHittersContainsSubString("spoofRA") || heavyHittersContainsSubString("sp_spoofRA")); + assertTrue(heavyHittersContainsSubString("spoofCell") || heavyHittersContainsSubString("sp_spoofCell")); + assertTrue(heavyHittersContainsSubString("spoofRA") || heavyHittersContainsSubString("sp_spoofRA")); } finally { rtplatform = platformOld; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmL2SVM.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmL2SVM.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmL2SVM.java index dbffb40..de0de31 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmL2SVM.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmL2SVM.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; 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; @@ -150,20 +149,16 @@ public class AlgorithmL2SVM extends AutomatedTestBase } private void runL2SVMTest( String testname, boolean rewrites, boolean sparse, ExecType instType, TestType testType) - { + { + boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } + currentTestType = testType; - boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) - DMLScript.USE_LOCAL_SPARK_CONFIG = true; - try { String TEST_NAME = testname; @@ -194,7 +189,7 @@ public class AlgorithmL2SVM extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("w"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("w"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { rtplatform = platformOld; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmLinregCG.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmLinregCG.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmLinregCG.java index a7cbb79..0f51c54 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmLinregCG.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmLinregCG.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; 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; @@ -308,18 +307,14 @@ public class AlgorithmLinregCG extends AutomatedTestBase private void runLinregCGTest( String testname, boolean rewrites, boolean sparse, int intercept, ExecType instType, TestType testType) { + boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } currentTestType = testType; - boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) - DMLScript.USE_LOCAL_SPARK_CONFIG = true; - + try { String TEST_NAME = testname; @@ -349,7 +344,7 @@ public class AlgorithmLinregCG extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("w"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("w"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoofRA") + assertTrue(heavyHittersContainsSubString("spoofRA") || heavyHittersContainsSubString("sp_spoofRA")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMLogreg.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMLogreg.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMLogreg.java index 356096b..9130fe8 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMLogreg.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMLogreg.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; 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; @@ -390,18 +389,15 @@ public class AlgorithmMLogreg extends AutomatedTestBase private void runMlogregTest( String testname, int classes, int intercept, boolean rewrites, boolean sparse, ExecType instType, TestType testType) { + boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } + currentTestType = testType; - boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) - DMLScript.USE_LOCAL_SPARK_CONFIG = true; - + try { String TEST_NAME = testname; @@ -431,7 +427,7 @@ public class AlgorithmMLogreg extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("w"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("w"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoof") + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMSVM.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMSVM.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMSVM.java index 1a90777..92d1816 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMSVM.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmMSVM.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; 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; @@ -150,17 +149,13 @@ public class AlgorithmMSVM extends AutomatedTestBase private void runMSVMTest( String testname, boolean rewrites, boolean sparse, int numClasses, ExecType instType, TestType testType) { + boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } currentTestType = testType; - boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) - DMLScript.USE_LOCAL_SPARK_CONFIG = true; try { @@ -191,7 +186,7 @@ public class AlgorithmMSVM extends AutomatedTestBase HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("w"); HashMap<CellIndex, Double> rfile = readRMatrixFromFS("w"); TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { rtplatform = platformOld; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPNMF.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPNMF.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPNMF.java index 19f943a..2e62b1c 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPNMF.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPNMF.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; 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; @@ -111,18 +110,14 @@ public class AlgorithmPNMF extends AutomatedTestBase private void runPNMFTest( String testname, boolean rewrites, boolean sparse, ExecType instType, TestType testType) { + boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } currentTestType = testType; - boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) - DMLScript.USE_LOCAL_SPARK_CONFIG = true; - + try { String TEST_NAME = testname; @@ -157,7 +152,7 @@ public class AlgorithmPNMF extends AutomatedTestBase HashMap<CellIndex, Double> rH = readRMatrixFromFS("H"); TestUtils.compareMatrices(dmlW, rW, eps, "Stat-DML", "Stat-R"); TestUtils.compareMatrices(dmlH, rH, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { rtplatform = platformOld; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPageRank.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPageRank.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPageRank.java index 5a429f4..a0679a5 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPageRank.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmPageRank.java @@ -22,7 +22,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; 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; @@ -129,18 +128,15 @@ public class AlgorithmPageRank extends AutomatedTestBase private void runPageRankTest( String testname, boolean rewrites, boolean sparse, ExecType instType, TestType testType) { + boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType); + if(shouldSkipTest()) + return; + boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - 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_SPARK; break; - } + currentTestType = testType; - boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) - DMLScript.USE_LOCAL_SPARK_CONFIG = true; - + try { String TEST_NAME = testname; @@ -171,7 +167,7 @@ public class AlgorithmPageRank extends AutomatedTestBase HashMap<CellIndex, Double> dml = readDMLMatrixFromHDFS("p"); HashMap<CellIndex, Double> r = readRMatrixFromFS("p"); TestUtils.compareMatrices(dml, r, eps, "Stat-DML", "Stat-R"); - Assert.assertTrue(heavyHittersContainsSubString("spoofRA") + assertTrue(heavyHittersContainsSubString("spoofRA") || heavyHittersContainsSubString("sp_spoofRA")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmStepwiseRegression.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmStepwiseRegression.java b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmStepwiseRegression.java index fb68ab8..ce10ab0 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmStepwiseRegression.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/codegenalg/AlgorithmStepwiseRegression.java @@ -21,7 +21,6 @@ package org.apache.sysml.test.integration.functions.codegenalg; import java.io.File; -import org.junit.Assert; import org.junit.Test; import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; @@ -172,16 +171,13 @@ public class AlgorithmStepwiseRegression extends AutomatedTestBase private void runStepwiseTest( StepwiseType type, boolean sparse, boolean rewrites, ExecType instType, TestType testType) { boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; - RUNTIME_PLATFORM platformOld = rtplatform; - switch( instType ){ - case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break; - default: rtplatform = RUNTIME_PLATFORM.HYBRID_SPARK; break; - } - currentTestType = testType; 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(instType); + if(shouldSkipTest()) + return; + + currentTestType = testType; + try { String TEST_NAME = TEST_NAME1; @@ -212,7 +208,7 @@ public class AlgorithmStepwiseRegression extends AutomatedTestBase runTest(true, false, null, -1); - Assert.assertTrue(heavyHittersContainsSubString("spoof") + assertTrue(heavyHittersContainsSubString("spoof") || heavyHittersContainsSubString("sp_spoof")); } finally { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicCompressionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicCompressionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicCompressionTest.java index dc6ca57..9cec6cb 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicCompressionTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicCompressionTest.java @@ -135,8 +135,11 @@ public class BasicCompressionTest extends AutomatedTestBase runCompressionTest(SparsityType.SPARSE, ValueType.CONST, false); } - private static void runCompressionTest(SparsityType sptype, ValueType vtype, boolean compress) + private void runCompressionTest(SparsityType sptype, ValueType vtype, boolean compress) { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicGetValueTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicGetValueTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicGetValueTest.java index c789b0f..53b723a 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicGetValueTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicGetValueTest.java @@ -137,8 +137,11 @@ public class BasicGetValueTest extends AutomatedTestBase runGetValueTest(SparsityType.SPARSE, ValueType.CONST, false); } - private static void runGetValueTest(SparsityType sptype, ValueType vtype, boolean compress) + private void runGetValueTest(SparsityType sptype, ValueType vtype, boolean compress) { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixAppendTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixAppendTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixAppendTest.java index c44bc28..03487cf 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixAppendTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixAppendTest.java @@ -136,8 +136,11 @@ public class BasicMatrixAppendTest extends AutomatedTestBase runMatrixAppendTest(SparsityType.SPARSE, ValueType.CONST, false); } - private static void runMatrixAppendTest(SparsityType sptype, ValueType vtype, boolean compress) - { + private void runMatrixAppendTest(SparsityType sptype, ValueType vtype, boolean compress) + { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixCentralMomentTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixCentralMomentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixCentralMomentTest.java index 9ea28e5..765c0b9 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixCentralMomentTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixCentralMomentTest.java @@ -138,8 +138,11 @@ public class BasicMatrixCentralMomentTest extends AutomatedTestBase runMatrixAppendTest(SparsityType.SPARSE, ValueType.CONST, false); } - private static void runMatrixAppendTest(SparsityType sptype, ValueType vtype, boolean compress) + private void runMatrixAppendTest(SparsityType sptype, ValueType vtype, boolean compress) { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixMultChainTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixMultChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixMultChainTest.java index 3a7322f..e346ac8 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixMultChainTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixMultChainTest.java @@ -226,8 +226,11 @@ public class BasicMatrixMultChainTest extends AutomatedTestBase runMatrixMultChainTest(SparsityType.SPARSE, ValueType.CONST, ChainType.XtwXv, false); } - private static void runMatrixMultChainTest(SparsityType sptype, ValueType vtype, ChainType ctype, boolean compress) + private void runMatrixMultChainTest(SparsityType sptype, ValueType vtype, ChainType ctype, boolean compress) { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixQuantileTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixQuantileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixQuantileTest.java index 1a2b697..b78c4d9 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixQuantileTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixQuantileTest.java @@ -135,8 +135,11 @@ public class BasicMatrixQuantileTest extends AutomatedTestBase runMatrixAppendTest(SparsityType.SPARSE, ValueType.CONST, false); } - private static void runMatrixAppendTest(SparsityType sptype, ValueType vtype, boolean compress) + private void runMatrixAppendTest(SparsityType sptype, ValueType vtype, boolean compress) { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixTransposeSelfMultTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixTransposeSelfMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixTransposeSelfMultTest.java index bd351b0..a721776 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixTransposeSelfMultTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixTransposeSelfMultTest.java @@ -136,8 +136,11 @@ public class BasicMatrixTransposeSelfMultTest extends AutomatedTestBase runTransposeSelfMatrixMultTest(SparsityType.SPARSE, ValueType.CONST, false); } - private static void runTransposeSelfMatrixMultTest(SparsityType sptype, ValueType vtype, boolean compress) + private void runTransposeSelfMatrixMultTest(SparsityType sptype, ValueType vtype, boolean compress) { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixVectorMultTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixVectorMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixVectorMultTest.java index 67e464a..002e1bb 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixVectorMultTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicMatrixVectorMultTest.java @@ -140,8 +140,11 @@ public class BasicMatrixVectorMultTest extends AutomatedTestBase runMatrixVectorMultTest(SparsityType.SPARSE, ValueType.CONST, false); } - private static void runMatrixVectorMultTest(SparsityType sptype, ValueType vtype, boolean compress) + private void runMatrixVectorMultTest(SparsityType sptype, ValueType vtype, boolean compress) { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicScalarOperationsSparseUnsafeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicScalarOperationsSparseUnsafeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicScalarOperationsSparseUnsafeTest.java index eee2d30..37deda0 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicScalarOperationsSparseUnsafeTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/compress/BasicScalarOperationsSparseUnsafeTest.java @@ -138,8 +138,11 @@ public class BasicScalarOperationsSparseUnsafeTest extends AutomatedTestBase runScalarOperationsTest(SparsityType.SPARSE, ValueType.CONST, false); } - private static void runScalarOperationsTest(SparsityType sptype, ValueType vtype, boolean compress) + private void runScalarOperationsTest(SparsityType sptype, ValueType vtype, boolean compress) { + if(shouldSkipTest()) + return; + try { //prepare sparsity for input data
