[SYSTEMML-1387] Fix parfor constrained optimizer (fused dpe selection) Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/e3a75d14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/e3a75d14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/e3a75d14
Branch: refs/heads/master Commit: e3a75d1412c1b3d159e05cc877dd6e90fbdf5153 Parents: 600e641 Author: Matthias Boehm <[email protected]> Authored: Thu Mar 9 18:56:40 2017 -0800 Committer: Matthias Boehm <[email protected]> Committed: Thu Mar 9 18:56:40 2017 -0800 ---------------------------------------------------------------------- .../runtime/controlprogram/parfor/opt/OptimizerRuleBased.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/e3a75d14/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java index a84f93f..90db845 100644 --- a/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java +++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java @@ -1499,8 +1499,8 @@ public class OptimizerRuleBased extends Optimizer // (this also implies that the body is CP only) // try to merge MR data partitioning and MR exec - if( (pn.getExecType()==ExecType.MR || pn.getExecType()==ExecType.SPARK) //MR/SP EXEC and CP body - && M < _rm2 //fits into remote memory of reducers + if( (pn.getExecType()==ExecType.MR && M < _rm2 //fits into remote memory of reducers + || pn.getExecType()==ExecType.SPARK) //MR/SP EXEC and CP body && partitioner!=null && partitioner.equals(REMOTE_DP.toString()) //MR/SP partitioning && partitionedMatrices.size()==1 ) //only one partitioned matrix {
