Merge branch 'master' into feat/time_profiling

Author: Vasileios Karakasis

cscs-checks/apps/icon/rrtmgp_check.py

@@ -19,14 +19,14 @@ def __init__(self):
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'RRTMGP')
         self.tags = {'external-resources'}
-        self.prebuild_cmd = ['cp build/Makefile.conf.dom build/Makefile.conf']
+        self.prebuild_cmds = ['cp build/Makefile.conf.dom build/Makefile.conf']
         self.executable = 'python'
         self.executable_opts = [
             'util/scripts/run_tests.py',
             '--verbose', '--rel_diff_cut 1e-13',
             '--root ..', '--test ${INIFILE}_ncol-${NCOL}.ini'
         ]
-        self.pre_run = [
+        self.prerun_cmds = [
             'pwd',
             'module load netcdf-python/1.4.1-CrayGNU-19.06-python2',
             'cd test'

cscs-checks/apps/openfoam/check_openfoam.py

@@ -29,7 +29,7 @@ def __init__(self):
         self.maintainers = ['MKr', 'AJ']
         self.tags = {'scs', 'production', 'external-resources'}
 
-        self.pre_run = ['source $FOAM_BASH']
+        self.prerun_cmds = ['source $FOAM_BASH']
 
 
 @rfm.simple_test

cscs-checks/apps/openfoam/check_openfoam_extend.py

@@ -34,7 +34,7 @@ def __init__(self):
 
         self.maintainers = ['MKr', 'AJ']
         self.tags = {'scs', 'production', 'external-resources'}
-        self.pre_run = ['source $FOAM_INST_DIR/foam-extend-4.0/etc/bashrc']
+        self.prerun_cmds = ['source $FOAM_INST_DIR/foam-extend-4.0/etc/bashrc']
 
 
 @rfm.simple_test

cscs-checks/apps/quantumespresso/quantumespresso_check.py

@@ -117,20 +117,20 @@ def __init__(self, scale, variant):
         references = {
             'maint': {
                 'small': {
-                    'dom:gpu': {'time': (60.0, None, 0.05, 's')},
-                    'daint:gpu': {'time': (60.0, None, 0.10, 's')}
+                    'dom:gpu': {'time': (61.0, None, 0.05, 's')},
+                    'daint:gpu': {'time': (61.0, None, 0.05, 's')}
                 },
                 'large': {
-                    'daint:gpu': {'time': (60.0, None, 0.10, 's')}
+                    'daint:gpu': {'time': (54.0, None, 0.05, 's')}
                 }
             },
             'prod': {
                 'small': {
-                    'dom:gpu': {'time': (60.0, None, 0.05, 's')},
-                    'daint:gpu': {'time': (60.0, None, 0.10, 's')}
+                    'dom:gpu': {'time': (61.0, None, 0.05, 's')},
+                    'daint:gpu': {'time': (61.0, None, 0.05, 's')}
                 },
                 'large': {
-                    'daint:gpu': {'time': (60.0, None, 0.10, 's')}
+                    'daint:gpu': {'time': (54.0, None, 0.05, 's')}
                 }
             }
         }

cscs-checks/apps/spark/spark_check.py

@@ -19,8 +19,8 @@ def __init__(self):
         self.valid_prog_environs = ['builtin']
         self.modules = ['Spark']
         self.sourcesdir = None
-        self.pre_run = ['start-all.sh']
-        self.post_run = ['stop-all.sh']
+        self.prerun_cmds = ['start-all.sh']
+        self.postrun_cmds = ['stop-all.sh']
         self.num_tasks = 2
         self.num_tasks_per_node = 1
         pi_value = sn.extractsingle(r'Pi is roughly\s+(?P<pi>\S+)',

cscs-checks/apps/tensorflow/tensorflow_check.py

@@ -28,8 +28,8 @@ def __init__(self, model_name):
         # TensorFlow
         # FIXME: Currently the branch for Tensorflow 1.14.0 is not
         # available, we use the one for 1.13.0
-        # self.pre_run = ['git checkout r%s' % tf_version]
-        self.pre_run = ['git checkout r1.13.0']
+        # self.prerun_cmds = ['git checkout r%s' % tf_version]
+        self.prerun_cmds = ['git checkout r1.13.0']
         self.variables = {'PYTHONPATH': '$PYTHONPATH:.'}
 
 
@@ -74,6 +74,6 @@ def __init__(self):
                 0.85, -0.05, None)
         ])
 
