http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java index 24eb045..bbe96ff 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.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; @@ -34,7 +33,7 @@ public class MatrixScalarArithmeticSPInstruction extends ArithmeticBinarySPInstr @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //sanity check opcode String opcode = getOpcode();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java index 195e96c..024e31b 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.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 MatrixScalarBuiltinSPInstruction extends BuiltinBinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //sanity check opcode String opcode = getOpcode(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java index 4d8b75f..9f8edcb 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.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 MatrixScalarRelationalSPInstruction extends RelationalBinarySPInstr @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String opcode = getOpcode(); if ( !(opcode.equalsIgnoreCase("==") || opcode.equalsIgnoreCase("!=") || opcode.equalsIgnoreCase("<") http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java index e59de45..0b0ee35 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java @@ -32,7 +32,6 @@ import scala.Tuple2; import org.apache.sysml.lops.PMapMult; 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; @@ -94,7 +93,7 @@ public class PMapmmSPInstruction 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/ParameterizedBuiltinSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java index d099853..782161f 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java @@ -33,7 +33,6 @@ import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.parser.Statement; 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; @@ -100,7 +99,7 @@ public class ParameterizedBuiltinSPInstruction extends ComputationSPInstruction } public static ParameterizedBuiltinSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); // first part is always the opcode @@ -170,7 +169,7 @@ public class ParameterizedBuiltinSPInstruction extends ComputationSPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + 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/PmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java index 5581388..44313e6 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java @@ -31,7 +31,6 @@ import org.apache.sysml.hops.OptimizerUtils; import org.apache.sysml.lops.MapMult.CacheType; import org.apache.sysml.lops.PMMJ; 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; @@ -96,7 +95,7 @@ public class PmmSPInstruction extends BinarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; @@ -136,7 +135,7 @@ public class PmmSPInstruction extends BinarySPInstruction private int _brlen = -1; public RDDPMMFunction( CacheType type, PartitionedBroadcastMatrix binput, long rlen, int brlen ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { _brlen = brlen; _rlen = rlen; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java index 55b9584..befc9f6 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java @@ -29,7 +29,6 @@ import scala.Tuple2; import org.apache.sysml.lops.PickByCount.OperationTypes; 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; @@ -111,7 +110,7 @@ public class QuantilePickSPInstruction extends BinarySPInstruction @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/QuantileSortSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java index 793354f..4be5fd0 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java @@ -25,7 +25,6 @@ import org.apache.sysml.lops.SortKeys; 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.instructions.InstructionUtils; @@ -90,7 +89,7 @@ public class QuantileSortSPInstruction extends UnarySPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; boolean weighted = (input2 != null); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java index c87b5ec..c021c04 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java @@ -45,7 +45,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.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -207,7 +206,7 @@ public class QuaternarySPInstruction extends ComputationSPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; QuaternaryOperator qop = (QuaternaryOperator) _optr; @@ -390,7 +389,7 @@ public class QuaternarySPInstruction extends ComputationSPInstruction private static final long serialVersionUID = -8209188316939435099L; public RDDQuaternaryFunction1( QuaternaryOperator qop, PartitionedBroadcastMatrix bcU, PartitionedBroadcastMatrix bcV ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { super(qop, bcU, bcV); } @@ -439,7 +438,7 @@ public class QuaternarySPInstruction extends ComputationSPInstruction private static final long serialVersionUID = 7493974462943080693L; public RDDQuaternaryFunction2( QuaternaryOperator qop, PartitionedBroadcastMatrix bcU, PartitionedBroadcastMatrix bcV ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { super(qop, bcU, bcV); } @@ -475,7 +474,7 @@ public class QuaternarySPInstruction extends ComputationSPInstruction private static final long serialVersionUID = -2294086455843773095L; public RDDQuaternaryFunction3( QuaternaryOperator qop, PartitionedBroadcastMatrix bcU, PartitionedBroadcastMatrix bcV ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { super(qop, bcU, bcV); } @@ -514,7 +513,7 @@ public class QuaternarySPInstruction extends ComputationSPInstruction private static final long serialVersionUID = 7328911771600289250L; public RDDQuaternaryFunction4( QuaternaryOperator qop ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { super(qop, null, null); } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java index 5685e44..000bd63 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java @@ -24,7 +24,6 @@ import org.apache.hadoop.io.Text; 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; @@ -80,7 +79,7 @@ public class ReblockSPInstruction 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/ReorgSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java index 1514e5e..ee5b9a6 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java @@ -30,7 +30,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.DiagIndex; @@ -119,7 +118,7 @@ public class ReorgSPInstruction 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/RmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/RmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/RmmSPInstruction.java index d4ea437..e301f04 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/RmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/RmmSPInstruction.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.Multiply; @@ -83,7 +82,7 @@ public class RmmSPInstruction 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/SPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java index 8b27d29..ae16075 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java @@ -23,7 +23,6 @@ import org.apache.sysml.api.MLContext; import org.apache.sysml.api.MLContextProxy; import org.apache.sysml.lops.runtime.RunMRJobs; 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.Instruction; @@ -84,7 +83,7 @@ public abstract class SPInstruction extends Instruction @Override public Instruction preprocessInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //default pre-process behavior (e.g., debug state) Instruction tmp = super.preprocessInstruction(ec); @@ -114,7 +113,7 @@ public abstract class SPInstruction extends Instruction @Override public abstract void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException; + throws DMLRuntimeException; @Override public void postprocessInstruction(ExecutionContext ec) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/TernarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/TernarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/TernarySPInstruction.java index fa00eb0..e743820 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/TernarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/TernarySPInstruction.java @@ -31,7 +31,6 @@ import scala.Tuple2; import org.apache.sysml.lops.Ternary; 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.CTable; @@ -115,7 +114,7 @@ public class TernarySPInstruction 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/TsmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/TsmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/TsmmSPInstruction.java index 2e162bb..6bd20a4 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/TsmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/TsmmSPInstruction.java @@ -25,7 +25,6 @@ import org.apache.spark.api.java.function.Function; import org.apache.sysml.lops.MMTSJ.MMTSJType; 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; @@ -76,7 +75,7 @@ public class TsmmSPInstruction 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/UaggOuterChainSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/UaggOuterChainSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/UaggOuterChainSPInstruction.java index ae1ab91..e2cb782 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/UaggOuterChainSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/UaggOuterChainSPInstruction.java @@ -32,7 +32,6 @@ import scala.Tuple2; import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType; import org.apache.sysml.lops.UAggOuterChain; 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; @@ -120,7 +119,7 @@ public class UaggOuterChainSPInstruction 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/WriteSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java index 3a6ad01..987cf7d 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java @@ -30,7 +30,6 @@ import org.apache.spark.api.java.JavaRDD; 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.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; @@ -128,7 +127,7 @@ public class WriteSPInstruction extends SPInstruction @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/ZipmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ZipmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ZipmmSPInstruction.java index 3316b60..8ad18fe 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ZipmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ZipmmSPInstruction.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.Multiply; @@ -85,7 +84,7 @@ public class ZipmmSPInstruction 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/data/PartitionedBroadcastMatrix.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java index bfd5e0b..f79d8c1 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java @@ -24,7 +24,6 @@ import java.io.Serializable; import org.apache.spark.broadcast.Broadcast; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.MatrixBlock; /** @@ -91,7 +90,7 @@ public class PartitionedBroadcastMatrix implements Serializable } public MatrixBlock sliceOperations(long rl, long ru, long cl, long cu, MatrixBlock matrixBlock) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { MatrixBlock ret = null; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedMatrixBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedMatrixBlock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedMatrixBlock.java index 985de11..901b130 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedMatrixBlock.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedMatrixBlock.java @@ -32,7 +32,6 @@ import java.util.ArrayList; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; @@ -258,11 +257,10 @@ public class PartitionedMatrixBlock implements Externalizable * @param cu * @param matrixBlock * @return - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ public MatrixBlock sliceOperations(long rl, long ru, long cl, long cu, MatrixBlock matrixBlock) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { int lrl = (int) rl; int lru = (int) ru; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDSortUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDSortUtils.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDSortUtils.java index 34c1358..48a8496 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDSortUtils.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDSortUtils.java @@ -35,7 +35,6 @@ import org.apache.spark.broadcast.Broadcast; import scala.Tuple2; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; import org.apache.sysml.runtime.functionobjects.SortIndex; @@ -186,65 +185,6 @@ public class RDDSortUtils } /** - * - * @param val - * @param data - * @param asc - * @param rlen - * @param brlen - * @param bclen - * @param ec - * @param r_op - * @return - * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException - */ - /* This function collects and sorts value column through cluster distribution and then broadcasts it. - * - * For now, its commented out until it gets evaluated completely through experiments. - */ -// public static JavaPairRDD<MatrixIndexes, MatrixBlock> sortDataByValDistSort( JavaPairRDD<MatrixIndexes, MatrixBlock> val, -// JavaPairRDD<MatrixIndexes, MatrixBlock> data, boolean asc, long rlen, long clen, int brlen, int bclen, -// ExecutionContext ec, ReorgOperator r_op) -// throws DMLRuntimeException, DMLUnsupportedOperationException -// { -// SparkExecutionContext sec = (SparkExecutionContext)ec; -// MatrixBlock sortedBlock; -// -// //create value-index rdd from inputs -// JavaPairRDD<ValueIndexPair, Double> dvals = val -// .flatMapToPair(new ExtractDoubleValuesWithIndexFunction(brlen)); -// -// //sort (creates sorted range per partition) -// long hdfsBlocksize = InfrastructureAnalyzer.getHDFSBlockSize(); -// int numPartitions = (int)Math.ceil(((double)rlen*16)/hdfsBlocksize); -// JavaRDD<ValueIndexPair> sdvals = dvals -// .sortByKey(new IndexComparator(asc), true, numPartitions) -// .keys(); //workaround for index comparator -// -// //create target indexes by original index -// JavaPairRDD<Long, Long> ixmap = sdvals -// .zipWithIndex() -// .mapToPair(new ExtractIndexFunction()) // Original Index sorted by values -// .sortByKey(); // Original Index sorted to original order, with target index associaed with them. -// -// JavaPairRDD<MatrixIndexes, MatrixBlock> ixmap2 = ixmap -// .mapPartitions(new ConvertToBinaryBlockFunction4(rlen, brlen)) -// .mapToPair(new UnfoldBinaryBlockFunction()); -// -// sortedBlock = SparkExecutionContext.toMatrixBlock(ixmap2, (int)rlen, 1, brlen, bclen, -1); -// -// PartitionedMatrixBlock pmb = new PartitionedMatrixBlock(sortedBlock, brlen, bclen); -// Broadcast<PartitionedMatrixBlock> _pmb = sec.getSparkContext().broadcast(pmb); -// -// JavaPairRDD<MatrixIndexes, MatrixBlock> ret = data -// .flatMapToPair(new ShuffleMatrixBlockRowsInMemFunction(rlen, brlen, _pmb)); -// ret = RDDAggregateUtils.mergeByKey(ret); -// -// return ret; -// } - - /** * This function collects and sorts value column in memory and then broadcasts it. * * @param val @@ -257,12 +197,11 @@ public class RDDSortUtils * @param r_op * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static JavaPairRDD<MatrixIndexes, MatrixBlock> sortDataByValMemSort( JavaPairRDD<MatrixIndexes, MatrixBlock> val, JavaPairRDD<MatrixIndexes, MatrixBlock> data, boolean asc, long rlen, long clen, int brlen, int bclen, SparkExecutionContext sec, ReorgOperator r_op) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //collect orderby column for in-memory sorting MatrixBlock inMatBlock = SparkExecutionContext http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/SparkUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/SparkUtils.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/SparkUtils.java index 6b9037a..3c898a6 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/SparkUtils.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/SparkUtils.java @@ -34,7 +34,6 @@ import scala.Tuple2; import org.apache.sysml.lops.Checkpoint; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.spark.functions.CopyBinaryCellFunction; import org.apache.sysml.runtime.instructions.spark.functions.CopyBlockFunction; import org.apache.sysml.runtime.matrix.MatrixCharacteristics; @@ -97,7 +96,6 @@ public class SparkUtils * @param blen * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static MatrixBlock[] partitionIntoRowBlocks( MatrixBlock mb, int blen ) throws DMLRuntimeException @@ -123,7 +121,6 @@ public class SparkUtils * @param brlen * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static MatrixBlock[] partitionIntoColumnBlocks( MatrixBlock mb, int blen ) throws DMLRuntimeException http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/FrameReaderFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/FrameReaderFactory.java b/src/main/java/org/apache/sysml/runtime/io/FrameReaderFactory.java index 58f2490..e18a7d2 100644 --- a/src/main/java/org/apache/sysml/runtime/io/FrameReaderFactory.java +++ b/src/main/java/org/apache/sysml/runtime/io/FrameReaderFactory.java @@ -23,7 +23,6 @@ import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties; import org.apache.sysml.runtime.matrix.data.FileFormatProperties; import org.apache.sysml.runtime.matrix.data.InputInfo; -import org.apache.sysml.runtime.matrix.data.OutputInfo; /** * http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/FrameWriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/FrameWriter.java b/src/main/java/org/apache/sysml/runtime/io/FrameWriter.java index 6c1b303..b5058f0 100644 --- a/src/main/java/org/apache/sysml/runtime/io/FrameWriter.java +++ b/src/main/java/org/apache/sysml/runtime/io/FrameWriter.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.FrameBlock; /** @@ -44,12 +43,11 @@ public abstract class FrameWriter * @param rlen * @param clen * @return - * @throws IOException - * @throws DMLUnsupportedOperationException + * @throws IOException * @throws DMLRuntimeException */ public abstract void writeFrameToHDFS( FrameBlock src, String fname, long rlen, long clen ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException; + throws IOException, DMLRuntimeException; /** * http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/FrameWriterBinaryBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/FrameWriterBinaryBlock.java b/src/main/java/org/apache/sysml/runtime/io/FrameWriterBinaryBlock.java index 7daf3c3..d8eddd9 100644 --- a/src/main/java/org/apache/sysml/runtime/io/FrameWriterBinaryBlock.java +++ b/src/main/java/org/apache/sysml/runtime/io/FrameWriterBinaryBlock.java @@ -27,7 +27,6 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.ConfigurationManager; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.FrameBlock; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; import org.apache.sysml.runtime.util.MapReduceTool; @@ -49,11 +48,10 @@ public class FrameWriterBinaryBlock extends FrameWriter * @return * @throws IOException * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ @Override public void writeFrameToHDFS( FrameBlock src, String fname, long rlen, long clen ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //prepare file access JobConf job = new JobConf(ConfigurationManager.getCachedJobConf()); @@ -75,12 +73,11 @@ public class FrameWriterBinaryBlock extends FrameWriter * @param clen * @return * @throws IOException - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ @SuppressWarnings("deprecation") protected void writeBinaryBlockFrameToHDFS( Path path, JobConf job, FrameBlock src, long rlen, long clen ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { FileSystem fs = FileSystem.get(job); int brlen = ConfigurationManager.getBlocksize(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCSV.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCSV.java b/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCSV.java index 10d957f..455f44d 100644 --- a/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCSV.java +++ b/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCSV.java @@ -29,7 +29,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.ConfigurationManager; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties; import org.apache.sysml.runtime.matrix.data.FrameBlock; import org.apache.sysml.runtime.util.MapReduceTool; @@ -56,12 +55,11 @@ public class FrameWriterTextCSV extends FrameWriter * @param clen * @return * @throws IOException - * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException + * @throws DMLRuntimeException */ @Override public void writeFrameToHDFS(FrameBlock src, String fname, long rlen, long clen) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //validity check frame dimensions if( src.getNumRows() != rlen || src.getNumColumns() != clen ) { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCell.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCell.java b/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCell.java index c595448..8064ce5 100644 --- a/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCell.java +++ b/src/main/java/org/apache/sysml/runtime/io/FrameWriterTextCell.java @@ -29,7 +29,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.ConfigurationManager; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.FrameBlock; import org.apache.sysml.runtime.util.MapReduceTool; @@ -41,11 +40,10 @@ public class FrameWriterTextCell extends FrameWriter * @return * @throws IOException * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ @Override public void writeFrameToHDFS( FrameBlock src, String fname, long rlen, long clen ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //validity check frame dimensions if( src.getNumRows() != rlen || src.getNumColumns() != clen ) { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/MatrixWriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/MatrixWriter.java b/src/main/java/org/apache/sysml/runtime/io/MatrixWriter.java index 98965b9..eca3caf 100644 --- a/src/main/java/org/apache/sysml/runtime/io/MatrixWriter.java +++ b/src/main/java/org/apache/sysml/runtime/io/MatrixWriter.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.io; import java.io.IOException; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.MatrixBlock; /** @@ -44,11 +43,10 @@ public abstract class MatrixWriter * @param bclen * @param expNnz * @return - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ public abstract void writeMatrixToHDFS( MatrixBlock src, String fname, long rlen, long clen, int brlen, int bclen, long nnz ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException; + throws IOException, DMLRuntimeException; /** * Writes a minimal entry to represent an empty matrix on hdfs. @@ -60,7 +58,6 @@ public abstract class MatrixWriter * @param bclen * @throws IOException * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public abstract void writeEmptyMatrixToHDFS( String fname, long rlen, long clen, int brlen, int bclen ) throws IOException, DMLRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlock.java b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlock.java index 54b011f..a3e0ebf 100644 --- a/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlock.java +++ b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlock.java @@ -28,7 +28,6 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.ConfigurationManager; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; @@ -48,7 +47,7 @@ public class WriterBinaryBlock extends MatrixWriter @Override public void writeMatrixToHDFS(MatrixBlock src, String fname, long rlen, long clen, int brlen, int bclen, long nnz) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //prepare file access JobConf job = new JobConf(ConfigurationManager.getCachedJobConf()); @@ -93,12 +92,11 @@ public class WriterBinaryBlock extends MatrixWriter * @param brlen * @param bclen * @throws IOException - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ @SuppressWarnings("deprecation") protected void writeBinaryBlockMatrixToHDFS( Path path, JobConf job, MatrixBlock src, long rlen, long clen, int brlen, int bclen, int replication ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { boolean sparse = src.isInSparseFormat(); FileSystem fs = FileSystem.get(job); @@ -187,12 +185,11 @@ public class WriterBinaryBlock extends MatrixWriter * @param bclen * @param replication * @throws IOException - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ @SuppressWarnings("deprecation") protected void writeDiagBinaryBlockMatrixToHDFS( Path path, JobConf job, MatrixBlock src, long rlen, long clen, int brlen, int bclen, int replication ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { boolean sparse = src.isInSparseFormat(); FileSystem fs = FileSystem.get(job); @@ -293,11 +290,10 @@ public class WriterBinaryBlock extends MatrixWriter * @param pformat * @throws IOException * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ @SuppressWarnings("deprecation") public void writePartitionedBinaryBlockMatrixToHDFS( Path path, JobConf job, MatrixBlock src, long rlen, long clen, int brlen, int bclen, PDataPartitionFormat pformat ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { boolean sparse = src.isInSparseFormat(); FileSystem fs = FileSystem.get(job); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlockParallel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlockParallel.java b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlockParallel.java index a950c88..b316f8b 100644 --- a/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlockParallel.java +++ b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlockParallel.java @@ -34,7 +34,6 @@ import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.DMLConfig; import org.apache.sysml.hops.OptimizerUtils; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; @@ -59,12 +58,11 @@ public class WriterBinaryBlockParallel extends WriterBinaryBlock * @param brlen * @param bclen * @throws IOException - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ @Override protected void writeBinaryBlockMatrixToHDFS( Path path, JobConf job, MatrixBlock src, long rlen, long clen, int brlen, int bclen, int replication ) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //estimate output size and number of output blocks (min 1) int numPartFiles = (int)(OptimizerUtils.estimatePartitionedSizeExactSparsity(rlen, clen, brlen, bclen, src.getNonZeros()) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/WriterBinaryCell.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/WriterBinaryCell.java b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryCell.java index 66b0324..8c66d52 100644 --- a/src/main/java/org/apache/sysml/runtime/io/WriterBinaryCell.java +++ b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryCell.java @@ -28,7 +28,6 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.ConfigurationManager; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.IJV; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixCell; @@ -40,7 +39,7 @@ public class WriterBinaryCell extends MatrixWriter @Override public void writeMatrixToHDFS(MatrixBlock src, String fname, long rlen, long clen, int brlen, int bclen, long nnz) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //prepare file access JobConf job = new JobConf(ConfigurationManager.getCachedJobConf()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarket.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarket.java b/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarket.java index 7b37385..42d504a 100644 --- a/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarket.java +++ b/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarket.java @@ -35,7 +35,6 @@ import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.ConfigurationManager; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.IJV; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.util.MapReduceTool; @@ -47,7 +46,7 @@ public class WriterMatrixMarket extends MatrixWriter { @Override public void writeMatrixToHDFS(MatrixBlock src, String fname, long rlen, long clen, int brlen, int bclen, long nnz) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //validity check matrix dimensions if( src.getNumRows() != rlen || src.getNumColumns() != clen ) { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/WriterTextCSV.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/WriterTextCSV.java b/src/main/java/org/apache/sysml/runtime/io/WriterTextCSV.java index 54ec1a4..f18a8ec 100644 --- a/src/main/java/org/apache/sysml/runtime/io/WriterTextCSV.java +++ b/src/main/java/org/apache/sysml/runtime/io/WriterTextCSV.java @@ -36,7 +36,6 @@ import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.ConfigurationManager; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.CSVReblockMR; import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -60,7 +59,7 @@ public class WriterTextCSV extends MatrixWriter @Override public void writeMatrixToHDFS(MatrixBlock src, String fname, long rlen, long clen, int brlen, int bclen, long nnz) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //validity check matrix dimensions if( src.getNumRows() != rlen || src.getNumColumns() != clen ) { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/io/WriterTextCell.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/io/WriterTextCell.java b/src/main/java/org/apache/sysml/runtime/io/WriterTextCell.java index e293fd6..dd421ed 100644 --- a/src/main/java/org/apache/sysml/runtime/io/WriterTextCell.java +++ b/src/main/java/org/apache/sysml/runtime/io/WriterTextCell.java @@ -30,7 +30,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; import org.apache.sysml.conf.ConfigurationManager; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.matrix.data.IJV; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.util.MapReduceTool; @@ -39,7 +38,7 @@ public class WriterTextCell extends MatrixWriter { @Override public void writeMatrixToHDFS(MatrixBlock src, String fname, long rlen, long clen, int brlen, int bclen, long nnz) - throws IOException, DMLRuntimeException, DMLUnsupportedOperationException + throws IOException, DMLRuntimeException { //validity check matrix dimensions if( src.getNumRows() != rlen || src.getNumColumns() != clen ) { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/matrix/GMR.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/GMR.java b/src/main/java/org/apache/sysml/runtime/matrix/GMR.java index 0d399fa..dd54886 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/GMR.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/GMR.java @@ -36,7 +36,6 @@ import org.apache.sysml.conf.DMLConfig; 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.controlprogram.ParForProgramBlock.PDataPartitionFormat; import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; import org.apache.sysml.runtime.instructions.Instruction; @@ -315,10 +314,9 @@ public class GMR * @param rlens * @param clens * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private static void setupDistributedCache(JobConf job, String instMap, String instRed, String[] inputs, long[] rlens, long[] clens) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //concatenate mapper and reducer instructions String allInsts = (instMap!=null && !instMap.trim().isEmpty() ) ? instMap : null; @@ -386,10 +384,9 @@ public class GMR * @param inst4 * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private static boolean[] getDistCacheOnlyInputs(byte[] realIndexes, String inst1, String inst2, String inst3, String inst4) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { boolean[] ret = new boolean[realIndexes.length]; String[] inst = new String[]{inst1, inst2, inst3, inst4}; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/matrix/MatrixCharacteristics.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/MatrixCharacteristics.java b/src/main/java/org/apache/sysml/runtime/matrix/MatrixCharacteristics.java index 8151465..65f3b1a 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/MatrixCharacteristics.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/MatrixCharacteristics.java @@ -25,7 +25,6 @@ import java.util.HashMap; 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.mr.AggregateBinaryInstruction; import org.apache.sysml.runtime.instructions.mr.AggregateInstruction; import org.apache.sysml.runtime.instructions.mr.AggregateUnaryInstruction; @@ -204,27 +203,26 @@ public class MatrixCharacteristics implements Serializable } public static void reorg(MatrixCharacteristics dim, ReorgOperator op, - MatrixCharacteristics dimOut) throws DMLUnsupportedOperationException, DMLRuntimeException + MatrixCharacteristics dimOut) throws DMLRuntimeException { op.fn.computeDimension(dim, dimOut); } public static void aggregateUnary(MatrixCharacteristics dim, AggregateUnaryOperator op, - MatrixCharacteristics dimOut) throws DMLUnsupportedOperationException, DMLRuntimeException + MatrixCharacteristics dimOut) throws DMLRuntimeException { op.indexFn.computeDimension(dim, dimOut); } public static void aggregateBinary(MatrixCharacteristics dim1, MatrixCharacteristics dim2, AggregateBinaryOperator op, MatrixCharacteristics dimOut) - throws DMLUnsupportedOperationException { //set dimension dimOut.set(dim1.numRows, dim2.numColumns, dim1.numRowsPerBlock, dim2.numColumnsPerBlock); } public static void computeDimension(HashMap<Byte, MatrixCharacteristics> dims, MRInstruction ins) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { MatrixCharacteristics dimOut=dims.get(ins.output); if(dimOut==null) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/matrix/data/CM_N_COVCell.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/CM_N_COVCell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/CM_N_COVCell.java index a1fc979..58bd529 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/CM_N_COVCell.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/CM_N_COVCell.java @@ -28,7 +28,6 @@ import java.util.ArrayList; import org.apache.hadoop.io.WritableComparable; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.cp.CM_COV_Object; import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue; import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator; @@ -55,27 +54,27 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable @Override public MatrixValue aggregateBinaryOperations(MatrixValue m1Value, MatrixValue m2Value, MatrixValue result, AggregateBinaryOperator op) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public MatrixValue aggregateUnaryOperations(AggregateUnaryOperator op, MatrixValue result, int brlen, int bclen, MatrixIndexes indexesIn) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public MatrixValue binaryOperations(BinaryOperator op, MatrixValue thatValue, MatrixValue result) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public void binaryOperationsInPlace(BinaryOperator op, MatrixValue thatValue) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @@ -122,14 +121,14 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable @Override public void incrementalAggregate(AggregateOperator aggOp, MatrixValue correction, MatrixValue newWithCorrection) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new RuntimeException("operation not supported fro WeightedCell"); } @Override public void incrementalAggregate(AggregateOperator aggOp, MatrixValue newWithCorrection) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new RuntimeException("operation not supported fro WeightedCell"); } @@ -146,7 +145,7 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable @Override public MatrixValue reorgOperations(ReorgOperator op, MatrixValue result, int startRow, int startColumn, int length) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new RuntimeException("operation not supported fro WeightedCell"); } @@ -174,7 +173,7 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable @Override public MatrixValue scalarOperations(ScalarOperator op, MatrixValue result) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @@ -195,13 +194,13 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable @Override public MatrixValue unaryOperations(UnaryOperator op, MatrixValue result) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public void unaryOperationsInPlace(UnaryOperator op) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @@ -274,14 +273,14 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable @Override public MatrixValue zeroOutOperations(MatrixValue result, IndexRange range, boolean complementary) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public void ternaryOperations(Operator op, MatrixValue that, MatrixValue that2, CTableMap resultMap, MatrixBlock resultBlock) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @@ -289,34 +288,34 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable @Override public void ternaryOperations(Operator op, MatrixValue that, double scalarThat2, boolean ignoreZeros, CTableMap resultMap, MatrixBlock resultBlock) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public void ternaryOperations(Operator op, double scalarThat, double scalarThat2, CTableMap resultMap, MatrixBlock resultBlock) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public void ternaryOperations(Operator op, MatrixIndexes ix1, double scalarThat, boolean left, int brlen, CTableMap resultMap, MatrixBlock resultBlock) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public void ternaryOperations(Operator op, double scalarThat, MatrixValue that2, CTableMap resultMap, MatrixBlock resultBlock) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public MatrixValue quaternaryOperations(QuaternaryOperator qop, MatrixValue um, MatrixValue vm, MatrixValue wm, MatrixValue out) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @@ -326,13 +325,13 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable public void sliceOperations(ArrayList<IndexedMatrixValue> outlist, IndexRange range, int rowCut, int colCut, int blockRowFactor, int blockColFactor, int boundaryRlen, int boundaryClen) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public MatrixValue replaceOperations(MatrixValue result, double pattern, double replacement) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @@ -340,7 +339,7 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable public MatrixValue aggregateUnaryOperations(AggregateUnaryOperator op, MatrixValue result, int blockingFactorRow, int blockingFactorCol, MatrixIndexes indexesIn, boolean inCP) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @@ -348,14 +347,14 @@ public class CM_N_COVCell extends MatrixValue implements WritableComparable public MatrixValue aggregateBinaryOperations(MatrixIndexes m1Index, MatrixValue m1Value, MatrixIndexes m2Index, MatrixValue m2Value, MatrixValue result, AggregateBinaryOperator op) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } @Override public void appendOperations(MatrixValue valueIn2, ArrayList<IndexedMatrixValue> outlist, int blockRowFactor, int blockColFactor, boolean cbind, boolean m2IsLast, int nextNCol) - throws DMLUnsupportedOperationException, DMLRuntimeException { + throws DMLRuntimeException { throw new DMLRuntimeException("operation not supported fro WeightedCell"); } } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java index a5620e5..974d0f4 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java @@ -29,7 +29,6 @@ import java.util.concurrent.Future; 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.Builtin; import org.apache.sysml.runtime.functionobjects.Builtin.BuiltinFunctionCode; import org.apache.sysml.runtime.functionobjects.CM; @@ -706,10 +705,9 @@ public class LibMatrixAgg * @param aop * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private static void aggregateFinalResult( AggregateOperator aop, MatrixBlock out, MatrixBlock partout ) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { AggregateOperator laop = aop; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java index 698149c..23cd5ba 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java @@ -37,7 +37,6 @@ import org.apache.sysml.lops.WeightedSigmoid.WSigmoidType; import org.apache.sysml.lops.WeightedSquaredLoss.WeightsType; import org.apache.sysml.lops.WeightedUnaryMM.WUMMType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.functionobjects.SwapIndex; import org.apache.sysml.runtime.functionobjects.ValueFunction; import org.apache.sysml.runtime.matrix.operators.ReorgOperator; @@ -226,10 +225,9 @@ public class LibMatrixMult * @param ret * @param ct * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static void matrixMultChain(MatrixBlock mX, MatrixBlock mV, MatrixBlock mW, MatrixBlock ret, ChainType ct) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //check inputs / outputs (after that mV and mW guaranteed to be dense) if( mX.isEmptyBlock(false) || mV.isEmptyBlock(false) || (mW !=null && mW.isEmptyBlock(false)) ) { @@ -271,10 +269,9 @@ public class LibMatrixMult * @param ct * @param k * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static void matrixMultChain(MatrixBlock mX, MatrixBlock mV, MatrixBlock mW, MatrixBlock ret, ChainType ct, int k) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //check inputs / outputs (after that mV and mW guaranteed to be dense) if( mX.isEmptyBlock(false) || mV.isEmptyBlock(false) || (mW !=null && mW.isEmptyBlock(false)) ) { @@ -331,10 +328,9 @@ public class LibMatrixMult * @param ret * @param leftTranspose * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static void matrixMultTransposeSelf( MatrixBlock m1, MatrixBlock ret, boolean leftTranspose ) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //check inputs / outputs if( m1.isEmptyBlock(false) ) { @@ -368,11 +364,10 @@ public class LibMatrixMult * @param ret * @param leftTranspose * @param k - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ public static void matrixMultTransposeSelf( MatrixBlock m1, MatrixBlock ret, boolean leftTranspose, int k ) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //check inputs / outputs if( m1.isEmptyBlock(false) ) { @@ -426,11 +421,10 @@ public class LibMatrixMult * @param m2 * @param ret1 * @param ret2 - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ public static void matrixMultPermute( MatrixBlock pm1, MatrixBlock m2, MatrixBlock ret1, MatrixBlock ret2 ) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //check inputs / outputs if( pm1.isEmptyBlock(false) || m2.isEmptyBlock(false) ) @@ -471,12 +465,10 @@ public class LibMatrixMult * @param m2 * @param ret1 * @param ret2 - * @throws DMLUnsupportedOperationException - * @throws DMLRuntimeException * @throws DMLRuntimeException */ public static void matrixMultPermute( MatrixBlock pm1, MatrixBlock m2, MatrixBlock ret1, MatrixBlock ret2, int k) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //check inputs / outputs if( pm1.isEmptyBlock(false) || m2.isEmptyBlock(false) ) @@ -1606,7 +1598,6 @@ public class LibMatrixMult * @param ret * @param ct * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private static void matrixMultChainDense(MatrixBlock mX, MatrixBlock mV, MatrixBlock mW, MatrixBlock ret, ChainType ct, int rl, int ru) { @@ -1661,7 +1652,6 @@ public class LibMatrixMult * @param rl * @param ru * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private static void matrixMultChainSparse(MatrixBlock mX, MatrixBlock mV, MatrixBlock mW, MatrixBlock ret, ChainType ct, int rl, int ru) { @@ -1718,7 +1708,6 @@ public class LibMatrixMult * @param ret * @param leftTranspose * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private static void matrixMultTransposeSelfDense( MatrixBlock m1, MatrixBlock ret, boolean leftTranspose, int rl, int ru ) throws DMLRuntimeException @@ -1856,7 +1845,6 @@ public class LibMatrixMult * * @param out * @param leftTranspose - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ private static void matrixMultTransposeSelfSparse( MatrixBlock m1, MatrixBlock ret, boolean leftTranspose, int rl, int ru ) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixOuterAgg.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixOuterAgg.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixOuterAgg.java index fd551d5..dab24a0 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixOuterAgg.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixOuterAgg.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.matrix.data; import java.util.Arrays; 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.Equals; import org.apache.sysml.runtime.functionobjects.GreaterThan; @@ -120,15 +119,17 @@ public class LibMatrixOuterAgg } - /* + /** * * @param iCols * @param vmb * @param bOp * @param uaggOp - * + * @return + * @throws DMLRuntimeException */ - public static int[] prepareRowIndices(int iCols, double vmb[], BinaryOperator bOp, AggregateUnaryOperator uaggOp) throws DMLRuntimeException, DMLUnsupportedOperationException + public static int[] prepareRowIndices(int iCols, double vmb[], BinaryOperator bOp, AggregateUnaryOperator uaggOp) + throws DMLRuntimeException { return (isRowIndexMax(uaggOp)?prepareRowIndicesMax(iCols, vmb, bOp):prepareRowIndicesMin(iCols, vmb, bOp)); } @@ -161,7 +162,7 @@ public class LibMatrixOuterAgg * @param bOp * @return vixCumSum */ - public static int[] prepareRowIndicesMax(int iCols, double vmb[], BinaryOperator bOp) throws DMLRuntimeException, DMLUnsupportedOperationException + public static int[] prepareRowIndicesMax(int iCols, double vmb[], BinaryOperator bOp) throws DMLRuntimeException { int[] vixCumSum = null; int[] vix = new int[iCols]; @@ -241,7 +242,7 @@ public class LibMatrixOuterAgg * @param bOp * @return vixCumSum */ - public static int[] prepareRowIndicesMin(int iCols, double vmb[], BinaryOperator bOp) throws DMLRuntimeException, DMLUnsupportedOperationException + public static int[] prepareRowIndicesMin(int iCols, double vmb[], BinaryOperator bOp) throws DMLRuntimeException { int[] vixCumSum = null; int[] vix = new int[iCols]; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixReorg.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixReorg.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixReorg.java index 388a632..b288ba0 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixReorg.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixReorg.java @@ -29,7 +29,6 @@ import java.util.HashSet; import java.util.Map.Entry; 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.SortIndex; @@ -184,11 +183,10 @@ public class LibMatrixReorg * @param rows1 * @param brlen * @param out - * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException + * @throws DMLRuntimeException */ public static void rev( IndexedMatrixValue in, long rlen, int brlen, ArrayList<IndexedMatrixValue> out ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //input block reverse MatrixIndexes inix = in.getIndexes(); @@ -482,11 +480,10 @@ public class LibMatrixReorg * @param in * @param out * @param rows - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ public static MatrixBlock rmempty(MatrixBlock in, MatrixBlock ret, boolean rows) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { return rmempty(in, ret, rows, null); } @@ -497,11 +494,10 @@ public class LibMatrixReorg * @param in * @param out * @param rows - * @throws DMLUnsupportedOperationException * @throws DMLRuntimeException */ public static MatrixBlock rmempty(MatrixBlock in, MatrixBlock ret, boolean rows, MatrixBlock select) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //check for empty inputs //(the semantics of removeEmpty are that for an empty m-by-n matrix, the output @@ -618,10 +614,9 @@ public class LibMatrixReorg * @param rows * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static MatrixBlock rexpand(MatrixBlock in, MatrixBlock ret, double max, boolean rows, boolean cast, boolean ignore) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //prepare parameters int lmax = (int)UtilFunctions.toLong(max); @@ -658,10 +653,9 @@ public class LibMatrixReorg * @param bclen * @param outList * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static void rexpand(IndexedMatrixValue data, double max, boolean rows, boolean cast, boolean ignore, long brlen, long bclen, ArrayList<IndexedMatrixValue> outList) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //prepare parameters MatrixIndexes ix = data.getIndexes(); @@ -1797,10 +1791,9 @@ public class LibMatrixReorg * @param select * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private static MatrixBlock removeEmptyRows(MatrixBlock in, MatrixBlock ret, MatrixBlock select) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { final int m = in.rlen; final int n = in.clen; @@ -1895,10 +1888,9 @@ public class LibMatrixReorg * @param select * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private static MatrixBlock removeEmptyColumns(MatrixBlock in, MatrixBlock ret, MatrixBlock select) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { final int m = in.rlen; final int n = in.clen;
