You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by lr...@apache.org on 2015/11/19 21:47:14 UTC
[32/50] [abbrv] incubator-systemml git commit: Fix table-rexpand
simplification rewrite (literal inconsistency)
Fix table-rexpand simplification rewrite (literal inconsistency)
Incl (1) literal creation reorgop and better error handling rexpand zero
checks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/cb3a4ce6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/cb3a4ce6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/cb3a4ce6
Branch: refs/heads/master
Commit: cb3a4ce66c26c9798acd07b8cb8c4f59d0ff30d2
Parents: e5ccf21
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Tue Nov 3 18:50:38 2015 -0800
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Wed Nov 4 09:17:56 2015 -0800
----------------------------------------------------------------------
src/main/java/com/ibm/bi/dml/hops/ReorgOp.java | 4 ++--
.../dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java | 4 ++--
src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java | 2 +-
.../java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java | 3 ++-
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/cb3a4ce6/src/main/java/com/ibm/bi/dml/hops/ReorgOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/ibm/bi/dml/hops/ReorgOp.java b/src/main/java/com/ibm/bi/dml/hops/ReorgOp.java
index cf95c8f..ec78078 100644
--- a/src/main/java/com/ibm/bi/dml/hops/ReorgOp.java
+++ b/src/main/java/com/ibm/bi/dml/hops/ReorgOp.java
@@ -180,8 +180,8 @@ public class ReorgOp extends Hop
if( !(desc instanceof LiteralOp && ixret instanceof LiteralOp) ) {
LOG.warn("Unsupported non-constant ordering parameters, using defaults and mark for recompilation.");
setRequiresRecompile();
- desc = new LiteralOp("FALSE", false);
- ixret = new LiteralOp("FALSE", false);
+ desc = new LiteralOp("false", false);
+ ixret = new LiteralOp("false", false);
}
//Step 1: extraction (if unknown ncol or multiple columns)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/cb3a4ce6/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java b/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
index 25f4f4e..d96ded0 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
+++ b/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
@@ -2089,8 +2089,8 @@ public class RewriteAlgebraicSimplificationStatic extends HopRewriteRule
inputargs.put("target", hi.getInput().get(ixTgt));
inputargs.put("max", hi.getInput().get(ixMax));
inputargs.put("dir", new LiteralOp(direction, direction));
- inputargs.put("ignore", new LiteralOp("true", false));
- inputargs.put("cast", new LiteralOp("false", true));
+ inputargs.put("ignore", new LiteralOp("false", false));
+ inputargs.put("cast", new LiteralOp("true", true));
//create new hop
ParameterizedBuiltinOp pbop = new ParameterizedBuiltinOp("tmp", DataType.MATRIX, ValueType.DOUBLE,
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/cb3a4ce6/src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java b/src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java
index 4163ca9..f1ccd1a 100644
--- a/src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java
+++ b/src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java
@@ -1481,7 +1481,7 @@ public class DMLTranslator
return hops.get(sourceId.getName());
} else if (source instanceof BooleanIdentifier) {
BooleanIdentifier sourceBoolean = (BooleanIdentifier) source;
- LiteralOp litop = new LiteralOp(Boolean.toString(sourceBoolean.getValue()), sourceBoolean.getValue());
+ LiteralOp litop = new LiteralOp(String.valueOf(sourceBoolean.getValue()), sourceBoolean.getValue());
litop.setAllPositions(sourceBoolean.getBeginLine(), sourceBoolean.getBeginColumn(), sourceBoolean.getEndLine(), sourceBoolean.getEndColumn());
setIdentifierParams(litop, sourceBoolean);
return litop;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/cb3a4ce6/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java b/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java
index 3fdbbf3..6d8d924 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java
+++ b/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java
@@ -536,7 +536,8 @@ public class LibMatrixReorg
//sanity check for input nnz (incl implicit handling of empty blocks)
if( !ignore && in.getNonZeros()<in.getNumRows() )
- throw new DMLRuntimeException("Invalid input w/ zeros for rexpand ignore=false.");
+ throw new DMLRuntimeException("Invalid input w/ zeros for rexpand ignore=false "
+ + "(rlen="+in.getNumRows()+", nnz="+in.getNonZeros()+").");
//check for empty inputs (for ignore=true)
if( in.isEmptyBlock(false) ) {