Repository: incubator-systemml Updated Branches: refs/heads/master 781d24d86 -> 195ff182b
Fix various warnings (unnecessary imports, unused methods/variables) Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/195ff182 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/195ff182 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/195ff182 Branch: refs/heads/master Commit: 195ff182bfc9b7f9f3b3481891742892e7b31e6b Parents: 781d24d Author: Matthias Boehm <[email protected]> Authored: Thu May 19 00:23:52 2016 -0700 Committer: Matthias Boehm <[email protected]> Committed: Thu May 19 00:23:52 2016 -0700 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/parser/DMLTranslator.java | 1 + .../runtime/instructions/cp/ConvolutionCPInstruction.java | 1 + .../org/apache/sysml/runtime/matrix/data/MatrixBlock.java | 8 +++++--- .../sysml/test/integration/functions/misc/ToStringTest.java | 6 ++++-- src/test/java/org/apache/sysml/test/utils/TestUtils.java | 2 -- 5 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/195ff182/src/main/java/org/apache/sysml/parser/DMLTranslator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/DMLTranslator.java b/src/main/java/org/apache/sysml/parser/DMLTranslator.java index c587b6f..61ba4c8 100644 --- a/src/main/java/org/apache/sysml/parser/DMLTranslator.java +++ b/src/main/java/org/apache/sysml/parser/DMLTranslator.java @@ -2921,6 +2921,7 @@ public class DMLTranslator return ret; } + @SuppressWarnings("unused") //TODO remove if not used private ArrayList<Hop> getALHopsForConvOpPoolingIM2COL(Hop first, BuiltinFunctionExpression source, int skip, HashMap<String, Hop> hops) throws ParseException { ArrayList<Hop> ret = new ArrayList<Hop>(); ret.add(first); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/195ff182/src/main/java/org/apache/sysml/runtime/instructions/cp/ConvolutionCPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/ConvolutionCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ConvolutionCPInstruction.java index 24f24dc..4148a7d 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/ConvolutionCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ConvolutionCPInstruction.java @@ -240,6 +240,7 @@ public class ConvolutionCPInstruction extends UnaryCPInstruction { ec.setMatrixOutput(getOutputVariableName(), outputBlock); } + @SuppressWarnings("unused") private MatrixBlock getDenseOutputBlock(ExecutionContext ec, int numRows, int numCols, boolean reuseNonZeroedOutput1) throws DMLRuntimeException { long start = -1; if(DMLScript.STATISTICS) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/195ff182/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java index 19831a4..a7f7c38 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java @@ -30,6 +30,7 @@ import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; + import org.apache.commons.math3.random.Well1024a; import org.apache.hadoop.io.DataInputBuffer; import org.apache.sysml.api.DMLScript; @@ -403,6 +404,7 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab allocateDenseBlock(); } + @SuppressWarnings("unused") public void allocateDenseBlock(boolean clearNNZ, boolean zeroOut) throws RuntimeException { @@ -416,9 +418,9 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab //allocate block if non-existing or too small (guaranteed to be 0-initialized), if(!zeroOut && DMLScript.REUSE_NONZEROED_OUTPUT - && (denseBlock == null || denseBlock.length < limit) - // Not a column vector - && rlen != 1 && clen != 1) { + && (denseBlock == null || denseBlock.length < limit) + && rlen != 1 && clen != 1 ) // Not a column vector + { denseBlock = LibMatrixDNN.getReuseableData(limit); } if(denseBlock == null || denseBlock.length < limit) { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/195ff182/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java index c823849..abc4854 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ToStringTest.java @@ -115,7 +115,8 @@ public class ToStringTest extends AutomatedTestBase { */ @Test public void testBiggerArrayDefaultRowsCols(){ - final int INPUT_ROWS = 200; + //script-consistency required: 200x200 + //TODO pass as arguments final int INPUT_COLS = 200; final int MAX_ROWS = 100; final int MAX_COLS = 100; @@ -144,7 +145,8 @@ public class ToStringTest extends AutomatedTestBase { */ @Test public void testBiggerArraySpecifyRowsCols(){ - final int INPUT_ROWS = 200; + //script-consistency required: 200x200 + //TODO pass as arguments final int INPUT_COLS = 200; final int MAX_ROWS = 190; final int MAX_COLS = 190; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/195ff182/src/test/java/org/apache/sysml/test/utils/TestUtils.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/utils/TestUtils.java b/src/test/java/org/apache/sysml/test/utils/TestUtils.java index 9e3c55d..4f97f7f 100644 --- a/src/test/java/org/apache/sysml/test/utils/TestUtils.java +++ b/src/test/java/org/apache/sysml/test/utils/TestUtils.java @@ -61,8 +61,6 @@ import org.apache.sysml.runtime.matrix.data.MatrixIndexes; import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex; import org.apache.sysml.test.integration.BinaryMatrixCharacteristics; -import junit.framework.Assert; - /** * <p>
