Add 'tapetests' argument to (regression) test case functions to inform them whether the test case is run in a tapetest stage or not.

Author: oleburghardt

TestCases/TestCase.py

@@ -108,6 +108,9 @@ def __init__(self,tag_in):
         # multizone problem
         self.multizone = False
 
+        # Indicate tapetest mode
+        self.enabled_with_tapetests = False
+
         # The test condition. These must be set after initialization
         self.test_iter = 1
         self.ntest_vals = 4
@@ -128,9 +131,10 @@ def __init__(self,tag_in):
         self.reference_file_aarch64 = ""
         self.test_file      = "of_grad.dat"
 
-    def run_test(self, with_tsan=False, with_asan=False):
+    def run_test(self, with_tsan=False, with_asan=False, with_tapetests=False):
 
-        if not self.is_enabled(with_tsan, with_asan):
+        # Check whether this test is valid and can be continued
+        if not self.is_enabled(with_tsan, with_asan, with_tapetests):
             return True
 
         print('==================== Start Test: %s ===================='%self.tag)
@@ -284,9 +288,9 @@ def run_test(self, with_tsan=False, with_asan=False):
         os.chdir(workdir)
         return passed
 
-    def run_filediff(self, with_tsan=False, with_asan=False):
+    def run_filediff(self, with_tsan=False, with_asan=False, with_tapetests=False):
 
-        if not self.is_enabled(with_tsan, with_asan):
+        if not self.is_enabled(with_tsan, with_asan, with_tapetests):
             return True
 
         print('==================== Start Test: %s ===================='%self.tag)
@@ -481,9 +485,9 @@ def run_filediff(self, with_tsan=False, with_asan=False):
         os.chdir(workdir)
         return passed
 
-    def run_opt(self, with_tsan=False, with_asan=False):
+    def run_opt(self, with_tsan=False, with_asan=False, with_tapetests=False):
 
-        if not self.is_enabled(with_tsan, with_asan):
+        if not self.is_enabled(with_tsan, with_asan, with_tapetests):
             return True
 
         print('==================== Start Test: %s ===================='%self.tag)
@@ -606,9 +610,9 @@ def run_opt(self, with_tsan=False, with_asan=False):
         os.chdir(workdir)
         return passed
 
-    def run_geo(self, with_tsan=False, with_asan=False):
+    def run_geo(self, with_tsan=False, with_asan=False, with_tapetests=False):
 
-        if not self.is_enabled(with_tsan, with_asan):
+        if not self.is_enabled(with_tsan, with_asan, with_tapetests):
             return True
 
         print('==================== Start Test: %s ===================='%self.tag)
@@ -746,9 +750,9 @@ def run_geo(self, with_tsan=False, with_asan=False):
         os.chdir(workdir)
         return passed
 
-    def run_def(self, with_tsan=False, with_asan=False):
+    def run_def(self, with_tsan=False, with_asan=False, with_tapetests=False):
 
-        if not self.is_enabled(with_tsan, with_asan):
+        if not self.is_enabled(with_tsan, with_asan, with_tapetests):
             return True
 
         print('==================== Start Test: %s ===================='%self.tag)
@@ -971,19 +975,24 @@ def disable_restart(self):
 
         return
 
-    def is_enabled(self, with_tsan=False, with_asan=False):
+    def is_enabled(self, with_tsan=False, with_asan=False, with_tapetests=False):
         is_enabled_on_arch = self.cpu_arch in self.enabled_on_cpu_arch
 
         if not is_enabled_on_arch:
             print('Ignoring test "%s" because it is not enabled for the current CPU architecture: %s' % (self.tag, self.cpu_arch))
 
+        # A test case is valid to be continued if neither of the special modes (tsan, asan, tapetests) is active, or if so, the corresponding test case is enabled, too.
         tsan_compatible = not with_tsan or self.enabled_with_tsan
         asan_compatible = not with_asan or self.enabled_with_asan
+        tapetests_compatible = not with_tapetests or self.enabled_with_tapetests
 
         if not tsan_compatible:
             print('Ignoring test "%s" because it is not enabled to run with the thread sanitizer.' % self.tag)
 
-        return is_enabled_on_arch and tsan_compatible and asan_compatible
+        if not tapetests_compatible:
+            print('Ignoring test "%s" because it is not enabled to run a test of the tape.' % self.tag)
+
+        return is_enabled_on_arch and tsan_compatible and asan_compatible and tapetests_compatible and tapetests_compatible
 
     def adjust_test_data(self):
 

TestCases/serial_regression_AD.py

@@ -234,7 +234,7 @@ def main():
         if test.tol == 0.0:
             test.tol = 0.00001
 
-    pass_list = [ test.run_test(args.tsan, args.asan) for test in test_list ]
+    pass_list = [ test.run_test(args.tsan, args.asan, args.tapetests) for test in test_list ]
 
     ###################################
     ### Coupled RHT-CFD Adjoint     ###
