You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2015/12/04 19:04:24 UTC
[3/5] incubator-systemml git commit: Improved binary max
compilation/runtime (rewrite, cond. sparse-safe)
Improved binary max compilation/runtime (rewrite, cond. sparse-safe)
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/0215a5a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/0215a5a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/0215a5a0
Branch: refs/heads/master
Commit: 0215a5a064a2ef1c8a2c736ccb0c2f508de289e0
Parents: bb1680f
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Thu Dec 3 19:07:20 2015 -0800
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Thu Dec 3 19:07:20 2015 -0800
----------------------------------------------------------------------
.../RewriteAlgebraicSimplificationStatic.java | 16 ++++++++++++++++
.../runtime/matrix/operators/ScalarOperator.java | 5 ++++-
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/0215a5a0/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
index 68cbeb4..558c1ae 100644
--- a/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
@@ -983,6 +983,22 @@ public class RewriteAlgebraicSimplificationStatic extends HopRewriteRule
}
}
}
+
+ //select positive (selp) operator; pattern: max(X,0) -> selp+
+ if( bop.getOp() == OpOp2.MAX && left.getDataType()==DataType.MATRIX
+ && right instanceof LiteralOp && HopRewriteUtils.getDoubleValue((LiteralOp)right)==0 )
+ {
+ UnaryOp unary = HopRewriteUtils.createUnary(left, OpOp1.SELP);
+ HopRewriteUtils.removeChildReferenceByPos(parent, bop, pos);
+ HopRewriteUtils.addChildReference(parent, unary, pos);
+
+ //cleanup if only consumer of intermediate
+ if( bop.getParent().isEmpty() )
+ HopRewriteUtils.removeAllChildReferences(bop);
+ hi = unary;
+
+ LOG.debug("Applied fuseBinarySubDAGToUnaryOperation-selp3");
+ }
}
return hi;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/0215a5a0/src/main/java/org/apache/sysml/runtime/matrix/operators/ScalarOperator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/operators/ScalarOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/ScalarOperator.java
index 5b86f53..1949594 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/operators/ScalarOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/ScalarOperator.java
@@ -83,7 +83,10 @@ public class ScalarOperator extends Operator
|| (fn instanceof LessThan && _constant==0)
|| (fn instanceof NotEquals && _constant==0)
|| (fn instanceof Equals && _constant!=0)
- || (fn instanceof Minus && _constant==0))
+ || (fn instanceof Minus && _constant==0)
+ || (fn instanceof Minus && _constant==0)
+ || (fn instanceof Builtin && ((Builtin)fn).getBuiltinFunctionCode()==BuiltinFunctionCode.MAX && _constant<=0)
+ || (fn instanceof Builtin && ((Builtin)fn).getBuiltinFunctionCode()==BuiltinFunctionCode.MIN && _constant>=0))
{
sparseSafe = true;
}