Repository: incubator-systemml
Updated Branches:
  refs/heads/master 2c32dbf54 -> c2893b0fd


[SYSTEMML-951] Fix Block Alignment Check For Multi-Block Index Pruning

In `isMultiBlockLookup` we check that the index range is block aligned
with `OptimizerUtils.isIndexingRangeBlockAligned`.  In that method, we
aim to grab the rows & cols per block.  However, instead we end up
grabbing the number of row blocks & column blocks.  This patch changes
this logic to correctly compute the rows & columns per block.


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

Branch: refs/heads/master
Commit: c2893b0fdb446b0f177f36cf4af2b2750d4fe137
Parents: 2c32dbf
Author: Mike Dusenberry <mwdus...@us.ibm.com>
Authored: Wed Oct 12 12:23:15 2016 -0700
Committer: Mike Dusenberry <mwdus...@us.ibm.com>
Committed: Wed Oct 12 14:57:09 2016 -0700

----------------------------------------------------------------------
 src/main/java/org/apache/sysml/hops/OptimizerUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/c2893b0f/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/OptimizerUtils.java 
b/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
index 7fd8420..ed52bf5 100644
--- a/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
+++ b/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
@@ -893,8 +893,8 @@ public class OptimizerUtils
                long ru = ixrange.rowEnd;
                long cl = ixrange.colStart;
                long cu = ixrange.colEnd;
-               long brlen = mc.getNumRowBlocks();
-               long bclen = mc.getNumColBlocks();
+               long brlen = mc.getRowsPerBlock();
+               long bclen = mc.getColsPerBlock();
                return isIndexingRangeBlockAligned(rl, ru, cl, cu, brlen, 
bclen);
        }
        

Reply via email to