You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2015/11/26 19:50:56 UTC

[2/3] incubator-systemml git commit: Fix rdd checkpoint compilation (more conservative decision for vectors)

Fix rdd checkpoint compilation (more conservative decision for vectors)

Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/f5196177
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/f5196177
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/f5196177

Branch: refs/heads/master
Commit: f5196177b688720d66a3dafc55fdb7219215234a
Parents: 38b8be1
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Wed Nov 25 18:35:42 2015 -0800
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Wed Nov 25 20:06:36 2015 -0800

----------------------------------------------------------------------
 src/main/java/com/ibm/bi/dml/hops/Hop.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/f5196177/src/main/java/com/ibm/bi/dml/hops/Hop.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/ibm/bi/dml/hops/Hop.java b/src/main/java/com/ibm/bi/dml/hops/Hop.java
index b968952..3545ba3 100644
--- a/src/main/java/com/ibm/bi/dml/hops/Hop.java
+++ b/src/main/java/com/ibm/bi/dml/hops/Hop.java
@@ -351,7 +351,8 @@ public abstract class Hop
 			//(1) avoid unnecessary persist and unpersist calls, and 
 			//(2) avoid unnecessary creation of spark context (incl executors)
 			if(    OptimizerUtils.isHybridExecutionMode() 
-				&& _outputMemEstimate < OptimizerUtils.getLocalMemBudget()
+				&& (getDim2() > 1 && _outputMemEstimate < OptimizerUtils.getLocalMemBudget()
+				|| getDim2() == 1 && _outputMemEstimate < OptimizerUtils.getLocalMemBudget()/3 )
 				|| _etypeForced == ExecType.CP )
 			{
 				et = ExecType.CP;