http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/Compression.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/Compression.java b/src/main/java/org/apache/sysml/lops/Compression.java index 65293ef..b29a235 100644 --- a/src/main/java/org/apache/sysml/lops/Compression.java +++ b/src/main/java/org/apache/sysml/lops/Compression.java @@ -38,10 +38,8 @@ public class Compression extends Lop } } - public Compression(Lop input, DataType dt, ValueType vt, ExecType et) - throws LopsException - { - super(Lop.Type.Checkpoint, dt, vt); + public Compression(Lop input, DataType dt, ValueType vt, ExecType et) { + super(Lop.Type.Checkpoint, dt, vt); this.addInput(input); input.addOutput(this); @@ -60,9 +58,7 @@ public class Compression extends Lop } @Override - public String getInstructions(String input1, String output) - throws LopsException - { + public String getInstructions(String input1, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( Lop.OPERAND_DELIMITOR ); @@ -71,7 +67,6 @@ public class Compression extends Lop sb.append( getInputs().get(0).prepInputOperand(input1)); sb.append( OPERAND_DELIMITOR ); sb.append( prepOutputOperand(output)); - return sb.toString(); } } \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java b/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java index bfb4758..192adb5 100644 --- a/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java +++ b/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java @@ -175,7 +175,7 @@ public class ConvolutionTransform extends Lop } @Override - public String getInstructions(String input, String bias, String output) throws LopsException { + public String getInstructions(String input, String bias, String output) { if(operation == OperationTypes.BIAS_ADD || operation == OperationTypes.BIAS_MULTIPLY || operation == OperationTypes.RELU_BACKWARD) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); @@ -206,7 +206,7 @@ public class ConvolutionTransform extends Lop } @Override - public String getInstructions(String input, String C, String HW, String output) throws LopsException { + public String getInstructions(String input, String C, String HW, String output) { if(operation == OperationTypes.CHANNEL_SUMS) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); @@ -231,7 +231,7 @@ public class ConvolutionTransform extends Lop } @Override - public String getInstructions(String[] inputs, String output) throws LopsException { + public String getInstructions(String[] inputs, String output) { StringBuilder sb = new StringBuilder(); appendOpcode(sb); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/Ctable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/Ctable.java b/src/main/java/org/apache/sysml/lops/Ctable.java index 8aac934..ff9c720 100644 --- a/src/main/java/org/apache/sysml/lops/Ctable.java +++ b/src/main/java/org/apache/sysml/lops/Ctable.java @@ -128,7 +128,7 @@ public class Ctable extends Lop } @Override - public String getInstructions(String input1, String input2, String input3, String output) throws LopsException + public String getInstructions(String input1, String input2, String input3, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); @@ -194,7 +194,7 @@ public class Ctable extends Lop } @Override - public String getInstructions(int input_index1, int input_index2, int input_index3, int output_index) throws LopsException + public String getInstructions(int input_index1, int input_index2, int input_index3, int output_index) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java b/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java index c9ad84c..5d07c44 100644 --- a/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java +++ b/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java @@ -31,8 +31,7 @@ public class CumulativeOffsetBinary extends Lop private OperationTypes _op; private double _initValue = 0; - public CumulativeOffsetBinary(Lop data, Lop offsets, DataType dt, ValueType vt, OperationTypes op, ExecType et) - throws LopsException + public CumulativeOffsetBinary(Lop data, Lop offsets, DataType dt, ValueType vt, OperationTypes op, ExecType et) { super(Lop.Type.CumulativeOffsetBinary, dt, vt); checkSupportedOperations(op); @@ -42,7 +41,6 @@ public class CumulativeOffsetBinary extends Lop } public CumulativeOffsetBinary(Lop data, Lop offsets, DataType dt, ValueType vt, double init, OperationTypes op, ExecType et) - throws LopsException { super(Lop.Type.CumulativeOffsetBinary, dt, vt); checkSupportedOperations(op); @@ -88,9 +86,7 @@ public class CumulativeOffsetBinary extends Lop return "CumulativeOffsetBinary"; } - private static void checkSupportedOperations(OperationTypes op) - throws LopsException - { + private static void checkSupportedOperations(OperationTypes op) { //sanity check for supported aggregates if( !(op == OperationTypes.KahanSum || op == OperationTypes.Product || op == OperationTypes.Min || op == OperationTypes.Max) ) http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/CumulativePartialAggregate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/CumulativePartialAggregate.java b/src/main/java/org/apache/sysml/lops/CumulativePartialAggregate.java index 3e0e6a3..015bcd0 100644 --- a/src/main/java/org/apache/sysml/lops/CumulativePartialAggregate.java +++ b/src/main/java/org/apache/sysml/lops/CumulativePartialAggregate.java @@ -30,9 +30,7 @@ public class CumulativePartialAggregate extends Lop private OperationTypes _op; - public CumulativePartialAggregate(Lop input, DataType dt, ValueType vt, OperationTypes op, ExecType et) - throws LopsException - { + public CumulativePartialAggregate(Lop input, DataType dt, ValueType vt, OperationTypes op, ExecType et) { super(Lop.Type.CumulativePartialAggregate, dt, vt); //sanity check for supported aggregates http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/CumulativeSplitAggregate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/CumulativeSplitAggregate.java b/src/main/java/org/apache/sysml/lops/CumulativeSplitAggregate.java index 697b616..b999b45 100644 --- a/src/main/java/org/apache/sysml/lops/CumulativeSplitAggregate.java +++ b/src/main/java/org/apache/sysml/lops/CumulativeSplitAggregate.java @@ -28,9 +28,7 @@ public class CumulativeSplitAggregate extends Lop { private double _initValue = 0; - public CumulativeSplitAggregate(Lop input, DataType dt, ValueType vt, double init) - throws LopsException - { + public CumulativeSplitAggregate(Lop input, DataType dt, ValueType vt, double init) { super(Lop.Type.CumulativeSplitAggregate, dt, vt); _initValue = init; init(input, dt, vt, ExecType.MR); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/Data.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/Data.java b/src/main/java/org/apache/sysml/lops/Data.java index 7f22038..f000bab 100644 --- a/src/main/java/org/apache/sysml/lops/Data.java +++ b/src/main/java/org/apache/sysml/lops/Data.java @@ -55,9 +55,8 @@ public class Data extends Lop * @param vt value type * @param literalValue literal value * @return literal low-level operator - * @throws LopsException if LopsException occurs */ - public static Data createLiteralLop(ValueType vt, String literalValue) throws LopsException { + public static Data createLiteralLop(ValueType vt, String literalValue) { // All literals have default format type of TEXT return new Data(OperationTypes.READ, null, null, null, literalValue, DataType.SCALAR, vt, false, FileFormatTypes.BINARY); } @@ -76,10 +75,9 @@ public class Data extends Lop * @param vt value type * @param isTransient true if transient * @param fmt file format - * @throws LopsException if LopsException occurs */ public Data(Data.OperationTypes op, Lop input, HashMap<String, Lop> - inputParametersLops, String name, String literal, DataType dt, ValueType vt, boolean isTransient, FileFormatTypes fmt) throws LopsException + inputParametersLops, String name, String literal, DataType dt, ValueType vt, boolean isTransient, FileFormatTypes fmt) { super(Lop.Type.Data, dt, vt); @@ -180,9 +178,8 @@ public class Data extends Lop /** * Method to set format types for input, output files. * @param type file format - * @throws LopsException if LopsException occurs */ - public void setFileFormatAndProperties(FileFormatTypes type) throws LopsException + public void setFileFormatAndProperties(FileFormatTypes type) { this.formatType = type ; if(type == FileFormatTypes.BINARY) @@ -238,8 +235,7 @@ public class Data extends Lop return _inputParams.get(name); } - public Lop getNamedInputLop(String name, String defaultVal) - throws LopsException { + public Lop getNamedInputLop(String name, String defaultVal) { if( _inputParams.containsKey(name) ) return _inputParams.get(name); else @@ -254,7 +250,7 @@ public class Data extends Lop return literal_var; } - public boolean getBooleanValue() throws LopsException { + public boolean getBooleanValue() { if(literal_var) { return Boolean.parseBoolean(getOutputParameters().getLabel()); } @@ -262,7 +258,7 @@ public class Data extends Lop throw new LopsException("Cannot obtain the value of a non-literal variable at compile time."); } - public double getDoubleValue() throws LopsException { + public double getDoubleValue() { if(literal_var) { return Double.parseDouble(getOutputParameters().getLabel()); } @@ -270,7 +266,7 @@ public class Data extends Lop throw new LopsException("Cannot obtain the value of a non-literal variable at compile time."); } - public long getLongValue() throws LopsException { + public long getLongValue() { if(literal_var) { ValueType vt = getValueType(); switch(vt) { @@ -287,7 +283,7 @@ public class Data extends Lop throw new LopsException("Can not obtain the value of a non-literal variable at compile time."); } - public String getStringValue() throws LopsException { + public String getStringValue() { if(literal_var) { return getOutputParameters().getLabel(); } @@ -316,7 +312,7 @@ public class Data extends Lop * */ @Override - public String getInstructions(int input_index, int output_index) throws LopsException { + public String getInstructions(int input_index, int output_index) { OutputParameters oparams = getOutputParameters(); @@ -381,8 +377,7 @@ public class Data extends Lop */ @Override public String getInstructions(String input1, String input2) - throws LopsException - { + { if ( getOutputParameters().getFile_name() == null && operation == OperationTypes.READ ) throw new LopsException(this.printErrorLocation() + "Data.getInstructions(): Exepecting a SCALAR data type, encountered " + getDataType()); @@ -493,19 +488,18 @@ public class Data extends Lop /** * Method to generate createvar instruction that updates symbol table with metadata, hdfsfile name, etc. * - * @throws LopsException if LopsException occurs */ @Override - public String getInstructions() throws LopsException { + public String getInstructions() { return getCreateVarInstructions(getOutputParameters().getFile_name(), getOutputParameters().getLabel()); } @Override - public String getInstructions(String outputFileName) throws LopsException { + public String getInstructions(String outputFileName) { return getCreateVarInstructions(outputFileName, getOutputParameters().getLabel() ); } - public String getCreateVarInstructions(String outputFileName, String outputLabel) throws LopsException { + public String getCreateVarInstructions(String outputFileName, String outputLabel) { if ( getDataType() == DataType.MATRIX || getDataType() == DataType.FRAME ) { if ( isTransient() ) @@ -576,9 +570,8 @@ public class Data extends Lop * The set of properties that are attached for a READ operation is different from that for a WRITE operation. * * @return instruction with csv format properties appended - * @throws LopsException if LopsException occurs */ - private String createVarCSVHelper() throws LopsException { + private String createVarCSVHelper() { StringBuilder sb = new StringBuilder(); if ( operation == OperationTypes.READ ) { Data headerLop = (Data) getNamedInputLop(DataExpression.DELIM_HAS_HEADER_ROW); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/DataGen.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/DataGen.java b/src/main/java/org/apache/sysml/lops/DataGen.java index 51bfb5a..72dcd32 100644 --- a/src/main/java/org/apache/sysml/lops/DataGen.java +++ b/src/main/java/org/apache/sysml/lops/DataGen.java @@ -61,10 +61,9 @@ public class DataGen extends Lop * @param dt Data type * @param vt Value type * @param et Execution type - * @throws LopsException if LopsException occurs */ public DataGen(DataGenMethod mthd, DataIdentifier id, HashMap<String, Lop> - inputParametersLops, String baseDir, DataType dt, ValueType vt, ExecType et) throws LopsException + inputParametersLops, String baseDir, DataType dt, ValueType vt, ExecType et) { super(Type.DataGen, dt, vt); method = mthd; @@ -117,8 +116,7 @@ public class DataGen extends Lop * passed from piggybacking as the function argument <code>output</code>. */ @Override - public String getInstructions(String output) - throws LopsException + public String getInstructions(String output) { switch( method ) { @@ -137,9 +135,7 @@ public class DataGen extends Lop } @Override - public String getInstructions(int inputIndex, int outputIndex) - throws LopsException - { + public String getInstructions(int inputIndex, int outputIndex) { switch(method) { case RAND: return getRandInstructionMR(inputIndex, outputIndex); @@ -156,11 +152,9 @@ public class DataGen extends Lop * * @param output output operand * @return cp instruction for rand - * @throws LopsException if LopsException occurs */ private String getRandInstructionCPSpark(String output) - throws LopsException - { + { //sanity checks if ( method != DataGenMethod.RAND ) throw new LopsException("Invalid instruction generation for data generation method " + method); @@ -239,7 +233,6 @@ public class DataGen extends Lop } private String getSInitInstructionCPSpark(String output) - throws LopsException { if ( method != DataGenMethod.SINIT ) throw new LopsException("Invalid instruction generation for data generation method " + method); @@ -287,7 +280,6 @@ public class DataGen extends Lop } private String getSampleInstructionCPSpark(String output) - throws LopsException { if ( method != DataGenMethod.SAMPLE ) throw new LopsException("Invalid instruction generation for data generation method " + method); @@ -335,9 +327,8 @@ public class DataGen extends Lop * * @param output output operand * @return cp instruction for seq - * @throws LopsException if LopsException occurs */ - private String getSeqInstructionCPSpark(String output) throws LopsException { + private String getSeqInstructionCPSpark(String output) { if ( method != DataGenMethod.SEQ ) throw new LopsException("Invalid instruction generation for data generation method " + method); @@ -393,17 +384,14 @@ public class DataGen extends Lop * @param inputIndex input index * @param outputIndex output index * @return mr instruction for rand - * @throws LopsException if LopsException occurs */ - private String getRandInstructionMR(int inputIndex, int outputIndex) - throws LopsException - { + private String getRandInstructionMR(int inputIndex, int outputIndex) { //sanity checks if( getInputs().size() != DataExpression.RAND_VALID_PARAM_NAMES.length) { throw new LopsException(printErrorLocation() + "Invalid number of operands (" + getInputs().size() + ") for a Rand operation"); } - + StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( Lop.OPERAND_DELIMITOR ); @@ -472,9 +460,8 @@ public class DataGen extends Lop * @param inputIndex input index * @param outputIndex output index * @return mr instruction for seq - * @throws LopsException if LopsException occurs */ - private String getSeqInstructionMR(int inputIndex, int outputIndex) throws LopsException { + private String getSeqInstructionMR(int inputIndex, int outputIndex) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/DataPartition.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/DataPartition.java b/src/main/java/org/apache/sysml/lops/DataPartition.java index 81599db..8b3cd0a 100644 --- a/src/main/java/org/apache/sysml/lops/DataPartition.java +++ b/src/main/java/org/apache/sysml/lops/DataPartition.java @@ -38,9 +38,8 @@ public class DataPartition extends Lop private PDataPartitionFormat _pformat = null; public DataPartition(Lop input, DataType dt, ValueType vt, ExecType et, PDataPartitionFormat pformat) - throws LopsException { - super(Lop.Type.DataPartition, dt, vt); + super(Lop.Type.DataPartition, dt, vt); this.addInput(input); input.addOutput(this); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/FunctionCallCP.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/FunctionCallCP.java b/src/main/java/org/apache/sysml/lops/FunctionCallCP.java index 3490b8d..ac58335 100644 --- a/src/main/java/org/apache/sysml/lops/FunctionCallCP.java +++ b/src/main/java/org/apache/sysml/lops/FunctionCallCP.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import org.apache.sysml.hops.FunctionOp; import org.apache.sysml.hops.Hop; -import org.apache.sysml.hops.HopsException; import org.apache.sysml.lops.LopProperties.ExecLocation; import org.apache.sysml.lops.LopProperties.ExecType; import org.apache.sysml.lops.compile.JobType; @@ -39,9 +38,7 @@ public class FunctionCallCP extends Lop private String[] _outputs; private ArrayList<Lop> _outputLops = null; - public FunctionCallCP(ArrayList<Lop> inputs, String fnamespace, String fname, String[] outputs, ArrayList<Hop> outputHops, ExecType et) - throws HopsException, LopsException - { + public FunctionCallCP(ArrayList<Lop> inputs, String fnamespace, String fname, String[] outputs, ArrayList<Hop> outputHops, ExecType et) { this(inputs, fnamespace, fname, outputs, et); if(outputHops != null) { _outputLops = new ArrayList<>(); @@ -107,7 +104,7 @@ public class FunctionCallCP extends Lop * Builtin functions have their namespace set to DMLProgram.INTERNAL_NAMESPACE ("_internal"). */ @Override - public String getInstructions(String[] inputs, String[] outputs) throws LopsException + public String getInstructions(String[] inputs, String[] outputs) { // Handle internal builtin functions if (_fnamespace.equalsIgnoreCase(DMLProgram.INTERNAL_NAMESPACE) ) { http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/FunctionCallCPSingle.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/FunctionCallCPSingle.java b/src/main/java/org/apache/sysml/lops/FunctionCallCPSingle.java index ef96ed5..b134f26 100644 --- a/src/main/java/org/apache/sysml/lops/FunctionCallCPSingle.java +++ b/src/main/java/org/apache/sysml/lops/FunctionCallCPSingle.java @@ -64,42 +64,42 @@ public class FunctionCallCPSingle extends Lop } @Override - public String getInstructions(String input1, String output) throws LopsException { + public String getInstructions(String input1, String output) { return getInstructions(new String[]{input1}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String output) throws LopsException { + public String getInstructions(String input1, String input2, String output) { return getInstructions(new String[]{input1, input2}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String output) { return getInstructions(new String[]{input1, input2, input3}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String output) { return getInstructions(new String[]{input1, input2, input3, input4}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String output) { return getInstructions(new String[]{input1, input2, input3, input4, input5}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String output) { return getInstructions(new String[]{input1, input2, input3, input4, input5, input6}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String input7, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String input7, String output) { return getInstructions(new String[]{input1, input2, input3, input4, input5, input6, input7}, new String[]{output}); } @Override - public String getInstructions(String[] inputs, String output) throws LopsException + public String getInstructions(String[] inputs, String output) { StringBuilder inst = new StringBuilder(); inst.append(getExecType()); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/GroupedAggregate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/GroupedAggregate.java b/src/main/java/org/apache/sysml/lops/GroupedAggregate.java index b1fd486..b40c6d0 100644 --- a/src/main/java/org/apache/sysml/lops/GroupedAggregate.java +++ b/src/main/java/org/apache/sysml/lops/GroupedAggregate.java @@ -157,9 +157,7 @@ public class GroupedAggregate extends Lop * */ @Override - public String getInstructions(String output) - throws LopsException - { + public String getInstructions(String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/LeftIndex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/LeftIndex.java b/src/main/java/org/apache/sysml/lops/LeftIndex.java index e841059..99595c0 100644 --- a/src/main/java/org/apache/sysml/lops/LeftIndex.java +++ b/src/main/java/org/apache/sysml/lops/LeftIndex.java @@ -39,16 +39,14 @@ public class LeftIndex extends Lop private LixCacheType _type; public LeftIndex( - Lop lhsInput, Lop rhsInput, Lop rowL, Lop rowU, Lop colL, Lop colU, DataType dt, ValueType vt, ExecType et) - throws LopsException { + Lop lhsInput, Lop rhsInput, Lop rowL, Lop rowU, Lop colL, Lop colU, DataType dt, ValueType vt, ExecType et) { super(Lop.Type.LeftIndex, dt, vt); _type = LixCacheType.NONE; init(lhsInput, rhsInput, rowL, rowU, colL, colU, et); } public LeftIndex( - Lop lhsInput, Lop rhsInput, Lop rowL, Lop rowU, Lop colL, Lop colU, DataType dt, ValueType vt, ExecType et, LixCacheType type) - throws LopsException { + Lop lhsInput, Lop rhsInput, Lop rowL, Lop rowU, Lop colL, Lop colU, DataType dt, ValueType vt, ExecType et, LixCacheType type) { super(Lop.Type.LeftIndex, dt, vt); _type = type; init(lhsInput, rhsInput, rowL, rowU, colL, colU, et); @@ -65,9 +63,8 @@ public class LeftIndex extends Lop * @param colL column lower lop * @param colU column upper lop * @param et execution type - * @throws LopsException if LopsException occurs */ - private void init(Lop lhsMatrix, Lop rhsMatrix, Lop rowL, Lop rowU, Lop colL, Lop colU, ExecType et) throws LopsException { + private void init(Lop lhsMatrix, Lop rhsMatrix, Lop rowL, Lop rowU, Lop colL, Lop colU, ExecType et) { /* * A[i:j, k:l] = B; * B -> rhsMatrix @@ -110,8 +107,7 @@ public class LeftIndex extends Lop } @Override - public String getInstructions(String lhsInput, String rhsInput, String rowl, String rowu, String coll, String colu, String output) - throws LopsException + public String getInstructions(String lhsInput, String rhsInput, String rowl, String rowu, String coll, String colu, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/Lop.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/Lop.java b/src/main/java/org/apache/sysml/lops/Lop.java index 8d79224..3d6a4f3 100644 --- a/src/main/java/org/apache/sysml/lops/Lop.java +++ b/src/main/java/org/apache/sysml/lops/Lop.java @@ -421,9 +421,8 @@ public abstract class Lop * * @param output output * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(String output) throws LopsException { + public String getInstructions(String output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -432,9 +431,8 @@ public abstract class Lop * @param input1 input 1 * @param output output * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(String input1, String output) throws LopsException { + public String getInstructions(String input1, String output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -444,9 +442,8 @@ public abstract class Lop * @param input2 input 2 * @param output output * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(String input1, String input2, String output) throws LopsException { + public String getInstructions(String input1, String input2, String output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -458,9 +455,8 @@ public abstract class Lop * @param input3 input 3 * @param output output * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(String input1, String input2, String input3, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -473,9 +469,8 @@ public abstract class Lop * @param input4 input 4 * @param output output * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(String input1, String input2, String input3, String input4, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -489,9 +484,8 @@ public abstract class Lop * @param input5 input 5 * @param output output * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -505,26 +499,25 @@ public abstract class Lop * @param input6 input 6 * @param output output * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String input7, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String input7, String output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } - public String getInstructions(String[] inputs, String outputs) throws LopsException { + public String getInstructions(String[] inputs, String outputs) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } - public String getInstructions(int output_index) throws LopsException { + public String getInstructions(int output_index) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass. Lop Type: " + this.getType()); } - public String getInstructions(int input_index, int output_index) throws LopsException { + public String getInstructions(int input_index, int output_index) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass. Lop Type: " + this.getType()); } @@ -534,9 +527,8 @@ public abstract class Lop * @param input_index2 input index 2 * @param output_index output index * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(int input_index1, int input_index2, int output_index) throws LopsException { + public String getInstructions(int input_index1, int input_index2, int output_index) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -547,9 +539,8 @@ public abstract class Lop * @param input_index3 input index 3 * @param output_index output index * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(int input_index1, int input_index2, int input_index3, int output_index) throws LopsException { + public String getInstructions(int input_index1, int input_index2, int input_index3, int output_index) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -561,9 +552,8 @@ public abstract class Lop * @param input_index4 input index 4 * @param output_index output index * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int output_index) throws LopsException { + public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int output_index) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -576,9 +566,8 @@ public abstract class Lop * @param input_index5 input index 5 * @param output_index output index * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int input_index5, int output_index) throws LopsException { + public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int input_index5, int output_index) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -588,27 +577,24 @@ public abstract class Lop * @param inputs array of inputs * @param outputs array of outputs * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions(String[] inputs, String[] outputs) throws LopsException { + public String getInstructions(String[] inputs, String[] outputs) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } /** Method should be overridden if needed * * @return instructions as string - * @throws LopsException if LopsException occurs */ - public String getInstructions() throws LopsException { + public String getInstructions() { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } /** Method should be overridden if needed * * @return simple instruction type - * @throws LopsException if LopsException occurs */ - public SimpleInstType getSimpleInstructionType() throws LopsException { + public SimpleInstType getSimpleInstructionType() { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } @@ -645,7 +631,7 @@ public abstract class Lop public String getInstructions(int input, int rowl, int rowu, int coll, int colu, int leftRowDim, - int leftColDim, int output) throws LopsException { + int leftColDim, int output) { throw new LopsException(this.printErrorLocation() + "Should never be invoked in Baseclass"); } http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/MapMult.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/MapMult.java b/src/main/java/org/apache/sysml/lops/MapMult.java index 7fb5a60..ce25483 100644 --- a/src/main/java/org/apache/sysml/lops/MapMult.java +++ b/src/main/java/org/apache/sysml/lops/MapMult.java @@ -68,12 +68,10 @@ public class MapMult extends Lop * @param rightCache true if right cache, false if left cache * @param partitioned true if partitioned, false if not partitioned * @param emptyBlocks true if output empty blocks - * @throws LopsException if LopsException occurs */ public MapMult(Lop input1, Lop input2, DataType dt, ValueType vt, boolean rightCache, boolean partitioned, boolean emptyBlocks ) - throws LopsException { - super(Lop.Type.MapMult, dt, vt); + super(Lop.Type.MapMult, dt, vt); this.addInput(input1); this.addInput(input2); input1.addOutput(this); @@ -106,12 +104,9 @@ public class MapMult extends Lop * @param partitioned true if partitioned, false if not partitioned * @param emptyBlocks true if output empty blocks * @param aggtype spark aggregation type - * @throws LopsException if LopsException occurs */ - public MapMult(Lop input1, Lop input2, DataType dt, ValueType vt, boolean rightCache, boolean partitioned, boolean emptyBlocks, SparkAggType aggtype) - throws LopsException - { - super(Lop.Type.MapMult, dt, vt); + public MapMult(Lop input1, Lop input2, DataType dt, ValueType vt, boolean rightCache, boolean partitioned, boolean emptyBlocks, SparkAggType aggtype) { + super(Lop.Type.MapMult, dt, vt); this.addInput(input1); this.addInput(input2); input1.addOutput(this); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/MapMultChain.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/MapMultChain.java b/src/main/java/org/apache/sysml/lops/MapMultChain.java index e19e522..bef1925 100644 --- a/src/main/java/org/apache/sysml/lops/MapMultChain.java +++ b/src/main/java/org/apache/sysml/lops/MapMultChain.java @@ -49,12 +49,9 @@ public class MapMultChain extends Lop * @param dt data type * @param vt value type * @param et execution type - * @throws LopsException if LopsException occurs */ - public MapMultChain(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et) - throws LopsException - { - super(Lop.Type.MapMultChain, dt, vt); + public MapMultChain(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et) { + super(Lop.Type.MapMultChain, dt, vt); addInput(input1); //X addInput(input2); //v input1.addOutput(this); @@ -75,12 +72,9 @@ public class MapMultChain extends Lop * @param dt data type * @param vt value type * @param et execution type - * @throws LopsException if LopsException occurs */ - public MapMultChain(Lop input1, Lop input2, Lop input3, ChainType chain, DataType dt, ValueType vt, ExecType et) - throws LopsException - { - super(Lop.Type.MapMultChain, dt, vt); + public MapMultChain(Lop input1, Lop input2, Lop input3, ChainType chain, DataType dt, ValueType vt, ExecType et) { + super(Lop.Type.MapMultChain, dt, vt); addInput(input1); //X addInput(input2); //w addInput(input3); //v http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/Nary.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/Nary.java b/src/main/java/org/apache/sysml/lops/Nary.java index 7df863a..7541ffa 100644 --- a/src/main/java/org/apache/sysml/lops/Nary.java +++ b/src/main/java/org/apache/sysml/lops/Nary.java @@ -37,8 +37,7 @@ public class Nary extends Lop { private OperationType operationType; - public Nary(OperationType operationType, DataType dt, ValueType vt, Lop[] inputLops, ExecType et) - throws LopsException + public Nary(OperationType operationType, DataType dt, ValueType vt, Lop[] inputLops, ExecType et) { super(Lop.Type.Nary, dt, vt); this.operationType = operationType; @@ -93,7 +92,7 @@ public class Nary extends Lop { * */ @Override - public String getInstructions(String[] inputs, String output) throws LopsException { + public String getInstructions(String[] inputs, String output) { String opString = getOpcode(); StringBuilder sb = new StringBuilder(); @@ -114,7 +113,7 @@ public class Nary extends Lop { return sb.toString(); } - private String getOpcode() throws LopsException { + private String getOpcode() { switch (operationType) { case PRINTF: case CBIND: http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/OutputParameters.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/OutputParameters.java b/src/main/java/org/apache/sysml/lops/OutputParameters.java index bdabdad..c34157e 100644 --- a/src/main/java/org/apache/sysml/lops/OutputParameters.java +++ b/src/main/java/org/apache/sysml/lops/OutputParameters.java @@ -61,7 +61,7 @@ public class OutputParameters _file_label = label; } - public void setDimensions(long rows, long cols, long rows_per_block, long cols_per_block, long nnz) throws HopsException { + public void setDimensions(long rows, long cols, long rows_per_block, long cols_per_block, long nnz) { _num_rows = rows; _num_cols = cols; _nnz = nnz; @@ -82,7 +82,7 @@ public class OutputParameters } } - public void setDimensions(long rows, long cols, long rows_per_block, long cols_per_block, long nnz, UpdateType update) throws HopsException { + public void setDimensions(long rows, long cols, long rows_per_block, long cols_per_block, long nnz, UpdateType update) { _updateType = update; setDimensions(rows, cols, rows_per_block, cols_per_block, nnz); } http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/PMMJ.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/PMMJ.java b/src/main/java/org/apache/sysml/lops/PMMJ.java index 0f4e9c3..5c542a1 100644 --- a/src/main/java/org/apache/sysml/lops/PMMJ.java +++ b/src/main/java/org/apache/sysml/lops/PMMJ.java @@ -50,12 +50,9 @@ public class PMMJ extends Lop * @param partitioned true if partitioned * @param emptyBlocks true if output empty blocks * @param et execution type - * @throws LopsException if LopsException occurs */ - public PMMJ(Lop pminput, Lop rightinput, Lop nrow, DataType dt, ValueType vt, boolean partitioned, boolean emptyBlocks, ExecType et) - throws LopsException - { - super(Lop.Type.PMMJ, dt, vt); + public PMMJ(Lop pminput, Lop rightinput, Lop nrow, DataType dt, ValueType vt, boolean partitioned, boolean emptyBlocks, ExecType et) { + super(Lop.Type.PMMJ, dt, vt); addInput(pminput); addInput(rightinput); addInput(nrow); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/PMapMult.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/PMapMult.java b/src/main/java/org/apache/sysml/lops/PMapMult.java index e6bf3ac..3ab62ee 100644 --- a/src/main/java/org/apache/sysml/lops/PMapMult.java +++ b/src/main/java/org/apache/sysml/lops/PMapMult.java @@ -30,10 +30,8 @@ public class PMapMult extends Lop { public static final String OPCODE = "pmapmm"; - public PMapMult(Lop input1, Lop input2, DataType dt, ValueType vt) - throws LopsException - { - super(Lop.Type.MapMult, dt, vt); + public PMapMult(Lop input1, Lop input2, DataType dt, ValueType vt) { + super(Lop.Type.MapMult, dt, vt); this.addInput(input1); this.addInput(input2); input1.addOutput(this); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java b/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java index 1188f1b..1670412 100644 --- a/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java +++ b/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java @@ -22,7 +22,6 @@ package org.apache.sysml.lops; import java.util.HashMap; import java.util.Map.Entry; -import org.apache.sysml.hops.HopsException; import org.apache.sysml.lops.LopProperties.ExecLocation; import org.apache.sysml.lops.LopProperties.ExecType; import org.apache.sysml.lops.compile.JobType; @@ -49,15 +48,11 @@ public class ParameterizedBuiltin extends Lop //cp-specific parameters private int _numThreads = 1; - public ParameterizedBuiltin(HashMap<String, Lop> paramLops, OperationTypes op, DataType dt, ValueType vt, ExecType et) - throws HopsException - { + public ParameterizedBuiltin(HashMap<String, Lop> paramLops, OperationTypes op, DataType dt, ValueType vt, ExecType et) { this(paramLops, op, dt, vt, et, 1); } - public ParameterizedBuiltin(HashMap<String, Lop> paramLops, OperationTypes op, DataType dt, ValueType vt, ExecType et, int k) - throws HopsException - { + public ParameterizedBuiltin(HashMap<String, Lop> paramLops, OperationTypes op, DataType dt, ValueType vt, ExecType et, int k) { super(Lop.Type.ParameterizedBuiltin, dt, vt); _operation = op; @@ -105,9 +100,7 @@ public class ParameterizedBuiltin extends Lop lps.setProperties(inputs, et, eloc, breaksAlignment, aligner, definesMRJob); } - public ParameterizedBuiltin(HashMap<String, Lop> paramLops, OperationTypes op, DataType dt, ValueType vt, ExecType et, boolean bRmEmptyBC) - throws HopsException - { + public ParameterizedBuiltin(HashMap<String, Lop> paramLops, OperationTypes op, DataType dt, ValueType vt, ExecType et, boolean bRmEmptyBC) { this(paramLops, op, dt, vt, et); _bRmEmptyBC = bRmEmptyBC; } @@ -129,8 +122,7 @@ public class ParameterizedBuiltin extends Lop } @Override - public String getInstructions(String output) - throws LopsException + public String getInstructions(String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); @@ -246,8 +238,7 @@ public class ParameterizedBuiltin extends Lop } @Override - public String getInstructions(int input_index1, int input_index2, int input_index3, int output_index) - throws LopsException + public String getInstructions(int input_index1, int input_index2, int input_index3, int output_index) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); @@ -288,8 +279,7 @@ public class ParameterizedBuiltin extends Lop } @Override - public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int input_index5, int output_index) - throws LopsException + public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int input_index5, int output_index) { int[] tmp = new int[]{input_index1, input_index2, input_index3, input_index4, input_index5}; http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/PartialAggregate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/PartialAggregate.java b/src/main/java/org/apache/sysml/lops/PartialAggregate.java index c42e787..5afa805 100644 --- a/src/main/java/org/apache/sysml/lops/PartialAggregate.java +++ b/src/main/java/org/apache/sysml/lops/PartialAggregate.java @@ -72,7 +72,6 @@ public class PartialAggregate extends Lop public PartialAggregate( Lop input, Aggregate.OperationTypes op, PartialAggregate.DirectionTypes direct, DataType dt, ValueType vt) - throws LopsException { super(Lop.Type.PartialAggregate, dt, vt); init(input, op, direct, dt, vt, ExecType.MR); @@ -80,7 +79,6 @@ public class PartialAggregate extends Lop public PartialAggregate( Lop input, Aggregate.OperationTypes op, PartialAggregate.DirectionTypes direct, DataType dt, ValueType vt, ExecType et, int k) - throws LopsException { super(Lop.Type.PartialAggregate, dt, vt); init(input, op, direct, dt, vt, et); @@ -89,7 +87,6 @@ public class PartialAggregate extends Lop public PartialAggregate( Lop input, Aggregate.OperationTypes op, PartialAggregate.DirectionTypes direct, DataType dt, ValueType vt, SparkAggType aggtype, ExecType et) - throws LopsException { super(Lop.Type.PartialAggregate, dt, vt); init(input, op, direct, dt, vt, et); @@ -160,17 +157,12 @@ public class PartialAggregate extends Lop * dml.runtime.matrix.operator.AggregateOperator.java and dml.runtime.matrix) * * @return correct location - * @throws LopsException if LopsException occurs */ - public CorrectionLocationType getCorrectionLocation() - throws LopsException - { + public CorrectionLocationType getCorrectionLocation() { return getCorrectionLocation(operation, direction); } - public static CorrectionLocationType getCorrectionLocation(Aggregate.OperationTypes operation, DirectionTypes direction) - throws LopsException - { + public static CorrectionLocationType getCorrectionLocation(Aggregate.OperationTypes operation, DirectionTypes direction) { CorrectionLocationType loc; switch (operation) { @@ -254,14 +246,13 @@ public class PartialAggregate extends Lop } public void setDimensionsBasedOnDirection(long dim1, long dim2, - long rowsPerBlock, long colsPerBlock) throws LopsException + long rowsPerBlock, long colsPerBlock) { setDimensionsBasedOnDirection(this, dim1, dim2, rowsPerBlock, colsPerBlock, direction); } public static void setDimensionsBasedOnDirection(Lop lop, long dim1, long dim2, - long rowsPerBlock, long colsPerBlock, DirectionTypes dir) - throws LopsException + long rowsPerBlock, long colsPerBlock, DirectionTypes dir) { try { if (dir == DirectionTypes.Row) http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/PickByCount.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/PickByCount.java b/src/main/java/org/apache/sysml/lops/PickByCount.java index 513724b..fe775de 100644 --- a/src/main/java/org/apache/sysml/lops/PickByCount.java +++ b/src/main/java/org/apache/sysml/lops/PickByCount.java @@ -105,9 +105,7 @@ public class PickByCount extends Lop * rangepick:::0:DOUBLE:::Var3:DOUBLE:::1:DOUBLE */ @Override - public String getInstructions(int input_index1, int input_index2, int output_index) - throws LopsException - { + public String getInstructions(int input_index1, int input_index2, int output_index) { return getInstructions(""+input_index1, ""+input_index2, ""+output_index); } @@ -120,8 +118,7 @@ public class PickByCount extends Lop * valuepick:::temp2:STRING:::Var1:DOUBLE:::Var2:DOUBLE */ @Override - public String getInstructions(String input1, String input2, String output) throws LopsException - { + public String getInstructions(String input1, String input2, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( Lop.OPERAND_DELIMITOR ); @@ -159,9 +156,7 @@ public class PickByCount extends Lop * iqm:::input:::output */ @Override - public String getInstructions(String input, String output) - throws LopsException - { + public String getInstructions(String input, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( Lop.OPERAND_DELIMITOR ); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/ReBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/ReBlock.java b/src/main/java/org/apache/sysml/lops/ReBlock.java index 15a2bf6..61f45c9 100644 --- a/src/main/java/org/apache/sysml/lops/ReBlock.java +++ b/src/main/java/org/apache/sysml/lops/ReBlock.java @@ -39,7 +39,7 @@ public class ReBlock extends Lop private int _rows_per_block; private int _cols_per_block; - public ReBlock(Lop input, int rows_per_block, int cols_per_block, DataType dt, ValueType vt, boolean outputEmptyBlocks, ExecType et) throws LopsException + public ReBlock(Lop input, int rows_per_block, int cols_per_block, DataType dt, ValueType vt, boolean outputEmptyBlocks, ExecType et) { super(Lop.Type.ReBlock, dt, vt); this.addInput(input); @@ -102,7 +102,7 @@ public class ReBlock extends Lop // This function is replicated in Dag.java @SuppressWarnings("unused") - private Format getChildFormat(Lop node) throws LopsException { + private Format getChildFormat(Lop node) { if(node.getOutputParameters().getFile_name() != null || node.getOutputParameters().getLabel() != null) http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/RepMat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/RepMat.java b/src/main/java/org/apache/sysml/lops/RepMat.java index b443c80..2303c87 100644 --- a/src/main/java/org/apache/sysml/lops/RepMat.java +++ b/src/main/java/org/apache/sysml/lops/RepMat.java @@ -40,12 +40,9 @@ public class RepMat extends Lop * @param repCols ? * @param dt data type * @param vt value type - * @throws LopsException if LopsException occurs */ - public RepMat(Lop input1, Lop input2, boolean repCols, DataType dt, ValueType vt) - throws LopsException - { - super(Lop.Type.RepMat, dt, vt); + public RepMat(Lop input1, Lop input2, boolean repCols, DataType dt, ValueType vt) { + super(Lop.Type.RepMat, dt, vt); this.addInput(input1); this.addInput(input2); input1.addOutput(this); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/RightIndex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/RightIndex.java b/src/main/java/org/apache/sysml/lops/RightIndex.java index 812425a..595a5b9 100644 --- a/src/main/java/org/apache/sysml/lops/RightIndex.java +++ b/src/main/java/org/apache/sysml/lops/RightIndex.java @@ -38,7 +38,6 @@ public class RightIndex extends Lop public RightIndex(Lop input, Lop rowL, Lop rowU, Lop colL, Lop colU, Lop rowDim, Lop colDim, DataType dt, ValueType vt, ExecType et, boolean forleft) - throws LopsException { super(Lop.Type.RightIndex, dt, vt); init(input, rowL, rowU, colL, colU, rowDim, colDim, dt, vt, et, forleft); @@ -46,7 +45,6 @@ public class RightIndex extends Lop public RightIndex(Lop input, Lop rowL, Lop rowU, Lop colL, Lop colU, Lop rowDim, Lop colDim, DataType dt, ValueType vt, ExecType et) - throws LopsException { super(Lop.Type.RightIndex, dt, vt); init(input, rowL, rowU, colL, colU, rowDim, colDim, dt, vt, et, false); @@ -54,7 +52,6 @@ public class RightIndex extends Lop public RightIndex(Lop input, Lop rowL, Lop rowU, Lop colL, Lop colU, Lop rowDim, Lop colDim, DataType dt, ValueType vt, SparkAggType aggtype, ExecType et) - throws LopsException { super(Lop.Type.RightIndex, dt, vt); _aggtype = aggtype; @@ -107,8 +104,7 @@ public class RightIndex extends Lop } @Override - public String getInstructions(String input, String rowl, String rowu, String coll, String colu, String leftRowDim, String leftColDim, String output) - throws LopsException { + public String getInstructions(String input, String rowl, String rowu, String coll, String colu, String leftRowDim, String leftColDim, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( OPERAND_DELIMITOR ); @@ -155,8 +151,7 @@ public class RightIndex extends Lop } @Override - public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int input_index5, int input_index6, int input_index7, int output_index) - throws LopsException { + public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int input_index5, int input_index6, int input_index7, int output_index) { /* * Example: B = A[row_l:row_u, col_l:col_u] * A - input matrix (input_index1) http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/SpoofFused.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/SpoofFused.java b/src/main/java/org/apache/sysml/lops/SpoofFused.java index 3f0ec59..c4689c1 100644 --- a/src/main/java/org/apache/sysml/lops/SpoofFused.java +++ b/src/main/java/org/apache/sysml/lops/SpoofFused.java @@ -52,49 +52,47 @@ public class SpoofFused extends Lop } @Override - public String getInstructions(String input1, String output) throws LopsException { + public String getInstructions(String input1, String output) { return getInstructions(new String[]{input1}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String output) throws LopsException { + public String getInstructions(String input1, String input2, String output) { return getInstructions(new String[]{input1, input2}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String output) { return getInstructions(new String[]{input1, input2, input3}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String output) { return getInstructions(new String[]{input1, input2, input3, input4}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String output) { return getInstructions(new String[]{input1, input2, input3, input4, input5}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String output) { return getInstructions(new String[]{input1, input2, input3, input4, input5, input6}, new String[]{output}); } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String input7, String output) throws LopsException { + public String getInstructions(String input1, String input2, String input3, String input4, String input5, String input6, String input7, String output) { return getInstructions(new String[]{input1, input2, input3, input4, input5, input6, input7}, new String[]{output}); } @Override - public String getInstructions(String[] inputs, String output) throws LopsException { + public String getInstructions(String[] inputs, String output) { return getInstructions(inputs, new String[]{output}); } @Override - public String getInstructions(String[] inputs, String[] outputs) - throws LopsException - { + public String getInstructions(String[] inputs, String[] outputs) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( OPERAND_DELIMITOR ); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/TernaryAggregate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/TernaryAggregate.java b/src/main/java/org/apache/sysml/lops/TernaryAggregate.java index 08600e4..18e0881 100644 --- a/src/main/java/org/apache/sysml/lops/TernaryAggregate.java +++ b/src/main/java/org/apache/sysml/lops/TernaryAggregate.java @@ -69,7 +69,7 @@ public class TernaryAggregate extends Lop @Override public String getInstructions(String input1, String input2, String input3, String output) - throws LopsException + { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/Transform.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/Transform.java b/src/main/java/org/apache/sysml/lops/Transform.java index 07cc91e..1de2a9c 100644 --- a/src/main/java/org/apache/sysml/lops/Transform.java +++ b/src/main/java/org/apache/sysml/lops/Transform.java @@ -167,9 +167,7 @@ public class Transform extends Lop //CP instructions @Override - public String getInstructions(String input1, String output) - throws LopsException - { + public String getInstructions(String input1, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( OPERAND_DELIMITOR ); @@ -188,9 +186,7 @@ public class Transform extends Lop } @Override - public String getInstructions(String input1, String input2, String input3, String input4, String output) - throws LopsException - { + public String getInstructions(String input1, String input2, String input3, String input4, String output) { //only used for reshape StringBuilder sb = new StringBuilder(); @@ -224,9 +220,7 @@ public class Transform extends Lop //MR instructions @Override - public String getInstructions(int input_index, int output_index) - throws LopsException - { + public String getInstructions(int input_index, int output_index) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( OPERAND_DELIMITOR ); @@ -240,9 +234,7 @@ public class Transform extends Lop } @Override - public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int output_index) - throws LopsException - { + public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int output_index) { //only used for reshape StringBuilder sb = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/UAggOuterChain.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/UAggOuterChain.java b/src/main/java/org/apache/sysml/lops/UAggOuterChain.java index bdd4e0c..8d5230e 100644 --- a/src/main/java/org/apache/sysml/lops/UAggOuterChain.java +++ b/src/main/java/org/apache/sysml/lops/UAggOuterChain.java @@ -55,12 +55,10 @@ public class UAggOuterChain extends Lop * @param dt data type * @param vt value type * @param et execution type - * @throws LopsException if LopsException occurs */ public UAggOuterChain(Lop input1, Lop input2, Aggregate.OperationTypes uaop, PartialAggregate.DirectionTypes uadir, Binary.OperationTypes bop, DataType dt, ValueType vt, ExecType et) - throws LopsException { - super(Lop.Type.UaggOuterChain, dt, vt); + super(Lop.Type.UaggOuterChain, dt, vt); addInput(input1); addInput(input2); input1.addOutput(this); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/Unary.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/Unary.java b/src/main/java/org/apache/sysml/lops/Unary.java index 880181c..7c1ceeb 100644 --- a/src/main/java/org/apache/sysml/lops/Unary.java +++ b/src/main/java/org/apache/sysml/lops/Unary.java @@ -113,19 +113,14 @@ public class Unary extends Lop * @param vt value type * @param et execution type * @param numThreads number of threads - * @throws LopsException if LopsException occurs */ - public Unary(Lop input1, OperationTypes op, DataType dt, ValueType vt, ExecType et, int numThreads) - throws LopsException - { + public Unary(Lop input1, OperationTypes op, DataType dt, ValueType vt, ExecType et, int numThreads) { super(Lop.Type.UNARY, dt, vt); init(input1, op, dt, vt, et); _numThreads = numThreads; } - private void init(Lop input1, OperationTypes op, DataType dt, ValueType vt, ExecType et) - throws LopsException - { + private void init(Lop input1, OperationTypes op, DataType dt, ValueType vt, ExecType et) { //sanity check if ( (op == OperationTypes.INVERSE || op == OperationTypes.CHOLESKY) && (et == ExecType.SPARK || et == ExecType.MR) ) { @@ -169,15 +164,11 @@ public class Unary extends Lop return "Operation: " + operation + " " + "Label: N/A"; } - private String getOpcode() - throws LopsException - { + private String getOpcode() { return getOpcode(operation); } - public static String getOpcode(OperationTypes op) - throws LopsException - { + public static String getOpcode(OperationTypes op) { switch (op) { case NOT: return "!"; @@ -342,9 +333,7 @@ public class Unary extends Lop } @Override - public String getInstructions(String input1, String output) - throws LopsException - { + public String getInstructions(String input1, String output) { //sanity check number of operands if( getInputs().size() != 1 ) { throw new LopsException(printErrorLocation() + "Invalid number of operands (" @@ -371,14 +360,12 @@ public class Unary extends Lop } @Override - public String getInstructions(int input_index, int output_index) throws LopsException { + public String getInstructions(int input_index, int output_index) { return getInstructions(String.valueOf(input_index), String.valueOf(output_index)); } @Override - public String getInstructions(String input1, String input2, String output) - throws LopsException - { + public String getInstructions(String input1, String input2, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); @@ -404,8 +391,7 @@ public class Unary extends Lop } @Override - public String getInstructions(int inputIndex1, int inputIndex2, - int outputIndex) throws LopsException { + public String getInstructions(int inputIndex1, int inputIndex2, int outputIndex) { if (this.getInputs().size() == 2) { // Unary operators with two inputs // Determine the correct operation, depending on the scalar input http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/UnaryCP.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/UnaryCP.java b/src/main/java/org/apache/sysml/lops/UnaryCP.java index a444178..26e1731 100644 --- a/src/main/java/org/apache/sysml/lops/UnaryCP.java +++ b/src/main/java/org/apache/sysml/lops/UnaryCP.java @@ -85,7 +85,7 @@ public class UnaryCP extends Lop } - private String getOpCode() throws LopsException { + private String getOpCode() { switch (operation) { case NOT: return "!"; @@ -188,8 +188,7 @@ public class UnaryCP extends Lop } @Override - public String getInstructions(String input, String output) - throws LopsException { + public String getInstructions(String input, String output) { StringBuilder sb = new StringBuilder(); sb.append(getExecType()); sb.append( OPERAND_DELIMITOR ); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java index 5249eae..fafba3a 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java +++ b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java @@ -42,10 +42,8 @@ public class WeightedCrossEntropy extends Lop private WCeMMType _wcemmType = null; - public WeightedCrossEntropy(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WCeMMType wt, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedCeMM, dt, vt); + public WeightedCrossEntropy(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WCeMMType wt, ExecType et) { + super(Lop.Type.WeightedCeMM, dt, vt); addInput(input1); //X addInput(input2); //U addInput(input3); //V http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java index 228b9d7..d019883 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java +++ b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java @@ -36,10 +36,8 @@ public class WeightedCrossEntropyR extends Lop private boolean _cacheU = false; private boolean _cacheV = false; - public WeightedCrossEntropyR(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WCeMMType wt, boolean cacheU, boolean cacheV, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedCeMM, dt, vt); + public WeightedCrossEntropyR(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WCeMMType wt, boolean cacheU, boolean cacheV, ExecType et) { + super(Lop.Type.WeightedCeMM, dt, vt); addInput(input1); //X addInput(input2); //U addInput(input3); //V @@ -56,9 +54,7 @@ public class WeightedCrossEntropyR extends Lop setupLopProperties(et); } - private void setupLopProperties( ExecType et ) - throws LopsException - { + private void setupLopProperties( ExecType et ) { if( et == ExecType.MR ) { //setup MR parameters http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedDivMM.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedDivMM.java b/src/main/java/org/apache/sysml/lops/WeightedDivMM.java index 758ef9e..48169e2 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedDivMM.java +++ b/src/main/java/org/apache/sysml/lops/WeightedDivMM.java @@ -82,10 +82,8 @@ public class WeightedDivMM extends Lop private WDivMMType _weightsType = null; - public WeightedDivMM(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WDivMMType wt, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedDivMM, dt, vt); + public WeightedDivMM(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WDivMMType wt, ExecType et) { + super(Lop.Type.WeightedDivMM, dt, vt); addInput(input1); //W addInput(input2); //U addInput(input3); //V http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java b/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java index 648551b..bcda7e8 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java +++ b/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java @@ -34,10 +34,8 @@ public class WeightedDivMMR extends Lop private boolean _cacheU = false; private boolean _cacheV = false; - public WeightedDivMMR(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WDivMMType wt, boolean cacheU, boolean cacheV, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedDivMM, dt, vt); + public WeightedDivMMR(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WDivMMType wt, boolean cacheU, boolean cacheV, ExecType et) { + super(Lop.Type.WeightedDivMM, dt, vt); addInput(input1); //W addInput(input2); //U addInput(input3); //V @@ -53,9 +51,7 @@ public class WeightedDivMMR extends Lop setupLopProperties(et); } - private void setupLopProperties( ExecType et ) - throws LopsException - { + private void setupLopProperties( ExecType et ) { if( et == ExecType.MR ) { //setup MR parameters http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java b/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java index 3dcc930..0618d2d 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java +++ b/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java @@ -41,10 +41,8 @@ public class WeightedSigmoid extends Lop private WSigmoidType _wsigmoidType = null; - public WeightedSigmoid(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, WSigmoidType wt, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedSigmoid, dt, vt); + public WeightedSigmoid(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, WSigmoidType wt, ExecType et) { + super(Lop.Type.WeightedSigmoid, dt, vt); addInput(input1); //X addInput(input2); //U addInput(input3); //V http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java b/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java index 9778168..8df25f4 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java +++ b/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java @@ -35,14 +35,12 @@ public class WeightedSigmoidR extends Lop private boolean _cacheU = false; private boolean _cacheV = false; - public WeightedSigmoidR(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, WSigmoidType wt, boolean cacheU, boolean cacheV, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedSigmoid, dt, vt); + public WeightedSigmoidR(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, WSigmoidType wt, boolean cacheU, boolean cacheV, ExecType et) { + super(Lop.Type.WeightedSigmoid, dt, vt); addInput(input1); //X addInput(input2); //U addInput(input3); //V - input1.addOutput(this); + input1.addOutput(this); input2.addOutput(this); input3.addOutput(this); @@ -53,9 +51,7 @@ public class WeightedSigmoidR extends Lop setupLopProperties(et); } - private void setupLopProperties( ExecType et ) - throws LopsException - { + private void setupLopProperties( ExecType et ) { if( et == ExecType.MR ) { //setup MR parameters http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java b/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java index 84de064..83c2c05 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java +++ b/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java @@ -44,15 +44,13 @@ public class WeightedSquaredLoss extends Lop private WeightsType _weightsType = null; - public WeightedSquaredLoss(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WeightsType wt, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedSquaredLoss, dt, vt); + public WeightedSquaredLoss(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WeightsType wt, ExecType et) { + super(Lop.Type.WeightedSquaredLoss, dt, vt); addInput(input1); //X addInput(input2); //U addInput(input3); //V addInput(input4); //W - input1.addOutput(this); + input1.addOutput(this); input2.addOutput(this); input3.addOutput(this); input4.addOutput(this); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java b/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java index 6d7127a..b3c1e29 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java +++ b/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java @@ -34,10 +34,8 @@ public class WeightedSquaredLossR extends Lop private boolean _cacheU = false; private boolean _cacheV = false; - public WeightedSquaredLossR(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WeightsType wt, boolean cacheU, boolean cacheV, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedSquaredLoss, dt, vt); + public WeightedSquaredLossR(Lop input1, Lop input2, Lop input3, Lop input4, DataType dt, ValueType vt, WeightsType wt, boolean cacheU, boolean cacheV, ExecType et) { + super(Lop.Type.WeightedSquaredLoss, dt, vt); addInput(input1); //X addInput(input2); //U addInput(input3); //V @@ -54,9 +52,7 @@ public class WeightedSquaredLossR extends Lop setupLopProperties(et); } - private void setupLopProperties( ExecType et ) - throws LopsException - { + private void setupLopProperties( ExecType et ) { if( et == ExecType.MR ) { //setup MR parameters http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java b/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java index 8d120af..4b71226 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java +++ b/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java @@ -40,14 +40,12 @@ public class WeightedUnaryMM extends Lop private OperationTypes _uop = null; private int _numThreads = 1; - public WeightedUnaryMM(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, WUMMType wt, OperationTypes op, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedUMM, dt, vt); + public WeightedUnaryMM(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, WUMMType wt, OperationTypes op, ExecType et) { + super(Lop.Type.WeightedUMM, dt, vt); addInput(input1); //X addInput(input2); //U addInput(input3); //V - input1.addOutput(this); + input1.addOutput(this); input2.addOutput(this); input3.addOutput(this); @@ -86,9 +84,7 @@ public class WeightedUnaryMM extends Lop } @Override - public String getInstructions(int input1, int input2, int input3, int output) - throws LopsException - { + public String getInstructions(int input1, int input2, int input3, int output) { return getInstructions( String.valueOf(input1), String.valueOf(input2), @@ -97,9 +93,7 @@ public class WeightedUnaryMM extends Lop } @Override - public String getInstructions(String input1, String input2, String input3, String output) - throws LopsException - { + public String getInstructions(String input1, String input2, String input3, String output) { StringBuilder sb = new StringBuilder(); sb.append(getExecType()); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java b/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java index 0a91034..85d55cd 100644 --- a/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java +++ b/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java @@ -36,10 +36,8 @@ public class WeightedUnaryMMR extends Lop private boolean _cacheU = false; private boolean _cacheV = false; - public WeightedUnaryMMR(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, WUMMType wt, OperationTypes op, boolean cacheU, boolean cacheV, ExecType et) - throws LopsException - { - super(Lop.Type.WeightedUMM, dt, vt); + public WeightedUnaryMMR(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, WUMMType wt, OperationTypes op, boolean cacheU, boolean cacheV, ExecType et) { + super(Lop.Type.WeightedUMM, dt, vt); addInput(input1); //X addInput(input2); //U addInput(input3); //V @@ -55,9 +53,7 @@ public class WeightedUnaryMMR extends Lop setupLopProperties(et); } - private void setupLopProperties( ExecType et ) - throws LopsException - { + private void setupLopProperties( ExecType et ) { if( et == ExecType.MR ) { //setup MR parameters @@ -85,9 +81,7 @@ public class WeightedUnaryMMR extends Lop } @Override - public String getInstructions(int input1, int input2, int input3, int output) - throws LopsException - { + public String getInstructions(int input1, int input2, int input3, int output) { return getInstructions( String.valueOf(input1), String.valueOf(input2), @@ -96,9 +90,7 @@ public class WeightedUnaryMMR extends Lop } @Override - public String getInstructions(String input1, String input2, String input3, String output) - throws LopsException - { + public String getInstructions(String input1, String input2, String input3, String output) { StringBuilder sb = new StringBuilder(); sb.append(getExecType()); http://git-wip-us.apache.org/repos/asf/systemml/blob/215a1cc6/src/main/java/org/apache/sysml/lops/ZeroOut.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/ZeroOut.java b/src/main/java/org/apache/sysml/lops/ZeroOut.java index 20bc766..8db436a 100644 --- a/src/main/java/org/apache/sysml/lops/ZeroOut.java +++ b/src/main/java/org/apache/sysml/lops/ZeroOut.java @@ -60,9 +60,8 @@ public class ZeroOut extends Lop } } - public ZeroOut( - Lop input, Lop rowL, Lop rowU, Lop colL, Lop colU, long rowDim, long colDim, DataType dt, ValueType vt, ExecType et) - throws LopsException { + public ZeroOut(Lop input, Lop rowL, Lop rowU, Lop colL, Lop colU, long rowDim, + long colDim, DataType dt, ValueType vt, ExecType et) { super(Lop.Type.ZeroOut, dt, vt); init(input, rowL, rowU, colL, colU, rowDim, colDim, dt, vt, et); } @@ -72,9 +71,7 @@ public class ZeroOut extends Lop } @Override - public String getInstructions(String input, String rowl, String rowu, String coll, String colu, String output) - throws LopsException - { + public String getInstructions(String input, String rowl, String rowu, String coll, String colu, String output) { StringBuilder sb = new StringBuilder(); sb.append( getExecType() ); sb.append( OPERAND_DELIMITOR ); @@ -101,25 +98,11 @@ public class ZeroOut extends Lop } @Override - public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int input_index5, int output_index) - throws LopsException { - /* - * Example: B = A[row_l:row_u, col_l:col_u] - * A - input matrix (input_index1) - * row_l - lower bound in row dimension - * row_u - upper bound in row dimension - * col_l - lower bound in column dimension - * col_u - upper bound in column dimension - * - * Since row_l,row_u,col_l,col_u are scalars, values for input_index(2,3,4,5) - * will be equal to -1. They should be ignored and the scalar value labels must - * be derived from input lops. - */ - + public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int input_index5, int output_index) { return getInstructions( - String.valueOf(input_index1), String.valueOf(input_index2), - String.valueOf(input_index3), String.valueOf(input_index4), - String.valueOf(input_index5), String.valueOf(output_index)); + String.valueOf(input_index1), String.valueOf(input_index2), + String.valueOf(input_index3), String.valueOf(input_index4), + String.valueOf(input_index5), String.valueOf(output_index)); } @Override