@@ -251,7 +251,7 @@ def main():
     discadj_rht.reference_file_aarch64 = "of_grad_cd_aarch64.csv.ref"
     discadj_rht.test_file      = "of_grad_cd.csv"
     discadj_rht.enabled_with_asan = False
-    pass_list.append(discadj_rht.run_filediff(args.tsan, args.asan))
+    pass_list.append(discadj_rht.run_filediff(args.tsan, args.asan, args.tapetests))
     test_list.append(discadj_rht)
 
     ######################################
@@ -269,7 +269,7 @@ def main():
     discadj_euler_py.reference_file_aarch64 = "of_grad_cd_disc_aarch64.dat.ref"
     discadj_euler_py.test_file = "of_grad_cd.dat"
     discadj_euler_py.enabled_with_asan = False
-    pass_list.append(discadj_euler_py.run_filediff(args.tsan, args.asan))
+    pass_list.append(discadj_euler_py.run_filediff(args.tsan, args.asan, args.tapetests))
     test_list.append(discadj_euler_py)
 
     # test discrete_adjoint with multiple ffd boxes
@@ -283,7 +283,7 @@ def main():
     discadj_multiple_ffd_py.reference_file_aarch64 = "of_grad_cd_aarch64.dat.ref"
     discadj_multiple_ffd_py.test_file = "of_grad_cd.dat"
     discadj_multiple_ffd_py.enabled_with_asan = False
-    pass_list.append(discadj_multiple_ffd_py.run_filediff(args.tsan, args.asan))
+    pass_list.append(discadj_multiple_ffd_py.run_filediff(args.tsan, args.asan, args.tapetests))
     test_list.append(discadj_multiple_ffd_py)
 
     # test direct_differentiation.py
@@ -297,7 +297,7 @@ def main():
     directdiff_euler_py.reference_file_aarch64 = "of_grad_directdiff_aarch64.dat.ref"
     directdiff_euler_py.test_file = "DIRECTDIFF/of_grad_directdiff.dat"
     directdiff_euler_py.enabled_with_asan = False
-    pass_list.append(directdiff_euler_py.run_filediff(args.tsan, args.asan))
+    pass_list.append(directdiff_euler_py.run_filediff(args.tsan, args.asan, args.tapetests))
     test_list.append(directdiff_euler_py)
 
     # test direct_differentiation.py with multiple ffd boxes
@@ -311,7 +311,7 @@ def main():
     directdiff_multiple_ffd_py.reference_file_aarch64 = "of_grad_directdiff_aarch64.dat.ref"
     directdiff_multiple_ffd_py.test_file = "DIRECTDIFF/of_grad_directdiff.dat"
     directdiff_multiple_ffd_py.enabled_with_asan = False
-    pass_list.append(directdiff_multiple_ffd_py.run_filediff(args.tsan, args.asan))
+    pass_list.append(directdiff_multiple_ffd_py.run_filediff(args.tsan, args.asan, args.tapetests))
     test_list.append(directdiff_multiple_ffd_py)
 
     # test continuous_adjoint.py, with multiple objectives
@@ -338,7 +338,7 @@ def main():
     pywrapper_FEA_AD_FlowLoad.new_output    = False
     pywrapper_FEA_AD_FlowLoad.enabled_with_asan = False
     test_list.append(pywrapper_FEA_AD_FlowLoad)
-    pass_list.append(pywrapper_FEA_AD_FlowLoad.run_test(args.tsan, args.asan))
+    pass_list.append(pywrapper_FEA_AD_FlowLoad.run_test(args.tsan, args.asan, args.tapetests))
 
     # Flow AD Mesh Displacement Sensitivity
     pywrapper_CFD_AD_MeshDisp               = TestCase('pywrapper_CFD_AD_MeshDisp')
@@ -352,7 +352,7 @@ def main():
     pywrapper_CFD_AD_MeshDisp.new_output    = False
     pywrapper_CFD_AD_MeshDisp.enabled_with_asan = False
     test_list.append(pywrapper_CFD_AD_MeshDisp)
-    pass_list.append(pywrapper_CFD_AD_MeshDisp.run_test(args.tsan, args.asan))
+    pass_list.append(pywrapper_CFD_AD_MeshDisp.run_test(args.tsan, args.asan, args.tapetests))
 
 
     ###################################
@@ -369,7 +369,7 @@ def main():
     grad_smooth_naca0012.reference_file_aarch64 = "of_hess_aarch64.dat.ref"
     grad_smooth_naca0012.test_file = "of_hess.dat"
     grad_smooth_naca0012.enabled_with_asan = False
-    pass_list.append(grad_smooth_naca0012.run_filediff(args.tsan, args.asan))
+    pass_list.append(grad_smooth_naca0012.run_filediff(args.tsan, args.asan, args.tapetests))
     test_list.append(grad_smooth_naca0012)
 
     # Tests summary