(systemds) branch main updated: [MINOR] Remove potential for compression Scalars

[baunsgaard]

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

baunsgaard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/main by this push:
     new 9426792b00 [MINOR] Remove potential for compression Scalars
9426792b00 is described below

commit 9426792b009b638667a8415c58552945e1be3d1b
Author: Sebastian Baunsgaard <baunsga...@apache.org>
AuthorDate: Mon Oct 30 12:22:00 2023 +0100

    [MINOR] Remove potential for compression Scalars
---
 .../java/org/apache/sysds/hops/rewrite/RewriteCompressedReblock.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sysds/hops/rewrite/RewriteCompressedReblock.java 
b/src/main/java/org/apache/sysds/hops/rewrite/RewriteCompressedReblock.java
index 8dd323dd44..ec917b0145 100644
--- a/src/main/java/org/apache/sysds/hops/rewrite/RewriteCompressedReblock.java
+++ b/src/main/java/org/apache/sysds/hops/rewrite/RewriteCompressedReblock.java
@@ -156,7 +156,7 @@ public class RewriteCompressedReblock extends 
StatementBlockRewriteRule {
        public static boolean satisfiesCompressionCondition(Hop hop) {
                boolean satisfies = false;
                if(satisfiesSizeConstraintsForCompression(hop)){
-                       satisfies |= HopRewriteUtils.isData(hop, 
OpOpData.PERSISTENTREAD);
+                       satisfies |= HopRewriteUtils.isData(hop, 
OpOpData.PERSISTENTREAD) && !hop.isScalar();
                        satisfies |= HopRewriteUtils.isTransformEncode(hop);
                }
                return satisfies;
@@ -171,7 +171,7 @@ public class RewriteCompressedReblock extends 
StatementBlockRewriteRule {
                        satisfies |= HopRewriteUtils.isTernary(hop, 
OpOp3.CTABLE) 
                                && hop.getInput(0).getDataType().isMatrix() 
                                && hop.getInput(1).getDataType().isMatrix();
-                       satisfies |= HopRewriteUtils.isData(hop, 
OpOpData.PERSISTENTREAD);
+                       satisfies |= HopRewriteUtils.isData(hop, 
OpOpData.PERSISTENTREAD) && !hop.isScalar();
                        satisfies |= HopRewriteUtils.isUnary(hop, OpOp1.ROUND, 
OpOp1.FLOOR, OpOp1.NOT, OpOp1.CEIL);
                        satisfies |= HopRewriteUtils.isBinary(hop, OpOp2.EQUAL, 
OpOp2.NOTEQUAL, OpOp2.LESS,
                                OpOp2.LESSEQUAL, OpOp2.GREATER, 
OpOp2.GREATEREQUAL, OpOp2.AND, OpOp2.OR, OpOp2.MODULUS);