http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/MRJobInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/MRJobInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/MRJobInstruction.java index 8d3bfb6..2811dd8 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/MRJobInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/MRJobInstruction.java @@ -32,7 +32,6 @@ import org.apache.sysml.lops.compile.JobType; import org.apache.sysml.lops.runtime.RunMRJobs; 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.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; @@ -1491,7 +1490,7 @@ public class MRJobInstruction extends Instruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { if ( DMLScript.rtplatform == RUNTIME_PLATFORM.SINGLE_NODE) throw new DMLRuntimeException("MapReduce jobs cannot be executed when execution mode = singlenode");
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java b/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java index 2694fc9..fa1a630 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java @@ -34,7 +34,6 @@ import org.apache.sysml.lops.WeightedSquaredLossR; import org.apache.sysml.lops.WeightedUnaryMM; import org.apache.sysml.lops.WeightedUnaryMMR; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.instructions.spark.AggregateTernarySPInstruction; import org.apache.sysml.runtime.instructions.spark.AggregateUnarySPInstruction; import org.apache.sysml.runtime.instructions.spark.AppendGAlignedSPInstruction; @@ -260,7 +259,7 @@ public class SPInstructionParser extends InstructionParser } public static SPInstruction parseSingleInstruction (String str ) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { if ( str == null || str.isEmpty() ) return null; @@ -268,7 +267,7 @@ public class SPInstructionParser extends InstructionParser SPINSTRUCTION_TYPE cptype = InstructionUtils.getSPType(str); if ( cptype == null ) // return null; - throw new DMLUnsupportedOperationException("Invalid SP Instruction Type: " + str); + throw new DMLRuntimeException("Invalid SP Instruction Type: " + str); SPInstruction spinst = parseSingleInstruction(cptype, str); if ( spinst == null ) throw new DMLRuntimeException("Unable to parse instruction: " + str); @@ -276,7 +275,7 @@ public class SPInstructionParser extends InstructionParser } public static SPInstruction parseSingleInstruction ( SPINSTRUCTION_TYPE sptype, String str ) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { if ( str == null || str.isEmpty() ) return null; @@ -410,7 +409,7 @@ public class SPInstructionParser extends InstructionParser case INVALID: default: - throw new DMLUnsupportedOperationException("Invalid SP Instruction Type: " + sptype ); + throw new DMLRuntimeException("Invalid SP Instruction Type: " + sptype ); } } } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateBinaryCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateBinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateBinaryCPInstruction.java index 4d7c2ed..05a1bc5 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateBinaryCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateBinaryCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.functionobjects.Multiply; import org.apache.sysml.runtime.functionobjects.Plus; @@ -73,7 +72,7 @@ public class AggregateBinaryCPInstruction extends BinaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //get inputs MatrixBlock matBlock1 = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateTernaryCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateTernaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateTernaryCPInstruction.java index 53e3b18..bb704d4 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateTernaryCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateTernaryCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.functionobjects.KahanPlus; import org.apache.sysml.runtime.functionobjects.Multiply; @@ -73,7 +72,7 @@ public class AggregateTernaryCPInstruction extends ComputationCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { MatrixBlock matBlock1 = ec.getMatrixInput(input1.getName()); MatrixBlock matBlock2 = ec.getMatrixInput(input2.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java index 4950df3..24b2438 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java @@ -23,7 +23,6 @@ import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; 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.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.functionobjects.Builtin; @@ -73,7 +72,7 @@ public class AggregateUnaryCPInstruction extends UnaryCPInstruction @Override public void processInstruction( ExecutionContext ec ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String output_name = output.getName(); String opcode = getOpcode(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java index c58b1f2..38ba9dd 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.operators.Operator; @@ -42,7 +41,7 @@ public abstract class ArithmeticBinaryCPInstruction extends BinaryCPInstruction } public static ArithmeticBinaryCPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { CPOperand in1 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand in2 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); @@ -97,7 +96,7 @@ public abstract class ArithmeticBinaryCPInstruction extends BinaryCPInstruction if(vt1 == ValueType.STRING || vt2 == ValueType.STRING || vt3 == ValueType.STRING) - throw new DMLUnsupportedOperationException("We do not support element-wise string operations on matrices " + throw new DMLRuntimeException("We do not support element-wise string operations on matrices " + in1.getName() + ", " + in2.getName() http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java index 89464ec..fd75d11 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.operators.BinaryOperator; @@ -47,7 +46,7 @@ public abstract class BuiltinBinaryCPInstruction extends BinaryCPInstruction } public static BuiltinBinaryCPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException { + throws DMLRuntimeException { CPOperand in1 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand in2 = 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/cp/BuiltinUnaryCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java index 2e5bcdf..27b291b 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java @@ -24,7 +24,6 @@ import java.util.Arrays; 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; @@ -50,7 +49,7 @@ public abstract class BuiltinUnaryCPInstruction extends UnaryCPInstruction } public static BuiltinUnaryCPInstruction 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/cp/CPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/CPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/CPInstruction.java index 1baff2c..4f3f530 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/CPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/CPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.instructions.CPInstructionParser; import org.apache.sysml.runtime.instructions.Instruction; @@ -69,7 +68,7 @@ public abstract class CPInstruction extends Instruction @Override public Instruction preprocessInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //default preprocess behavior (e.g., debug state) Instruction tmp = super.preprocessInstruction(ec); @@ -90,5 +89,5 @@ public abstract class CPInstruction extends Instruction @Override public abstract void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException; + throws DMLRuntimeException; } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/CentralMomentCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/CentralMomentCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/CentralMomentCPInstruction.java index 0b11d31..e8ca315 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/CentralMomentCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/CentralMomentCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.functionobjects.CM; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -92,7 +91,7 @@ public class CentralMomentCPInstruction extends AggregateUnaryCPInstruction @Override public void processInstruction( ExecutionContext ec ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String output_name = output.getName(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/CovarianceCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/CovarianceCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/CovarianceCPInstruction.java index c4bf559..7ee6706 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/CovarianceCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/CovarianceCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.functionobjects.COV; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -85,7 +84,7 @@ public class CovarianceCPInstruction extends BinaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { MatrixBlock matBlock1 = ec.getMatrixInput(input1.getName()); MatrixBlock matBlock2 = ec.getMatrixInput(input2.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/DataPartitionCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/DataPartitionCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/DataPartitionCPInstruction.java index 16ee080..e474bcd 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/DataPartitionCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/DataPartitionCPInstruction.java @@ -24,7 +24,6 @@ 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.controlprogram.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; @@ -79,7 +78,7 @@ public class DataPartitionCPInstruction extends UnaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get input MatrixObject moIn = (MatrixObject) ec.getVariable(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/FileCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/FileCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/FileCPInstruction.java index 43d5556..404c26e 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/FileCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/FileCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; import java.io.IOException; 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.functionobjects.RemoveFile; import org.apache.sysml.runtime.functionobjects.RenameFile; @@ -56,18 +55,18 @@ public class FileCPInstruction extends CPInstruction } private static FileOperationCode getFileOperationCode ( String str ) - throws DMLUnsupportedOperationException + throws DMLRuntimeException { if ( str.equalsIgnoreCase("rm")) return FileOperationCode.RemoveFile; else if ( str.equalsIgnoreCase("mv") ) return FileOperationCode.MoveFile; else - throw new DMLUnsupportedOperationException("Invalid function: " + str); + throw new DMLRuntimeException("Invalid function: " + str); } public static FileCPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String opcode = InstructionUtils.getOpCode(str); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameAppendCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameAppendCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameAppendCPInstruction.java index de012b5..a3a03a0 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameAppendCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameAppendCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.FrameBlock; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -33,7 +32,7 @@ public final class FrameAppendCPInstruction extends AppendCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get inputs FrameBlock fin1 = ec.getFrameInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameIndexingCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameIndexingCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameIndexingCPInstruction.java index 7443503..df37c6e 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameIndexingCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/FrameIndexingCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.FrameBlock; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -40,7 +39,7 @@ public final class FrameIndexingCPInstruction extends IndexingCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { String opcode = getOpcode(); IndexRange ixrange = getIndexRange(ec); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/FunctionCallCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/FunctionCallCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/FunctionCallCPInstruction.java index 7e8ac12..348eef2 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/FunctionCallCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/FunctionCallCPInstruction.java @@ -32,7 +32,6 @@ 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.DMLScriptException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock; import org.apache.sysml.runtime.controlprogram.LocalVariableMap; import org.apache.sysml.runtime.controlprogram.caching.MatrixObject; @@ -82,7 +81,7 @@ public class FunctionCallCPInstruction extends CPInstruction * */ public static FunctionCallCPInstruction parseInstruction(String str) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String[] parts = InstructionUtils.getInstructionPartsWithValueType ( str ); String namespace = parts[1]; @@ -110,7 +109,7 @@ public class FunctionCallCPInstruction extends CPInstruction @Override public Instruction preprocessInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { //default pre-process behavior Instruction tmp = super.preprocessInstruction(ec); @@ -125,7 +124,7 @@ public class FunctionCallCPInstruction extends CPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { if( LOG.isTraceEnabled() ){ LOG.trace("Executing instruction : " + this.toString()); @@ -209,7 +208,7 @@ public class FunctionCallCPInstruction extends CPInstruction String boundVarName = _boundOutputParamNames.get(i); Data boundValue = retVars.get(fpb.getOutputParams().get(i).getName()); if (boundValue == null) - throw new DMLUnsupportedOperationException(boundVarName + " was not assigned a return value"); + throw new DMLRuntimeException(boundVarName + " was not assigned a return value"); //cleanup existing data bound to output variable name Data exdata = ec.removeVariable(boundVarName); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MMChainCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MMChainCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MMChainCPInstruction.java index 8d4600e..f6b1a82 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MMChainCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MMChainCPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -83,7 +82,7 @@ public class MMChainCPInstruction extends UnaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get inputs MatrixBlock X = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MMTSJCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MMTSJCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MMTSJCPInstruction.java index cc28230..c67ab1d 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MMTSJCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MMTSJCPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -71,7 +70,7 @@ public class MMTSJCPInstruction extends UnaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get inputs MatrixBlock matBlock1 = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixAppendCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixAppendCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixAppendCPInstruction.java index db34958..4c48ed7 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixAppendCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixAppendCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -33,7 +32,7 @@ public final class MatrixAppendCPInstruction extends AppendCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get inputs MatrixBlock matBlock1 = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java index 8e3705e..6116bc1 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.LibCommonsMath; @@ -37,7 +36,7 @@ public class MatrixBuiltinCPInstruction extends BuiltinUnaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { UnaryOperator u_op = (UnaryOperator) _optr; String output_name = output.getName(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixIndexingCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixIndexingCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixIndexingCPInstruction.java index 91d2c39..efa704c 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixIndexingCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixIndexingCPInstruction.java @@ -23,7 +23,6 @@ import org.apache.sysml.api.DMLScript; 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.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -43,7 +42,7 @@ public final class MatrixIndexingCPInstruction extends IndexingCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { String opcode = getOpcode(); IndexRange ixrange = getIndexRange(ec); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java index a55934a..208b688 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.operators.BinaryOperator; @@ -41,7 +40,7 @@ public class MatrixMatrixArithmeticCPInstruction extends ArithmeticBinaryCPInstr @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { // Read input matrices MatrixBlock inBlock1 = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java index 2681005..1fd0eb9 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.LibCommonsMath; @@ -43,7 +42,7 @@ public class MatrixMatrixBuiltinCPInstruction extends BuiltinBinaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String opcode = getOpcode(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java index c0640fd..f972748 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.operators.BinaryOperator; @@ -41,7 +40,7 @@ public class MatrixMatrixRelationalCPInstruction extends RelationalBinaryCPInstr @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { MatrixBlock inBlock1 = ec.getMatrixInput(input1.getName()); MatrixBlock inBlock2 = ec.getMatrixInput(input2.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixReshapeCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixReshapeCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixReshapeCPInstruction.java index 8139c62..608d2f6 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixReshapeCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixReshapeCPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.LibMatrixReorg; @@ -76,7 +75,7 @@ public class MatrixReshapeCPInstruction extends UnaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get inputs MatrixBlock in = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java index dc7cf73..cd140ef 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -42,7 +41,7 @@ public class MatrixScalarBuiltinCPInstruction extends BuiltinBinaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { CPOperand mat = ( input1.getDataType() == DataType.MATRIX ) ? input1 : input2; CPOperand scalar = ( input1.getDataType() == DataType.MATRIX ) ? input2 : input1; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java index e785375..5fc61cc 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java @@ -24,7 +24,6 @@ import java.util.ArrayList; 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.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -56,7 +55,7 @@ public class MultiReturnBuiltinCPInstruction extends ComputationCPInstruction } public static MultiReturnBuiltinCPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); ArrayList<CPOperand> outputs = new ArrayList<CPOperand>(); @@ -99,7 +98,7 @@ public class MultiReturnBuiltinCPInstruction extends ComputationCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String opcode = getOpcode(); MatrixObject mo = (MatrixObject) ec.getVariable(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/PMMJCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/PMMJCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/PMMJCPInstruction.java index 2961d21..8111cdb 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/PMMJCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/PMMJCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -68,7 +67,7 @@ public class PMMJCPInstruction extends ComputationCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get inputs MatrixBlock matBlock1 = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java index 4cff90a..04a7613 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java @@ -25,7 +25,6 @@ import org.apache.sysml.lops.Lop; import org.apache.sysml.parser.Statement; 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.functionobjects.ParameterizedBuiltin; @@ -75,7 +74,7 @@ public class ParameterizedBuiltinCPInstruction extends ComputationCPInstruction } public static ParameterizedBuiltinCPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); // first part is always the opcode @@ -136,7 +135,7 @@ public class ParameterizedBuiltinCPInstruction extends ComputationCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String opcode = getOpcode(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantilePickCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantilePickCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantilePickCPInstruction.java index ab48dd5..f061b22 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantilePickCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantilePickCPInstruction.java @@ -24,7 +24,6 @@ import java.io.IOException; import org.apache.sysml.lops.PickByCount.OperationTypes; 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.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -105,7 +104,7 @@ public class QuantilePickCPInstruction extends BinaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { switch( _type ) { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantileSortCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantileSortCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantileSortCPInstruction.java index 3b748d6..37c4997 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantileSortCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantileSortCPInstruction.java @@ -23,7 +23,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.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -84,7 +83,7 @@ public class QuantileSortCPInstruction extends UnaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //acquire inputs matrices MatrixBlock matBlock = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/QuaternaryCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/QuaternaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuaternaryCPInstruction.java index 551d8bb..a223b08 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/QuaternaryCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuaternaryCPInstruction.java @@ -26,7 +26,6 @@ import org.apache.sysml.lops.WeightedCrossEntropy.WCeMMType; import org.apache.sysml.lops.WeightedUnaryMM.WUMMType; 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.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -116,7 +115,7 @@ public class QuaternaryCPInstruction extends ComputationCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + 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/cp/ReorgCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/ReorgCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ReorgCPInstruction.java index ba79858..7e37c21 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/ReorgCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ReorgCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.functionobjects.DiagIndex; import org.apache.sysml.runtime.functionobjects.RevIndex; @@ -112,7 +111,7 @@ public class ReorgCPInstruction extends UnaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //acquire inputs MatrixBlock matBlock = ec.getMatrixInput(input1.getName()); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarAppendCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarAppendCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarAppendCPInstruction.java index 2bfae2d..e777ea4 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarAppendCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarAppendCPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.operators.Operator; @@ -32,7 +31,7 @@ public final class ScalarAppendCPInstruction extends AppendCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //Append type: STRING http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java index ee4e80a..50ed490 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -42,7 +41,7 @@ public class ScalarMatrixArithmeticCPInstruction extends ArithmeticBinaryCPInstr @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { CPOperand mat = ( input1.getDataType() == DataType.MATRIX ) ? input1 : input2; CPOperand scalar = ( input1.getDataType() == DataType.MATRIX ) ? input2 : input1; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java index 09f7c85..7a5b0af 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.cp; 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.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -42,7 +41,7 @@ public class ScalarMatrixRelationalCPInstruction extends RelationalBinaryCPInstr @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { CPOperand mat = ( input1.getDataType() == DataType.MATRIX ) ? input1 : input2; CPOperand scalar = ( input1.getDataType() == DataType.MATRIX ) ? input2 : input1; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/StringObject.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/StringObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/StringObject.java index 53a2d5e..093cf94 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/StringObject.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/StringObject.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.cp; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; -import org.apache.sysml.runtime.DMLUnsupportedOperationException; public class StringObject extends ScalarObject { @@ -78,7 +77,6 @@ public class StringObject extends ScalarObject /** * * @param len - * @throws DMLUnsupportedOperationException */ public static void checkMaxStringLength( long len ) throws DMLRuntimeException http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/TernaryCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/TernaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/TernaryCPInstruction.java index dc24dfd..0c48ba1 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/TernaryCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/TernaryCPInstruction.java @@ -23,7 +23,6 @@ import org.apache.sysml.lops.Ternary; 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.instructions.Instruction; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -96,7 +95,7 @@ public class TernaryCPInstruction extends ComputationCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException { + throws DMLRuntimeException { MatrixBlock matBlock1 = ec.getMatrixInput(input1.getName()); MatrixBlock matBlock2=null, wtBlock=null; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/UaggOuterChainCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/UaggOuterChainCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/UaggOuterChainCPInstruction.java index d03b817..fcd2d56 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/UaggOuterChainCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/UaggOuterChainCPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.cp; import org.apache.sysml.lops.UAggOuterChain; 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.functionobjects.ReduceAll; import org.apache.sysml.runtime.functionobjects.ReduceCol; @@ -80,7 +79,7 @@ public class UaggOuterChainCPInstruction extends UnaryCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { boolean rightCached = (_uaggOp.indexFn instanceof ReduceCol || _uaggOp.indexFn instanceof ReduceAll || !LibMatrixOuterAgg.isSupportedUaggOp(_uaggOp, _bOp)); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java index ac5d456..0bd3fad 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java @@ -28,7 +28,6 @@ import org.apache.sysml.lops.UnaryCP; 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.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter; @@ -110,7 +109,7 @@ public class VariableCPInstruction extends CPInstruction _uniqueVarID = new IDSequence(true); } - private static VariableOperationCode getVariableOperationCode ( String str ) throws DMLUnsupportedOperationException { + private static VariableOperationCode getVariableOperationCode ( String str ) throws DMLRuntimeException { if ( str.equalsIgnoreCase("createvar")) return VariableOperationCode.CreateVariable; @@ -158,7 +157,7 @@ public class VariableCPInstruction extends CPInstruction return VariableOperationCode.SetFileName; else - throw new DMLUnsupportedOperationException("Invalid function: " + str); + throw new DMLRuntimeException("Invalid function: " + str); } // Checks if this instructon is a remove instruction for varName @@ -247,7 +246,7 @@ public class VariableCPInstruction extends CPInstruction } public static VariableCPInstruction parseInstruction ( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String[] parts = InstructionUtils.getInstructionPartsWithValueType ( str ); String opcode = parts[0]; @@ -428,7 +427,7 @@ public class VariableCPInstruction extends CPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { switch ( opcode ) { @@ -872,7 +871,7 @@ public class VariableCPInstruction extends CPInstruction } } - public static Instruction prepareRemoveInstruction(String varName) throws DMLRuntimeException, DMLUnsupportedOperationException { + public static Instruction prepareRemoveInstruction(String varName) throws DMLRuntimeException { StringBuilder sb = new StringBuilder(); sb.append("CP"); sb.append(Lop.OPERAND_DELIMITOR); @@ -884,7 +883,7 @@ public class VariableCPInstruction extends CPInstruction return parseInstruction(str); } - public static Instruction prepareCopyInstruction(String srcVar, String destVar) throws DMLRuntimeException, DMLUnsupportedOperationException { + public static Instruction prepareCopyInstruction(String srcVar, String destVar) throws DMLRuntimeException { StringBuilder sb = new StringBuilder(); sb.append("CP"); sb.append(Lop.OPERAND_DELIMITOR); @@ -898,7 +897,7 @@ public class VariableCPInstruction extends CPInstruction return parseInstruction(str); } - public static Instruction prepareMoveInstruction(String srcVar, String destFileName, String format) throws DMLRuntimeException, DMLUnsupportedOperationException { + public static Instruction prepareMoveInstruction(String srcVar, String destFileName, String format) throws DMLRuntimeException { StringBuilder sb = new StringBuilder(); sb.append("CP"); sb.append(Lop.OPERAND_DELIMITOR); @@ -914,7 +913,7 @@ public class VariableCPInstruction extends CPInstruction return parseInstruction(str); } - public static Instruction prepareMoveInstruction(String srcVar, String destVar) throws DMLRuntimeException, DMLUnsupportedOperationException { + public static Instruction prepareMoveInstruction(String srcVar, String destVar) throws DMLRuntimeException { // example: mvvar tempA A // (instead of two instructions -- cpvar tempA A; rmvar tempA) StringBuilder sb = new StringBuilder(); @@ -947,11 +946,11 @@ public class VariableCPInstruction extends CPInstruction return sb.toString(); } - public static Instruction prepareCreateVariableInstruction(String varName, String fileName, boolean fNameOverride, String format) throws DMLRuntimeException, DMLUnsupportedOperationException { + public static Instruction prepareCreateVariableInstruction(String varName, String fileName, boolean fNameOverride, String format) throws DMLRuntimeException { return parseInstruction(getBasicCreateVarString(varName, fileName, fNameOverride, format)); } - public static Instruction prepareCreateVariableInstruction(String varName, String fileName, boolean fNameOverride, String format, MatrixCharacteristics mc) throws DMLRuntimeException, DMLUnsupportedOperationException { + public static Instruction prepareCreateVariableInstruction(String varName, String fileName, boolean fNameOverride, String format, MatrixCharacteristics mc) throws DMLRuntimeException { StringBuilder sb = new StringBuilder(); sb.append(getBasicCreateVarString(varName, fileName, fNameOverride, format)); @@ -971,7 +970,7 @@ public class VariableCPInstruction extends CPInstruction return parseInstruction(str); } - public static Instruction prepareCreateVariableInstruction(String varName, String fileName, boolean fNameOverride, String format, MatrixCharacteristics mc, boolean updateInPlace) throws DMLRuntimeException, DMLUnsupportedOperationException { + public static Instruction prepareCreateVariableInstruction(String varName, String fileName, boolean fNameOverride, String format, MatrixCharacteristics mc, boolean updateInPlace) throws DMLRuntimeException { StringBuilder sb = new StringBuilder(); sb.append(getBasicCreateVarString(varName, fileName, fNameOverride, format)); @@ -993,7 +992,7 @@ public class VariableCPInstruction extends CPInstruction return parseInstruction(str); } - public static Instruction prepareCreateVariableInstruction(String varName, String fileName, boolean fNameOverride, String format, MatrixCharacteristics mc, boolean updateInPlace, boolean hasHeader, String delim, boolean sparse) throws DMLRuntimeException, DMLUnsupportedOperationException { + public static Instruction prepareCreateVariableInstruction(String varName, String fileName, boolean fNameOverride, String format, MatrixCharacteristics mc, boolean updateInPlace, boolean hasHeader, String delim, boolean sparse) throws DMLRuntimeException { StringBuilder sb = new StringBuilder(); sb.append(getBasicCreateVarString(varName, fileName, fNameOverride, format)); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java index f5f2b58..d078560 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.cpfile; 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.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -93,7 +92,7 @@ public final class MatrixIndexingCPFileInstruction extends IndexingCPInstruction @Override public void processInstruction(ExecutionContext ec) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { String opcode = getOpcode(); IndexRange ixrange = getIndexRange(ec).add(1); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java index ba511c7..5302736 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java @@ -45,7 +45,6 @@ import org.apache.sysml.conf.ConfigurationManager; 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.caching.CacheException; import org.apache.sysml.runtime.controlprogram.caching.MatrixObject; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; @@ -90,10 +89,9 @@ public class ParameterizedBuiltinCPFileInstruction extends ParameterizedBuiltinC * @param str * @return * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ public static ParameterizedBuiltinCPFileInstruction parseInstruction( String str ) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); // first part is always the opcode @@ -117,7 +115,7 @@ public class ParameterizedBuiltinCPFileInstruction extends ParameterizedBuiltinC @Override public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { String opcode = getOpcode(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateBinaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateBinaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateBinaryInstruction.java index d6c3d38..cfcae93 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateBinaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateBinaryInstruction.java @@ -25,7 +25,6 @@ import org.apache.sysml.lops.MMCJ.MMCJType; 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.functionobjects.Multiply; import org.apache.sysml.runtime.functionobjects.Plus; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -149,7 +148,7 @@ public class AggregateBinaryInstruction extends BinaryMRInstructionBase implemen 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); IndexedMatrixValue in2=cachedValues.getFirst(input2); @@ -199,10 +198,9 @@ public class AggregateBinaryInstruction extends BinaryMRInstructionBase implemen * @param blockRowFactor * @param blockColFactor * @throws DMLRuntimeException - * @throws DMLUnsupportedOperationException */ private void processMapMultInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue in1, IndexedMatrixValue in2, int blockRowFactor, int blockColFactor) - throws DMLRuntimeException, DMLUnsupportedOperationException + throws DMLRuntimeException { boolean removeOutput = true; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateInstruction.java index f030904..0eb1926 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateInstruction.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; @@ -67,7 +66,7 @@ public class AggregateInstruction 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("no processInstruction for AggregateInstruction!"); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateUnaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateUnaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateUnaryInstruction.java index 64ee42c..ad9b8b8 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateUnaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateUnaryInstruction.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.ReduceDiag; import org.apache.sysml.runtime.instructions.InstructionUtils; import org.apache.sysml.runtime.matrix.data.MatrixBlock; @@ -74,7 +73,7 @@ public class AggregateUnaryInstruction 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/AppendGInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendGInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendGInstruction.java index e67291a..fae109e 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendGInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendGInstruction.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.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; @@ -66,7 +65,7 @@ public class AppendGInstruction extends AppendInstruction @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int brlen, int bclen) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //setup basic meta data int blen = _cbind ? bclen : brlen; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendInstruction.java index 0efe595..7a97bf7 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendInstruction.java @@ -21,7 +21,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; @@ -77,8 +76,8 @@ public class AppendInstruction extends BinaryMRInstructionBase @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int brlen, int bclen) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { - throw new DMLUnsupportedOperationException("Operations on base append instruction not supported."); + throw new DMLRuntimeException("Operations on base append instruction not supported."); } } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendMInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendMInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendMInstruction.java index ad13fb6..777640f 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendMInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendMInstruction.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import org.apache.sysml.lops.AppendM.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.MatrixIndexes; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -77,7 +76,7 @@ public class AppendMInstruction extends AppendInstruction implements IDistribute 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/AppendRInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendRInstruction.java index 41cbb06..35a7813 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendRInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendRInstruction.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.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -53,7 +52,7 @@ public class AppendRInstruction extends AppendInstruction @Override public void processInstruction(Class<? extends MatrixValue> valueClass, CachedValueMap cachedValues, IndexedMatrixValue tempValue, IndexedMatrixValue zeroInput, int brlen, int bclen) - throws DMLUnsupportedOperationException, DMLRuntimeException + throws DMLRuntimeException { //get both inputs IndexedMatrixValue left = cachedValues.getFirst(input1); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/BinUaggChainInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/BinUaggChainInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinUaggChainInstruction.java index 9f8bafc..b6711cd 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/BinUaggChainInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinUaggChainInstruction.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.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; @@ -96,7 +95,7 @@ public class BinUaggChainInstruction 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/BinaryInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryInstruction.java index d133a90..6d9c075 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryInstruction.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.MatrixIndexes; import org.apache.sysml.runtime.matrix.data.MatrixValue; @@ -65,7 +64,7 @@ public class BinaryInstruction extends BinaryMRInstructionBase 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); IndexedMatrixValue in2=cachedValues.getFirst(input2); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMInstruction.java index b24f1c3..c83e4e6 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMInstruction.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import org.apache.sysml.lops.AppendM.CacheType; import org.apache.sysml.lops.BinaryM.VectorType; 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; @@ -78,7 +77,7 @@ public class BinaryMInstruction extends BinaryMRInstructionBase implements IDist 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/CM_N_COVInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/CM_N_COVInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CM_N_COVInstruction.java index 6293f2f..1d6cb02 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/CM_N_COVInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CM_N_COVInstruction.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.CM; import org.apache.sysml.runtime.functionobjects.COV; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -87,7 +86,7 @@ public class CM_N_COVInstruction 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("no processInstruction for AggregateInstruction!"); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6c89c3a7/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVWriteInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVWriteInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVWriteInstruction.java index 8baf617..747ef00 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVWriteInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVWriteInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.mr; import org.apache.sysml.parser.DataExpression; 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; @@ -65,7 +64,7 @@ public class CSVWriteInstruction 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("CSVWriteInstruction.processInstruction should never be called"); } }
