commit edc9cf15e7072b10c96f6ae10cab0d647b619f85
author Mark Dokter <mark@dokter.cc> Fri Sep 25 15:44:15 2020 +0200
committer Mark Dokter <mark@dokter.cc> Fri Sep 25 15:58:14 2020 +0200
tree 6af4ee3870c646a78cd4557958962db9120f0be3
parent 0b66c780e81182590cb9801c4b9eded62651ec34

[Minor] Add proper winning condition for running FullSignTest and FullMinus1MultTest on GPU

src/test/java/org/apache/sysds/test/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java

diff --git a/src/test/java/org/apache/sysds/test/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java b/src/test/java/org/apache/sysds/test/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
index 0b5c273..186f9ed 100644
--- a/src/test/java/org/apache/sysds/test/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
@@ -129,7 +129,8 @@
 			//check generated opcode
 			if( rewrites ){
 				if( instType == ExecType.CP )
-					Assert.assertTrue("Missing opcode: 1-*", Statistics.getCPHeavyHitterOpCodes().contains("1-*"));
+					Assert.assertTrue("Missing opcode: 1-*", Statistics.getCPHeavyHitterOpCodes().contains("1-*") ||
+							Statistics.getCPHeavyHitterOpCodes().contains("gpu_1-*"));
 				else if( instType == ExecType.SPARK )
 					Assert.assertTrue("Missing opcode: sp_1-* | sp_map1-*", 
 							Statistics.getCPHeavyHitterOpCodes().contains("sp_1-*") || 

src/test/java/org/apache/sysds/test/functions/unary/matrix/FullSignTest.java

diff --git a/src/test/java/org/apache/sysds/test/functions/unary/matrix/FullSignTest.java b/src/test/java/org/apache/sysds/test/functions/unary/matrix/FullSignTest.java
index 69b094e..1f44ca2 100644
--- a/src/test/java/org/apache/sysds/test/functions/unary/matrix/FullSignTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/unary/matrix/FullSignTest.java
@@ -165,8 +165,10 @@
 			TestUtils.compareMatrices(dmlfile, rfile, 0, "Stat-DML", "Stat-R");
 			
 			//check generated opcode
-			if( instType == ExecType.CP )
-				Assert.assertTrue("Missing opcode: sign", Statistics.getCPHeavyHitterOpCodes().contains("sign"));
+			if( instType == ExecType.CP ) {
+				Assert.assertTrue("Missing opcode: sign", Statistics.getCPHeavyHitterOpCodes().contains("sign") ||
+						Statistics.getCPHeavyHitterOpCodes().contains("gpu_sign") );
+			}
 			else if ( instType == ExecType.SPARK )
 				Assert.assertTrue("Missing opcode: "+Instruction.SP_INST_PREFIX+"sign", Statistics.getCPHeavyHitterOpCodes().contains(Instruction.SP_INST_PREFIX+"sign"));	
 		}