Repository: incubator-systemml
Updated Branches:
  refs/heads/master 7491a680b -> 10f5dd920


[MINOR] Disable Spark Convolution operation until rectangular blocks are
handled

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

Branch: refs/heads/master
Commit: 10f5dd920ee4d966c29ce601ce31465492e971f4
Parents: 7491a68
Author: Niketan Pansare <npan...@us.ibm.com>
Authored: Wed Mar 29 20:54:01 2017 -0700
Committer: Niketan Pansare <npan...@us.ibm.com>
Committed: Wed Mar 29 20:54:01 2017 -0700

----------------------------------------------------------------------
 src/main/java/org/apache/sysml/hops/ConvolutionOp.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10f5dd92/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/ConvolutionOp.java 
b/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
index 567c793..a32a0b1 100644
--- a/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
+++ b/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
@@ -71,7 +71,8 @@ public class ConvolutionOp extends Hop  implements 
MultiThreadedHop
        }
 
        private boolean isEligibleForSpark() {
-               return (op == ConvOp.DIRECT_CONV2D || op == ConvOp.MAX_POOLING) 
? true : false;
+               // return (op == ConvOp.DIRECT_CONV2D || op == 
ConvOp.MAX_POOLING) ? true : false;
+               return false;
        }
        
        @Override

Reply via email to