Some fixes

Author: janniklinde

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

@@ -335,8 +335,14 @@ public static RewriterRuleSet deserialize(String[] data, final RuleContext ctx)
 			currentLines.clear();
 		}
 
-		for (RewriterRule rule : rules)
-			rule.determineConditionalApplicability();
+		for (RewriterRule rule : rules) {
+			try {
+				rule.determineConditionalApplicability();
+			} catch (Exception e) {
+				System.err.println("Error while determining the conditional ability of " + rule.toString());
+				e.printStackTrace();
+			}
+		}
 
 		return new RewriterRuleSet(ctx, rules);
 	}

src/main/java/org/apache/sysds/hops/rewriter/codegen/CodeGenUtils.java

@@ -1,6 +1,7 @@
 package org.apache.sysds.hops.rewriter.codegen;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.sysds.common.Types;
 import org.apache.sysds.hops.rewrite.HopRewriteUtils;
 import org.apache.sysds.hops.rewriter.assertions.RewriterAssertions;
 import org.apache.sysds.hops.rewriter.RewriterStatement;
@@ -69,6 +70,8 @@ public static String getOpCode(RewriterStatement stmt, final RuleContext ctx) {
 					return "Types.OpOp1.MULT2";
 				case "cast.MATRIX":
 					return "Types.OpOp1.CAST_AS_MATRIX";
+				case "cast.FLOAT":
+					return "Types.OpOp1.CAST_AS_SCALAR";
 				case "const":
 					return "Types.OpOpDG.RAND";
 			}
@@ -203,6 +206,7 @@ public static String getOpClass(RewriterStatement stmt, final RuleContext ctx) {
 			case "round":
 			case "*2":
 			case "cast.MATRIX":
+			case "cast.FLOAT":
 			case "nrow":
 			case "ncol":
 				return "UnaryOp";

src/main/java/org/apache/sysds/hops/rewriter/codegen/RewriterCodeGen.java

@@ -6,6 +6,8 @@
 import org.apache.sysds.hops.LiteralOp;
 import org.apache.sysds.hops.UnaryOp;
 import org.apache.sysds.hops.rewrite.HopRewriteUtils;
+import org.apache.sysds.hops.rewriter.RewriteAutomaticallyGenerated;
+import org.apache.sysds.hops.rewriter.RewriterRuleSet;
 import org.apache.sysds.hops.rewriter.assertions.RewriterAssertions;
 import org.apache.sysds.hops.rewriter.estimators.RewriterCostEstimator;
 import org.apache.sysds.hops.rewriter.RewriterDataType;
@@ -15,6 +17,10 @@
 import org.codehaus.janino.SimpleCompiler;
 import scala.Tuple2;
 
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,6 +34,29 @@
 public class RewriterCodeGen {
 	public static boolean DEBUG = true;
 
+	public static String generateRewritesFromFiles(List<String> filePaths, String targetFile, boolean optimize, final RuleContext ctx) throws IOException {
+		return generateRewritesFromFiles(filePaths, targetFile, optimize, 2, true, true, ctx);
+	}
+
+	public static String generateRewritesFromFiles(List<String> filePaths, String targetFile, boolean optimize, int maxOptimizationDepth, boolean includePackageInfo, boolean maintainStatistics, final RuleContext ctx) throws IOException {
+		List<String> lines = new ArrayList<>();
+
+		for (String path : filePaths) {
+			lines.addAll(Files.readAllLines(Paths.get(path)));
+		}
+
+		RewriterRuleSet ruleSet = RewriterRuleSet.deserialize(lines, ctx);
+		String javaCode = ruleSet.toJavaCode("GeneratedRewriteClass", optimize, maxOptimizationDepth, includePackageInfo, true, maintainStatistics);
+
+		try (FileWriter writer = new FileWriter(targetFile)) {
+			writer.write(javaCode);
+		} catch (IOException e) {
+			throw e;
+		}
+
+		return javaCode;
+	}
+
 	public static Function<Hop, Hop> compileRewrites(String className, List<Tuple2<String, RewriterRule>> rewrites, final RuleContext ctx, boolean ignoreErrors, boolean printErrors) throws Exception {
 		String code = generateClass(className, rewrites, false, false, ctx, ignoreErrors, printErrors);
 		System.out.println("Compiling code:\n" + code);
@@ -265,7 +294,7 @@ private static void buildMatchingSequence(String name, RewriterStatement from, L
 			for (int i = 1; i < msb.size(); i++) {
 				indent(indentation+1, sb);
 				sb.append("case " + i + ": {");
-				buildNewHop(name, from, tos.get(i-1), sb, combinedAssertions, vars, ctx, indentation+2, maintainRewriteStats);
+				buildNewHop(name, from, tos.get(i-1), sb, combinedAssertions, new HashMap<>(vars), ctx, indentation+2, maintainRewriteStats);
 				indent(indentation+1, sb);
 				sb.append("}\n");
 			}

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

@@ -268,30 +268,14 @@ public void testLiteral() {
 
 	@Test
 	public void codeGen() {
-		try {
-			List<String> lines = Files.readAllLines(Paths.get(RewriteAutomaticallyGenerated.FILE_PATH_MB));
-			RewriterRuleSet ruleSet = RewriterRuleSet.deserialize(lines, ctx);
-
-			RewriterRuntimeUtils.printUnknowns = false;
-			/*Set<RewriterRule> invalid_unoptimized = ruleSet.generateCodeAndTest(false, true);
-			Set<RewriterRule> invalid_optimized = ruleSet.generateCodeAndTest(true, true);
-			System.out.println("========== DIFF ===========");
-			invalid_optimized.removeAll(invalid_unoptimized);
-			for (RewriterRule rule : invalid_optimized) {
-				System.out.println(rule);
-			}*/
+		List<String> files = List.of(RewriteAutomaticallyGenerated.FILE_PATH, RewriteAutomaticallyGenerated.FILE_PATH_CONDITIONAL);
+		String targetPath = "/Users/janniklindemann/Dev/MScThesis/other/GeneratedRewriteClass.java";
 
+		try {
+			// This is to specify that the generated code should print to the console if it modifies the DAG
+			// This should be disabled when generating production code
 			RewriterCodeGen.DEBUG = true;
-			String javaCode = ruleSet.toJavaCode("GeneratedRewriteClass", true, 2, true, true, true);
-			String filePath = "/Users/janniklindemann/Dev/MScThesis/other/GeneratedRewriteClass.java";
-
-			try (FileWriter writer = new FileWriter(filePath)) {
-				writer.write(javaCode);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-
-			//System.out.println(javaCode);
+			RewriterCodeGen.generateRewritesFromFiles(files, targetPath, true, ctx);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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

@@ -101,9 +101,9 @@ public void validationTest3() {
 				.withParsedStatement("cast.MATRIX(sum(colVec(A)))")
 				.toParsedStatement("rowSums(colVec(A))")
 				.build();
-		
+
 		assert RewriterRuleCreator.validateRuleCorrectness(rule, ctx);
-		//assert RewriterRuleCreator.validateRuleApplicability(rule, ctx);
+		assert !RewriterRuleCreator.validateRuleApplicability(rule, ctx);
 	}
 
 	@Test