Merge branch 'master' into doc/expand-tutorials

Author: Vasileios Karakasis

cscs-checks/analytics/spark/spark_check.py

@@ -62,12 +62,15 @@ def __init__(self, module_name):
             sn.assert_found(f'{envvar_prefix}_VERSION', self.stderr)
         ])
 
-        # These modules should be fixed in later releases
+        # FIXME: These modules should be fixed in later releases,
+        # while gcc was fixed in 20.11
+
         cdt = osext.cray_cdt_version()
-        if (cdt and cdt <= '20.10' and
-            module_name in ['cray-petsc-complex',
-                            'cray-petsc-complex-64',
-                            'cudatoolkit', 'gcc']):
+        if ((cdt and cdt <= '20.11' and
+             module_name in ['cray-petsc-complex',
+                             'cray-petsc-complex-64',
+                             'cudatoolkit']) or
+            (cdt and cdt < 20.11 and module_name == 'gcc')):
             self.valid_systems = []
 
         self.maintainers = ['EK', 'VH']

cscs-checks/analytics/spark/src/spark_pi.py

@@ -112,7 +112,7 @@ def __init__(self):
 
     @rfm.run_before('run')
     def set_memory_limit(self):
-        self.job.options += ['--mem=120000']
+        self.job.options = ['--mem=120000']
 
 
 @rfm.simple_test
@@ -171,7 +171,7 @@ def __init__(self):
     def set_slurm_constraint(self):
         cabinet = self.cabinets.get(self.current_partition.fullname)
         if cabinet:
-            self.job.options += [f'--constraint={cabinet}']
+            self.job.options = [f'--constraint={cabinet}']
 
 
 @rfm.simple_test
@@ -188,7 +188,7 @@ def __init__(self):
 
     @rfm.run_before('run')
     def set_memory_limit(self):
-        self.job.options += ['--mem=2000']
+        self.job.options = ['--mem=2000']
 
 
 @rfm.simple_test

cscs-checks/prgenv/environ_check.py

@@ -192,9 +192,10 @@ You can view logger's log level as a general cut off.
 For example, if we have set it to ``warning``, no debug or informational messages would ever be printed.
 
 Finally, there is a special set of handlers for handling performance log messages.
-These are stored in the ``handlers_perflog`` property.
-The performance handler in this example will create a file per test and per system/partition combination and will append the performance data to it every time the test is run.
-Notice in the ``format`` property how the message to be logged is structured such that it can be easily parsed from post processing tools.
+Performance log messages are generated *only* for `performance tests <tutorial_basics.html#writing-a-performance-test>`__, i.e., tests defining the :attr:`perf_patterns <reframe.core.pipeline.RegressionTest.perf_patterns>` attribute.
+The performance log handlers are stored in the ``handlers_perflog`` property.
+The ``filelog`` handler used in this example will create a file per test and per system/partition combination (``./<system>/<partition>/<testname>.log``) and will append to it the obtained performance data every time a performance test is run.
+Notice how the message to be logged is structured in the ``format`` property, such that it can be easily parsed from post processing tools.
 Apart from file logging, ReFrame offers more advanced performance logging capabilities through Syslog and Graylog.
 
 

cscs-checks/system/slurm/slurm.py

@@ -61,7 +61,6 @@ def resolve_dep(src, dst):
     # c stands for check or case depending on the context
     # p stands for partition
     # e stands for environment
-    # t stands for target
 
     # We use an ordered dict here, because we need to keep the order of
     # partitions and environments
@@ -79,8 +78,23 @@ def resolve_dep(src, dst):
                     if when((psrc, esrc), (pdst, edst)):
                         c.deps.append(d)
         except DependencyError as e:
