You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/12/12 19:59:55 UTC
incubator-systemml git commit: [SYSTEMML-1149] Remove unused
constructors from project
Repository: incubator-systemml
Updated Branches:
refs/heads/master f8677e804 -> 731c77896
[SYSTEMML-1149] Remove unused constructors from project
Closes #315.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/731c7789
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/731c7789
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/731c7789
Branch: refs/heads/master
Commit: 731c77896a69c9e66857039819812568a19903d4
Parents: f8677e8
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Mon Dec 12 11:56:40 2016 -0800
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Mon Dec 12 11:56:40 2016 -0800
----------------------------------------------------------------------
.../sysml/debug/DMLDebuggerException.java | 11 ----
.../apache/sysml/debug/DMLProgramCounter.java | 27 ---------
.../org/apache/sysml/hops/ConvolutionOp.java | 14 +----
src/main/java/org/apache/sysml/hops/DataOp.java | 17 ------
.../java/org/apache/sysml/lops/Aggregate.java | 11 ----
.../org/apache/sysml/lops/BinaryScalar.java | 26 ---------
.../org/apache/sysml/lops/CentralMoment.java | 8 ---
.../java/org/apache/sysml/lops/CoVariance.java | 15 -----
.../apache/sysml/lops/ConvolutionTransform.java | 8 +--
.../org/apache/sysml/lops/LopsException.java | 4 --
.../apache/sysml/lops/ParameterizedBuiltin.java | 30 ----------
.../org/apache/sysml/lops/PartialAggregate.java | 8 ---
.../java/org/apache/sysml/lops/SortKeys.java | 5 --
.../org/apache/sysml/lops/TernaryAggregate.java | 4 --
src/main/java/org/apache/sysml/lops/Unary.java | 16 +-----
.../java/org/apache/sysml/lops/ZeroOut.java | 7 ---
.../sysml/parser/AssignmentStatement.java | 9 ---
.../sysml/parser/ExternalFunctionStatement.java | 14 -----
.../org/apache/sysml/parser/Identifier.java | 27 +--------
.../sysml/parser/MultiAssignmentStatement.java | 17 +-----
.../apache/sysml/parser/OutputStatement.java | 60 +-------------------
.../ParameterizedBuiltinFunctionExpression.java | 9 +--
.../apache/sysml/parser/StringIdentifier.java | 11 +---
.../parser/common/CustomErrorListener.java | 13 -----
.../runtime/compress/CompressedMatrixBlock.java | 7 ---
.../context/ExecutionContext.java | 13 -----
.../context/SparkExecutionContext.java | 5 --
.../parfor/ResultMergeTaggedMatrixIndexes.java | 8 +--
.../cp/AggregateUnaryCPInstruction.java | 4 --
.../cpfile/MatrixIndexingCPFileInstruction.java | 6 +-
.../ScalarMatrixArithmeticGPUInstruction.java | 10 +---
.../instructions/spark/BinarySPInstruction.java | 4 --
.../instructions/spark/WriteSPInstruction.java | 4 --
.../runtime/io/ReaderBinaryBlockParallel.java | 2 +-
.../matrix/data/AdaptivePartialBlock.java | 5 --
.../apache/sysml/runtime/matrix/data/IJV.java | 6 +-
.../sysml/runtime/matrix/data/InputInfo.java | 9 +--
.../runtime/matrix/data/MatrixPackedCell.java | 8 +--
.../data/NumItemsByEachReducerMetaData.java | 7 +--
.../matrix/mapred/FrameReblockBuffer.java | 5 --
.../runtime/matrix/mapred/ReblockBuffer.java | 7 +--
.../runtime/transform/ApplyTfCSVSPARK.java | 4 --
.../sysml/runtime/transform/BinAgent.java | 4 --
.../sysml/runtime/transform/DummycodeAgent.java | 6 +-
.../sysml/runtime/transform/OmitAgent.java | 10 +---
.../apache/sysml/runtime/transform/TfUtils.java | 11 +---
.../transform/decode/DecoderComposite.java | 6 --
.../transform/encode/EncoderComposite.java | 8 +--
.../sysml/runtime/util/NormalPRNGenerator.java | 7 +--
.../apache/sysml/runtime/util/PRNGenerator.java | 6 +-
.../sysml/runtime/util/PoissonPRNGenerator.java | 12 +---
51 files changed, 28 insertions(+), 527 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/debug/DMLDebuggerException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/debug/DMLDebuggerException.java b/src/main/java/org/apache/sysml/debug/DMLDebuggerException.java
index 10e71c6..a7affe4 100644
--- a/src/main/java/org/apache/sysml/debug/DMLDebuggerException.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebuggerException.java
@@ -29,15 +29,4 @@ public class DMLDebuggerException extends DMLException
private static final long serialVersionUID = 1L;
- public DMLDebuggerException(String string) {
- super(string);
- }
-
- public DMLDebuggerException(Exception e) {
- super(e);
- }
-
- public DMLDebuggerException(String string, Exception ex){
- super(string,ex);
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java b/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
index 13009cb..8a912ba 100644
--- a/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
+++ b/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
@@ -57,33 +57,6 @@ public class DMLProgramCounter {
}
/**
- * Parameterized constructor for DML pc without line number information
- * @param name Current namespace
- * @param fn Current function name in namespace
- * @param blockNum Current program block within function
- * @param instNum Current instruction within program block
- * @param instID Current instruction unique identifier
- */
- public DMLProgramCounter(String name, String fn, int blockNum, int instNum, long instID) {
- this(name, fn, blockNum, instNum);
- this.instID = instID;
- }
-
- /**
- * Fully parameterized constructor for DML pc
- * @param name Current namespace
- * @param fn Current function name in namespace
- * @param blockNum Current program block within function
- * @param instNum Current instruction within program block
- * @param instID Current instruction unique identifier
- * @param lineNum Current line number
- */
- public DMLProgramCounter(String name, String fn, int blockNum, int instNum, long instID, int lineNum) {
- this(name, fn, blockNum, instNum, instID);
- lineNumber = lineNum;
- }
-
- /**
* Getter for namespace field
* @return Current pc's namespace
*/
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/ConvolutionOp.java b/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
index d9ff962..1477139 100644
--- a/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
+++ b/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
@@ -43,19 +43,7 @@ public class ConvolutionOp extends Hop implements MultiThreadedHop
private ConvolutionOp() {
//default constructor for clone
}
-
- public ConvolutionOp(String l, DataType dt, ValueType vt, ConvOp o, Hop inp)
- {
- super(l, dt, vt);
- op = o;
- getInput().add(0, inp);
- inp.getParent().add(this);
-
- //compute unknown dims and nnz
- refreshSizeInformation();
- }
-
-
+
public ConvolutionOp(String l, DataType dt, ValueType vt, ConvOp o, ArrayList<Hop> inp)
{
super(l, dt, vt);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/hops/DataOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/DataOp.java b/src/main/java/org/apache/sysml/hops/DataOp.java
index d608d67..85d1692 100644
--- a/src/main/java/org/apache/sysml/hops/DataOp.java
+++ b/src/main/java/org/apache/sysml/hops/DataOp.java
@@ -144,23 +144,6 @@ public class DataOp extends Hop
setInputFormatType(FileFormatTypes.BINARY);
}
- // CHECKPOINT operation
- // This constructor does not support any expression in parameters
- public DataOp(String l, DataType dt, ValueType vt, Hop in,
- LiteralOp level, DataOpTypes dop, String fname) {
- super(l, dt, vt);
- _dataop = dop;
- getInput().add(0, in);
- getInput().add(1, level);
- in.getParent().add(this);
- level.getParent().add(this);
- _fileName = fname;
-
- if (dop == DataOpTypes.TRANSIENTWRITE || dop == DataOpTypes.FUNCTIONOUTPUT )
- setInputFormatType(FileFormatTypes.BINARY);
- }
-
-
/**
* WRITE operation for Matrix
* This constructor supports expression in parameters
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/lops/Aggregate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/Aggregate.java b/src/main/java/org/apache/sysml/lops/Aggregate.java
index b1e63cd..586a337 100644
--- a/src/main/java/org/apache/sysml/lops/Aggregate.java
+++ b/src/main/java/org/apache/sysml/lops/Aggregate.java
@@ -44,17 +44,6 @@ public class Aggregate extends Lop
private boolean isCorrectionUsed = false;
private CorrectionLocationType correctionLocation = CorrectionLocationType.INVALID;
-
- /**
- * @param input input lop
- * @param op operation type
- * @param dt data type
- * @param vt value type
- */
- public Aggregate(Lop input, Aggregate.OperationTypes op, DataType dt, ValueType vt ) {
- super(Lop.Type.Aggregate, dt, vt);
- init ( input, op, dt, vt, ExecType.MR );
- }
public Aggregate(Lop input, Aggregate.OperationTypes op, DataType dt, ValueType vt, ExecType et ) {
super(Lop.Type.Aggregate, dt, vt);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/lops/BinaryScalar.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/BinaryScalar.java b/src/main/java/org/apache/sysml/lops/BinaryScalar.java
index 6cba87f..7169101 100644
--- a/src/main/java/org/apache/sysml/lops/BinaryScalar.java
+++ b/src/main/java/org/apache/sysml/lops/BinaryScalar.java
@@ -43,32 +43,6 @@ public class BinaryScalar extends Lop
}
OperationTypes operation;
-
- /**
- * This overloaded constructor is used for setting exec type in case of spark backend
- *
- * @param input1 low-level operator 1
- * @param input2 low-level operator 2
- * @param op operation type
- * @param dt data type
- * @param vt value type
- * @param et exec type
- */
- public BinaryScalar(Lop input1, Lop input2, OperationTypes op, DataType dt, ValueType vt, ExecType et)
- {
- super(Lop.Type.BinaryCP, dt, vt);
- operation = op;
- this.addInput(input1);
- this.addInput(input2);
- input1.addOutput(this);
- input2.addOutput(this);
-
- boolean breaksAlignment = false; // this field does not carry any meaning for this lop
- boolean aligner = false;
- boolean definesMRJob = false;
- lps.addCompatibility(JobType.INVALID);
- this.lps.setProperties(inputs, et, ExecLocation.ControlProgram, breaksAlignment, aligner, definesMRJob );
- }
/**
* Constructor to perform a scalar operation
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/lops/CentralMoment.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/CentralMoment.java b/src/main/java/org/apache/sysml/lops/CentralMoment.java
index 881e5dc..fcacd5d 100644
--- a/src/main/java/org/apache/sysml/lops/CentralMoment.java
+++ b/src/main/java/org/apache/sysml/lops/CentralMoment.java
@@ -65,19 +65,11 @@ public class CentralMoment extends Lop
lps.setProperties(inputs, et, ExecLocation.ControlProgram, breaksAlignment, aligner, definesMRJob);
}
}
-
- public CentralMoment(Lop input1, Lop input2, DataType dt, ValueType vt) {
- this(input1, input2, null, dt, vt, ExecType.MR);
- }
public CentralMoment(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et) {
this(input1, input2, null, dt, vt, et);
}
- public CentralMoment(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt) {
- this(input1, input2, input3, dt, vt, ExecType.MR);
- }
-
public CentralMoment(Lop input1, Lop input2, Lop input3, DataType dt, ValueType vt, ExecType et) {
super(Lop.Type.CentralMoment, dt, vt);
init(input1, input2, input3, et);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/lops/CoVariance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/CoVariance.java b/src/main/java/org/apache/sysml/lops/CoVariance.java
index fe69fae..97429a9 100644
--- a/src/main/java/org/apache/sysml/lops/CoVariance.java
+++ b/src/main/java/org/apache/sysml/lops/CoVariance.java
@@ -32,21 +32,6 @@ import org.apache.sysml.parser.Expression.ValueType;
public class CoVariance extends Lop
{
-
- /**
- * Constructor to perform covariance.
- * input1 <- data
- * (prior to this lop, input vectors need to attached together using CombineBinary or CombineTertiary)
- *
- * @param input1 low-level operator
- * @param dt data type
- * @param vt value type
- * @throws LopsException if LopsException occurs
- */
- public CoVariance(Lop input1, DataType dt, ValueType vt) throws LopsException {
- this(input1, dt, vt, ExecType.MR);
- }
-
public CoVariance(Lop input1, DataType dt, ValueType vt, ExecType et) throws LopsException {
super(Lop.Type.CoVariance, dt, vt);
init(input1, null, null, et);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/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 2f3be2c..d4821ac 100644
--- a/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java
+++ b/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java
@@ -54,13 +54,7 @@ public class ConvolutionTransform extends Lop
init(input, op, dt, vt, et);
numThreads = k;
}
-
- public ConvolutionTransform(Lop input, ConvolutionTransform.OperationTypes op, DataType dt, ValueType vt)
- {
- super(Lop.Type.Transform, dt, vt);
- init(input, op, dt, vt, ExecType.MR);
- }
-
+
private void init (Lop input, ConvolutionTransform.OperationTypes op, DataType dt, ValueType vt, ExecType et)
{
operation = op;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/lops/LopsException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/LopsException.java b/src/main/java/org/apache/sysml/lops/LopsException.java
index 20b8001..da6e56d 100644
--- a/src/main/java/org/apache/sysml/lops/LopsException.java
+++ b/src/main/java/org/apache/sysml/lops/LopsException.java
@@ -31,10 +31,6 @@ public class LopsException extends DMLException
super(message);
}
- public LopsException(Exception e) {
- super(e);
- }
-
public LopsException(String message, Throwable cause) {
super(message, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/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 e259ba4..81593b8 100644
--- a/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java
+++ b/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java
@@ -48,36 +48,6 @@ public class ParameterizedBuiltin extends Lop
private HashMap<String, Lop> _inputParams;
private boolean _bRmEmptyBC;
- /**
- * Creates a new builtin function LOP.
- *
- * @param paramLops map of parameter lops
- * @param op operation type
- * @param dt data type
- * @param vt value type
- */
- public ParameterizedBuiltin(HashMap<String, Lop> paramLops, OperationTypes op, DataType dt, ValueType vt)
- {
- super(Lop.Type.ParameterizedBuiltin, dt, vt);
- _operation = op;
-
- for (Lop lop : paramLops.values()) {
- this.addInput(lop);
- lop.addOutput(this);
- }
-
- _inputParams = paramLops;
-
- /*
- * This lop is executed in control program.
- */
- boolean breaksAlignment = false;
- boolean aligner = false;
- boolean definesMRJob = false;
- lps.addCompatibility(JobType.INVALID);
- lps.setProperties(inputs, ExecType.CP, ExecLocation.ControlProgram, breaksAlignment, aligner, definesMRJob);
- }
-
public ParameterizedBuiltin(HashMap<String, Lop> paramLops, OperationTypes op, DataType dt, ValueType vt, ExecType et)
throws HopsException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/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 cd32f5b..9ec23f4 100644
--- a/src/main/java/org/apache/sysml/lops/PartialAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/PartialAggregate.java
@@ -72,14 +72,6 @@ public class PartialAggregate extends Lop
}
public PartialAggregate( Lop input, Aggregate.OperationTypes op,
- PartialAggregate.DirectionTypes direct, DataType dt, ValueType vt, ExecType et)
- throws LopsException
- {
- super(Lop.Type.PartialAggregate, dt, vt);
- init(input, op, direct, dt, vt, et);
- }
-
- public PartialAggregate( Lop input, Aggregate.OperationTypes op,
PartialAggregate.DirectionTypes direct, DataType dt, ValueType vt, ExecType et, int k)
throws LopsException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/lops/SortKeys.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/SortKeys.java b/src/main/java/org/apache/sysml/lops/SortKeys.java
index 5182f79..e2c6b6a 100644
--- a/src/main/java/org/apache/sysml/lops/SortKeys.java
+++ b/src/main/java/org/apache/sysml/lops/SortKeys.java
@@ -44,11 +44,6 @@ public class SortKeys extends Lop
public OperationTypes getOpType() {
return operation;
}
-
- public SortKeys(Lop input, OperationTypes op, DataType dt, ValueType vt) {
- super(Lop.Type.SortKeys, dt, vt);
- init(input, null, op, ExecType.MR);
- }
public SortKeys(Lop input, OperationTypes op, DataType dt, ValueType vt, ExecType et) {
super(Lop.Type.SortKeys, dt, vt);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/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 5f8443f..0932424 100644
--- a/src/main/java/org/apache/sysml/lops/TernaryAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/TernaryAggregate.java
@@ -35,10 +35,6 @@ public class TernaryAggregate extends Lop
//optional attribute for cp
private int _numThreads = -1;
-
- public TernaryAggregate(Lop input1, Lop input2, Lop input3, Aggregate.OperationTypes aggOp, Binary.OperationTypes binOp, DataType dt, ValueType vt, ExecType et ) {
- this(input1, input2, input3, aggOp, binOp, dt, vt, et, 1);
- }
public TernaryAggregate(Lop input1, Lop input2, Lop input3, Aggregate.OperationTypes aggOp, Binary.OperationTypes binOp, DataType dt, ValueType vt, ExecType et, int k )
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/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 c675b4e..df2e994 100644
--- a/src/main/java/org/apache/sysml/lops/Unary.java
+++ b/src/main/java/org/apache/sysml/lops/Unary.java
@@ -68,12 +68,7 @@ public class Unary extends Lop
super(Lop.Type.UNARY, dt, vt);
init(input1, input2, op, dt, vt, et);
}
-
- public Unary(Lop input1, Lop input2, OperationTypes op, DataType dt, ValueType vt) {
- super(Lop.Type.UNARY, dt, vt);
- init(input1, input2, op, dt, vt, ExecType.MR);
- }
-
+
private void init(Lop input1, Lop input2, OperationTypes op, DataType dt, ValueType vt, ExecType et) {
operation = op;
@@ -127,14 +122,7 @@ public class Unary extends Lop
init(input1, op, dt, vt, et);
_numThreads = numThreads;
}
-
- public Unary(Lop input1, OperationTypes op, DataType dt, ValueType vt)
- throws LopsException
- {
- super(Lop.Type.UNARY, dt, vt);
- init(input1, op, dt, vt, ExecType.MR);
- }
-
+
private void init(Lop input1, OperationTypes op, DataType dt, ValueType vt, ExecType et)
throws LopsException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/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 f659835..086e3dc 100644
--- a/src/main/java/org/apache/sysml/lops/ZeroOut.java
+++ b/src/main/java/org/apache/sysml/lops/ZeroOut.java
@@ -59,13 +59,6 @@ public class ZeroOut extends Lop
this.lps.setProperties(inputs, et, ExecLocation.ControlProgram, breaksAlignment, aligner, definesMRJob);
}
}
-
- public ZeroOut(
- Lop input, Lop rowL, Lop rowU, Lop colL, Lop colU, long rowDim, long colDim, DataType dt, ValueType vt)
- throws LopsException {
- super(Lop.Type.ZeroOut, dt, vt);
- init(input, rowL, rowU, colL, colU, rowDim, colDim, dt, vt, ExecType.MR);
- }
public ZeroOut(
Lop input, Lop rowL, Lop rowU, Lop colL, Lop colU, long rowDim, long colDim, DataType dt, ValueType vt, ExecType et)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/AssignmentStatement.java b/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
index 88ef2de..ba9ce6a 100644
--- a/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
+++ b/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
@@ -47,15 +47,6 @@ public class AssignmentStatement extends Statement
return retVal;
}
-
- public AssignmentStatement(DataIdentifier t, Expression s) {
-
- _targetList = new ArrayList<DataIdentifier>();
- _targetList.add(t);
- _source = s;
- }
-
-
public AssignmentStatement(DataIdentifier t, Expression s, int beginLine, int beginCol, int endLine, int endCol)
throws LanguageException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java b/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
index c0a3f31..a9f76e4 100644
--- a/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
+++ b/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
@@ -19,11 +19,8 @@
package org.apache.sysml.parser;
-import java.util.ArrayList;
import java.util.HashMap;
-
-
public class ExternalFunctionStatement extends FunctionStatement
{
@@ -51,17 +48,6 @@ public class ExternalFunctionStatement extends FunctionStatement
super();
}
-
-
- public ExternalFunctionStatement( ArrayList<DataIdentifier> functionInputs, ArrayList<DataIdentifier> functionOutputs, HashMap<String,String> map)
- {
- super();
- _inputParams = functionInputs;
- _outputParams = (functionOutputs == null) ? new ArrayList<DataIdentifier>() : functionOutputs;
- setOtherParams(map);
- }
-
-
public void setOtherParams(HashMap<String,String> params){
_otherParams = params;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/parser/Identifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/Identifier.java b/src/main/java/org/apache/sysml/parser/Identifier.java
index 6f115ba..8789875 100644
--- a/src/main/java/org/apache/sysml/parser/Identifier.java
+++ b/src/main/java/org/apache/sysml/parser/Identifier.java
@@ -34,32 +34,7 @@ public abstract class Identifier extends Expression
protected long _columns_in_block;
protected long _nnz;
protected FormatType _formatType;
-
- public Identifier(Identifier i)
- {
- _dataType = i.getDataType();
- _valueType = i.getValueType();
- if( i instanceof IndexedIdentifier ) {
- IndexedIdentifier ixi = (IndexedIdentifier)i;
- _dim1 = ixi.getOrigDim1();
- _dim2 = ixi.getOrigDim2();
- }
- else {
- _dim1 = i.getDim1();
- _dim2 = i.getDim2();
- }
- _rows_in_block = i.getRowsInBlock();
- _columns_in_block = i.getColumnsInBlock();
- _nnz = i.getNnz();
- _formatType = i.getFormatType();
-
- // copy position information
- setBeginLine(i.getBeginLine());
- setBeginColumn(i.getBeginColumn());
- setEndLine(i.getEndLine());
- setEndColumn(i.getEndColumn());
- }
-
+
public Identifier()
{
_dim1 = -1;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java b/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
index e76bcb6..c8446f9 100644
--- a/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
+++ b/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
@@ -60,22 +60,7 @@ public class MultiAssignmentStatement extends Statement
_targetList = tList;
_source = s;
}
-
- // NOTE: f is not used -- however, error is thrown "methods have same erasure" if not included in signature
- public MultiAssignmentStatement(ArrayList<ArrayList<Expression>> exprListList, Expression s, int f){
-
- _source = s;
-
- _targetList = new ArrayList<DataIdentifier>();
- for (ArrayList<Expression> exprList : exprListList){
- Expression expr = exprList.get(0);
- if( expr instanceof IndexedIdentifier )
- _targetList.add((IndexedIdentifier)expr);
- else
- _targetList.add(new DataIdentifier(expr.toString()));
- }
- }
-
+
public ArrayList<DataIdentifier> getTargetList(){
return _targetList;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/parser/OutputStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/OutputStatement.java b/src/main/java/org/apache/sysml/parser/OutputStatement.java
index aac1b11..3d1b7bb 100644
--- a/src/main/java/org/apache/sysml/parser/OutputStatement.java
+++ b/src/main/java/org/apache/sysml/parser/OutputStatement.java
@@ -19,14 +19,12 @@
package org.apache.sysml.parser;
-import java.util.ArrayList;
import java.util.HashMap;
import org.apache.sysml.api.DMLScript;
import org.apache.sysml.debug.DMLBreakpointManager;
import org.apache.sysml.parser.Expression.DataOp;
-
public class OutputStatement extends Statement
{
@@ -57,63 +55,7 @@ public class OutputStatement extends Statement
_paramsExpr = new DataExpression(op, new HashMap<String,Expression>(),
filename, blp, bcp, elp, ecp);
}
-
- /**
- * Called by the parser.
- *
- * @param fname function name
- * @param fci function call identifier
- * @param filename file name
- * @param blp beginning line position
- * @param bcp beginning column position
- * @param elp ending line position
- * @param ecp ending column position
- * @throws LanguageException if LanguageException occurs
- */
- public OutputStatement(String fname, FunctionCallIdentifier fci,
- String filename, int blp, int bcp, int elp, int ecp)
- throws LanguageException
- {
- setAllPositions(filename, blp, bcp, elp, ecp);
- DataOp op = Expression.DataOp.WRITE;
- ArrayList<ParameterExpression> passedExprs = fci.getParamExprs();
- _paramsExpr = new DataExpression(op, new HashMap<String,Expression>(),
- filename, blp, bcp, elp, ecp);
-
- //check number parameters and proceed only if this will not cause errors
- if (passedExprs.size() < 2)
- raiseValidateError("write method must specify both variable to write to file, and filename to write variable to");
- else
- {
- ParameterExpression firstParam = passedExprs.get(0);
- if (firstParam.getName() != null || (!(firstParam.getExpr() instanceof DataIdentifier)))
- raiseValidateError("first argument to write method must be name of variable to be written out");
- else
- _id = (DataIdentifier)firstParam.getExpr();
-
- ParameterExpression secondParam = passedExprs.get(1);
- if (secondParam.getName() != null || (secondParam.getName() != null && secondParam.getName().equals(DataExpression.IO_FILENAME)))
- raiseValidateError("second argument to write method must be filename of file variable written to");
- else
- addExprParam(DataExpression.IO_FILENAME, secondParam.getExpr(), false);
-
- for (int i = 2; i< passedExprs.size(); i++){
- ParameterExpression currParam = passedExprs.get(i);
- addExprParam(currParam.getName(), currParam.getExpr(), false);
- }
- if (fname.equals("writeMM")){
- StringIdentifier writeMMExpr = new StringIdentifier(DataExpression.FORMAT_TYPE_VALUE_MATRIXMARKET,
- this.getFilename(), this.getBeginLine(), this.getBeginColumn(), this.getEndLine(), this.getEndColumn());
- addExprParam(DataExpression.FORMAT_TYPE, writeMMExpr, false);
- }
- else if (fname.equals("write.csv")){
- StringIdentifier delimitedExpr = new StringIdentifier(DataExpression.FORMAT_TYPE_VALUE_CSV,
- this.getFilename(), this.getBeginLine(), this.getBeginColumn(), this.getEndLine(), this.getEndColumn());
- addExprParam(DataExpression.FORMAT_TYPE, delimitedExpr, false);
- }
- }
- }
-
+
public void setExprParam(String name, Expression value) {
_paramsExpr.addVarParam(name, value);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
index 438c90a..d632249 100644
--- a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
@@ -135,14 +135,7 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
_varParams = varParams;
this.setAllPositions(filename, blp, bcp, elp, ecp);
}
-
- public ParameterizedBuiltinFunctionExpression(String filename, int blp, int bcp, int elp, int ecp) {
- _kind = Kind.ParameterizedBuiltinFunctionOp;
- _opcode = ParameterizedBuiltinFunctionOp.INVALID;
- _varParams = new HashMap<String,Expression>();
- this.setAllPositions(filename, blp, bcp, elp, ecp);
- }
-
+
public Expression rewriteExpression(String prefix) throws LanguageException {
HashMap<String,Expression> newVarParams = new HashMap<String,Expression>();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/parser/StringIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/StringIdentifier.java b/src/main/java/org/apache/sysml/parser/StringIdentifier.java
index ed8a63f..dc91a60 100644
--- a/src/main/java/org/apache/sysml/parser/StringIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/StringIdentifier.java
@@ -40,16 +40,7 @@ public class StringIdentifier extends ConstIdentifier
this.setAllPositions(filename, blp, bcp, elp, ecp);
}
-
- public StringIdentifier(StringIdentifier s){
- super();
- _val = s.getValue();
- _kind = Kind.Data;
- this.setDimensions(0,0);
- this.computeDataType();
- this.setValueType(ValueType.STRING);
- }
-
+
public String getValue(){
return _val;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java b/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java
index bd7c548..fa3f9d9 100644
--- a/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java
+++ b/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java
@@ -178,19 +178,6 @@ public class CustomErrorListener extends BaseErrorListener {
*/
ParseIssueType parseIssueType;
- public ParseIssue(int line, int charPositionInLine, String message) {
- this.line = line;
- this.charPositionInLine = charPositionInLine;
- this.message = message;
- }
-
- public ParseIssue(int line, int charPositionInLine, String message, String fileName) {
- this.line = line;
- this.charPositionInLine = charPositionInLine;
- this.message = message;
- this.fileName = fileName;
- }
-
public ParseIssue(int line, int charPositionInLine, String message, String fileName,
ParseIssueType parseIssueType) {
this.line = line;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/compress/CompressedMatrixBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/compress/CompressedMatrixBlock.java b/src/main/java/org/apache/sysml/runtime/compress/CompressedMatrixBlock.java
index 50cc8a5..48ebcc5 100644
--- a/src/main/java/org/apache/sysml/runtime/compress/CompressedMatrixBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/compress/CompressedMatrixBlock.java
@@ -613,13 +613,6 @@ public class CompressedMatrixBlock extends MatrixBlock implements Externalizable
public CompressionStatistics() {
//do nothing
}
-
- public CompressionStatistics(double t1, double t2, double t3, double t4){
- timePhase1 = t1;
- timePhase2 = t2;
- timePhase3 = t3;
- timePhase4 = t4;
- }
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
index 9b0b52a..251b04f 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
@@ -74,19 +74,6 @@ public class ExecutionContext
//protected constructor to force use of ExecutionContextFactory
this( true, null );
}
-
- protected ExecutionContext(Program prog)
- {
- //protected constructor to force use of ExecutionContextFactory
- this( true, prog );
- }
-
- protected ExecutionContext(LocalVariableMap vars)
- {
- //protected constructor to force use of ExecutionContextFactory
- this( false, null);
- _variables = vars;
- }
protected ExecutionContext( boolean allocateVariableMap, Program prog )
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
index 9b2d650..8a65267 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
@@ -103,11 +103,6 @@ public class SparkExecutionContext extends ExecutionContext
.setLevel((Level) Level.DEBUG);
}
}
-
- protected SparkExecutionContext(Program prog) {
- //protected constructor to force use of ExecutionContextFactory
- this( true, prog );
- }
protected SparkExecutionContext(boolean allocateVars, Program prog)
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
index 14df440..5ac1a79 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
@@ -46,13 +46,7 @@ public class ResultMergeTaggedMatrixIndexes implements WritableComparable<Result
{
_ix = new MatrixIndexes();
}
-
- public ResultMergeTaggedMatrixIndexes(long r, long c, byte tag)
- {
- _ix = new MatrixIndexes(r, c);
- _tag = tag;
- }
-
+
public MatrixIndexes getIndexes()
{
return _ix;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
index bafaeb2..8790a53 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
@@ -42,10 +42,6 @@ public class AggregateUnaryCPInstruction extends UnaryCPInstruction
this(op, in, null, null, out, opcode, istr);
}
- public AggregateUnaryCPInstruction(Operator op, CPOperand in1, CPOperand in2, CPOperand out, String opcode, String istr){
- this(op, in1, in2, null, out, opcode, istr);
- }
-
public AggregateUnaryCPInstruction(Operator op, CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String opcode, String istr){
super(op, in1, in2, in3, out, opcode, istr);
_cptype = CPINSTRUCTION_TYPE.AggregateUnary;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
index 4481e28..7b6bb29 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
@@ -47,11 +47,7 @@ public final class MatrixIndexingCPFileInstruction extends IndexingCPInstruction
public MatrixIndexingCPFileInstruction(Operator op, CPOperand in, CPOperand rl, CPOperand ru, CPOperand cl, CPOperand cu, CPOperand out, String opcode, String istr) {
super( op, in, rl, ru, cl, cu, out, opcode, istr );
}
-
- public MatrixIndexingCPFileInstruction(Operator op, CPOperand lhsInput, CPOperand rhsInput, CPOperand rl, CPOperand ru, CPOperand cl, CPOperand cu, CPOperand out, String opcode, String istr) {
- super( op, lhsInput, rhsInput, rl, ru, cl, cu, out, opcode, istr);
- }
-
+
public static MatrixIndexingCPFileInstruction parseInstruction ( String str )
throws DMLRuntimeException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/instructions/gpu/ScalarMatrixArithmeticGPUInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/gpu/ScalarMatrixArithmeticGPUInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/gpu/ScalarMatrixArithmeticGPUInstruction.java
index 0832591..b1029ee 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/gpu/ScalarMatrixArithmeticGPUInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/gpu/ScalarMatrixArithmeticGPUInstruction.java
@@ -21,17 +21,13 @@ package org.apache.sysml.runtime.instructions.gpu;
import org.apache.sysml.parser.Expression.DataType;
import org.apache.sysml.runtime.DMLRuntimeException;
-import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
-import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
-import org.apache.sysml.runtime.matrix.operators.LeftScalarOperator;
-import org.apache.sysml.runtime.matrix.operators.Operator;
-import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
-import org.apache.sysml.runtime.functionobjects.Multiply;
-import org.apache.sysml.runtime.functionobjects.Multiply2;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
import org.apache.sysml.runtime.instructions.cp.CPOperand;
import org.apache.sysml.runtime.instructions.cp.ScalarObject;
import org.apache.sysml.runtime.matrix.data.LibMatrixCUDA;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
import org.apache.sysml.utils.Statistics;
public class ScalarMatrixArithmeticGPUInstruction extends ArithmeticBinaryGPUInstruction {
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/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 2bc28d7..ac7ef4b 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
@@ -49,10 +49,6 @@ public abstract class BinarySPInstruction extends ComputationSPInstruction
super(op, in1, in2, out, opcode, istr);
}
- public BinarySPInstruction(Operator op, CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String opcode, String istr ){
- super(op, in1, in2, in3, out, opcode, istr);
- }
-
protected static String parseBinaryInstruction(String instr, CPOperand in1, CPOperand in2, CPOperand out)
throws DMLRuntimeException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java
index 05e0cc6..431ff24 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java
@@ -60,10 +60,6 @@ public class WriteSPInstruction extends SPInstruction
//scalars might occur for transform
// TODO remove once transform over frames supported
private boolean isInputMatrixBlock = true;
-
- public WriteSPInstruction(String opcode, String istr) {
- super(opcode, istr);
- }
public WriteSPInstruction(CPOperand in1, CPOperand in2, CPOperand in3, String opcode, String str) {
super(opcode, str);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlockParallel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlockParallel.java b/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlockParallel.java
index 502d953..387eac8 100644
--- a/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlockParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlockParallel.java
@@ -138,7 +138,7 @@ public class ReaderBinaryBlockParallel extends ReaderBinaryBlock
}
@Override
- @SuppressWarnings({ "deprecation", "resource" })
+ @SuppressWarnings({ "deprecation" })
public Object call() throws Exception
{
boolean sparse = _dest.isInSparseFormat();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/matrix/data/AdaptivePartialBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/AdaptivePartialBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/AdaptivePartialBlock.java
index 5d3f0f5..d65c4e8 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/AdaptivePartialBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/AdaptivePartialBlock.java
@@ -45,11 +45,6 @@ public class AdaptivePartialBlock implements WritableComparable<AdaptivePartialB
}
- public AdaptivePartialBlock(MatrixBlock block)
- {
- set(block);
- }
-
public AdaptivePartialBlock(PartialBlock cell)
{
set(cell);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/matrix/data/IJV.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/IJV.java b/src/main/java/org/apache/sysml/runtime/matrix/data/IJV.java
index 77c4745..f19fedd 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/IJV.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/IJV.java
@@ -32,11 +32,7 @@ public class IJV
public IJV() {
//do nothing
}
-
- public IJV(int i, int j, double v){
- set(i, j, v);
- }
-
+
public void set(int i, int j, double v) {
_i = i;
_j = j;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/matrix/data/InputInfo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/InputInfo.java b/src/main/java/org/apache/sysml/runtime/matrix/data/InputInfo.java
index 248a997..e736b43 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/InputInfo.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/InputInfo.java
@@ -53,14 +53,7 @@ public class InputInfo implements Serializable
inputKeyClass=keyCls;
inputValueClass=valueCls;
}
- public InputInfo(Class<? extends InputFormat> formatCls,
- Class<? extends Writable> keyCls, Class<? extends Writable> valueCls, MetaData md)
- {
- inputFormatClass=formatCls;
- inputKeyClass=keyCls;
- inputValueClass=valueCls;
- metadata=md;
- }
+
public void setMetaData(MetaData md)
{
metadata=md;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixPackedCell.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixPackedCell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixPackedCell.java
index e606922..8565409 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixPackedCell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixPackedCell.java
@@ -37,13 +37,7 @@ public class MatrixPackedCell extends MatrixCell
private double[] extras=null;
private int extra_size=0;
-
- public MatrixPackedCell(double v, int n)
- {
- value=v;
- checkAndAllocateSpace(n);
- }
-
+
public MatrixPackedCell(MatrixPackedCell that)
{
this.value=that.value;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/NumItemsByEachReducerMetaData.java b/src/main/java/org/apache/sysml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
index e7913ed..ac82403 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
@@ -37,12 +37,7 @@ public class NumItemsByEachReducerMetaData extends MatrixDimensionsMetaData
partitionOfZero=part0;
numberOfZero=num0;
}
-
- public NumItemsByEachReducerMetaData(MatrixCharacteristics mc, long[] nums) {
- super(mc);
- numItems=nums;
- }
-
+
public long[] getNumItemsArray()
{
return numItems;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/matrix/mapred/FrameReblockBuffer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/mapred/FrameReblockBuffer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/FrameReblockBuffer.java
index f0bc899..1a553bc 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/mapred/FrameReblockBuffer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/FrameReblockBuffer.java
@@ -51,11 +51,6 @@ public class FrameReblockBuffer
private ValueType[] _schema;
- public FrameReblockBuffer( long rlen, long clen, ValueType[] schema )
- {
- this( DEFAULT_BUFFER_SIZE, rlen, clen, schema );
- }
-
public FrameReblockBuffer( int buffersize, long rlen, long clen, ValueType[] schema )
{
_bufflen = buffersize;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockBuffer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockBuffer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockBuffer.java
index 694c6ee..8e5b48e 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockBuffer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockBuffer.java
@@ -54,12 +54,7 @@ public class ReblockBuffer
private long _clen = -1;
private int _brlen = -1;
private int _bclen = -1;
-
- public ReblockBuffer( long rlen, long clen, int brlen, int bclen )
- {
- this( DEFAULT_BUFFER_SIZE, rlen, clen, brlen, bclen );
- }
-
+
public ReblockBuffer( int buffersize, long rlen, long clen, int brlen, int bclen )
{
_bufflen = buffersize;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVSPARK.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVSPARK.java b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVSPARK.java
index aefab6f..b820449 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVSPARK.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVSPARK.java
@@ -113,10 +113,6 @@ public class ApplyTfCSVSPARK {
TfUtils _tfmapper = null;
- ApplyTfCSVMap(boolean hasHeader, String delim, String naStrings, String specFile, String tmpPath, String tfMtdPath, long numCols, String headerLine, Broadcast<TfUtils> tf) throws IllegalArgumentException, IOException, JSONException {
- _tfmapper = tf.getValue();
- }
-
ApplyTfCSVMap(Broadcast<TfUtils> tf) throws IllegalArgumentException, IOException, JSONException {
_tfmapper = tf.getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/transform/BinAgent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/BinAgent.java b/src/main/java/org/apache/sysml/runtime/transform/BinAgent.java
index 72794dd..8bfa572 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/BinAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/BinAgent.java
@@ -64,10 +64,6 @@ public class BinAgent extends Encoder
private double[][] _binMins = null;
private double[][] _binMaxs = null;
- public BinAgent(int clen) {
- super( null, clen );
- }
-
public BinAgent(JSONObject parsedSpec, String[] colnames, int clen)
throws JSONException, IOException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/transform/DummycodeAgent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/DummycodeAgent.java b/src/main/java/org/apache/sysml/runtime/transform/DummycodeAgent.java
index c171489..d3b11d3 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/DummycodeAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/DummycodeAgent.java
@@ -59,11 +59,7 @@ public class DummycodeAgent extends Encoder
private int[] _domainSizes = null; // length = #of dummycoded columns
private int[] _dcdColumnMap = null; // to help in translating between original and dummycoded column IDs
private long _dummycodedLength = 0; // #of columns after dummycoded
-
- public DummycodeAgent(int[] list, int clen) {
- super(list, clen);
- }
-
+
public DummycodeAgent(JSONObject parsedSpec, String[] colnames, int clen) throws JSONException {
super(null, clen);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/transform/OmitAgent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/OmitAgent.java b/src/main/java/org/apache/sysml/runtime/transform/OmitAgent.java
index 982f4b9..0208c0e 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/OmitAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/OmitAgent.java
@@ -40,15 +40,7 @@ public class OmitAgent extends Encoder
private static final long serialVersionUID = 1978852120416654195L;
private int _rmRows = 0;
-
- public OmitAgent(int clen) {
- super(null, clen);
- }
-
- public OmitAgent(int[] list, int clen) {
- super(list, clen);
- }
-
+
public OmitAgent(JSONObject parsedSpec, String[] colnames, int clen)
throws JSONException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java b/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java
index e6d75a9..3e38d6e 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java
@@ -174,16 +174,7 @@ public class TfUtils implements Serializable{
init (headerLine, hasHeader, delim, naStrings, spec, ncol, offsetFile, tmpPath, null);
_tfMtdDir = tfMtdDir;
}
-
- //called from cp frame transformapply
- public TfUtils(JSONObject spec, long inNcol)
- throws IOException, JSONException
- {
- //TODO recodemaps handover
- _numInputCols = (int)inNcol;
- createAgents(spec, new String[]{});
- }
-
+
protected static boolean checkValidInputFile(FileSystem fs, Path path, boolean err)
throws IOException {
// check non-existing file
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderComposite.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderComposite.java b/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderComposite.java
index 43d8287..ca52ac5 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderComposite.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderComposite.java
@@ -19,7 +19,6 @@
package org.apache.sysml.runtime.transform.decode;
-import java.util.Arrays;
import java.util.List;
import org.apache.sysml.parser.Expression.ValueType;
@@ -42,11 +41,6 @@ public class DecoderComposite extends Decoder
super(schema, null);
_decoders = decoders;
}
-
- protected DecoderComposite(ValueType[] schema, Decoder[] decoders) {
- super(schema, null);
- _decoders = Arrays.asList(decoders);
- }
@Override
public FrameBlock decode(MatrixBlock in, FrameBlock out) {
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderComposite.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderComposite.java b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderComposite.java
index d6bf9d4..9efbc19 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderComposite.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderComposite.java
@@ -20,7 +20,6 @@
package org.apache.sysml.runtime.transform.encode;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -52,12 +51,7 @@ public class EncoderComposite extends Encoder
super(null, -1);
_encoders = encoders;
}
-
- protected EncoderComposite(Encoder[] encoders) {
- super(null, -1);
- _encoders = Arrays.asList(encoders);
- }
-
+
@Override
public int getNumCols() {
int clen = 0;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/util/NormalPRNGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/util/NormalPRNGenerator.java b/src/main/java/org/apache/sysml/runtime/util/NormalPRNGenerator.java
index affdf3f..ce6f7e0 100644
--- a/src/main/java/org/apache/sysml/runtime/util/NormalPRNGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/util/NormalPRNGenerator.java
@@ -39,12 +39,7 @@ public class NormalPRNGenerator extends PRNGenerator
public NormalPRNGenerator() {
super();
}
-
- public NormalPRNGenerator(long sd) {
- super();
- setSeed(sd);
- }
-
+
/*public NormalPRNGenerator(Random random) {
init(random);
}*/
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/util/PRNGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/util/PRNGenerator.java b/src/main/java/org/apache/sysml/runtime/util/PRNGenerator.java
index a8aa37c..5413dab 100644
--- a/src/main/java/org/apache/sysml/runtime/util/PRNGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/util/PRNGenerator.java
@@ -31,10 +31,6 @@ public abstract class PRNGenerator
public PRNGenerator() {
seed = -1;
}
-
- public PRNGenerator(long sd) {
- seed = sd;
- }
-
+
public abstract double nextDouble() ;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/731c7789/src/main/java/org/apache/sysml/runtime/util/PoissonPRNGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/util/PoissonPRNGenerator.java b/src/main/java/org/apache/sysml/runtime/util/PoissonPRNGenerator.java
index 099e6e0..39de4c0 100644
--- a/src/main/java/org/apache/sysml/runtime/util/PoissonPRNGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/util/PoissonPRNGenerator.java
@@ -34,9 +34,7 @@ public class PoissonPRNGenerator extends PRNGenerator
{
PoissonDistribution _pdist = null;
double _mean = Double.NaN;
-
- private static final double DEFAULT_MEAN = 1.0;
-
+
public PoissonPRNGenerator() {
// default mean and default seed
super();
@@ -51,13 +49,7 @@ public class PoissonPRNGenerator extends PRNGenerator
_mean = mean;
setup(_mean, seed);
}
-
- public PoissonPRNGenerator(long sd) {
- // default mean
- super();
- setup(DEFAULT_MEAN, sd);
- }
-
+
public void setup(double mean, long sd) {
seed = sd;