Merge branch 'master' into sanity_slurm_tests

Author: ChristopherBignamini

config/cscs.py

@@ -826,7 +826,7 @@
         {
             'name': 'PrgEnv-pgi-nompi-nocuda',
             'target_systems': [
-                'arolla', 'tsa'
+                'arolla',
             ],
             'modules': [
                 'PrgEnv-pgi/19.9-nocuda'
@@ -835,10 +835,22 @@
             'cxx': 'pgc++',
             'ftn': 'pgf90'
         },
+        {
+            'name': 'PrgEnv-pgi-nompi-nocuda',
+            'target_systems': [
+                'tsa',
+            ],
+            'modules': [
+                'PrgEnv-pgi/20.4-nocuda'
+            ],
+            'cc': 'pgcc',
+            'cxx': 'pgc++',
+            'ftn': 'pgf90'
+        },
         {
             'name': 'PrgEnv-pgi-nompi',
             'target_systems': [
-                'arolla', 'tsa'
+                'arolla',
             ],
             'modules': [
                 'PrgEnv-pgi/19.9'
@@ -847,10 +859,22 @@
             'cxx': 'pgc++',
             'ftn': 'pgf90'
         },
+        {
+            'name': 'PrgEnv-pgi-nompi',
+            'target_systems': [
+                'tsa',
+            ],
+            'modules': [
+                'PrgEnv-pgi/20.4'
+            ],
+            'cc': 'pgcc',
+            'cxx': 'pgc++',
+            'ftn': 'pgf90'
+        },
         {
             'name': 'PrgEnv-pgi',
             'target_systems': [
-                'arolla', 'tsa'
+                'arolla',
             ],
             'modules': [
                 'PrgEnv-pgi/19.9'
@@ -859,10 +883,22 @@
             'cxx': 'mpicxx',
             'ftn': 'mpifort'
         },
+        {
+            'name': 'PrgEnv-pgi',
+            'target_systems': [
+                'tsa',
+            ],
+            'modules': [
+                'PrgEnv-pgi/20.4'
+            ],
+            'cc': 'mpicc',
+            'cxx': 'mpicxx',
+            'ftn': 'mpifort'
+        },
         {
             'name': 'PrgEnv-pgi-nocuda',
             'target_systems': [
-                'arolla', 'tsa'
+                'arolla',
             ],
             'modules': [
                 'PrgEnv-pgi/19.9-nocuda'
@@ -871,6 +907,18 @@
             'cxx': 'mpicxx',
             'ftn': 'mpifort'
         },
+        {
+            'name': 'PrgEnv-pgi-nocuda',
+            'target_systems': [
+                'tsa',
+            ],
+            'modules': [
+                'PrgEnv-pgi/20.4-nocuda'
+            ],
+            'cc': 'mpicc',
+            'cxx': 'mpicxx',
+            'ftn': 'mpifort'
+        },
         {
             'name': 'PrgEnv-gnu',
             'target_systems': [

cscs-checks/apps/pytorch/pytorch_horovod_check.py

@@ -5,7 +5,6 @@
 
 import reframe as rfm
 import reframe.utility.sanity as sn
-import reframe.utility.osext as osext
 
 
 @rfm.parameterized_test(*[[model, mpi_task]
@@ -19,8 +18,7 @@ def __init__(self, model, mpi_task):
             self.valid_systems += ['dom:gpu']
 
         self.valid_prog_environs = ['builtin']
-        cray_cdt_version = osext.cray_cdt_version()
-        self.modules = [f'Horovod/0.19.5-CrayGNU-{cray_cdt_version}-pt-1.6.0']
+        self.modules = ['PyTorch']
         self.num_tasks_per_node = 1
         self.num_cpus_per_task = 12
         self.num_tasks = mpi_task

reframe/__init__.py

@@ -6,7 +6,7 @@
 import os
 import sys
 
-VERSION = '3.6.0-dev.0'
+VERSION = '3.6.0-dev.1'
 INSTALL_PREFIX = os.path.normpath(
     os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 )

reframe/core/decorators.py

@@ -20,7 +20,9 @@
 import traceback
 
 import reframe.utility.osext as osext
-from reframe.core.exceptions import ReframeSyntaxError, user_frame
+from reframe.core.exceptions import (ReframeSyntaxError,
+                                     SkipTestError,
+                                     user_frame)
 from reframe.core.logging import getlogger
 from reframe.core.pipeline import RegressionTest
 from reframe.utility.versioning import VersionValidator
@@ -54,12 +56,15 @@ def _instantiate_all():
 
             try:
                 ret.append(_instantiate(cls, args))
+            except SkipTestError as e:
+                getlogger().warning(f'skipping test {cls.__name__!r}: {e}')
             except Exception:
                 frame = user_frame(*sys.exc_info())
-                msg = "skipping test due to errors: %s: " % cls.__name__
-                msg += "use `-v' for more information\n"
-                msg += "  FILE: %s:%s" % (frame.filename, frame.lineno)
-                getlogger().warning(msg)
+                getlogger().warning(
+                    f"skipping test {cls.__name__!r} due to errors: "
+                    f"use `-v' for more information\n"
+                    f"    FILE: {frame.filename}:{frame.lineno}"
+                )
                 getlogger().verbose(traceback.format_exc())
 
         return ret

reframe/core/exceptions.py

@@ -7,6 +7,7 @@
 # Base regression exceptions
 #
 
+import contextlib
 import inspect
 import os
 import sys
@@ -156,12 +157,23 @@ class ContainerError(ReframeError):
 class BuildError(ReframeError):
     '''Raised when a build fails.'''
 
-    def __init__(self, stdout, stderr):
+    def __init__(self, stdout, stderr, prefix=None):
         super().__init__()
-        self._message = (
-            "standard error can be found in `%s', "
-            "standard output can be found in `%s'" % (stderr, stdout)
-        )
+        num_lines = 10
+        prefix = prefix or '.'
+        lines = [
+            f'stdout: {stdout!r}, stderr: {stderr!r}',
+            f'--- {stderr} (first {num_lines} lines) ---'
+        ]
+        with contextlib.suppress(OSError):
+            with open(os.path.join(prefix, stderr)) as fp:
+                for i, line in enumerate(fp):
+                    if i < num_lines:
+                        # Remove trailing '\n'
+                        lines.append(line[:-1])
+
+        lines += [f'--- {stderr} --- ']
+        self._message = '\n'.join(lines)
 
 
 class SpawnedProcessError(ReframeError):
@@ -276,6 +288,10 @@ class DependencyError(ReframeError):
     '''Raised when a dependency problem is encountered.'''
 
 
+class SkipTestError(ReframeError):
+    '''Raised when a test needs to be skipped.'''
+
+
 def user_frame(exc_type, exc_value, tb):
     '''Return a user frame from the exception's traceback.
 

reframe/core/meta.py

@@ -32,6 +32,7 @@ def __setitem__(self, key, value):
             if isinstance(value, variables.TestVar):
                 # Insert the attribute in the variable namespace
                 self['_rfm_local_var_space'][key] = value
+                value.__set_name__(self, key)
 
                 # Override the regular class attribute (if present)
                 self._namespace.pop(key, None)
@@ -64,9 +65,7 @@ def __getitem__(self, key):
             except KeyError as err:
                 try:
                     # Handle variable access
-                    v = self['_rfm_local_var_space'][key]
-                    v.__set_name__(self, key)
-                    return v
+                    return self['_rfm_local_var_space'][key]
 
                 except KeyError:
                     # Handle parameter access
@@ -81,12 +80,10 @@ def __getitem__(self, key):
                         # available in the current class' namespace.
                         for b in self['_rfm_bases']:
                             if key in b._rfm_var_space:
-                                v = b._rfm_var_space[key]
-                                v.__set_name__(self, key)
-
                                 # Store a deep-copy of the variable's
                                 # value and return.
-                                self._namespace[key] = v.default_value
+                                v = b._rfm_var_space[key].default_value
+                                self._namespace[key] = v
                                 return self._namespace[key]
 
                         # If 'key' is neither a variable nor a parameter,

reframe/core/parameters.py

@@ -46,9 +46,6 @@ def filter_params(x):
         self.values = tuple(values)
         self.filter_params = filter_params
 
-    def __set_name__(self, owner, name):
-        self.name = name
-
 
 class ParamSpace(namespaces.Namespace):
     ''' Regression test parameter space

reframe/core/pipeline.py

@@ -37,8 +37,8 @@
 from reframe.core.containers import ContainerPlatformField
 from reframe.core.deferrable import _DeferredExpression
 from reframe.core.exceptions import (BuildError, DependencyError,
-                                     PipelineError, SanityError,
-                                     PerformanceError)
+                                     PerformanceError, PipelineError,
+                                     SanityError, SkipTestError)
 from reframe.core.meta import RegressionTestMeta
 from reframe.core.schedulers import Job
 from reframe.core.warnings import user_deprecation_warning
@@ -603,7 +603,7 @@ def pipeline_hooks(cls):
     #:
     #:       ::
     #:
-    #:           self.sanity_patterns = sn.assert_found(r'.*', self.stdout)
+    #:           self.sanity_patterns = sn.assert_true(1)
     sanity_patterns = variable(_DeferredExpression, type(None), value=None)
 
     #: Patterns for verifying the performance of this test.
@@ -1294,7 +1294,8 @@ def compile_wait(self):
 
         # We raise a BuildError when we an exit code and it is non zero
         if self._build_job.exitcode:
-            raise BuildError(self._build_job.stdout, self._build_job.stderr)
+            raise BuildError(self._build_job.stdout,
+                             self._build_job.stderr, self._stagedir)
 
         self.build_system.post_build(self._build_job)
 
@@ -1842,6 +1843,26 @@ def getdep(self, target, environ=None, part=None):
         raise DependencyError(f'could not resolve dependency to ({target!r}, '
                               f'{part!r}, {environ!r})')
 
+    def skip(self, msg=None):
+        '''Skip test.
+
+        :arg msg: A message explaining why the test was skipped.
+
+        .. versionadded:: 3.5.1
+        '''
+        raise SkipTestError(msg)
+
+    def skip_if(self, cond, msg=None):
+        '''Skip test if condition is true.
+
+        :arg cond: The condition to check for skipping the test.
+        :arg msg: A message explaining why the test was skipped.
+
+        .. versionadded:: 3.5.1
+        '''
+        if cond:
+            self.skip(msg)
+
     def __str__(self):
         return "%s(name='%s', prefix='%s')" % (type(self).__name__,
                                                self.name, self.prefix)