http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineBinaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineBinaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineBinaryInstruction.java index d0f1b02..e14768b 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineBinaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineBinaryInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.mapred.CachedValueMap; @@ -70,7 +69,7 @@ public class CombineBinaryInstruction extends BinaryMRInstructionBase public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("CombineInstruction.processInstruction should never be called!"); }
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineTernaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineTernaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineTernaryInstruction.java index 0593602..783f1ae 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineTernaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineTernaryInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.lops.Ternary.OperationTypes; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.mapred.CachedValueMap; @@ -61,7 +60,7 @@ public class CombineTernaryInstruction extends TernaryInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("CombineTernaryInstruction.processInstruction should never be called!"); } } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineUnaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineUnaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineUnaryInstruction.java index 925805c..8d3affc 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineUnaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineUnaryInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.mapred.CachedValueMap; @@ -61,7 +60,7 @@ public class CombineUnaryInstruction extends UnaryMRInstructionBase public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("CombineInstruction.processInstruction should never be called!"); } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeAggregateInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeAggregateInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeAggregateInstruction.java index e1569be..d2272ac 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeAggregateInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeAggregateInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -69,7 +68,7 @@ public class CumulativeAggregateInstruction extends AggregateUnaryInstruction @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); if( blkList == null ) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeOffsetInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeOffsetInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeOffsetInstruction.java index ae11ba0..20ea366 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeOffsetInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeOffsetInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.Builtin; import org.apache.sysml.runtime.functionobjects.Multiply; import org.apache.sysml.runtime.functionobjects.Plus; @@ -79,7 +78,7 @@ public class CumulativeOffsetInstruction extends BinaryInstruction @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { IndexedMatrixValue in1 = cachedValues.getFirst(input1); //original data IndexedMatrixValue in2 = cachedValues.getFirst(input2); //offset row vector http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeSplitInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeSplitInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeSplitInstruction.java index c3d533e..cb74b92 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeSplitInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeSplitInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -71,7 +70,7 @@ public class CumulativeSplitInstruction extends UnaryInstruction @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); if( blkList == null ) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateInstruction.java index 24006e2..bff774b 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.CM; import org.apache.sysml.runtime.functionobjects.KahanPlus; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -70,7 +69,7 @@ public class GroupedAggregateInstruction extends UnaryMRInstructionBase CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("GroupedAggregateInstruction.processInstruction() should not be called!"); } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateMInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateMInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateMInstruction.java index 34f0945..e054427 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateMInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateMInstruction.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.KahanPlus; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; @@ -76,7 +75,7 @@ public class GroupedAggregateMInstruction extends BinaryMRInstructionBase implem public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input1); if( blkList == null ) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/MMTSJMRInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/MMTSJMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/MMTSJMRInstruction.java index de2ee5e..ce7b783 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/MMTSJMRInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/MMTSJMRInstruction.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import org.apache.sysml.lops.MMTSJ.MMTSJType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -86,7 +85,7 @@ public class MMTSJMRInstruction extends UnaryInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); if( blkList !=null ) @@ -109,7 +108,7 @@ public class MMTSJMRInstruction extends UnaryInstruction if( in instanceof MatrixBlock && out instanceof MatrixBlock ) ((MatrixBlock) in).transposeSelfMatrixMultOperations((MatrixBlock)out, _type ); else - throw new DMLUnsupportedOperationException("Types "+in.getClass()+" and "+out.getClass()+" incompatible with "+MatrixBlock.class); + throw new DMLRuntimeException("Types "+in.getClass()+" and "+out.getClass()+" incompatible with "+MatrixBlock.class); //put the output value in the cache if(iout==tempValue) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/MRInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/MRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/MRInstruction.java index 386eebe..ea47e96 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/MRInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/MRInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.Instruction; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -61,7 +60,7 @@ public abstract class MRInstruction extends Instruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //do nothing (not applicable for MR instructions) } @@ -74,12 +73,11 @@ public abstract class MRInstruction extends Instruction * @param zeroInput * @param blockRowFactor * @param blockColFactor - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ public abstract void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException; + throws DMLRuntimeException; /** http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/MapMultChainInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/MapMultChainInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/MapMultChainInstruction.java index 6fff0fb..35029d7 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/MapMultChainInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/MapMultChainInstruction.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import org.apache.sysml.lops.MapMultChain.ChainType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; @@ -184,7 +183,7 @@ public class MapMultChainInstruction extends MRInstruction implements IDistribut @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(_input1); if( blkList !=null ) @@ -227,10 +226,9 @@ public class MapMultChainInstruction extends MRInstruction implements IDistribut * @param outIx * @param outVal * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private void processXtXvOperations(MatrixIndexes inIx, MatrixValue inVal, MatrixIndexes outIx, MatrixValue outVal ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { DistributedCacheInput dcInput2 = MRBaseForCommonInstructions.dcValues.get(_input2); //v MatrixBlock Xi = (MatrixBlock)inVal; @@ -250,10 +248,9 @@ public class MapMultChainInstruction extends MRInstruction implements IDistribut * @param outIx * @param outVal * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private void processXtwXvOperations(MatrixIndexes inIx, MatrixValue inVal, MatrixIndexes outIx, MatrixValue outVal, ChainType chain ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { DistributedCacheInput dcInput2 = MRBaseForCommonInstructions.dcValues.get(_input2); //v DistributedCacheInput dcInput3 = MRBaseForCommonInstructions.dcValues.get(_input3); //w http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/MatrixReshapeMRInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/MatrixReshapeMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/MatrixReshapeMRInstruction.java index 997ff7e..6d83cf0 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/MatrixReshapeMRInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/MatrixReshapeMRInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.LibMatrixReorg; @@ -94,7 +93,7 @@ public class MatrixReshapeMRInstruction extends UnaryInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int brlen, int bclen ) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); if( blkList != null ) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/PMMJMRInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/PMMJMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/PMMJMRInstruction.java index 99e46ba..4e21aa3 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/PMMJMRInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/PMMJMRInstruction.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import org.apache.sysml.hops.OptimizerUtils; import org.apache.sysml.lops.PMMJ.CacheType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -96,7 +95,7 @@ public class PMMJMRInstruction extends BinaryMRInstructionBase implements IDistr public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get both matrix inputs (left side always permutation) DistributedCacheInput dcInput = MRBaseForCommonInstructions.dcValues.get(input1); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java index b58cf03..4cc0f6b 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.LibMatrixReorg; @@ -137,7 +136,7 @@ public class ParameterizedBuiltinMRInstruction extends UnaryInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); if( blkList !=null ) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/PickByCountInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/PickByCountInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/PickByCountInstruction.java index 2aed2cb..c1c0796 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/PickByCountInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/PickByCountInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.lops.PickByCount.OperationTypes; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.mapred.CachedValueMap; @@ -97,7 +96,7 @@ public class PickByCountInstruction extends MRInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("PickByCountInstruction.processInstruction should never be called!"); } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/QuaternaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/QuaternaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/QuaternaryInstruction.java index 8c2b110..4a70dd1 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/QuaternaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/QuaternaryInstruction.java @@ -33,7 +33,6 @@ import org.apache.sysml.lops.WeightedUnaryMM; import org.apache.sysml.lops.WeightedUnaryMM.WUMMType; import org.apache.sysml.lops.WeightedUnaryMMR; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.SwapIndex; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; @@ -308,7 +307,7 @@ public class QuaternaryInstruction extends MRInstruction implements IDistributed @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { QuaternaryOperator qop = (QuaternaryOperator)optr; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/RandInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/RandInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/RandInstruction.java index 136dd13..ed0f883 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/RandInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/RandInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.hops.Hop.DataGenMethod; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.mapred.CachedValueMap; @@ -104,7 +103,7 @@ public class RandInstruction extends DataGenMRInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //do nothing (only meta carrier, handled in special job type) } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/RangeBasedReIndexInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/RangeBasedReIndexInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/RangeBasedReIndexInstruction.java index 5ca5aa3..80ca147 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/RangeBasedReIndexInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/RangeBasedReIndexInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -99,7 +98,7 @@ public class RangeBasedReIndexInstruction extends UnaryMRInstructionBase public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { if(input==output) throw new DMLRuntimeException("input cannot be the same for output for "+instString); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/ReblockInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/ReblockInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReblockInstruction.java index 1d65446..2bcca4a 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/ReblockInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReblockInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.Instruction; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.mapred.CachedValueMap; @@ -67,7 +66,7 @@ public class ReblockInstruction extends UnaryMRInstructionBase public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("ReblockInstruction.processInstruction should never be called"); } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/RemoveEmptyMRInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/RemoveEmptyMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/RemoveEmptyMRInstruction.java index eaed828..1ca7973 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/RemoveEmptyMRInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/RemoveEmptyMRInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.LibMatrixReorg; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -93,7 +92,7 @@ public class RemoveEmptyMRInstruction extends BinaryInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get input and offsets IndexedMatrixValue inData = cachedValues.getFirst(input1); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/ReorgInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/ReorgInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReorgInstruction.java index a1d7cdc..6c6d50c 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/ReorgInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReorgInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.DiagIndex; import org.apache.sysml.runtime.functionobjects.RevIndex; import org.apache.sysml.runtime.functionobjects.SwapIndex; @@ -91,7 +90,7 @@ public class ReorgInstruction extends UnaryMRInstructionBase public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/ReplicateInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/ReplicateInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReplicateInstruction.java index 66dcf92..ed6ed8a 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/ReplicateInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReplicateInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; @@ -92,7 +91,7 @@ public class ReplicateInstruction extends UnaryMRInstructionBase @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/ScalarInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/ScalarInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ScalarInstruction.java index f896a32..b42b227 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/ScalarInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ScalarInstruction.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import org.apache.sysml.lops.Lop; import org.apache.sysml.parser.Expression.DataType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues; @@ -70,7 +69,7 @@ public class ScalarInstruction extends UnaryMRInstructionBase public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); if( blkList != null ) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/SeqInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/SeqInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/SeqInstruction.java index 3ff97d4..e650128 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/SeqInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/SeqInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.hops.Hop.DataGenMethod; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.mapred.CachedValueMap; @@ -71,7 +70,7 @@ public class SeqInstruction extends DataGenMRInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { // TODO Auto-generated method stub } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/TernaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/TernaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/TernaryInstruction.java index c7b84c8..be16af5 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/TernaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/TernaryInstruction.java @@ -24,7 +24,6 @@ import java.util.HashMap; import org.apache.sysml.lops.Ternary; import org.apache.sysml.lops.Ternary.OperationTypes; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.CTableMap; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -214,7 +213,7 @@ public class TernaryInstruction extends MRInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue zeroInput, HashMap<Byte, CTableMap> resultMaps, HashMap<Byte, MatrixBlock> resultBlocks, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { IndexedMatrixValue in1, in2, in3 = null; @@ -300,7 +299,7 @@ public class TernaryInstruction extends MRInstruction public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { throw new DMLRuntimeException("This function should not be called!"); } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/UaggOuterChainInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/UaggOuterChainInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/UaggOuterChainInstruction.java index 99123e7..d34d668 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/UaggOuterChainInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/UaggOuterChainInstruction.java @@ -24,7 +24,6 @@ import java.util.Arrays; import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.ReduceAll; import org.apache.sysml.runtime.functionobjects.ReduceCol; import org.apache.sysml.runtime.functionobjects.ReduceRow; @@ -132,7 +131,7 @@ public class UaggOuterChainInstruction extends BinaryInstruction implements IDis @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = null; boolean rightCached = (_uaggOp.indexFn instanceof ReduceCol || _uaggOp.indexFn instanceof ReduceAll http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryInstruction.java index 4c86751..3626f5f 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.Builtin; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -67,7 +66,7 @@ public class UnaryInstruction extends UnaryMRInstructionBase public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/ZeroOutInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/ZeroOutInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ZeroOutInstruction.java index 145a089..3282ac9 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/ZeroOutInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ZeroOutInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.mr; import java.util.ArrayList; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixValue; import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues; @@ -75,7 +74,7 @@ public class ZeroOutInstruction extends UnaryMRInstructionBase public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int blockRowFactor, int blockColFactor) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { ArrayList<IndexedMatrixValue> blkList = cachedValues.get(input); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateTernarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateTernarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateTernarySPInstruction.java index d05585b..14baa6e 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateTernarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateTernarySPInstruction.java @@ -25,7 +25,6 @@ import org.apache.spark.api.java.function.Function; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.KahanPlus; @@ -80,7 +79,7 @@ public class AggregateTernarySPInstruction extends ComputationSPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateUnarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateUnarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateUnarySPInstruction.java index 82fa6fd..7aebd0c 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateUnarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateUnarySPInstruction.java @@ -28,7 +28,6 @@ import scala.Tuple2; import org.apache.sysml.hops.AggBinaryOp.SparkAggType; import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.ReduceAll; @@ -89,7 +88,7 @@ public class AggregateUnarySPInstruction extends UnarySPInstruction @Override public void processInstruction( ExecutionContext ec ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; MatrixCharacteristics mc = sec.getMatrixCharacteristics(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGAlignedSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGAlignedSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGAlignedSPInstruction.java index f1ddcdf..4a83c6f 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGAlignedSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGAlignedSPInstruction.java @@ -25,7 +25,6 @@ import org.apache.spark.api.java.function.PairFunction; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex; @@ -71,7 +70,7 @@ public class AppendGAlignedSPInstruction extends BinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { // general case append (map-extend, aggregate) SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGSPInstruction.java index 30ca4f7..4badf24 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGSPInstruction.java @@ -29,7 +29,6 @@ import org.apache.spark.api.java.function.PairFunction; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex; @@ -77,7 +76,7 @@ public class AppendGSPInstruction extends BinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { // general case append (map-extend, aggregate) SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java index 245f234..0c1d22c 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java @@ -28,7 +28,6 @@ import org.apache.spark.api.java.function.PairFlatMapFunction; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex; @@ -81,7 +80,7 @@ public class AppendMSPInstruction extends BinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { // map-only append (rhs must be vector and fit in mapper mem) SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java index e9e6e35..93fc7aa 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java @@ -25,7 +25,6 @@ import org.apache.spark.api.java.function.Function; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex; @@ -69,7 +68,7 @@ public class AppendRSPInstruction extends BinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { // reduce-only append (output must have at most one column block) SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java index e4a8708..c73d4dc 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java @@ -24,7 +24,6 @@ import org.apache.sysml.lops.Lop; import org.apache.sysml.parser.Expression.DataType; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -43,10 +42,9 @@ public abstract class ArithmeticBinarySPInstruction extends BinarySPInstruction * @param str * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static ArithmeticBinarySPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { CPOperand in1 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand in2 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java index 5c7ed71..6b3efdb 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java @@ -23,7 +23,6 @@ import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.function.Function; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -69,7 +68,7 @@ public class BinUaggChainSPInstruction extends UnarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java index 20b1548..4d2e78c 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java @@ -24,7 +24,6 @@ import org.apache.spark.api.java.JavaPairRDD; import org.apache.sysml.lops.BinaryM.VectorType; import org.apache.sysml.parser.Expression.DataType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -97,10 +96,9 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction * * @param ec * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ protected void processMatrixMatrixBinaryInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; @@ -143,10 +141,9 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction * @param ec * @param type * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ protected void processMatrixBVectorBinaryInstruction(ExecutionContext ec, VectorType vtype) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; @@ -189,10 +186,9 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction * * @param ec * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ protected void processMatrixScalarBinaryInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinBinarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinBinarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinBinarySPInstruction.java index 01657ec..acad128 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinBinarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinBinarySPInstruction.java @@ -24,7 +24,6 @@ import org.apache.sysml.lops.BinaryM.VectorType; import org.apache.sysml.parser.Expression.DataType; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.Builtin; import org.apache.sysml.runtime.functionobjects.ValueFunction; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -47,10 +46,9 @@ public abstract class BuiltinBinarySPInstruction extends BinarySPInstruction * @param str * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static BuiltinBinarySPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { CPOperand in1 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand in2 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinUnarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinUnarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinUnarySPInstruction.java index 0bd272c..66e314f 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinUnarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinUnarySPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.sysml.parser.Expression.DataType; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.Builtin; import org.apache.sysml.runtime.functionobjects.ValueFunction; import org.apache.sysml.runtime.instructions.cp.CPOperand; @@ -44,10 +43,9 @@ public abstract class BuiltinUnarySPInstruction extends UnarySPInstruction * @param str * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static BuiltinUnarySPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { CPOperand in = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand out = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java index 6003a0d..6aa7597 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java @@ -25,7 +25,6 @@ import org.apache.spark.api.java.JavaPairRDD; import org.apache.sysml.hops.recompile.Recompiler; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; @@ -89,7 +88,7 @@ public class CSVReblockSPInstruction extends UnarySPInstruction @Override @SuppressWarnings("unchecked") public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext) ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java index a64f825..4786348 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java @@ -28,7 +28,6 @@ import scala.Tuple2; import org.apache.sysml.parser.Expression.DataType; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.CM; @@ -112,7 +111,7 @@ public class CentralMomentSPInstruction extends UnarySPInstruction @Override public void processInstruction( ExecutionContext ec ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java index 87b8a0c..31d7665 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java @@ -23,7 +23,6 @@ import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.storage.StorageLevel; import org.apache.sysml.hops.OptimizerUtils; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; @@ -70,7 +69,7 @@ public class CheckpointSPInstruction extends UnarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java index ba75803..10e0d56 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java @@ -28,7 +28,6 @@ import scala.Tuple2; import org.apache.sysml.parser.Expression.DataType; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.COV; @@ -97,7 +96,7 @@ public class CovarianceSPInstruction extends BinarySPInstruction @Override public void processInstruction( ExecutionContext ec ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; COVOperator cop = ((COVOperator)_optr); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java index b7720b9..58c5834 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java @@ -26,7 +26,6 @@ import scala.Tuple2; import org.apache.sysml.hops.AggBinaryOp.SparkAggType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.Multiply; @@ -92,7 +91,7 @@ public class CpmmSPInstruction extends BinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java index 3c803b8..91ad3fb 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java @@ -26,7 +26,6 @@ import org.apache.spark.api.java.function.PairFunction; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -73,7 +72,7 @@ public class CumulativeAggregateSPInstruction extends AggregateUnarySPInstructio @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; MatrixCharacteristics mc = sec.getMatrixCharacteristics(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java index 6022126..26b7375 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java @@ -28,7 +28,6 @@ import org.apache.spark.api.java.function.PairFlatMapFunction; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.Builtin; @@ -99,7 +98,7 @@ public class CumulativeOffsetSPInstruction extends BinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; MatrixCharacteristics mc = sec.getMatrixCharacteristics(input2.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java index 84e94bc..159eddf 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java @@ -29,7 +29,6 @@ import scala.Tuple2; import org.apache.sysml.lops.MapMultChain; import org.apache.sysml.lops.MapMultChain.ChainType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -122,7 +121,7 @@ public class MapmmChainSPInstruction extends SPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; @@ -161,7 +160,7 @@ public class MapmmChainSPInstruction extends SPInstruction private PartitionedBroadcastMatrix _pmV = null; public RDDMapMMChainFunction( PartitionedBroadcastMatrix bV) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //get first broadcast vector (always single block) _pmV = bV; @@ -192,7 +191,7 @@ public class MapmmChainSPInstruction extends SPInstruction private ChainType _chainType = null; public RDDMapMMChainFunction2( PartitionedBroadcastMatrix bV, PartitionedBroadcastMatrix bW, ChainType chain) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //get both broadcast vectors (first always single block) _pmV = bV; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java index f539631..400ccf0 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java @@ -33,7 +33,6 @@ import org.apache.sysml.hops.AggBinaryOp.SparkAggType; import org.apache.sysml.lops.MapMult; import org.apache.sysml.lops.MapMult.CacheType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.Multiply; @@ -107,7 +106,7 @@ public class MapmmSPInstruction extends BinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java index 6f3217f..f733402 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.sysml.lops.BinaryM.VectorType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -49,7 +48,7 @@ public class MatrixBVectorArithmeticSPInstruction extends ArithmeticBinarySPInst @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //common binary matrix-broadcast vector process instruction super.processMatrixBVectorBinaryInstruction(ec, _vtype); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java index a808c26..404bf39 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.sysml.lops.BinaryM.VectorType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -48,7 +47,7 @@ public class MatrixBVectorBuiltinSPInstruction extends BuiltinBinarySPInstructio @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //common binary matrix-broadcast vector process instruction super.processMatrixBVectorBinaryInstruction(ec, _vtype); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java index a253321..242b490 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.sysml.lops.BinaryM.VectorType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -49,7 +48,7 @@ public class MatrixBVectorRelationalSPInstruction extends RelationalBinarySPInst @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //common binary matrix-broadcast vector process instruction super.processMatrixBVectorBinaryInstruction(ec, _vtype); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java index 48e649e..1a18a05 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.function.Function; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; @@ -43,7 +42,7 @@ public class MatrixBuiltinSPInstruction extends BuiltinUnarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java index b379d2c..9aa553a 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java @@ -30,7 +30,6 @@ import scala.Tuple2; import org.apache.sysml.hops.AggBinaryOp.SparkAggType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -136,7 +135,7 @@ public class MatrixIndexingSPInstruction extends UnarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; String opcode = getOpcode(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java index 2aec1c0..e722a43 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -44,7 +43,7 @@ public class MatrixMatrixArithmeticSPInstruction extends ArithmeticBinarySPInstr @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //common binary matrix-matrix process instruction super.processMatrixMatrixBinaryInstruction(ec); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java index ec93487..1ab995e 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -35,7 +34,7 @@ public class MatrixMatrixBuiltinSPInstruction extends BuiltinBinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //common binary matrix-matrix process instruction super.processMatrixMatrixBinaryInstruction(ec); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java index e4ec117..ede6ad1 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -44,7 +43,7 @@ public class MatrixMatrixRelationalSPInstruction extends RelationalBinarySPInstr @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //common binary matrix-matrix process instruction super.processMatrixMatrixBinaryInstruction(ec); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java index c2d180e..9bcf178 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java @@ -28,7 +28,6 @@ import scala.Tuple2; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -90,7 +89,7 @@ public class MatrixReshapeSPInstruction extends UnarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec;
