Some bugfixes (origin still unknown)

Author: janniklinde

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

@@ -18,8 +18,8 @@
 import java.util.stream.Stream;
 
 public class RewriterAlphabetEncoder {
-	private static final List<String> ALL_TYPES = List.of("MATRIX", "FLOAT");
-	private static final List<String> MATRIX = List.of("MATRIX");
+	public static final List<String> ALL_TYPES = List.of("MATRIX", "FLOAT");
+	public static final List<String> MATRIX = List.of("MATRIX");
 
 	private static Operand[] instructionAlphabet = new Operand[] {
 			null,
@@ -146,13 +146,18 @@ public static List<RewriterStatement> buildAssertionVariations(RewriterStatement
 
 	private static RewriterStatement createVector(RewriterStatement of, boolean rowVector, Map<RewriterStatement, RewriterStatement> createdObjects) {
 		// TODO: Why is it necessary to discard the old DataType?
-		//RewriterStatement mCpy = new RewriterDataType().as(of.getId()).ofType(of.getResultingDataType(ctx)).consolidate(ctx);
+		RewriterStatement mCpy = createdObjects.get(of);
+
+		if (mCpy == null) {
+			mCpy = new RewriterDataType().as(of.getId()).ofType(of.getResultingDataType(ctx)).consolidate(ctx);
+			createdObjects.put(of, mCpy);
+		}
 		//RewriterStatement nRowCol = new RewriterInstruction().as(UUID.randomUUID().toString()).withInstruction(rowVector ? "nrow" : "ncol").withOps(mCpy).consolidate(ctx);
 		//createdObjects.put(of, mCpy);
 		return new RewriterInstruction()
 				.as(of.getId())
 				.withInstruction(rowVector ? "rowVec" : "colVec")
-				.withOps(of)
+				.withOps(mCpy)
 				.consolidate(ctx);
 	}
 

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

@@ -189,6 +189,7 @@ public static void testExpressionClustering() {
 						actualCtr += expanded.size();
 						for (RewriterStatement stmt : expanded) {
 							try {
+								ctx.metaPropagator.apply(stmt);
 								RewriterStatement canonicalForm = converter.apply(stmt);
 								stmt.getCost(ctx);
 
@@ -220,8 +221,8 @@ public static void testExpressionClustering() {
 
 								//stmt.getCost(ctx); // Fetch cost already
 								// TODO: Not quite working yet
-								//canonicalForm.compress();
-								//stmt.compress();
+								canonicalForm.compress();
+								stmt.compress();
 								synchronized (lock) {
 									RewriterEquivalenceDatabase.DBEntry entry = canonicalExprDB.insert(ctx, canonicalForm, stmt);
 

src/test/java/org/apache/sysds/test/component/codegen/rewrite/functions/RewriterAlphabetTest.java

@@ -7,9 +7,12 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
+import static org.apache.sysds.hops.rewriter.RewriterAlphabetEncoder.MATRIX;
+
 public class RewriterAlphabetTest {
 
 	private static RuleContext ctx;
@@ -51,7 +54,7 @@ public void testEncode1() {
 		assert l == 27;
 	}
 
-	@Test
+	//@Test
 	public void testRandomStatementGeneration() {
 		int ctr = 0;
 		for (int i = 0; i < 20; i++) {
@@ -80,4 +83,39 @@ public void test() {
 		System.out.println(stmt.toParsableString(ctx));
 	}
 
+	@Test
+	public void testRandomStatementGeneration2() {
+		int ctr = 0;
+		List<List<RewriterAlphabetEncoder.Operand>> opList = new ArrayList<>();
+		opList.add(List.of(new RewriterAlphabetEncoder.Operand("trace", 1, MATRIX), new RewriterAlphabetEncoder.Operand("%*%", 2, MATRIX)));
+		opList.add(List.of(new RewriterAlphabetEncoder.Operand("sum", 1, MATRIX), new RewriterAlphabetEncoder.Operand("*", 2, MATRIX), new RewriterAlphabetEncoder.Operand("t", 1, MATRIX)));
+		List<RewriterStatement> all = new ArrayList<>();
+		for (List<RewriterAlphabetEncoder.Operand> ops : opList) {
+			//List<RewriterAlphabetEncoder.Operand> ops = List.of(new RewriterAlphabetEncoder.Operand("sum", 1, MATRIX), new RewriterAlphabetEncoder.Operand("%*%", 1, MATRIX));
+			//System.out.println("Idx: " + i);
+			//System.out.println(ops);
+			//System.out.println(RewriterAlphabetEncoder.buildAllPossibleDAGs(ops, ctx, false).size());
+			for (RewriterStatement stmt : RewriterAlphabetEncoder.buildAllPossibleDAGs(ops, ctx, true)) {
+				System.out.println("Base: " + stmt.toParsableString(ctx));
+				List<RewriterStatement> expand = new ArrayList<>();
+				expand.addAll(RewriterAlphabetEncoder.buildVariations(stmt, ctx));
+				expand.addAll(RewriterAlphabetEncoder.buildAssertionVariations(stmt, ctx, false));
+
+				for (RewriterStatement sstmt : expand) {
+					canonicalConverter.apply(sstmt);
+					System.out.println(sstmt);
+					sstmt.compress();
+					all.add(sstmt);
+					//System.out.println("Raw: " + sstmt);
+					ctr++;
+				}
+			}
+		}
+
+		System.out.println("Total DAGs: " + ctr);
+		for (RewriterStatement sstmt : all) {
+			System.out.println(sstmt);
+		}
+	}
+
 }