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 2017/06/08 23:23:32 UTC

systemml git commit: [SYSTEMML-1668] Fix rbind size estimates in BinaryOp

Repository: systemml
Updated Branches:
  refs/heads/master fe4779cef -> d0c5c5d29


[SYSTEMML-1668] Fix rbind size estimates in BinaryOp

In BinaryOp.inferOutputCharacteristics, RBIND is not checked and CBIND is checked twice. Fix the second case to refer to RBIND.

Closes #533.


Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/d0c5c5d2
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/d0c5c5d2
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/d0c5c5d2

Branch: refs/heads/master
Commit: d0c5c5d29d4cc299649573fed3a2e112e828412d
Parents: fe4779c
Author: Dylan Hutchison <dh...@cs.washington.edu>
Authored: Thu Jun 8 16:22:28 2017 -0700
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Thu Jun 8 16:22:28 2017 -0700

----------------------------------------------------------------------
 src/main/java/org/apache/sysml/hops/BinaryOp.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/systemml/blob/d0c5c5d2/src/main/java/org/apache/sysml/hops/BinaryOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/BinaryOp.java b/src/main/java/org/apache/sysml/hops/BinaryOp.java
index 17a099f..ccf73c4 100644
--- a/src/main/java/org/apache/sysml/hops/BinaryOp.java
+++ b/src/main/java/org/apache/sysml/hops/BinaryOp.java
@@ -844,7 +844,7 @@ public class BinaryOp extends Hop
 			if( ldim1 > 0 || ldim2 > 0 || lnnz >= 0 )
 				return new long[]{ldim1, ldim2, lnnz};
 		}
-		else if( op== OpOp2.CBIND ) {
+		else if( op == OpOp2.RBIND ) {
 			long ldim1 = -1, ldim2 = -1, lnnz = -1;
 			
 			if( mc[0].colsKnown() || mc[1].colsKnown() )