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 2018/02/06 04:06:48 UTC
[2/2] systemml git commit: [MINOR] Cleanup codegen candidate
exploration (preserve all candidates)
[MINOR] Cleanup codegen candidate exploration (preserve all candidates)
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/94f1b72e
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/94f1b72e
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/94f1b72e
Branch: refs/heads/master
Commit: 94f1b72efa7fe768ca694d894cb6d39130ed43fc
Parents: 206e912
Author: Matthias Boehm <mb...@gmail.com>
Authored: Mon Feb 5 18:21:51 2018 -0800
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Mon Feb 5 19:10:48 2018 -0800
----------------------------------------------------------------------
.../org/apache/sysml/hops/codegen/template/TemplateRow.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/94f1b72e/src/main/java/org/apache/sysml/hops/codegen/template/TemplateRow.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateRow.java b/src/main/java/org/apache/sysml/hops/codegen/template/TemplateRow.java
index 74d7b78..effe577 100644
--- a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateRow.java
+++ b/src/main/java/org/apache/sysml/hops/codegen/template/TemplateRow.java
@@ -33,7 +33,6 @@ import org.apache.sysml.hops.LiteralOp;
import org.apache.sysml.hops.ParameterizedBuiltinOp;
import org.apache.sysml.hops.TernaryOp;
import org.apache.sysml.hops.UnaryOp;
-import org.apache.sysml.hops.codegen.SpoofCompiler;
import org.apache.sysml.hops.codegen.cplan.CNode;
import org.apache.sysml.hops.codegen.cplan.CNodeBinary;
import org.apache.sysml.hops.codegen.cplan.CNodeBinary.BinType;
@@ -86,8 +85,7 @@ public class TemplateRow extends TemplateBase
&& hop.getInput().get(0).getDim1()>1 && hop.getInput().get(0).getDim2()>1)
|| (hop instanceof AggBinaryOp && hop.dimsKnown() && LibMatrixMult.isSkinnyRightHandSide(
hop.getInput().get(0).getDim1(), hop.getInput().get(0).getDim2(), //MM
- hop.getInput().get(1).getDim1(), hop.getInput().get(1).getDim2(),
- SpoofCompiler.PLAN_SEL_POLICY.isCostBased())
+ hop.getInput().get(1).getDim1(), hop.getInput().get(1).getDim2(), false)
&& hop.getInput().get(0).getDim1()>1 && hop.getInput().get(0).getDim2()>1
&& !HopRewriteUtils.isOuterProductLikeMM(hop))
|| (HopRewriteUtils.isTransposeOperation(hop) && hop.getParent().size()==1
@@ -158,9 +156,8 @@ public class TemplateRow extends TemplateBase
//check for fusable but not opening matrix multiply (vect_outer-mult)
Hop in1 = hop.getInput().get(0); //transpose
Hop in2 = hop.getInput().get(1);
- boolean inclSizes = SpoofCompiler.PLAN_SEL_POLICY.isCostBased();
- return LibMatrixMult.isSkinnyRightHandSide(in1.getDim2(), in1.getDim1(), hop.getDim1(), hop.getDim2(), inclSizes)
- || LibMatrixMult.isSkinnyRightHandSide(in2.getDim1(), in2.getDim2(), hop.getDim2(), hop.getDim1(), inclSizes);
+ return LibMatrixMult.isSkinnyRightHandSide(in1.getDim2(), in1.getDim1(), hop.getDim1(), hop.getDim2(), false)
+ || LibMatrixMult.isSkinnyRightHandSide(in2.getDim1(), in2.getDim2(), hop.getDim2(), hop.getDim1(), false);
}
private static boolean isPartOfValidCumAggChain(Hop hop) {