Merge branch 'master' into feat/config-json-schema

Author: Vasileios Karakasis

Jenkinsfile

@@ -92,15 +92,9 @@ stage('Unittest') {
                                  script: """${loginBash}
                                             echo \$SCRATCH""").trim()
                 def reframeDir = "${scratch}/${dirPrefix}-${machineName}-${uniqueID}"
-                def moduleDefinition = ''
-                if (machineName == 'leone') {
-                    moduleDefinition = '''module() { eval `/usr/bin/modulecmd bash $*`; }
-                                          export -f module'''
-                }
                 dir(reframeDir) {
                     checkout scm
                     sh("""${loginBash}
-                          ${moduleDefinition}
                           bash ${reframeDir}/${bashScript} -f ${reframeDir} -i ''""")
                 }
             }

ci-scripts/ci-runner.bash

@@ -41,15 +41,15 @@ checked_exec()
 
 run_tutorial_checks()
 {
-    cmd="./bin/reframe -C tutorial/config/settings.py --exec-policy=async \
+    cmd="./bin/reframe -C tutorial/config/settings.py \
 --save-log-files -r -t tutorial $@"
     echo "Running tutorial checks with \`$cmd'"
     checked_exec $cmd
 }
 
 run_user_checks()
 {
-    cmd="./bin/reframe -C config/cscs.py --exec-policy=async --save-log-files \
+    cmd="./bin/reframe -C config/cscs.py --save-log-files \
 -r --flex-alloc-nodes=2 -t production|benchmark $@"
     echo "Running user checks with \`$cmd'"
     checked_exec $cmd
@@ -160,10 +160,7 @@ elif [ $CI_TUTORIAL -eq 1 ]; then
                        grep -e '^tutorial/(?!config/).*\.py') )
 
     if [ ${#tutorialchecks[@]} -ne 0 ]; then
-        tutorialchecks_path=""
-        for check in ${tutorialchecks[@]}; do
-            tutorialchecks_path="${tutorialchecks_path} -c ${check}"
-        done
+        tutorialchecks_path="-c $(IFS=: eval 'echo "${tutorialchecks[*]}"')"
 
         echo "========================"
         echo "Modified tutorial checks"
@@ -197,10 +194,7 @@ else
     userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
                    grep -e '^cscs-checks/.*\.py') )
     if [ ${#userchecks[@]} -ne 0 ]; then
-        userchecks_path=""
-        for check in ${userchecks[@]}; do
-            userchecks_path="${userchecks_path} -c ${check}"
-        done
+        userchecks_path="-c $(IFS=: eval 'echo "${userchecks[*]}"')"
 
         echo "===================="
         echo "Modified user checks"

cscs-checks/cuda/cuda_checks.py

@@ -1,12 +1,10 @@
 import os
-
 import reframe as rfm
 import reframe.utility.sanity as sn
 
 
 class CudaCheck(rfm.RegressionTest):
     def __init__(self):
-        super().__init__()
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn', 'tiger:gpu']
         self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu']
         if self.current_system.name == 'kesch':
@@ -81,7 +79,7 @@ def __init__(self):
         self.descr = 'Simple example demonstrating how to use MPI with CUDA'
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'CUDA', 'simplempi')
-        self.executable = 'simplempi'
+        self.executable = './simplempi'
         self.num_tasks = 2
         self.num_tasks_per_node = 2
         self.sanity_patterns = sn.assert_found(r'Result = PASS', self.stdout)

cscs-checks/libraries/io/hdf5_compile_run.py

@@ -7,7 +7,6 @@
                           for linkage in ['static', 'dynamic']))
 class HDF5Test(rfm.RegressionTest):
     def __init__(self, lang, linkage):
-        super().__init__()
         lang_names = {
             'c': 'C',
             'f90': 'Fortran 90'
@@ -20,6 +19,7 @@ def __init__(self, lang, linkage):
                                     'PrgEnv-intel', 'PrgEnv-pgi']
         self.modules = ['cray-hdf5']
         self.keep_files = ['h5dump_out.txt']
+
         # C and Fortran write transposed matrix
         if lang == 'c':
             self.sanity_patterns = sn.all([

cscs-checks/libraries/io/netcdf_compile_run.py

@@ -9,7 +9,6 @@
                           for linkage in ['dynamic', 'static']))
 class NetCDFTest(rfm.RegressionTest):
     def __init__(self, lang, linkage):
