Merge branch 'master' into doc/fix-container-example

Author: Vasileios Karakasis

cscs-checks/apps/gromacs/gromacs_check.py

@@ -51,7 +51,7 @@ def __init__(self, output_file):
 class GromacsGPUCheck(GromacsBaseCheck):
     def __init__(self, scale, variant):
         super().__init__('md.log')
-        self.valid_systems = ['daint:gpu']
+        self.valid_systems = ['daint:gpu', 'tiger:gpu']
         self.descr = 'GROMACS GPU check'
         self.executable_opts = ['mdrun', '-dlb yes', '-ntomp 1', '-npme 0',
                                 '-s herflat.tpr']

cscs-checks/apps/tensorflow/tensorflow_check.py

@@ -15,7 +15,7 @@ def __init__(self, model_name):
         self.num_gpus_per_node = 1
         tf_version = '1.14.0'
         cuda_version = '10.1.168'
-        tc_version = '19.09'
+        tc_version = '19.10'
         self.modules = ['TensorFlow/%s-CrayGNU-%s-cuda-%s-python3' %
                         (tf_version, tc_version, cuda_version)]
 

cscs-checks/apps/tensorflow/tf_horovod_check.py

@@ -11,7 +11,7 @@ def __init__(self, variant):
         self.valid_prog_environs = ['PrgEnv-gnu']
         tfshortver = '1.14'
         self.sourcesdir = 'https://github.com/tensorflow/benchmarks'
-        self.modules = ['Horovod/0.16.4-CrayGNU-19.09-tf-%s.0' % tfshortver]
+        self.modules = ['Horovod/0.16.4-CrayGNU-19.10-tf-%s.0' % tfshortver]
         if variant == 'small':
             self.valid_systems += ['dom:gpu']
             self.num_tasks = 8

cscs-checks/libraries/boost/boost_python_check.py

@@ -2,7 +2,7 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.parameterized_test(['1.70.0', '19.09', '2.7'], ['1.70.0', '19.09', '3.6'])
+@rfm.parameterized_test(['1.70.0', '19.10', '2.7'], ['1.70.0', '19.10', '3.6'])
 class BoostCrayGnuPythonTest(rfm.RegressionTest):
     def __init__(self, boost_version, cray_gnu_version, python_version):
         self.descr = ('Test for Boost-%s for CrayGnu-%s with python %s '

cscs-checks/tools/profiling_and_debugging/scorep_mpi_omp.py

@@ -13,15 +13,14 @@ def __init__(self, lang):
         self.descr = 'SCORE-P %s check' % lang
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
 
-        # Score-P fails with latest clang based cce compiler:
+        # Score-P fails with latest clang based cce and pgi compilers:
         # src/measurement/thread/fork_join/scorep_thread_fork_join_omp.c:402:
         # Fatal: Bug 'TPD == 0': Invalid OpenMP thread specific data object.
         # -> removing cce from supported compiler for now.
-        self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi']
+        self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel']
         self.prgenv_flags = {
             'PrgEnv-gnu': ['-g', '-fopenmp'],
             'PrgEnv-intel': ['-g', '-openmp'],
-            'PrgEnv-pgi': ['-g', '-mp']
         }
         self.sourcesdir = os.path.join('src', lang)
         self.executable = 'jacobi'
@@ -62,7 +61,7 @@ def __init__(self, lang):
 
     def setup(self, partition, environ, **job_opts):
         scorep_ver = '6.0'
-        tc_ver = '19.09'
+        tc_ver = '19.10'
         cu_ver = '10.1'
         self.scorep_modules = {
             'PrgEnv-gnu': ['Score-P/%s-CrayGNU-%s' % (scorep_ver, tc_ver)],
@@ -81,6 +80,4 @@ def setup(self, partition, environ, **job_opts):
         self.build_system.cxxflags = prgenv_flags
         self.build_system.fflags = prgenv_flags
         self.build_system.ldflags = ['-lm']
-        self.build_system.options = [
-            "PREP='scorep --nopreprocess --mpp=mpi --thread=omp'"
-        ]
+        self.build_system.options = ["PREP='scorep --mpp=mpi --thread=omp'"]

cscs-checks/tools/profiling_and_debugging/src/F90/_main.F90

@@ -118,8 +118,13 @@ subroutine Init (myData)
         endif
         call MPI_Get_version(version, subversion, iErr)
         write (6,'(3(A,I1))') 'MPI-', version, '.', subversion, '#', provided
+#ifdef _OPENMP
         write (6,*) 'Jacobi', myData%iNumProcs, 'MPI process(es) with', &
-                    omp_get_max_threads(), 'OpenMP-', _OPENMP, ' thread(s)/process'
+              omp_get_max_threads(), 'OpenMP-', _OPENMP, ' thread(s)/process'
+#else
+        write (6,*) 'Jacobi', myData%iNumProcs, 'MPI process(es) with', &
+               ' 0 OpenMP-xxx thread(s)/process'
+#endif
 
 ! MPI_Get_library_version:
         call MPI_Get_library_version(mpilibversion, resultlen, iErr)