Checkpoint

Author: janniklinde

src/main/java/org/apache/sysds/hops/rewriter/RewriterCostEstimator.java

@@ -49,8 +49,9 @@ public static long estimateCost(RewriterStatement stmt, Function<RewriterStateme
 
 		costFn = RewriterUtils.foldConstants(costFn, ctx);
 
-		if (!costFn.isLiteral())
-			throw new IllegalArgumentException("Cost function must be a literal: " + costFn.toParsableString(ctx));
+		if (!costFn.isLiteral()) {
+			//throw new IllegalArgumentException("Cost function must be a literal: " + costFn.toParsableString(ctx) + "\nCorresponding statement:\n" + stmt.toParsableString(ctx));
+		}
 
 		return (long)costFn.getLiteral();
 	}

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

@@ -79,14 +79,14 @@ public void testExpressionClustering() {
 		db.parForEach(expr -> {
 			if (ctr.incrementAndGet() % 10 == 0)
 				System.out.println("Done: " + ctr.intValue() + " / " + size);
-			if (ctr.intValue() > 1000)
-				return; // Skip
+			//if (ctr.intValue() > 1000)
+				//return; // Skip
 			// First, build all possible subtrees
 			//System.out.println("Eval:\n" + expr.toParsableString(ctx, true));
-			List<RewriterStatement> subExprs = RewriterUtils.generateSubtrees(expr, ctx, 500);
+			List<RewriterStatement> subExprs = RewriterUtils.generateSubtrees(expr, ctx, 300);
 			if (subExprs.size() > 100)
 				System.out.println("Critical number of subtrees: " + subExprs.size());
-			if (subExprs.size() > 2000) {
+			if (subExprs.size() > 500) {
 				System.out.println("Skipping subtrees...");
 				subExprs = List.of(expr);
 			}
@@ -261,8 +261,8 @@ private List<Tuple5<Double, Long, Long, RewriterStatement, RewriterStatement>> f
 
 					if (cost != null) {
 						double score = (((double)cost.longValue()) / minCost - 1) * 1000; // Relative cost reduction
-						score += cost.longValue() - minCost; // Absolute cost reduction
-						if (score > 0.000001)
+						score *= cost.longValue() - minCost; // Absolute cost reduction
+						if (score > 1e-10)
 							suggestedRewrites.add(new Tuple5<>(score, cost, minCost, eq, optimalStatement));
 					}
 				}

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

@@ -738,4 +738,20 @@ public void testAdvancedEquivalence1() {
 
 		assert stmt1.match(RewriterStatement.MatcherContext.exactMatch(ctx, stmt2));
 	}
+
+	@Test
+	public void testInequality() {
+		RewriterStatement stmt1 = RewriterUtils.parse("/(*(A, A), B)", ctx, "MATRIX:A,B");
+		RewriterStatement stmt2 = RewriterUtils.parse("/(*(A, A), sum(B))", ctx, "MATRIX:A,B");
+
+		stmt1 = canonicalConverter.apply(stmt1);
+		stmt2 = canonicalConverter.apply(stmt2);
+
+		System.out.println("==========");
+		System.out.println(stmt1.toParsableString(ctx, true));
+		System.out.println("==========");
+		System.out.println(stmt2.toParsableString(ctx, true));
+
+		assert !stmt1.match(RewriterStatement.MatcherContext.exactMatch(ctx, stmt2));
+	}
 }