-        super().__init__()
         lang_names = {
             'c': 'C',
             'cpp': 'C++',
@@ -42,7 +41,9 @@ def __init__(self, lang, linkage):
         self.maintainers = ['AJ', 'SO']
         self.tags = {'production', 'craype', 'external-resources'}
 
-    def setup(self, partition, environ, **job_opts):
+    @rfm.run_before('compile')
+    def setflags(self):
+        environ = self.current_environ
         if self.current_system.name == 'kesch':
             if environ.name == 'PrgEnv-cray-nompi':
                 self.modules = ['netcdf/4.4.1.1-gmvolf-17.02',
@@ -83,5 +84,3 @@ def setup(self, partition, environ, **job_opts):
                 ]
         else:
             self.build_system.ldflags = ['-%s' % self.linkage]
-
-        super().setup(partition, environ, **job_opts)

cscs-checks/libraries/math/scalapack_compile_run.py

@@ -6,7 +6,6 @@
 
 class ScaLAPACKTest(rfm.RegressionTest):
     def __init__(self, linkage):
-        super().__init__()
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'scalapack')
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc',
@@ -16,7 +15,6 @@ def __init__(self, linkage):
         self.num_tasks = 16
         self.num_tasks_per_node = 8
         self.variables = {'CRAYPE_LINK_TYPE': linkage}
-
         if self.current_system.name == 'kesch':
             self.exclusive_access = True
             self.valid_prog_environs = ['PrgEnv-cray']

cscs-checks/libraries/math/trilinos_compile_run.py

@@ -6,7 +6,6 @@
 @rfm.parameterized_test(['static'], ['dynamic'])
 class TrilinosTest(rfm.RegressionTest):
     def __init__(self, linkage):
-        super().__init__()
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
                               'tiger:gpu']
         # NOTE: PrgEnv-cray in dynamic does not work because of CrayBug/809265
@@ -38,7 +37,7 @@ def __init__(self, linkage):
         self.maintainers = ['AJ', 'CB']
         self.tags = {'production', 'craype'}
 
-    def setup(self, partition, environ, **job_opts):
-        prgenv_flags = self.prgenv_flags[environ.name]
-        self.build_system.cxxflags = prgenv_flags
-        super().setup(partition, environ, **job_opts)
+    @rfm.run_before('compile')
+    def set_cxxflags(self):
+        flags = self.prgenv_flags[self.current_environ.name]
+        self.build_system.cxxflags = flags

cscs-checks/libraries/petsc/petsc_helloworld.py

@@ -5,28 +5,28 @@
 @rfm.required_version('>=2.14')
 @rfm.parameterized_test(['dynamic'], ['static'])
 class PetscPoisson2DCheck(rfm.RegressionTest):
-    def __init__(self, variant):
-        super().__init__()
+    def __init__(self, linkage):
         self.descr = ('Compile/run PETSc 2D Poisson example with cray-petsc '
-                      '(%s linking)') % variant
+                      '(%s linking)') % linkage
         self.valid_systems = ['daint:gpu', 'daint:mc',
                               'dom:gpu', 'dom:mc', 'tiger:gpu']
-        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
-                                    'PrgEnv-intel']
+        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu']
+        if linkage == 'dynamic':
+            # FIXME: static compilation yields a link error in case of
+            # PrgEnv-intel (Cray Bug #255701)
+            self.valid_prog_environs += ['PrgEnv-intel']
+
         self.sourcepath = 'poisson2d.c'
         self.modules = ['cray-petsc']
         self.num_tasks = 16
         self.num_tasks_per_node = 8
         self.build_system = 'SingleSource'
-        if variant == 'dynamic':
-            self.build_system.cflags = ['-dynamic']
-
+        self.variables = {'CRAYPE_LINK_TYPE': linkage}
         self.executable_opts = ['-da_grid_x 4', '-da_grid_y 4', '-ksp_monitor']
 
         # Check the final residual norm for convergence
         norm = sn.extractsingle(r'\s+\d+\s+KSP Residual norm\s+(?P<norm>\S+)',
                                 self.stdout, 'norm', float, -1)
         self.sanity_patterns = sn.assert_lt(norm, 1.0e-5)
-
         self.tags = {'production', 'craype'}
         self.maintainers = ['AJ', 'CB']

cscs-checks/mch/g2g_meteoswiss_check.py

@@ -5,13 +5,9 @@
 @rfm.parameterized_test([1], [2])
 class G2GMeteoswissTest(rfm.RegressionTest):
     def __init__(self, g2g):
-        super().__init__()
         self.descr = 'G2G Meteoswiss check with G2G=%s' % g2g
         self.strict_check = False
         self.valid_systems = ['kesch:cn']
-
-        # FIXME: temporary workaround until the mvapich module is fixed;
-        #        'PrgEnv-gnu-c2sm-gpu' will be added later
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.exclusive_access = True
         self.modules = ['cmake']

cscs-checks/mch/gpu_direct_cuda.py

@@ -6,11 +6,8 @@
 @rfm.simple_test
 class GpuDirectCudaCheck(rfm.RegressionTest):
     def __init__(self):
-        super().__init__()
         self.descr = 'tests gpu-direct for CUDA'
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn', 'tiger:gpu']
-        # FIXME: temporary workaround until the mvapich module is fixed
-        #        'PrgEnv-gnu-c2sm-gpu' will be added later
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.sourcepath = 'gpu_direct_cuda.cu'
         self.build_system = 'SingleSource'