[SYSTEMDS-3839] Fix rewrite utils robustness (correct value types)

This patch fixes special cases of creating new unary and binary
operators during rewrites, where the value types where not correctly
set.

Author: mboehm7

src/main/java/org/apache/sysds/common/Types.java

@@ -136,6 +136,10 @@ public boolean isNumeric() {
 			}
 		}
 
+		public boolean isFP() {
+			return this==FP64 || this==FP32;
+		}
+		
 		/**
 		 * Helper method to detect Unknown ValueTypes.
 		 * 

src/main/java/org/apache/sysds/hops/rewrite/HopRewriteUtils.java

@@ -622,7 +622,13 @@ public static UnaryOp createUnary(Hop input, String type) {
 	public static UnaryOp createUnary(Hop input, OpOp1 type)  {
 		DataType dt = type.isScalarOutput() ? DataType.SCALAR :
 			(type==OpOp1.CAST_AS_MATRIX) ? DataType.MATRIX : input.getDataType();
-		ValueType vt = (type==OpOp1.CAST_AS_MATRIX) ? ValueType.FP64 : input.getValueType();
+		ValueType vt = input.getValueType();
+		switch( type ) {
+			case CAST_AS_MATRIX: 
+			case CAST_AS_DOUBLE:  vt = ValueType.FP64; break;
+			case CAST_AS_INT:     vt = ValueType.INT64; break;
+			case CAST_AS_BOOLEAN: vt = ValueType.BOOLEAN; break;
+		}
 		UnaryOp unary = new UnaryOp(input.getName(), dt, vt, type, input);
 		unary.setBlocksize(input.getBlocksize());
 		if( type.isScalarOutput() || type == OpOp1.CAST_AS_MATRIX ) {
@@ -650,11 +656,16 @@ public static BinaryOp createBinary(Hop input1, Hop input2, OpOp2 op) {
 	public static BinaryOp createBinary(Hop input1, Hop input2, OpOp2 op, boolean outer) {
 		Hop mainInput = input1.getDataType().isMatrix() ? input1 :
 			input2.getDataType().isMatrix() ? input2 : input1;
+		Hop otherInput = mainInput==input1 ? input2 : input1;
 		BinaryOp bop = new BinaryOp(mainInput.getName(), mainInput.getDataType(),
 			mainInput.getValueType(), op, input1, input2);
-		//cleanup value type for relational operations
+		//cleanup value type for relational operations and others
+		if( otherInput.getValueType().isFP() && !mainInput.getValueType().isFP() )
+			bop.setValueType(otherInput.getValueType());
 		if( bop.isPPredOperation() && bop.getDataType().isScalar() )
 			bop.setValueType(ValueType.BOOLEAN);
+		if( bop.getDataType().isMatrix() )
+			bop.setValueType(ValueType.FP64);
 		bop.setOuterVectorOperation(outer);
 		bop.setBlocksize(mainInput.getBlocksize());
 		copyLineNumbers(mainInput, bop);

src/test/java/org/apache/sysds/test/component/misc/RewriteUtilsTest.java

@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.test.component.misc;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.OpOp1;
+import org.apache.sysds.common.Types.OpOp2;
+import org.apache.sysds.common.Types.OpOpData;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.hops.DataOp;
+import org.apache.sysds.hops.Hop;
+import org.apache.sysds.hops.LiteralOp;
+import org.apache.sysds.hops.rewrite.HopRewriteUtils;
+import org.junit.Test;
+
+public class RewriteUtilsTest 
+{
+	@Test
+	public void testUnaryValueTypes() {
+		Hop input = new LiteralOp("true");
+		
+		assertEquals(ValueType.FP64,
+			HopRewriteUtils.createUnary(input, OpOp1.CAST_AS_DOUBLE).getValueType());
+		assertEquals(ValueType.INT64,
+			HopRewriteUtils.createUnary(input, OpOp1.CAST_AS_INT).getValueType());
+		assertEquals(ValueType.BOOLEAN, 
+			HopRewriteUtils.createUnary(input, OpOp1.CAST_AS_BOOLEAN).getValueType());
+	}
+	
+	@Test
+	public void testBinaryValueTypes1() {
+		Hop input1 = new LiteralOp(7d);
+		Hop input2 = new DataOp("tmp", DataType.MATRIX, ValueType.INT64,
+			OpOpData.TRANSIENTREAD, null, 3, 7, 21, 1000);
+		assertEquals(ValueType.FP64,
+			HopRewriteUtils.createBinary(input1, input2, OpOp2.MULT).getValueType());
+	}
+	
+	@Test
+	public void testBinaryValueTypes2() {
+		Hop input1 = new LiteralOp(7);
+		Hop input2 = new DataOp("tmp", DataType.MATRIX, ValueType.INT64,
+			OpOpData.TRANSIENTREAD, null, 3, 7, 21, 1000);
+		assertEquals(ValueType.FP64,
+			HopRewriteUtils.createBinary(input1, input2, OpOp2.MULT).getValueType());
+	}
+	
+	@Test
+	public void testBinaryValueTypes3() {
+		Hop input1 = new LiteralOp(7);
+		Hop input2 = new LiteralOp(3);
+		assertEquals(ValueType.INT64,
+			HopRewriteUtils.createBinary(input1, input2, OpOp2.MULT).getValueType());
+	}
+}