-            getlogger().warning(f'{e}; skipping test case...')
-            skipped_cases.append(c)
+            getlogger().warning(f'{e}; skipping dependent test cases:')
+
+            # FIXME: we need to unit test this properly
+            skip_nodes = {c}
+            while skip_nodes:
+                v = skip_nodes.pop()
+                skipped_cases.append(v)
+                getlogger().warning(f'  - {v}')
+                pruned_nodes = []
+                for u, adj in graph.items():
+                    if v in adj:
+                        skip_nodes.add(u)
+                        pruned_nodes.append(u)
+
+                for u in pruned_nodes:
+                    del graph[u]
+
             continue
 
         graph[c] = util.OrderedSet(c.deps)

docs/configure.rst

@@ -30,7 +30,7 @@ def tasks(self, run=-1):
         try:
             return self._alltasks[run]
         except IndexError:
-            raise errors.StatisticsError('no such run: %s' % run) from None
+            raise errors.StatisticsError(f'no such run: {run}') from None
 
     def failures(self, run=-1):
         return [t for t in self.tasks(run) if t.failed]
@@ -58,11 +58,10 @@ def retry_report(self):
                 if t.check.current_environ:
                     environ_name = t.check.current_environ.name
 
-                key = '%s:%s:%s' % (t.check.name, partition_name, environ_name)
                 # Overwrite entry from previous run if available
-                messages[key] = (
-                    '  * Test %s was retried %s time(s) and %s.' %
-                    (t.check.info(), run, 'failed' if t.failed else 'passed')
+                messages[f"{t.check.name}:{partition_name}:{environ_name}"] = (
+                    f"  * Test {t.check.info()} was retried {run} time(s) and "
+                    f"{'failed' if t.failed else 'passed'}."
                 )
 
         for key in sorted(messages.keys()):
@@ -208,7 +207,7 @@ def print_failure_report(self, printer):
             printer.info(f"  * Maintainers: {r['maintainers']}")
             printer.info(f"  * Failing phase: {r['fail_phase']}")
             printer.info(f"  * Rerun with '-n {r['name']}"
-                         f" -p {r['environment']} --system {r['system']}'")
+                         f" -p {r['environment']} --system {r['system']} -r'")
             printer.info(f"  * Reason: {r['fail_reason']}")
 
             tb = ''.join(traceback.format_exception(*r['fail_info'].values()))
@@ -248,8 +247,8 @@ def print_failure_stats(self, printer):
             num_failures += len(l)
 
         stats_body = ['']
-        stats_body.append('Total number of test cases: %s' % num_tests)
-        stats_body.append('Total number of failures: %s' % num_failures)
+        stats_body.append(f'Total number of test cases: {num_tests}')
+        stats_body.append(f'Total number of failures: {num_failures}')
         stats_body.append('')
         stats_body.append(stats_header)
         stats_body.append(stats_hline)
@@ -276,16 +275,16 @@ def performance_report(self):
             if t.check.perfvalues.keys():
                 if t.check.name != previous_name:
                     report_body.append(line_width * '-')
-                    report_body.append('%s' % t.check.name)
+                    report_body.append(t.check.name)
                     previous_name = t.check.name
 
                 if t.check.current_partition.fullname != previous_part:
                     report_body.append(
-                        '- %s' % t.check.current_partition.fullname)
+                        f'- {t.check.current_partition.fullname}')
                     previous_part = t.check.current_partition.fullname
 
-                report_body.append('   - %s' % t.check.current_environ)
-                report_body.append('      * num_tasks: %s' % t.check.num_tasks)
+                report_body.append(f'   - {t.check.current_environ}')
+                report_body.append(f'      * num_tasks: {t.check.num_tasks}')
 
             for key, ref in t.check.perfvalues.items():
                 var = key.split(':')[-1]
@@ -295,7 +294,7 @@ def performance_report(self):
                 except IndexError:
                     unit = '(no unit specified)'
 
-                report_body.append('      * %s: %s %s' % (var, val, unit))
+                report_body.append(f'      * {var}: {val} {unit}')
 
         if report_body:
             return '\n'.join([report_start, report_title, *report_body,