http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java index 7860600..11edbaa 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java @@ -38,9 +38,7 @@ public abstract class AppendMSPInstruction extends BinarySPInstruction { _cbind = cbind; } - public static AppendMSPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static AppendMSPInstruction parseInstruction( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); InstructionUtils.checkNumFields (parts, 5); @@ -59,7 +57,7 @@ public abstract class AppendMSPInstruction extends BinarySPInstruction { return new MatrixAppendMSPInstruction(new ReorgOperator(OffsetColumnIndex .getOffsetColumnIndexFnObject(-1)), in1, in2, offset, out, cbind, opcode, str); } - else { //frame + else { //frame return new FrameAppendMSPInstruction(new ReorgOperator(OffsetColumnIndex .getOffsetColumnIndexFnObject(-1)), in1, in2, offset, out, cbind, opcode, str); }
http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java index 1903081..1a27440 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java @@ -34,9 +34,7 @@ public abstract class AppendRSPInstruction extends BinarySPInstruction { _cbind = cbind; } - public static AppendRSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static AppendRSPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); InstructionUtils.checkNumFields (parts, 4); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java index a029fa4..dca17ee 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java @@ -22,7 +22,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.function.Function; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -45,26 +44,20 @@ public class BinUaggChainSPInstruction extends UnarySPInstruction { } - public static BinUaggChainSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static BinUaggChainSPInstruction parseInstruction ( String str ) { //parse instruction parts (without exec type) - String[] parts = InstructionUtils.getInstructionPartsWithValueType( str ); + String[] parts = InstructionUtils.getInstructionPartsWithValueType( str ); InstructionUtils.checkNumFields( parts, 4 ); - String opcode = parts[0]; BinaryOperator bop = InstructionUtils.parseBinaryOperator(parts[1]); AggregateUnaryOperator uaggop = InstructionUtils.parseBasicAggregateUnaryOperator(parts[2]); CPOperand in = new CPOperand(parts[3]); CPOperand out = new CPOperand(parts[4]); - return new BinUaggChainSPInstruction(in, out, bop, uaggop, opcode, str); } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //get input http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixBVectorSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixBVectorSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixBVectorSPInstruction.java index 4317be5..6073ab8 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixBVectorSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixBVectorSPInstruction.java @@ -20,7 +20,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.sysml.lops.BinaryM.VectorType; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -29,15 +28,13 @@ public class BinaryMatrixBVectorSPInstruction extends BinarySPInstruction { private VectorType _vtype = null; protected BinaryMatrixBVectorSPInstruction(Operator op, CPOperand in1, CPOperand in2, CPOperand out, - VectorType vtype, String opcode, String istr) throws DMLRuntimeException { + VectorType vtype, String opcode, String istr) { super(SPType.Binary, op, in1, in2, out, opcode, istr); _vtype = vtype; } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { //common binary matrix-broadcast vector process instruction super.processMatrixBVectorBinaryInstruction(ec, _vtype); } http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixMatrixSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixMatrixSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixMatrixSPInstruction.java index 8a122af..dd37f33 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixMatrixSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixMatrixSPInstruction.java @@ -19,22 +19,18 @@ package org.apache.sysml.runtime.instructions.spark; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; public class BinaryMatrixMatrixSPInstruction extends BinarySPInstruction { - protected BinaryMatrixMatrixSPInstruction(Operator op, CPOperand in1, CPOperand in2, CPOperand out, - String opcode, String istr) throws DMLRuntimeException { + protected BinaryMatrixMatrixSPInstruction(Operator op, CPOperand in1, CPOperand in2, CPOperand out, String opcode, String istr) { super(SPType.Binary, op, in1, in2, out, opcode, istr); } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { //common binary matrix-matrix process instruction super.processMatrixMatrixBinaryInstruction(ec); } http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixScalarSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixScalarSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixScalarSPInstruction.java index cbce94e..baa6891 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixScalarSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinaryMatrixScalarSPInstruction.java @@ -19,7 +19,6 @@ package org.apache.sysml.runtime.instructions.spark; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.matrix.operators.Operator; @@ -32,9 +31,7 @@ public class BinaryMatrixScalarSPInstruction extends BinarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { //common binary matrix-scalar process instruction super.processMatrixScalarBinaryInstruction(ec); } http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java index 1560545..6993929 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java @@ -50,9 +50,7 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { super(type, op, in1, in2, out, opcode, istr); } - public static BinarySPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static BinarySPInstruction parseInstruction ( String str ) { CPOperand in1 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand in2 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand out = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); @@ -93,32 +91,24 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { return null; } - protected static String parseBinaryInstruction(String instr, CPOperand in1, CPOperand in2, CPOperand out) - throws DMLRuntimeException - { + protected static String parseBinaryInstruction(String instr, CPOperand in1, CPOperand in2, CPOperand out) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(instr); InstructionUtils.checkNumFields ( parts, 3 ); - String opcode = parts[0]; in1.split(parts[1]); in2.split(parts[2]); out.split(parts[3]); - return opcode; } - protected static String parseBinaryInstruction(String instr, CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out) - throws DMLRuntimeException - { + protected static String parseBinaryInstruction(String instr, CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(instr); InstructionUtils.checkNumFields ( parts, 4 ); - String opcode = parts[0]; in1.split(parts[1]); in2.split(parts[2]); in3.split(parts[3]); out.split(parts[4]); - return opcode; } @@ -126,10 +116,8 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { * Common binary matrix-matrix process instruction * * @param ec execution context - * @throws DMLRuntimeException if DMLRuntimeException occurs */ protected void processMatrixMatrixBinaryInstruction(ExecutionContext ec) - throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; @@ -171,7 +159,6 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { } protected void processMatrixBVectorBinaryInstruction(ExecutionContext ec, VectorType vtype) - throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; @@ -211,7 +198,6 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { } protected void processMatrixScalarBinaryInstruction(ExecutionContext ec) - throws DMLRuntimeException { SparkExecutionContext sec = (SparkExecutionContext)ec; @@ -235,7 +221,6 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { } protected MatrixCharacteristics updateBinaryMMOutputMatrixCharacteristics(SparkExecutionContext sec, boolean checkCommonDim) - throws DMLRuntimeException { MatrixCharacteristics mc1 = sec.getMatrixCharacteristics(input1.getName()); MatrixCharacteristics mc2 = sec.getMatrixCharacteristics(input2.getName()); @@ -255,7 +240,6 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { } protected void updateBinaryAppendOutputMatrixCharacteristics(SparkExecutionContext sec, boolean cbind) - throws DMLRuntimeException { MatrixCharacteristics mc1 = sec.getMatrixCharacteristics(input1.getName()); MatrixCharacteristics mc2 = sec.getMatrixCharacteristics(input2.getName()); @@ -297,7 +281,6 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { } protected void checkMatrixMatrixBinaryCharacteristics(SparkExecutionContext sec) - throws DMLRuntimeException { MatrixCharacteristics mc1 = sec.getMatrixCharacteristics(input1.getName()); MatrixCharacteristics mc2 = sec.getMatrixCharacteristics(input2.getName()); @@ -325,7 +308,6 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction { } protected void checkBinaryAppendInputCharacteristics(SparkExecutionContext sec, boolean cbind, boolean checkSingleBlk, boolean checkAligned) - throws DMLRuntimeException { MatrixCharacteristics mc1 = sec.getMatrixCharacteristics(input1.getName()); MatrixCharacteristics mc2 = sec.getMatrixCharacteristics(input2.getName()); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinNarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinNarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinNarySPInstruction.java index ea09a67..583fe96 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinNarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinNarySPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.function.PairFunction; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -47,9 +46,7 @@ public class BuiltinNarySPInstruction extends SPInstruction output = out; } - public static BuiltinNarySPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static BuiltinNarySPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = parts[0]; CPOperand output = new CPOperand(parts[parts.length - 1]); @@ -61,9 +58,7 @@ public class BuiltinNarySPInstruction extends SPInstruction } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; boolean cbind = getOpcode().equals("cbind"); @@ -95,9 +90,7 @@ public class BuiltinNarySPInstruction extends SPInstruction sec.addLineageRDD(output.getName(), input.getName()); } - private static MatrixCharacteristics computeOutputMatrixCharacteristics(SparkExecutionContext sec, CPOperand[] inputs, boolean cbind) - throws DMLRuntimeException - { + private static MatrixCharacteristics computeOutputMatrixCharacteristics(SparkExecutionContext sec, CPOperand[] inputs, boolean cbind) { MatrixCharacteristics mcIn1 = sec.getMatrixCharacteristics(inputs[0].getName()); MatrixCharacteristics mcOut = new MatrixCharacteristics( 0, 0, mcIn1.getRowsPerBlock(), mcIn1.getColsPerBlock(), 0); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java index be6c712..e329e3d 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java @@ -61,9 +61,7 @@ public class CSVReblockSPInstruction extends UnarySPInstruction { _fillValue = fillValue; } - public static CSVReblockSPInstruction parseInstruction(String str) - throws DMLRuntimeException - { + public static CSVReblockSPInstruction parseInstruction(String str) { String opcode = InstructionUtils.getOpCode(str); if( !opcode.equals("csvrblk") ) throw new DMLRuntimeException("Incorrect opcode for CSVReblockSPInstruction:" + opcode); @@ -87,9 +85,7 @@ public class CSVReblockSPInstruction extends UnarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext) ec; //sanity check input info @@ -127,9 +123,7 @@ public class CSVReblockSPInstruction extends UnarySPInstruction { } @SuppressWarnings("unchecked") - protected JavaPairRDD<MatrixIndexes,MatrixBlock> processMatrixCSVReblockInstruction(SparkExecutionContext sec, MatrixCharacteristics mcOut) - throws DMLRuntimeException - { + protected JavaPairRDD<MatrixIndexes,MatrixBlock> processMatrixCSVReblockInstruction(SparkExecutionContext sec, MatrixCharacteristics mcOut) { //get input rdd (needs to be longwritable/text for consistency with meta data, in case of //serialization issues create longwritableser/textser as serializable wrappers JavaPairRDD<LongWritable, Text> in = (JavaPairRDD<LongWritable, Text>) @@ -141,9 +135,7 @@ public class CSVReblockSPInstruction extends UnarySPInstruction { } @SuppressWarnings("unchecked") - protected JavaPairRDD<Long,FrameBlock> processFrameCSVReblockInstruction(SparkExecutionContext sec, MatrixCharacteristics mcOut, ValueType[] schema) - throws DMLRuntimeException - { + protected JavaPairRDD<Long,FrameBlock> processFrameCSVReblockInstruction(SparkExecutionContext sec, MatrixCharacteristics mcOut, ValueType[] schema) { //get input rdd (needs to be longwritable/text for consistency with meta data, in case of //serialization issues create longwritableser/textser as serializable wrappers JavaPairRDD<LongWritable, Text> in = (JavaPairRDD<LongWritable, Text>) http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CastSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CastSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CastSPInstruction.java index 10211c1..ccff1bc 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CastSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CastSPInstruction.java @@ -43,24 +43,18 @@ public class CastSPInstruction extends UnarySPInstruction { super(SPType.Cast, op, in, out, opcode, istr); } - public static CastSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static CastSPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); InstructionUtils.checkNumFields(parts, 2); - String opcode = parts[0]; CPOperand in = new CPOperand(parts[1]); CPOperand out = new CPOperand(parts[2]); - return new CastSPInstruction(null, in, out, opcode, str); } @Override @SuppressWarnings("unchecked") - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; String opcode = getOpcode(); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java index cdfa41a..f25899f 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java @@ -47,9 +47,7 @@ public class CentralMomentSPInstruction extends UnarySPInstruction { super(SPType.CentralMoment, op, in1, in2, in3, out, opcode, str); } - public static CentralMomentSPInstruction parseInstruction(String str) - throws DMLRuntimeException - { + public static CentralMomentSPInstruction parseInstruction(String str) { CPOperand in1 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand in2 = null; CPOperand in3 = null; @@ -98,9 +96,7 @@ public class CentralMomentSPInstruction extends UnarySPInstruction { } @Override - public void processInstruction( ExecutionContext ec ) - throws DMLRuntimeException - { + public void processInstruction( ExecutionContext ec ) { SparkExecutionContext sec = (SparkExecutionContext)ec; //parse 'order' input argument http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java index 6f8a08e..ccd7319 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java @@ -24,7 +24,6 @@ import org.apache.spark.storage.StorageLevel; import org.apache.sysml.hops.OptimizerUtils; import org.apache.sysml.lops.Checkpoint; import org.apache.sysml.parser.Expression.DataType; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.caching.CacheableData; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; @@ -52,9 +51,7 @@ public class CheckpointSPInstruction extends UnarySPInstruction { _level = level; } - public static CheckpointSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static CheckpointSPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); InstructionUtils.checkNumFields(parts, 3); @@ -68,9 +65,7 @@ public class CheckpointSPInstruction extends UnarySPInstruction { @Override @SuppressWarnings("unchecked") - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; // Step 1: early abort on non-existing or in-memory (cached) inputs http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CompressionSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CompressionSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CompressionSPInstruction.java index ef04571..72da510 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CompressionSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CompressionSPInstruction.java @@ -21,7 +21,6 @@ package org.apache.sysml.runtime.instructions.spark; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.function.Function; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.compress.CompressedMatrixBlock; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; @@ -37,9 +36,7 @@ public class CompressionSPInstruction extends UnarySPInstruction { super(SPType.Compression, op, in, out, opcode, istr); } - public static CompressionSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static CompressionSPInstruction parseInstruction ( String str ) { InstructionUtils.checkNumFields(str, 2); String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); return new CompressionSPInstruction(null, @@ -47,9 +44,7 @@ public class CompressionSPInstruction extends UnarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //get input rdd handle http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/ComputationSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ComputationSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ComputationSPInstruction.java index 37b886e..f726da2 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ComputationSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ComputationSPInstruction.java @@ -53,15 +53,11 @@ public abstract class ComputationSPInstruction extends SPInstruction { return output.getName(); } - protected void updateUnaryOutputMatrixCharacteristics(SparkExecutionContext sec) - throws DMLRuntimeException - { + protected void updateUnaryOutputMatrixCharacteristics(SparkExecutionContext sec) { updateUnaryOutputMatrixCharacteristics(sec, input1.getName(), output.getName()); } - protected void updateUnaryOutputMatrixCharacteristics(SparkExecutionContext sec, String nameIn, String nameOut) - throws DMLRuntimeException - { + protected void updateUnaryOutputMatrixCharacteristics(SparkExecutionContext sec, String nameIn, String nameOut) { MatrixCharacteristics mc1 = sec.getMatrixCharacteristics(nameIn); MatrixCharacteristics mcOut = sec.getMatrixCharacteristics(nameOut); if(!mcOut.dimsKnown()) { @@ -72,9 +68,7 @@ public abstract class ComputationSPInstruction extends SPInstruction { } } - protected void updateBinaryOutputMatrixCharacteristics(SparkExecutionContext sec) - throws DMLRuntimeException - { + protected void updateBinaryOutputMatrixCharacteristics(SparkExecutionContext sec) { MatrixCharacteristics mcIn1 = sec.getMatrixCharacteristics(input1.getName()); MatrixCharacteristics mcIn2 = sec.getMatrixCharacteristics(input2.getName()); MatrixCharacteristics mcOut = sec.getMatrixCharacteristics(output.getName()); @@ -90,9 +84,7 @@ public abstract class ComputationSPInstruction extends SPInstruction { } } - protected void updateUnaryAggOutputMatrixCharacteristics(SparkExecutionContext sec, IndexFunction ixFn) - throws DMLRuntimeException - { + protected void updateUnaryAggOutputMatrixCharacteristics(SparkExecutionContext sec, IndexFunction ixFn) { MatrixCharacteristics mc1 = sec.getMatrixCharacteristics(input1.getName()); MatrixCharacteristics mcOut = sec.getMatrixCharacteristics(output.getName()); if( mcOut.dimsKnown() ) http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/ConvolutionSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ConvolutionSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ConvolutionSPInstruction.java index 0ec5595..da24b6d 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ConvolutionSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ConvolutionSPInstruction.java @@ -97,7 +97,7 @@ public class ConvolutionSPInstruction extends UnarySPInstruction { _in2 = in2; } - public static ConvolutionSPInstruction parseInstruction( String str ) throws DMLRuntimeException { + public static ConvolutionSPInstruction parseInstruction( String str ) { CPOperand in = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand out = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); @@ -209,7 +209,7 @@ public class ConvolutionSPInstruction extends UnarySPInstruction { } } - private static JavaPairRDD<MatrixIndexes,MatrixBlock> reblockAsRectangularMatrices(SparkExecutionContext sec, String name, int numRowsPerBlock) throws DMLRuntimeException { + private static JavaPairRDD<MatrixIndexes,MatrixBlock> reblockAsRectangularMatrices(SparkExecutionContext sec, String name, int numRowsPerBlock) { JavaPairRDD<MatrixIndexes,MatrixBlock> in1 = sec.getBinaryBlockRDDHandleForVariable( name ); MatrixCharacteristics mcRdd = sec.getMatrixCharacteristics(name); if(mcRdd.getColsPerBlock() < mcRdd.getCols() || mcRdd.getRowsPerBlock() != 1) { @@ -224,15 +224,14 @@ public class ConvolutionSPInstruction extends UnarySPInstruction { return in1; } - private Broadcast<MatrixBlock> getBroadcast(SparkExecutionContext sec, String name) throws DMLRuntimeException { + private Broadcast<MatrixBlock> getBroadcast(SparkExecutionContext sec, String name) { MatrixBlock mb = sec.getMatrixInput( name, getExtendedOpcode() ); sec.releaseMatrixInput(name, getExtendedOpcode()); return sec.getSparkContext().broadcast(mb); } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; if(instOpcode.equalsIgnoreCase("conv2d") || instOpcode.equalsIgnoreCase("conv2d_bias_add") || instOpcode.equalsIgnoreCase("maxpooling") || instOpcode.equalsIgnoreCase("relu_maxpooling")) { @@ -294,8 +293,7 @@ public class ConvolutionSPInstruction extends UnarySPInstruction { } } - private static int getScalarInput(ExecutionContext ec, ArrayList<CPOperand> aL, int index) - throws DMLRuntimeException { + private static int getScalarInput(ExecutionContext ec, ArrayList<CPOperand> aL, int index) { return (int) ec.getScalarInput(aL.get(index).getName(), aL.get(index).getValueType(), aL.get(index).isLiteral()).getLongValue(); } http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java index d69d617..dd6fc44 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java @@ -50,7 +50,6 @@ public class CovarianceSPInstruction extends BinarySPInstruction { } public static CovarianceSPInstruction parseInstruction(String str) - throws DMLRuntimeException { CPOperand in1 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand in2 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); @@ -81,31 +80,26 @@ public class CovarianceSPInstruction extends BinarySPInstruction { } @Override - public void processInstruction( ExecutionContext ec ) - throws DMLRuntimeException - { + public void processInstruction( ExecutionContext ec ) { SparkExecutionContext sec = (SparkExecutionContext)ec; COVOperator cop = ((COVOperator)_optr); //get input JavaPairRDD<MatrixIndexes,MatrixBlock> in1 = sec.getBinaryBlockRDDHandleForVariable( input1.getName() ); JavaPairRDD<MatrixIndexes,MatrixBlock> in2 = sec.getBinaryBlockRDDHandleForVariable( input2.getName() ); - + //process central moment instruction CM_COV_Object cmobj = null; - if( input3 == null ) //w/o weights - { + if( input3 == null ) { //w/o weights cmobj = in1.join( in2 ) - .values().map(new RDDCOVFunction(cop)) - .fold(new CM_COV_Object(), new RDDCOVReduceFunction(cop)); + .values().map(new RDDCOVFunction(cop)) + .fold(new CM_COV_Object(), new RDDCOVReduceFunction(cop)); } - else //with weights - { + else { //with weights JavaPairRDD<MatrixIndexes,MatrixBlock> in3 = sec.getBinaryBlockRDDHandleForVariable( input3.getName() ); - cmobj = in1.join( in2 ) - .join( in3 ) - .values().map(new RDDCOVWeightsFunction(cop)) - .fold(new CM_COV_Object(), new RDDCOVReduceFunction(cop)); + cmobj = in1.join( in2 ).join( in3 ) + .values().map(new RDDCOVWeightsFunction(cop)) + .fold(new CM_COV_Object(), new RDDCOVReduceFunction(cop)); } //create scalar output (no lineage information required) http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java index adac2fc..376cf5b 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java @@ -60,15 +60,11 @@ public class CpmmSPInstruction extends BinarySPInstruction { _aggtype = aggtype; } - public static CpmmSPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static CpmmSPInstruction parseInstruction( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = parts[0]; - if ( !opcode.equalsIgnoreCase("cpmm")) throw new DMLRuntimeException("CpmmSPInstruction.parseInstruction(): Unknown opcode " + opcode); - CPOperand in1 = new CPOperand(parts[1]); CPOperand in2 = new CPOperand(parts[2]); CPOperand out = new CPOperand(parts[3]); @@ -79,9 +75,7 @@ public class CpmmSPInstruction extends BinarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //get rdd inputs http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CtableSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CtableSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CtableSPInstruction.java index 001e7b6..8cb156c 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CtableSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CtableSPInstruction.java @@ -73,9 +73,7 @@ public class CtableSPInstruction extends ComputationSPInstruction { _ignoreZeros = ignoreZeros; } - public static CtableSPInstruction parseInstruction(String inst) - throws DMLRuntimeException - { + public static CtableSPInstruction parseInstruction(String inst) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(inst); InstructionUtils.checkNumFields ( parts, 7 ); @@ -105,9 +103,7 @@ public class CtableSPInstruction extends ComputationSPInstruction { @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //get input rdd handle http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java index 74c493c..bf99add 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java @@ -25,7 +25,6 @@ import org.apache.spark.api.java.function.PairFunction; import scala.Tuple2; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.InstructionUtils; @@ -43,9 +42,7 @@ public class CumulativeAggregateSPInstruction extends AggregateUnarySPInstructio super(SPType.CumsumAggregate, op, null, in1, out, null, opcode, istr); } - public static CumulativeAggregateSPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static CumulativeAggregateSPInstruction parseInstruction( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType( str ); InstructionUtils.checkNumFields ( parts, 2 ); @@ -59,9 +56,7 @@ public class CumulativeAggregateSPInstruction extends AggregateUnarySPInstructio } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; MatrixCharacteristics mc = sec.getMatrixCharacteristics(input1.getName()); long rlen = mc.getRows(); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java index cbe6282..05b827f 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java @@ -28,7 +28,6 @@ import org.apache.spark.api.java.function.PairFlatMapFunction; import scala.Tuple2; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.functionobjects.Builtin; @@ -68,25 +67,19 @@ public class CumulativeOffsetSPInstruction extends BinarySPInstruction { _initValue = init; } - public static CumulativeOffsetSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static CumulativeOffsetSPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType( str ); InstructionUtils.checkNumFields ( parts, 4 ); - String opcode = parts[0]; CPOperand in1 = new CPOperand(parts[1]); CPOperand in2 = new CPOperand(parts[2]); CPOperand out = new CPOperand(parts[3]); double init = Double.parseDouble(parts[4]); - return new CumulativeOffsetSPInstruction(null, in1, in2, out, init, opcode, str); } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; MatrixCharacteristics mc = sec.getMatrixCharacteristics(input2.getName()); long rlen = mc.getRows(); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendMSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendMSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendMSPInstruction.java index 081db1f..098b9a8 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendMSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendMSPInstruction.java @@ -44,9 +44,7 @@ public class FrameAppendMSPInstruction extends AppendMSPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { // map-only append (rhs must be vector and fit in mapper mem) SparkExecutionContext sec = (SparkExecutionContext)ec; checkBinaryAppendInputCharacteristics(sec, _cbind, false, false); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendRSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendRSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendRSPInstruction.java index eca944f..dd539a3 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendRSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameAppendRSPInstruction.java @@ -26,7 +26,6 @@ import org.apache.spark.api.java.function.PairFunction; import scala.Tuple2; import org.apache.sysml.hops.OptimizerUtils; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; @@ -42,9 +41,7 @@ public class FrameAppendRSPInstruction extends AppendRSPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; JavaPairRDD<Long,FrameBlock> in1 = sec.getFrameBinaryBlockRDDHandleForVariable( input1.getName() ); JavaPairRDD<Long,FrameBlock> in2 = sec.getFrameBinaryBlockRDDHandleForVariable( input2.getName() ); @@ -52,10 +49,10 @@ public class FrameAppendRSPInstruction extends AppendRSPInstruction { long leftRows = sec.getMatrixCharacteristics(input1.getName()).getRows(); if(_cbind) { - JavaPairRDD<Long,FrameBlock> in1Aligned = in1.mapToPair(new ReduceSideAppendAlignFunction(leftRows)); - in1Aligned = FrameRDDAggregateUtils.mergeByKey(in1Aligned); + JavaPairRDD<Long,FrameBlock> in1Aligned = in1.mapToPair(new ReduceSideAppendAlignFunction(leftRows)); + in1Aligned = FrameRDDAggregateUtils.mergeByKey(in1Aligned); JavaPairRDD<Long,FrameBlock> in2Aligned = in2.mapToPair(new ReduceSideAppendAlignFunction(leftRows)); - in2Aligned = FrameRDDAggregateUtils.mergeByKey(in2Aligned); + in2Aligned = FrameRDDAggregateUtils.mergeByKey(in2Aligned); out = in1Aligned.join(in2Aligned).mapValues(new ReduceSideColumnsFunction(_cbind)); } else { //rbind @@ -67,7 +64,7 @@ public class FrameAppendRSPInstruction extends AppendRSPInstruction { updateBinaryAppendOutputMatrixCharacteristics(sec, _cbind); sec.setRDDHandleForVariable(output.getName(), out); sec.addLineageRDD(output.getName(), input1.getName()); - sec.addLineageRDD(output.getName(), input2.getName()); + sec.addLineageRDD(output.getName(), input2.getName()); //update schema of output with merged input schemas sec.getFrameObject(output.getName()).setSchema( @@ -86,12 +83,9 @@ public class FrameAppendRSPInstruction extends AppendRSPInstruction { } @Override - public FrameBlock call(Tuple2<FrameBlock, FrameBlock> arg0) - throws Exception - { + public FrameBlock call(Tuple2<FrameBlock, FrameBlock> arg0) { FrameBlock left = arg0._1(); FrameBlock right = arg0._2(); - return left.append(right, new FrameBlock(), _cbind); } } http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameIndexingSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameIndexingSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameIndexingSPInstruction.java index 0f338d7..f2c20a3 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameIndexingSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/FrameIndexingSPInstruction.java @@ -66,9 +66,7 @@ public class FrameIndexingSPInstruction extends IndexingSPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; String opcode = getOpcode(); @@ -169,9 +167,7 @@ public class FrameIndexingSPInstruction extends IndexingSPInstruction { (ixrange.rowStart==1 && ixrange.rowEnd==mcIn.getRows() )); //Entire Column/s } - private static void checkValidOutputDimensions(MatrixCharacteristics mcOut) - throws DMLRuntimeException - { + private static void checkValidOutputDimensions(MatrixCharacteristics mcOut) { if(!mcOut.dimsKnown()) { throw new DMLRuntimeException("FrameIndexingSPInstruction: The updated output dimensions are invalid: " + mcOut); } http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/IndexingSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/IndexingSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/IndexingSPInstruction.java index 3f44aa6..f31a989 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/IndexingSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/IndexingSPInstruction.java @@ -56,9 +56,7 @@ public abstract class IndexingSPInstruction extends UnarySPInstruction { colUpper = cu; } - public static IndexingSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static IndexingSPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = parts[0]; http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java index 345388f..c9566a2 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java @@ -63,9 +63,7 @@ public class MapmmChainSPInstruction extends SPInstruction { _chainType = type; } - public static MapmmChainSPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static MapmmChainSPInstruction parseInstruction( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType( str ); InstructionUtils.checkNumFields ( parts, 4, 5 ); String opcode = parts[0]; @@ -97,9 +95,7 @@ public class MapmmChainSPInstruction extends SPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //get rdd and broadcast inputs @@ -134,19 +130,14 @@ public class MapmmChainSPInstruction extends SPInstruction { private PartitionedBroadcast<MatrixBlock> _pmV = null; - public RDDMapMMChainFunction( PartitionedBroadcast<MatrixBlock> bV) - throws DMLRuntimeException - { + public RDDMapMMChainFunction( PartitionedBroadcast<MatrixBlock> bV) { //get first broadcast vector (always single block) _pmV = bV; } @Override - public MatrixBlock call( MatrixBlock arg0 ) - throws Exception - { + public MatrixBlock call( MatrixBlock arg0 ) { MatrixBlock pmV = _pmV.getBlock(1, 1); - //execute mapmmchain operation return arg0.chainMatrixMultOperations(pmV, null, new MatrixBlock(), ChainType.XtXv); @@ -165,9 +156,7 @@ public class MapmmChainSPInstruction extends SPInstruction { private PartitionedBroadcast<MatrixBlock> _pmW = null; private ChainType _chainType = null; - public RDDMapMMChainFunction2( PartitionedBroadcast<MatrixBlock> bV, PartitionedBroadcast<MatrixBlock> bW, ChainType chain) - throws DMLRuntimeException - { + public RDDMapMMChainFunction2( PartitionedBroadcast<MatrixBlock> bV, PartitionedBroadcast<MatrixBlock> bW, ChainType chain) { //get both broadcast vectors (first always single block) _pmV = bV; _pmW = bW; @@ -175,15 +164,11 @@ public class MapmmChainSPInstruction extends SPInstruction { } @Override - public MatrixBlock call( Tuple2<MatrixIndexes, MatrixBlock> arg0 ) - throws Exception - { + public MatrixBlock call( Tuple2<MatrixIndexes, MatrixBlock> arg0 ) { MatrixBlock pmV = _pmV.getBlock(1, 1); - MatrixIndexes ixIn = arg0._1(); MatrixBlock blkIn = arg0._2(); int rowIx = (int)ixIn.getRowIndex(); - //execute mapmmchain operation return blkIn.chainMatrixMultOperations(pmV, _pmW.getBlock(rowIx,1), new MatrixBlock(), _chainType); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java index f882885..8f8f576 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java @@ -68,9 +68,7 @@ public class MapmmSPInstruction extends BinarySPInstruction { _aggtype = aggtype; } - public static MapmmSPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static MapmmSPInstruction parseInstruction( String str ) { String parts[] = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = parts[0]; @@ -90,9 +88,7 @@ public class MapmmSPInstruction extends BinarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; CacheType type = _type; http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendMSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendMSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendMSPInstruction.java index 8ada4e8..3019a78 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendMSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendMSPInstruction.java @@ -27,7 +27,6 @@ import org.apache.spark.api.java.function.PairFlatMapFunction; import scala.Tuple2; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; @@ -49,9 +48,7 @@ public class MatrixAppendMSPInstruction extends AppendMSPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { // map-only append (rhs must be vector and fit in mapper mem) SparkExecutionContext sec = (SparkExecutionContext)ec; checkBinaryAppendInputCharacteristics(sec, _cbind, false, false); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendRSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendRSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendRSPInstruction.java index efe4f9d..e9abca3 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendRSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixAppendRSPInstruction.java @@ -24,7 +24,6 @@ import org.apache.spark.api.java.function.Function; import scala.Tuple2; -import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; import org.apache.sysml.runtime.instructions.cp.CPOperand; @@ -40,9 +39,7 @@ public class MatrixAppendRSPInstruction extends AppendRSPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { // reduce-only append (output must have at most one column block) SparkExecutionContext sec = (SparkExecutionContext)ec; checkBinaryAppendInputCharacteristics(sec, _cbind, true, false); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java index b6df075..a26a6f1 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java @@ -79,9 +79,7 @@ public class MatrixIndexingSPInstruction extends IndexingSPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; String opcode = getOpcode(); @@ -177,7 +175,7 @@ public class MatrixIndexingSPInstruction extends IndexingSPInstruction { public static MatrixBlock inmemoryIndexing(JavaPairRDD<MatrixIndexes,MatrixBlock> in1, - MatrixCharacteristics mcIn, MatrixCharacteristics mcOut, IndexRange ixrange) throws DMLRuntimeException { + MatrixCharacteristics mcIn, MatrixCharacteristics mcOut, IndexRange ixrange) { if( isSingleBlockLookup(mcIn, ixrange) ) { return singleBlockIndexing(in1, mcIn, mcOut, ixrange); } @@ -189,7 +187,7 @@ public class MatrixIndexingSPInstruction extends IndexingSPInstruction { } private static MatrixBlock multiBlockIndexing(JavaPairRDD<MatrixIndexes,MatrixBlock> in1, - MatrixCharacteristics mcIn, MatrixCharacteristics mcOut, IndexRange ixrange) throws DMLRuntimeException { + MatrixCharacteristics mcIn, MatrixCharacteristics mcOut, IndexRange ixrange) { //create list of all required matrix indexes List<MatrixIndexes> filter = new ArrayList<>(); long rlix = UtilFunctions.computeBlockIndex(ixrange.rowStart, mcIn.getRowsPerBlock()); @@ -212,7 +210,7 @@ public class MatrixIndexingSPInstruction extends IndexingSPInstruction { } private static MatrixBlock singleBlockIndexing(JavaPairRDD<MatrixIndexes,MatrixBlock> in1, - MatrixCharacteristics mcIn, MatrixCharacteristics mcOut, IndexRange ixrange) throws DMLRuntimeException { + MatrixCharacteristics mcIn, MatrixCharacteristics mcOut, IndexRange ixrange) { //single block output via lookup (on partitioned inputs, this allows for single partition //access to avoid a full scan of the input; note that this is especially important for //out-of-core datasets as entire partitions are read, not just keys as in the in-memory setting. @@ -254,9 +252,7 @@ public class MatrixIndexingSPInstruction extends IndexingSPInstruction { return out; } - private static void checkValidOutputDimensions(MatrixCharacteristics mcOut) - throws DMLRuntimeException - { + private static void checkValidOutputDimensions(MatrixCharacteristics mcOut) { if(!mcOut.dimsKnown()) { throw new DMLRuntimeException("MatrixIndexingSPInstruction: The updated output dimensions are invalid: " + mcOut); } http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java index 5a80aac..42b4dd9 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java @@ -56,9 +56,7 @@ public class MatrixReshapeSPInstruction extends UnarySPInstruction { _opByRow = in4; } - public static MatrixReshapeSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static MatrixReshapeSPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); InstructionUtils.checkNumFields( parts, 5 ); @@ -76,9 +74,7 @@ public class MatrixReshapeSPInstruction extends UnarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //get parameters http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/MultiReturnParameterizedBuiltinSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MultiReturnParameterizedBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MultiReturnParameterizedBuiltinSPInstruction.java index 5d6c9e8..cd5e2ba 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MultiReturnParameterizedBuiltinSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MultiReturnParameterizedBuiltinSPInstruction.java @@ -76,9 +76,7 @@ public class MultiReturnParameterizedBuiltinSPInstruction extends ComputationSPI _outputs = outputs; } - public static MultiReturnParameterizedBuiltinSPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static MultiReturnParameterizedBuiltinSPInstruction parseInstruction( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); ArrayList<CPOperand> outputs = new ArrayList<>(); String opcode = parts[0]; @@ -99,9 +97,7 @@ public class MultiReturnParameterizedBuiltinSPInstruction extends ComputationSPI @Override @SuppressWarnings("unchecked") - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext) ec; try http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java index 55c84f4..2e7ac11 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java @@ -62,9 +62,7 @@ public class PMapmmSPInstruction extends BinarySPInstruction { super(SPType.PMAPMM, op, in1, in2, out, opcode, istr); } - public static PMapmmSPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static PMapmmSPInstruction parseInstruction( String str ) { String parts[] = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = parts[0]; @@ -83,9 +81,7 @@ public class PMapmmSPInstruction extends BinarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //get inputs http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java index 425739d..0b37bd8 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java @@ -111,9 +111,7 @@ public class ParameterizedBuiltinSPInstruction extends ComputationSPInstruction return paramMap; } - public static ParameterizedBuiltinSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static ParameterizedBuiltinSPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); // first part is always the opcode String opcode = parts[0]; @@ -183,9 +181,7 @@ public class ParameterizedBuiltinSPInstruction extends ComputationSPInstruction @Override @SuppressWarnings("unchecked") - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; String opcode = getOpcode(); @@ -194,7 +190,7 @@ public class ParameterizedBuiltinSPInstruction extends ComputationSPInstruction { //get input rdd handle String targetVar = params.get(Statement.GAGG_TARGET); - String groupsVar = params.get(Statement.GAGG_GROUPS); + String groupsVar = params.get(Statement.GAGG_GROUPS); JavaPairRDD<MatrixIndexes,MatrixBlock> target = sec.getBinaryBlockRDDHandleForVariable(targetVar); PartitionedBroadcast<MatrixBlock> groups = sec.getBroadcastForVariable(groupsVar); MatrixCharacteristics mc1 = sec.getMatrixCharacteristics( targetVar ); @@ -874,9 +870,7 @@ public class ParameterizedBuiltinSPInstruction extends ComputationSPInstruction } } - public void setOutputCharacteristicsForGroupedAgg(MatrixCharacteristics mc1, MatrixCharacteristics mcOut, JavaPairRDD<MatrixIndexes, MatrixCell> out) - throws DMLRuntimeException - { + public void setOutputCharacteristicsForGroupedAgg(MatrixCharacteristics mc1, MatrixCharacteristics mcOut, JavaPairRDD<MatrixIndexes, MatrixCell> out) { if(!mcOut.dimsKnown()) { if(!mc1.dimsKnown()) { throw new DMLRuntimeException("The output dimensions are not specified for grouped aggregate"); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java index 313e2e2..3914c55 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java @@ -59,32 +59,26 @@ public class PmmSPInstruction extends BinarySPInstruction { _nrow = nrow; } - public static PmmSPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static PmmSPInstruction parseInstruction( String str ) { String parts[] = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = InstructionUtils.getOpCode(str); - if ( opcode.equalsIgnoreCase(PMMJ.OPCODE)) { CPOperand in1 = new CPOperand(parts[1]); CPOperand in2 = new CPOperand(parts[2]); CPOperand nrow = new CPOperand(parts[3]); CPOperand out = new CPOperand(parts[4]); CacheType type = CacheType.valueOf(parts[5]); - AggregateOperator agg = new AggregateOperator(0, Plus.getPlusFnObject()); AggregateBinaryOperator aggbin = new AggregateBinaryOperator(Multiply.getMultiplyFnObject(), agg); return new PmmSPInstruction(aggbin, in1, in2, out, nrow, type, opcode, str); } else { throw new DMLRuntimeException("PmmSPInstruction.parseInstruction():: Unknown opcode " + opcode); - } + } } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; String rddVar = (_type==CacheType.LEFT) ? input2.getName() : input1.getName(); @@ -118,18 +112,14 @@ public class PmmSPInstruction extends BinarySPInstruction { private long _rlen = -1; private int _brlen = -1; - public RDDPMMFunction( CacheType type, PartitionedBroadcast<MatrixBlock> binput, long rlen, int brlen ) - throws DMLRuntimeException - { + public RDDPMMFunction( CacheType type, PartitionedBroadcast<MatrixBlock> binput, long rlen, int brlen ) { _brlen = brlen; _rlen = rlen; _pmV = binput; } @Override - public Iterator<Tuple2<MatrixIndexes, MatrixBlock>> call( Tuple2<MatrixIndexes, MatrixBlock> arg0 ) - throws Exception - { + public Iterator<Tuple2<MatrixIndexes, MatrixBlock>> call( Tuple2<MatrixIndexes, MatrixBlock> arg0 ) { ArrayList<Tuple2<MatrixIndexes,MatrixBlock>> ret = new ArrayList<>(); MatrixIndexes ixIn = arg0._1(); MatrixBlock mb2 = arg0._2(); @@ -170,5 +160,4 @@ public class PmmSPInstruction extends BinarySPInstruction { return ret.iterator(); } } - } http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java index 0aa5c9d..18f0bef 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java @@ -62,9 +62,7 @@ public class QuantilePickSPInstruction extends BinarySPInstruction { _type = type; } - public static QuantilePickSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException - { + public static QuantilePickSPInstruction parseInstruction ( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = parts[0]; @@ -102,9 +100,7 @@ public class QuantilePickSPInstruction extends BinarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //get input rdds @@ -154,10 +150,8 @@ public class QuantilePickSPInstruction extends BinarySPInstruction { * @param mc matrix characteristics * @param quantiles one or more quantiles between 0 and 1. * @return a summary of weighted quantiles - * @throws DMLRuntimeException */ private static double[] getWeightedQuantileSummary(JavaPairRDD<MatrixIndexes,MatrixBlock> w, MatrixCharacteristics mc, Double... quantiles) - throws DMLRuntimeException { double[] ret = new double[3*quantiles.length + 1]; if( mc.getCols()==2 ) //weighted @@ -216,9 +210,7 @@ public class QuantilePickSPInstruction extends BinarySPInstruction { return ret; } - private static double lookupKey(JavaPairRDD<MatrixIndexes,MatrixBlock> in, long key, int brlen) - throws DMLRuntimeException - { + private static double lookupKey(JavaPairRDD<MatrixIndexes,MatrixBlock> in, long key, int brlen) { long rix = UtilFunctions.computeBlockIndex(key, brlen); long pos = UtilFunctions.computeCellInBlock(key, brlen); List<MatrixBlock> val = in.lookup(new MatrixIndexes(rix,1)); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java index 5088491..313d79c 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java @@ -55,8 +55,7 @@ public class QuantileSortSPInstruction extends UnarySPInstruction { super(SPType.QSort, op, in1, in2, out, opcode, istr); } - public static QuantileSortSPInstruction parseInstruction ( String str ) - throws DMLRuntimeException { + public static QuantileSortSPInstruction parseInstruction ( String str ) { CPOperand in1 = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); CPOperand in2 = null; CPOperand out = new CPOperand("", ValueType.UNKNOWN, DataType.UNKNOWN); @@ -86,9 +85,7 @@ public class QuantileSortSPInstruction extends UnarySPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; boolean weighted = (input2 != null); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java index 96b37d2..a5a5d94 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java @@ -72,9 +72,7 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { _cacheV = cacheV; } - public static QuaternarySPInstruction parseInstruction( String str ) - throws DMLRuntimeException - { + public static QuaternarySPInstruction parseInstruction( String str ) { String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = parts[0]; @@ -191,9 +189,7 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { } @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; QuaternaryOperator qop = (QuaternaryOperator) _optr; @@ -314,22 +310,19 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { } } - private void updateOutputMatrixCharacteristics(SparkExecutionContext sec, QuaternaryOperator qop) - throws DMLRuntimeException - { + private void updateOutputMatrixCharacteristics(SparkExecutionContext sec, QuaternaryOperator qop) { MatrixCharacteristics mcIn1 = sec.getMatrixCharacteristics(input1.getName()); MatrixCharacteristics mcIn2 = sec.getMatrixCharacteristics(input2.getName()); MatrixCharacteristics mcIn3 = sec.getMatrixCharacteristics(input3.getName()); MatrixCharacteristics mcOut = sec.getMatrixCharacteristics(output.getName()); - if( qop.wtype2 != null || qop.wtype5 != null ) { //output size determined by main input mcOut.set(mcIn1.getRows(), mcIn1.getCols(), mcIn1.getRowsPerBlock(), mcIn1.getColsPerBlock()); } else if(qop.wtype3 != null ) { //wdivmm long rank = qop.wtype3.isLeft() ? mcIn3.getCols() : mcIn2.getCols(); - MatrixCharacteristics mcTmp = qop.wtype3.computeOutputCharacteristics(mcIn1.getRows(), mcIn1.getCols(), rank); - mcOut.set(mcTmp.getRows(), mcTmp.getCols(), mcIn1.getRowsPerBlock(), mcIn1.getColsPerBlock()); + MatrixCharacteristics mcTmp = qop.wtype3.computeOutputCharacteristics(mcIn1.getRows(), mcIn1.getCols(), rank); + mcOut.set(mcTmp.getRows(), mcTmp.getCols(), mcIn1.getRowsPerBlock(), mcIn1.getColsPerBlock()); } } @@ -342,17 +335,16 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { protected PartitionedBroadcast<MatrixBlock> _pmV = null; public RDDQuaternaryBaseFunction( QuaternaryOperator qop, PartitionedBroadcast<MatrixBlock> bcU, PartitionedBroadcast<MatrixBlock> bcV ) { - _qop = qop; + _qop = qop; _pmU = bcU; _pmV = bcV; } - protected MatrixIndexes createOutputIndexes(MatrixIndexes in) - { + protected MatrixIndexes createOutputIndexes(MatrixIndexes in) { if( _qop.wtype3 != null && !_qop.wtype3.isBasic() ){ //key change boolean left = _qop.wtype3.isLeft(); return new MatrixIndexes(left?in.getColumnIndex():in.getRowIndex(), 1); - } + } return in; } } @@ -362,16 +354,12 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { { private static final long serialVersionUID = -8209188316939435099L; - public RDDQuaternaryFunction1( QuaternaryOperator qop, PartitionedBroadcast<MatrixBlock> bcU, PartitionedBroadcast<MatrixBlock> bcV ) - throws DMLRuntimeException - { + public RDDQuaternaryFunction1( QuaternaryOperator qop, PartitionedBroadcast<MatrixBlock> bcU, PartitionedBroadcast<MatrixBlock> bcV ) { super(qop, bcU, bcV); } @Override - public LazyIterableIterator<Tuple2<MatrixIndexes, MatrixBlock>> call(Iterator<Tuple2<MatrixIndexes, MatrixBlock>> arg) - throws Exception - { + public LazyIterableIterator<Tuple2<MatrixIndexes, MatrixBlock>> call(Iterator<Tuple2<MatrixIndexes, MatrixBlock>> arg) { return new RDDQuaternaryPartitionIterator(arg); } @@ -382,13 +370,10 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { } @Override - protected Tuple2<MatrixIndexes, MatrixBlock> computeNext(Tuple2<MatrixIndexes, MatrixBlock> arg) - throws Exception - { + protected Tuple2<MatrixIndexes, MatrixBlock> computeNext(Tuple2<MatrixIndexes, MatrixBlock> arg) { MatrixIndexes ixIn = arg._1(); MatrixBlock blkIn = arg._2(); MatrixBlock blkOut = new MatrixBlock(); - MatrixBlock mbU = _pmU.getBlock((int)ixIn.getRowIndex(), 1); MatrixBlock mbV = _pmV.getBlock((int)ixIn.getColumnIndex(), 1); @@ -399,7 +384,6 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { MatrixIndexes ixOut = createOutputIndexes(ixIn); return new Tuple2<>(ixOut, blkOut); } - } } @@ -408,21 +392,16 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { { private static final long serialVersionUID = 7493974462943080693L; - public RDDQuaternaryFunction2( QuaternaryOperator qop, PartitionedBroadcast<MatrixBlock> bcU, PartitionedBroadcast<MatrixBlock> bcV ) - throws DMLRuntimeException - { + public RDDQuaternaryFunction2( QuaternaryOperator qop, PartitionedBroadcast<MatrixBlock> bcU, PartitionedBroadcast<MatrixBlock> bcV ) { super(qop, bcU, bcV); } @Override - public Tuple2<MatrixIndexes, MatrixBlock> call(Tuple2<MatrixIndexes, Tuple2<MatrixBlock, MatrixBlock>> arg0) - throws Exception - { + public Tuple2<MatrixIndexes, MatrixBlock> call(Tuple2<MatrixIndexes, Tuple2<MatrixBlock, MatrixBlock>> arg0) { MatrixIndexes ixIn = arg0._1(); MatrixBlock blkIn1 = arg0._2()._1(); MatrixBlock blkIn2 = arg0._2()._2(); MatrixBlock blkOut = new MatrixBlock(); - MatrixBlock mbU = (_pmU!=null)?_pmU.getBlock((int)ixIn.getRowIndex(), 1) : blkIn2; MatrixBlock mbV = (_pmV!=null)?_pmV.getBlock((int)ixIn.getColumnIndex(), 1) : blkIn2; MatrixBlock mbW = (_qop.hasFourInputs()) ? blkIn2 : null; @@ -441,23 +420,17 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { { private static final long serialVersionUID = -2294086455843773095L; - public RDDQuaternaryFunction3( QuaternaryOperator qop, PartitionedBroadcast<MatrixBlock> bcU, PartitionedBroadcast<MatrixBlock> bcV ) - throws DMLRuntimeException - { + public RDDQuaternaryFunction3( QuaternaryOperator qop, PartitionedBroadcast<MatrixBlock> bcU, PartitionedBroadcast<MatrixBlock> bcV ) { super(qop, bcU, bcV); } @Override - public Tuple2<MatrixIndexes, MatrixBlock> call(Tuple2<MatrixIndexes, Tuple2<Tuple2<MatrixBlock, MatrixBlock>, MatrixBlock>> arg0) - throws Exception - { + public Tuple2<MatrixIndexes, MatrixBlock> call(Tuple2<MatrixIndexes, Tuple2<Tuple2<MatrixBlock, MatrixBlock>, MatrixBlock>> arg0) { MatrixIndexes ixIn = arg0._1(); MatrixBlock blkIn1 = arg0._2()._1()._1(); MatrixBlock blkIn2 = arg0._2()._1()._2(); MatrixBlock blkIn3 = arg0._2()._2(); - MatrixBlock blkOut = new MatrixBlock(); - MatrixBlock mbU = (_pmU!=null)?_pmU.getBlock((int)ixIn.getRowIndex(), 1) : blkIn2; MatrixBlock mbV = (_pmV!=null)?_pmV.getBlock((int)ixIn.getColumnIndex(), 1) : (_pmU!=null)? blkIn2 : blkIn3; @@ -480,15 +453,12 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { { private static final long serialVersionUID = 7328911771600289250L; - public RDDQuaternaryFunction4( QuaternaryOperator qop ) - throws DMLRuntimeException - { - super(qop, null, null); + public RDDQuaternaryFunction4( QuaternaryOperator qop ) { + super(qop, null, null); } @Override public Tuple2<MatrixIndexes, MatrixBlock> call(Tuple2<MatrixIndexes, Tuple2<Tuple2<Tuple2<MatrixBlock, MatrixBlock>, MatrixBlock>, MatrixBlock>> arg0) - throws Exception { MatrixIndexes ixIn1 = arg0._1(); MatrixBlock blkIn1 = arg0._2()._1()._1()._1(); @@ -511,9 +481,7 @@ public class QuaternarySPInstruction extends ComputationSPInstruction { private static final long serialVersionUID = -2571724736131823708L; @Override - public Tuple2<MatrixIndexes, MatrixBlock> call( Tuple2<MatrixIndexes, MatrixBlock> arg0 ) - throws Exception - { + public Tuple2<MatrixIndexes, MatrixBlock> call( Tuple2<MatrixIndexes, MatrixBlock> arg0 ) { MatrixIndexes ixIn = arg0._1(); MatrixBlock blkIn = arg0._2(); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/RandSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/RandSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/RandSPInstruction.java index 926e229..3ec3e6b 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/RandSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/RandSPInstruction.java @@ -153,9 +153,7 @@ public class RandSPInstruction extends UnarySPInstruction { return sparsity; } - public static RandSPInstruction parseInstruction(String str) - throws DMLRuntimeException - { + public static RandSPInstruction parseInstruction(String str) { String[] s = InstructionUtils.getInstructionPartsWithValueType ( str ); String opcode = s[0]; @@ -229,9 +227,7 @@ public class RandSPInstruction extends UnarySPInstruction { } @Override - public void processInstruction( ExecutionContext ec ) - throws DMLRuntimeException - { + public void processInstruction( ExecutionContext ec ){ SparkExecutionContext sec = (SparkExecutionContext)ec; //process specific datagen operator @@ -244,9 +240,7 @@ public class RandSPInstruction extends UnarySPInstruction { } } - private void generateRandData(SparkExecutionContext sec) - throws DMLRuntimeException - { + private void generateRandData(SparkExecutionContext sec) { long lrows = sec.getScalarInput(rows).getLongValue(); long lcols = sec.getScalarInput(cols).getLongValue(); @@ -352,9 +346,7 @@ public class RandSPInstruction extends UnarySPInstruction { sec.setRDDHandleForVariable(output.getName(), out); } - private void generateSequence(SparkExecutionContext sec) - throws DMLRuntimeException - { + private void generateSequence(SparkExecutionContext sec) { double lfrom = sec.getScalarInput(seq_from).getDoubleValue(); double lto = sec.getScalarInput(seq_to).getDoubleValue(); double lincr = sec.getScalarInput(seq_incr).getDoubleValue(); @@ -439,11 +431,8 @@ public class RandSPInstruction extends UnarySPInstruction { * Helper function to construct a sample. * * @param sec spark execution context - * @throws DMLRuntimeException if DMLRuntimeException occurs */ - private void generateSample(SparkExecutionContext sec) - throws DMLRuntimeException - { + private void generateSample(SparkExecutionContext sec) { long lrows = sec.getScalarInput(rows).getLongValue(); if ( maxValue < lrows && !replace ) throw new DMLRuntimeException("Sample (size=" + rows + ") larger than population (size=" + maxValue + ") can only be generated with replacement."); http://git-wip-us.apache.org/repos/asf/systemml/blob/1f323976/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java index 7f97d04..a227425 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java @@ -59,8 +59,7 @@ public class ReblockSPInstruction extends UnarySPInstruction { outputEmptyBlocks = emptyBlocks; } - public static ReblockSPInstruction parseInstruction(String str) throws DMLRuntimeException - { + public static ReblockSPInstruction parseInstruction(String str) { String parts[] = InstructionUtils.getInstructionPartsWithValueType(str); String opcode = parts[0]; @@ -77,12 +76,9 @@ public class ReblockSPInstruction extends UnarySPInstruction { Operator op = null; // no operator for ReblockSPInstruction return new ReblockSPInstruction(op, in, out, brlen, bclen, outputEmptyBlocks, opcode, str); } - @Override - public void processInstruction(ExecutionContext ec) - throws DMLRuntimeException - { + public void processInstruction(ExecutionContext ec) { SparkExecutionContext sec = (SparkExecutionContext)ec; //set the output characteristics @@ -114,9 +110,7 @@ public class ReblockSPInstruction extends UnarySPInstruction { } @SuppressWarnings("unchecked") - protected void processMatrixReblockInstruction(SparkExecutionContext sec, InputInfo iinfo) - throws DMLRuntimeException - { + protected void processMatrixReblockInstruction(SparkExecutionContext sec, InputInfo iinfo) { MatrixObject mo = sec.getMatrixObject(input1.getName()); MatrixCharacteristics mc = sec.getMatrixCharacteristics(input1.getName()); MatrixCharacteristics mcOut = sec.getMatrixCharacteristics(output.getName()); @@ -191,7 +185,6 @@ public class ReblockSPInstruction extends UnarySPInstruction { @SuppressWarnings("unchecked") protected void processFrameReblockInstruction(SparkExecutionContext sec, InputInfo iinfo) - throws DMLRuntimeException { FrameObject fo = sec.getFrameObject(input1.getName()); MatrixCharacteristics mcOut = sec.getMatrixCharacteristics(output.getName());
