[systemml] branch master updated: [SYSTEMML-2296] Fix MNC sparsity estimator for unary operations

[mboehm7]

This is an automated email from the ASF dual-hosted git repository.

mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemml.git


The following commit(s) were added to refs/heads/master by this push:
     new 330635e  [SYSTEMML-2296] Fix MNC sparsity estimator for unary 
operations
330635e is described below

commit 330635e7f42dcd0036b7d1b529be530607f4dc81
Author: Matthias Boehm <mboe...@gmail.com>
AuthorDate: Fri Apr 5 21:56:24 2019 +0200

    [SYSTEMML-2296] Fix MNC sparsity estimator for unary operations
---
 .../java/org/apache/sysml/hops/estim/EstimatorMatrixHistogram.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sysml/hops/estim/EstimatorMatrixHistogram.java 
b/src/main/java/org/apache/sysml/hops/estim/EstimatorMatrixHistogram.java
index b079a7e..ac324f4 100644
--- a/src/main/java/org/apache/sysml/hops/estim/EstimatorMatrixHistogram.java
+++ b/src/main/java/org/apache/sysml/hops/estim/EstimatorMatrixHistogram.java
@@ -72,7 +72,8 @@ public class EstimatorMatrixHistogram extends 
SparsityEstimator
                }
                
                //sketch propagation for intermediates other than final result
-               h2.setData(root.getRight().isLeaf() ? root.getRight().getData() 
: null);
+               if( h2 != null && root.getRight() != null )
+                       h2.setData(root.getRight().isLeaf() ? 
root.getRight().getData() : null);
                MatrixHistogram outMap = MatrixHistogram
                        .deriveOutputHistogram(h1, h2, ret, root.getOp(), 
root.getMisc());
                root.setSynopsis(outMap);