You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by du...@apache.org on 2015/12/03 19:47:52 UTC
incubator-systemml git commit: Addressing a minor issue with the
static runtime cost estimator in which unary aggregate column summations
(uac+ and uack+) would be estimated to have 0 FLOPs.
Repository: incubator-systemml
Updated Branches:
refs/heads/master 7cd7dc2be -> cbcf2d884
Addressing a minor issue with the static runtime cost estimator in which unary aggregate column summations (uac+ and uack+) would be estimated to have 0 FLOPs.
Closes #5.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/cbcf2d88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/cbcf2d88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/cbcf2d88
Branch: refs/heads/master
Commit: cbcf2d8848d22efa1c3f7b0b8466eb5e12c9b1fc
Parents: 7cd7dc2
Author: Mike Dusenberry <mw...@us.ibm.com>
Authored: Wed Dec 2 13:40:19 2015 -0800
Committer: Mike Dusenberry <mw...@us.ibm.com>
Committed: Thu Dec 3 10:46:37 2015 -0800
----------------------------------------------------------------------
.../org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/cbcf2d88/src/main/java/org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java b/src/main/java/org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java
index ff360c1..b215ed4 100644
--- a/src/main/java/org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java
+++ b/src/main/java/org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java
@@ -941,14 +941,14 @@ public class CostEstimatorStaticRuntime extends CostEstimator
}
else if( optype.equals("uatrace") || optype.equals("uaktrace") )
return 2 * d1m * d1n;
- else if( optype.equals("ua+") || optype.equals("uar+") || optype.equals("uar+") ){
+ else if( optype.equals("ua+") || optype.equals("uar+") || optype.equals("uac+") ){
//sparse safe operations
if( !leftSparse ) //dense
return d1m * d1n;
else //sparse
return d1m * d1n * d1s;
}
- else if( optype.equals("uak+") || optype.equals("uark+") || optype.equals("uark+"))
+ else if( optype.equals("uak+") || optype.equals("uark+") || optype.equals("uack+"))
return 4 * d1m * d1n; //1*k+
else if( optype.equals("uasqk+") || optype.equals("uarsqk+") || optype.equals("uacsqk+"))
return 5 * d1m * d1n; // +1 for multiplication to square term