Repository: systemml Updated Branches: refs/heads/master f991e4b48 -> 1634239ce
[MINOR] Fix incorrect setup 'matrix mult chain' tests Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/1634239c Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/1634239c Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/1634239c Branch: refs/heads/master Commit: 1634239ce19b4d42ed1ec59bfac01cd8777d153a Parents: f991e4b Author: Matthias Boehm <mboe...@gmail.com> Authored: Sat Sep 16 20:14:18 2017 -0700 Committer: Matthias Boehm <mboe...@gmail.com> Committed: Sat Sep 16 20:14:18 2017 -0700 ---------------------------------------------------------------------- .../misc/RewriteElementwiseMultChainOptimizationAllTest.java | 2 +- .../misc/RewriteElementwiseMultChainOptimizationTest.java | 2 +- .../integration/functions/misc/RewriteMatrixMultChainOptTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/1634239c/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 ba5c78d..bd80194 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 @@ -82,7 +82,7 @@ public class RewriteElementwiseMultChainOptimizationAllTest extends AutomatedTes } boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK ) + if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) DMLScript.USE_LOCAL_SPARK_CONFIG = true; boolean rewritesOld = OptimizerUtils.ALLOW_SUM_PRODUCT_REWRITES; http://git-wip-us.apache.org/repos/asf/systemml/blob/1634239c/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 82208eb..dd8c0f0 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 @@ -81,7 +81,7 @@ public class RewriteElementwiseMultChainOptimizationTest extends AutomatedTestBa } boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK ) + if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) DMLScript.USE_LOCAL_SPARK_CONFIG = true; boolean rewritesOld = OptimizerUtils.ALLOW_SUM_PRODUCT_REWRITES; http://git-wip-us.apache.org/repos/asf/systemml/blob/1634239c/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 152ce52..bbe5c3d 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 @@ -78,7 +78,7 @@ public class RewriteMatrixMultChainOptTest extends AutomatedTestBase } boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK ) + if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK ) DMLScript.USE_LOCAL_SPARK_CONFIG = true; boolean rewritesOld = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;