[systemds] branch master updated: [MINOR] Fix RowAggTmplTest for running SPOOF CUDA tests

[markd]

This is an automated email from the ASF dual-hosted git repository.

markd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/master by this push:
     new 473644b  [MINOR] Fix RowAggTmplTest for running SPOOF CUDA tests
473644b is described below

commit 473644bdfc1d574da314b7ebb948e79f3de2cada
Author: Mark Dokter <m...@dokter.cc>
AuthorDate: Tue Apr 13 23:57:08 2021 +0200

    [MINOR] Fix RowAggTmplTest for running SPOOF CUDA tests
    
    * Adjust eps in RowAgg test #38 when running on GPU
    * simplify some logic statements
---
 .../sysds/test/functions/codegen/RowAggTmplTest.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/src/test/java/org/apache/sysds/test/functions/codegen/RowAggTmplTest.java 
b/src/test/java/org/apache/sysds/test/functions/codegen/RowAggTmplTest.java
index fb6cae1..f3fd04d 100644
--- a/src/test/java/org/apache/sysds/test/functions/codegen/RowAggTmplTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/codegen/RowAggTmplTest.java
@@ -92,7 +92,7 @@ public class RowAggTmplTest extends AutomatedTestBase
        private final static String TEST_CONF = "SystemDS-config-codegen.xml";
        private final static File   TEST_CONF_FILE = new File(SCRIPT_DIR + 
TEST_DIR, TEST_CONF);
 
-       private static final double eps = Math.pow(10, -10);
+       private static double eps = Math.pow(10, -10);
        
        @Override
        public void setUp() {
@@ -813,6 +813,8 @@ public class RowAggTmplTest extends AutomatedTestBase
                        runTest(true, false, null, -1);
                        runRScript(true);
                        
+                       if(testname.equals(TEST_NAME38) && TEST_GPU)
+                               eps = Math.pow(10, -7);
                        //compare matrices
                        HashMap<CellIndex, Double> dmlfile = 
readDMLMatrixFromOutputDir("S");
                        HashMap<CellIndex, Double> rfile  = 
readRMatrixFromExpectedDir("S");
@@ -823,9 +825,9 @@ public class RowAggTmplTest extends AutomatedTestBase
                        
                        //ensure full aggregates for certain patterns
                        if( testname.equals(TEST_NAME15) )
-                               
Assert.assertTrue(!heavyHittersContainsSubString("uark+"));
+                               
Assert.assertFalse(heavyHittersContainsSubString("uark+"));
                        if( testname.equals(TEST_NAME17) )
-                               
Assert.assertTrue(!heavyHittersContainsSubString(RightIndex.OPCODE));
+                               
Assert.assertFalse(heavyHittersContainsSubString(RightIndex.OPCODE));
                        if( testname.equals(TEST_NAME28) || 
testname.equals(TEST_NAME45) )
                                
Assert.assertTrue(!heavyHittersContainsSubString("spoofRA", 2)
                                        && 
!heavyHittersContainsSubString("sp_spoofRA", 2));
@@ -833,14 +835,14 @@ public class RowAggTmplTest extends AutomatedTestBase
                                
Assert.assertTrue(!heavyHittersContainsSubString("spoofRA", 2)
                                        && 
!heavyHittersContainsSubString(RightIndex.OPCODE));
                        if( testname.equals(TEST_NAME31) )
-                               
Assert.assertTrue(!heavyHittersContainsSubString("spoofRA", 2));
+                               
Assert.assertFalse(heavyHittersContainsSubString("spoofRA", 2));
                        if( testname.equals(TEST_NAME35) )
                                
Assert.assertTrue(!heavyHittersContainsSubString("spoofRA", 2)
                                        && 
!heavyHittersContainsSubString("cbind"));
                        if( testname.equals(TEST_NAME36) )
-                               
Assert.assertTrue(!heavyHittersContainsSubString("xor"));
+                               
Assert.assertFalse(heavyHittersContainsSubString("xor"));
                        if( testname.equals(TEST_NAME41) )
-                               
Assert.assertTrue(!heavyHittersContainsSubString("seq"));
+                               
Assert.assertFalse(heavyHittersContainsSubString("seq"));
                        if( testname.equals(TEST_NAME42) )
                                
Assert.assertTrue(!heavyHittersContainsSubString("min","nmin") 
                                        && 
!heavyHittersContainsSubString("spoof", 2));