-        self.pre_run += ['mkdir ./official/wide_deep/model_dir',
-                         'python3 ./official/wide_deep/census_dataset.py '
-                         '--data_dir ./official/wide_deep/']
+        self.prerun_cmds += ['mkdir ./official/wide_deep/model_dir',
+                             'python3 ./official/wide_deep/census_dataset.py '
+                             '--data_dir ./official/wide_deep/']

cscs-checks/apps/tensorflow/tf2_horovod_check.py

@@ -60,9 +60,9 @@ def __init__(self, variant):
             'NCCL_IB_CUDA_SUPPORT': '1',
             'OMP_NUM_THREADS': '$SLURM_CPUS_PER_TASK',
         }
-        self.pre_run = ['wget https://raw.githubusercontent.com/horovod/'
-                        'horovod/26b55a7890f6923ca58cdb68a765ed0ec436ab0f/'
-                        'examples/tensorflow2_synthetic_benchmark.py']
+        self.prerun_cmds = ['wget https://raw.githubusercontent.com/horovod/'
+                            'horovod/26b55a7890f6923ca58cdb68a765ed0ec436ab0f/'
+                            'examples/tensorflow2_synthetic_benchmark.py']
         self.executable = 'python'
         self.executable_opts = [
             'tensorflow2_synthetic_benchmark.py',

cscs-checks/apps/tensorflow/tf_horovod_check.py

@@ -47,7 +47,7 @@ def __init__(self, variant):
         self.sanity_patterns = sn.assert_eq(sn.count(sn.findall(
             r'total images/sec:', self.stdout)), self.num_tasks)
 
-        self.pre_run = ['git checkout cnn_tf_v%s_compatible' % tfshortver]
+        self.prerun_cmds = ['git checkout cnn_tf_v%s_compatible' % tfshortver]
         self.variables = {
             'NCCL_DEBUG': 'INFO',
             'NCCL_IB_HCA': 'ipogif0',

cscs-checks/compile/libsci_resolve.py

@@ -49,7 +49,7 @@ def __init__(self, module_name):
         # produce any output when xalt/2.7.10 is loaded, thus we use readelf
         # to find the dynamic libraries of the executable
         # self.build_system.fflags = ['-Wl,-ydgemm_']
-        self.postbuild_cmd = ['readelf -d %s' % self.executable]
+        self.postbuild_cmds = ['readelf -d %s' % self.executable]
 
     @rfm.run_before('sanity')
     def set_sanity(self):
@@ -99,7 +99,7 @@ def __init__(self):
         # to find the dynamic libraries of the executable
         # self.build_system.fflags = ['-Wl,-ydgemm_', '-mkl']
         self.build_system.fflags = ['-mkl']
-        self.postbuild_cmd = ['readelf -d %s' % self.executable]
+        self.postbuild_cmds = ['readelf -d %s' % self.executable]
         regex = (r'.*\(NEEDED\).*libmkl_(?P<prgenv>[A-Za-z]+)_(?P<version>\S+)'
                  r'\.so')
         self.sanity_patterns = sn.all([

cscs-checks/cuda/cuda_memtest_check.py

@@ -20,7 +20,7 @@ def __init__(self):
         self.modules = ['cudatoolkit']
         src_url = ('https://downloads.sourceforge.net/project/cudagpumemtest/'
                    'cuda_memtest-1.2.3.tar.gz')
-        self.prebuild_cmd = [
+        self.prebuild_cmds = [
             'wget %s' % src_url,
             'tar -xzf cuda_memtest-1.2.3.tar.gz',
             'cd cuda_memtest-1.2.3',