add test case

Author: Twolvero

src/test/java/org/apache/sysds/test/functions/codegen/RowAggTmplTest.java

@@ -89,7 +89,8 @@ public class RowAggTmplTest extends AutomatedTestBase
 	private static final String TEST_NAME46 = TEST_NAME+"46"; //conv2d(X - mean(X), F1) + conv2d(X - mean(X), F2);
 	private static final String TEST_NAME47 = TEST_NAME+"47"; //sum(X + rowVars(X))
 	private static final String TEST_NAME48 = TEST_NAME+"48"; //sum(rowVars(X))
-	private static final String TEST_NAME49 = TEST_NAME+"49";
+	private static final String TEST_NAME49 = TEST_NAME+"49"; //X*rowSums(K*v)*X
+	private static final String TEST_NAME50 = TEST_NAME+"50"; //(abs(A)*B)+(B*v)
 
 	private static final String TEST_DIR = "functions/codegen/";
 	private static final String TEST_CLASS_DIR = TEST_DIR + RowAggTmplTest.class.getSimpleName() + "/";
@@ -101,7 +102,7 @@ public class RowAggTmplTest extends AutomatedTestBase
 	@Override
 	public void setUp() {
 		TestUtils.clearAssertionInformation();
-		for(int i=1; i<=49; i++)
+		for(int i=1; i<=50; i++)
 			addTestConfiguration( TEST_NAME+i, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME+i, new String[] { String.valueOf(i) }) );
 	}
 
@@ -831,6 +832,9 @@ public void testCodegenRowAgg48SP() {
 	@Test
 	public void testCodegenRowAgg49CP() {testCodegenIntegration( TEST_NAME49, false, ExecType.CP );}
 
+	@Test
+	public void testCodegenRowAgg50CP() {testCodegenIntegration( TEST_NAME50, false, ExecType.CP );}
+
 	private void testCodegenIntegration( String testname, boolean rewrites, ExecType instType )
 	{
 		boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;

src/test/scripts/functions/codegen/rowAggPattern49.R

@@ -39,8 +39,8 @@ K = rbind(Z, Y, Y, Y, Y, Y, Y, Y, Y)
 
 # S = (X < rowSums(X*K))
 # S = X*rowMins(K)*X
-# S = X*rowSums(K*v)*X
-S = (X*v)/rowSums(X*v)
+S = X*rowSums(K*v)*X
+# S = (X*v)/rowSums(X*v)
 # S = abs((X*v)/rowSums(X*v))
 # S = (X/v)+rowMeans(X-v)
 # S = (X*v)+rowSums(X*v)

src/test/scripts/functions/codegen/rowAggPattern49.dml

@@ -38,8 +38,8 @@ while(FALSE) { }
 # S = B * rowSums(v)
 # S = (X < rowSums(X*K))
 # S = X*(k>1)*X
-# S = X*rowSums(K*v)*X
-S = (X*v)/rowSums(X*v)
+S = X*rowSums(K*v)*X
+# S = (X*v)/rowSums(X*v)
 # S = abs((X*v)/rowSums(X*v))
 # S = (X/v)+rowMeans(X-v)
 # S = (X*v)+rowSums(X*v)

src/test/scripts/functions/codegen/rowAggPattern50.R

@@ -0,0 +1,43 @@
+#-------------------------------------------------------------
+#
+# 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.
+#
+#-------------------------------------------------------------
+
+args<-commandArgs(TRUE)
+options(digits=22)
+library("Matrix")
+# library("matrixStats")
+
+W = matrix(seq(28,29), 1, 2)
+J = matrix(0, 1, 8)
+Z = cbind(J, W, J)
+Y = matrix(0, 10, 18)
+X = rbind(Z, Y, Y, Y, Y, Y, Y, Y, Y)
+v = seq(1,81)
+v1 = seq(20, 37)
+W = matrix(seq(13,14), 1, 2)
+J = matrix(0, 1, 8)
+Z= cbind(J, W, J)
+Y = matrix(0, 10, 18)
+K = rbind(Z, Y, Y, Y, Y, Y, Y, Y, Y)
+
+S = (abs(X)*K)+rowSums(X*v)
+
+
+writeMM(as(S, "CsparseMatrix"), paste(args[2], "S", sep=""));

src/test/scripts/functions/codegen/rowAggPattern50.dml

@@ -0,0 +1,40 @@
+#-------------------------------------------------------------
+#
+# 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.
+#
+#-------------------------------------------------------------
+
+W = matrix(seq(28,29), 1, 2)
+J = matrix(0, 1, 8)
+Z= cbind(J, W, J)
+Y = matrix(0, 10, 18)
+X = rbind(Z, Y, Y, Y, Y, Y, Y, Y, Y)
+v = seq(1,81)
+v1 = seq(20, 37)
+W = matrix(seq(13,14), 1, 2)
+J = matrix(0, 1, 8)
+Z= cbind(J, W, J)
+Y = matrix(0, 10, 18)
+K = rbind(Z, Y, Y, Y, Y, Y, Y, Y, Y)
+while(FALSE) { }
+
+
+S = (abs(X)*K)+rowSums(X*v)
+
+
+write(S,$1)