Merge branch 'master' into docs/renew-tutorial

Author: Vasileios Karakasis

bin/reframe

@@ -8,7 +8,9 @@
 import os
 import sys
 
-prefix = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..')
+prefix = os.path.normpath(
+    os.path.join(os.path.abspath(os.path.dirname(__file__)), '..')
+)
 external = os.path.join(prefix, 'external')
 sys.path = [prefix, external] + sys.path
 

config/cscs-ci.py

@@ -26,7 +26,8 @@
                     ],
                     'access': [
                         '--constraint=gpu',
-                        '--partition=cscsci'
+                        '--partition=cscsci',
+                        '--account=jenscscs'
                     ],
                     'environs': [
                         'builtin'
@@ -61,7 +62,8 @@
                         'daint-gpu'
                     ],
                     'access': [
-                        '--constraint=gpu'
+                        '--constraint=gpu',
+                        '--account=jenscscs'
                     ],
                     'environs': [
                         'builtin'
@@ -85,7 +87,8 @@
                         'daint-gpu'
                     ],
                     'access': [
-                        'proc=gpu'
+                        'proc=gpu',
+                        '-A jenscscs'
                     ],
                     'environs': [
                         'builtin'
@@ -101,7 +104,8 @@
                         'daint-gpu'
                     ],
                     'access': [
-                        '-l proc=gpu'
+                        '-l proc=gpu',
+                        '-A jenscscs'
                     ],
                     'environs': [
                         'builtin'

reframe/__init__.py

@@ -8,7 +8,9 @@
 
 
 VERSION = '3.1-dev1'
-INSTALL_PREFIX = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+INSTALL_PREFIX = os.path.normpath(
+    os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+)
 MIN_PYTHON_VERSION = (3, 6, 0)
 
 # Check python version

reframe/core/decorators.py

@@ -227,9 +227,13 @@ def require_deps(func):
     The converted arguments are essentially functions accepting a single
     argument, which is the target test's programming environment.
 
+    Additionally, this decorator will attach the function to run *after* the
+    test's setup phase, but *before* any other "post_setup" pipeline hook.
+
     This decorator is also directly available under the :mod:`reframe` module.
 
     .. versionadded:: 2.21
+
     '''
     tests = inspect.getfullargspec(func).args[1:]
     func._rfm_resolve_deps = True

reframe/frontend/cli.py

@@ -418,6 +418,15 @@ def main():
         for err in options.update_config(site_config):
             printer.warning(str(err))
 
+        # Update options from the selected execution mode
+        if options.mode:
+            mode_args = site_config.get(f'modes/@{options.mode}/options')
+
+            # Parse the mode's options and reparse the command-line
+            options = argparser.parse_args(mode_args)
+            options = argparser.parse_args(namespace=options.cmd_options)
+            options.update_config(site_config)
+
         logging.configure_logging(site_config)
     except (OSError, ConfigError) as e:
         printer.error(f'failed to load configuration: {e}')
@@ -447,18 +456,6 @@ def main():
         printer.error('could not load module mappings: %s' % e)
         sys.exit(1)
 
-    if options.mode:
-        try:
-            mode_args = rt.get_option(f'modes/@{options.mode}/options')
-
-            # Parse the mode's options and reparse the command-line
-            options = argparser.parse_args(mode_args)
-            options = argparser.parse_args(namespace=options.cmd_options)
-            options.update_config(rt.site_config)
-        except ConfigError as e:
-            printer.error('could not obtain execution mode: %s' % e)
-            sys.exit(1)
-
     if (os_ext.samefile(rt.stage_prefix, rt.output_prefix) and
         not site_config.get('general/0/keep_stage_files')):
         printer.error("stage and output refer to the same directory; "