Repository: incubator-systemml Updated Branches: refs/heads/master c944ad1dc -> c79314035
[MINOR] Disable Spark Convolution Operation and cleanup Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/c7931403 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/c7931403 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/c7931403 Branch: refs/heads/master Commit: c7931403526bda5dba6090f9b40394fbf76924e3 Parents: c944ad1 Author: Niketan Pansare <[email protected]> Authored: Thu Mar 30 17:18:34 2017 -0700 Committer: Niketan Pansare <[email protected]> Committed: Thu Mar 30 17:18:34 2017 -0700 ---------------------------------------------------------------------- .../org/apache/sysml/hops/ConvolutionOp.java | 39 ++------------------ 1 file changed, 4 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/c7931403/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 a32a0b1..1a48bc4 100644 --- a/src/main/java/org/apache/sysml/hops/ConvolutionOp.java +++ b/src/main/java/org/apache/sysml/hops/ConvolutionOp.java @@ -96,7 +96,7 @@ public class ConvolutionOp extends Hop implements MultiThreadedHop case BIAS_ADD: case BIAS_MULTIPLY: { - if(et == ExecType.CP || et == ExecType.GPU || et == ExecType.SPARK) { + if(et == ExecType.CP || et == ExecType.GPU) { setLops(constructConvolutionLops(et, inputs)); break; } @@ -142,38 +142,6 @@ public class ConvolutionOp extends Hop implements MultiThreadedHop return input instanceof ConvolutionOp && ((ConvolutionOp) input).getOp() == ConvOp.DIRECT_CONV2D; } - @SuppressWarnings("unused") - private Lop addReblockIfNecessary(ExecType et, OperationTypes lopOp, Lop in) throws LopsException { - if(et == ExecType.SPARK) { - switch(lopOp) { - case MAX_POOLING: - case RELU_MAX_POOLING: - case DIRECT_CONV2D: - case DIRECT_CONV2D_BIAS_ADD: - if(in.getOutputParameters().getColsInBlock() < in.getOutputParameters().getNumCols() || - in.getOutputParameters().getRowsInBlock() != 1) { - // Need to add a reblock - return new ReBlock(in, 1L, in.getOutputParameters().getNumCols(), DataType.MATRIX, ValueType.DOUBLE, true, et); - } - else - return in; - default: - throw new LopsException("Spark operator is not implemented for " + lopOp.name()); - } - } - return in; - } - - @SuppressWarnings("unused") - private void setReblockedOutputDimension(ExecType et, Lop lop) throws HopsException { - if(et == ExecType.SPARK) { - lop.getOutputParameters().setDimensions(getDim1(), getDim2(), 1L, getDim2(), getNnz(), getUpdateType()); - } - else { - setOutputDimensions(lop); - } - } - public Lop constructConvolutionLops(ExecType et, ArrayList<Hop> inputs) throws HopsException, LopsException { if(inputs.size() != getNumExpectedInputs()) throw new HopsException("Incorrect number of inputs for " + op.name()); @@ -330,8 +298,6 @@ public class ConvolutionOp extends Hop implements MultiThreadedHop { if ( OptimizerUtils.isMemoryBasedOptLevel() ) { _etype = findGPUExecTypeByMemEstimate(findExecTypeByMemEstimate()); - // TODO: Fix this after adding remaining spark instructions - _etype = !isEligibleForSpark() && _etype == REMOTE ? ExecType.CP : _etype; } else { _etype = REMOTE; @@ -341,6 +307,9 @@ public class ConvolutionOp extends Hop implements MultiThreadedHop checkAndSetInvalidCPDimsAndSize(); } + // TODO: Fix this after adding remaining spark instructions + _etype = !isEligibleForSpark() && _etype == REMOTE ? ExecType.CP : _etype; + //mark for recompile (forever) if( ConfigurationManager.isDynamicRecompilation() && !dimsKnown(true) && _etype==REMOTE ) setRequiresRecompile();
