Bugfix

Author: janniklinde

src/main/java/org/apache/sysds/hops/rewriter/rule/RewriterHeuristics.java

@@ -57,9 +57,9 @@ public void addRepeated(String name, RewriterHeuristicTransformation heur) {
 	public RewriterStatement apply(RewriterStatement stmt, @Nullable BiFunction<RewriterStatement, RewriterRule, Boolean> func, MutableBoolean bool, boolean print) {
 		for (HeuristicEntry entry : heuristics) {
 			if (print) {
-				LOG.info("\n");
-				LOG.info("> " + entry.name + " <");
-				LOG.info("\n");
+				System.out.println("\n");
+				System.out.println("> " + entry.name + " <");
+				System.out.println("\n");
 			}
 
 			stmt = entry.heuristics.apply(stmt, func, bool, print);

src/main/java/org/apache/sysds/hops/rewriter/rule/RewriterRuleCollection.java

@@ -1387,7 +1387,8 @@ public static void flattenOperations(final List<RewriterRule> rules, final RuleC
 							if (newOwnerId == null)
 								throw new IllegalArgumentException();
 
-							stmt.getOperands().get(0).getOperands().get(1).unsafePutMeta("ownerId", newOwnerId);
+							if (!stmt.getChild(0, 1).isLiteral())
+								stmt.getOperands().get(0).getOperands().get(1).unsafePutMeta("ownerId", newOwnerId);
 						}, true)
 						.build());
 

src/main/java/org/apache/sysds/hops/rewriter/utils/RewriterUtils.java

@@ -920,6 +920,8 @@ private static RewriterStatement tryPullOutSum(RewriterStatement sum, final Rule
 			List<RewriterStatement> components = new ArrayList<>();
 
 			for (RewriterStatement idx : indices) {
+				if (idx.isLiteral())
+					continue;
 				RewriterStatement idxFrom = idx.getChild(0);
 				RewriterStatement idxTo = idx.getChild(1);
 				RewriterStatement negation = new RewriterInstruction().as(UUID.randomUUID().toString()).withInstruction("-").withOps(/*RewriterStatement.ensureFloat(ctx, idxFrom)*/idxFrom).consolidate(ctx);
@@ -1104,9 +1106,12 @@ private static RewriterStatement foldNaryReducible(RewriterStatement stmt, final
 		int[] literals = IntStream.range(0, argList.size()).filter(i -> argList.get(i).isLiteral()).toArray();
 
 		if (literals.length == 1) {
-			RewriterStatement overwrite = ConstantFoldingUtils.overwritesLiteral((Number)argList.get(literals[0]).getLiteral(), stmt.trueInstruction(), ctx);
-			if (overwrite != null)
-				return overwrite;
+			Object literal = argList.get(literals[0]).getLiteral();
+			if (literal instanceof Number) {
+				RewriterStatement overwrite = ConstantFoldingUtils.overwritesLiteral((Number) literal, stmt.trueInstruction(), ctx);
+				if (overwrite != null)
+					return overwrite;
+			}
 
 			// Check if is neutral element
 			if (ConstantFoldingUtils.isNeutralElement(argList.get(literals[0]).getLiteral(), stmt.trueInstruction())) {

src/test/java/org/apache/sysds/test/component/codegen/rewrite/RewriterStreamTests.java

@@ -1758,4 +1758,14 @@ public void testSparsityComparison() {
 
 		assert can2.match(RewriterStatement.MatcherContext.exactMatch(ctx, can1, can2));
 	}
+
+	@Test
+	public void testTEST() {
+		RewriterStatement stmt1 = RewriterUtils.parse("t(/(<=(A,B),rowSums(<=(C,B))))", ctx, "MATRIX:A,B,C,D,E", "LITERAL_FLOAT:1.0", "LITERAL_INT:1");
+
+		stmt1 = canonicalConverter.apply(stmt1);
+
+		LOG.info("==========");
+		LOG.info(stmt1.toParsableString(ctx, true));
+	}
 }