Merge branch 'master' into doc/copyright-dates

Author: Vasileios Karakasis

docs/advanced.rst

@@ -227,7 +227,7 @@ The important bit here is the following line that sets the time limit for the te
   :lines: 17
   :dedent: 8
 
-The :attr:`time_limit <reframe.core.pipeline.RegressionTest.time_limit>` attribute is a three-tuple in the form ``(HOURS, MINUTES, SECONDS)``.
+The :attr:`time_limit <reframe.core.pipeline.RegressionTest.time_limit>` attribute is a string in the form ``<DAYS>d<HOURS>h<MINUTES>m<SECONDS>s)``.
 Time limits are implemented for all the scheduler backends.
 
 The sanity condition for this test verifies that associated job has been canceled due to the time limit (note that this message is SLURM-specific).

docs/tutorial.rst

@@ -527,7 +527,7 @@ For schedulers that do not provide the same functionality, some of the variables
 ================================================ ===========================================
       :class:`RegressionTest` attribute                    Corresponding SLURM option
 ================================================ ===========================================
-      ``time_limit = (0, 10, 30)``                         ``--time=00:10:30``
+      ``time_limit = '10m30s``                             ``--time=00:10:30``
       ``use_multithreading = True``                        ``--hint=multithread``
       ``use_multithreading = False``                       ``--hint=nomultithread``
       ``exclusive_access = True``                          ``--exclusive``

reframe/core/fields.py

@@ -8,7 +8,9 @@
 #
 
 import copy
+import datetime
 import os
+import re
 
 import reframe.utility.typecheck as types
 from reframe.core.exceptions import user_deprecation_warning
@@ -105,23 +107,32 @@ def __set__(self, obj, value):
 
 
 class TimerField(TypedField):
-    '''Stores a timer in the form of a tuple ``(hh, mm, ss)``'''
+    '''Stores a timer in the form of a :class:`datetime.timedelta` object'''
 
     def __init__(self, fieldname, *other_types):
-        super().__init__(fieldname, types.Tuple[int, int, int], *other_types)
+        super().__init__(fieldname, datetime.timedelta, str,
+                         types.Tuple[int, int, int], *other_types)
 
     def __set__(self, obj, value):
         self._check_type(value)
-        if value is not None:
-            # Check also the values for minutes and seconds
+        if isinstance(value, tuple):
+            user_deprecation_warning(
+                "setting a timer field from a tuple is deprecated: "
+                "please use a string '<days>d<hours>h<minutes>m<seconds>s'")
             h, m, s = value
-            if h < 0 or m < 0 or s < 0:
-                raise ValueError('timer field must have '
-                                 'non-negative values')
-
-            if m > 59 or s > 59:
-                raise ValueError('minutes and seconds in a timer '
-                                 'field must not exceed 59')
+            value = datetime.timedelta(hours=h, minutes=m, seconds=s)
+
+        if isinstance(value, str):
+            time_match = re.match(r'^((?P<days>\d+)d)?'
+                                  r'((?P<hours>\d+)h)?'
+                                  r'((?P<minutes>\d+)m)?'
+                                  r'((?P<seconds>\d+)s)?$',
+                                  value)
+            if not time_match:
+                raise ValueError('invalid format for timer field')
+
+            value = datetime.timedelta(
+                **{k: int(v) for k, v in time_match.groupdict().items() if v})
 
         # Call Field's __set__() method, type checking is already performed
         Field.__set__(self, obj, value)

reframe/core/launchers/mpi.py

@@ -5,6 +5,7 @@
 
 from reframe.core.launchers import JobLauncher
 from reframe.core.launchers.registry import register_launcher
+from reframe.utility import seconds_to_hms
 
 
 @register_launcher('srun')
@@ -57,7 +58,8 @@ def command(self, job):
             ret += ['--job-name=%s' % job.name]
 
         if job.time_limit:
-            ret += ['--time=%d:%d:%d' % job.time_limit]
+            h, m, s = seconds_to_hms(job.time_limit.total_seconds())
+            ret += ['--time=%d:%d:%d' % (h, m, s)]
 
         if job.stdout:
             ret += ['--output=%s' % job.stdout]

reframe/core/pipeline.py

@@ -545,20 +545,28 @@ class RegressionTest(metaclass=RegressionTestMeta):
 
     #: Time limit for this test.
     #:
-    #: Time limit is specified as a three-tuple in the form ``(hh, mm, ss)``,
-    #: with ``hh >= 0``, ``0 <= mm <= 59`` and ``0 <= ss <= 59``.
+    #: Time limit is specified as a string in the form
+    #: ``<days>d<hours>h<minutes>m<seconds>s``.
     #: If set to :class:`None`, no time limit will be set.
     #: The default time limit of the system partition's scheduler will be used.
     #:
+    #: The value is internaly kept as a :class:`datetime.timedelta` object.
+    #: For example '2h30m' is represented as
+    #: `datetime.timedelta(hours=2, minutes=30)`
     #:
-    #: :type: :class:`tuple[int]`
-    #: :default: ``(0, 10, 0)``
+    #: :type: :class:`str` or :class:`datetime.timedelta`
+    #: :default: ``'10m'``
     #:
     #: .. note::
     #:    .. versionchanged:: 2.15
     #:
     #:    This attribute may be set to :class:`None`.
     #:
+    #: .. warning::
+    #:    .. versionchanged:: 3.0
+    #:
+    #:    The old syntax using a ``(h, m, s)`` tuple is deprecated.
+    #:
     time_limit = fields.TimerField('time_limit', type(None))
 
     #: Extra resources for this test.
@@ -715,7 +723,7 @@ def _rfm_init(self, name=None, prefix=None):
         self.variables = {}
 
         # Time limit for the check
-        self.time_limit = (0, 10, 0)
+        self.time_limit = '10m'
 
         # Runtime information of the test
         self._current_partition = None

reframe/core/schedulers/local.py

@@ -9,7 +9,7 @@
 import stat
 import subprocess
 import time
-from datetime import datetime
+from datetime import datetime, timedelta
 
 import reframe.core.schedulers as sched
 import reframe.utility.os_ext as os_ext
@@ -125,7 +125,7 @@ def cancel(self, job):
 
         # Set the time limit to the grace period and let wait() do the final
         # killing
-        job.time_limit = (0, 0, self._cancel_grace_period)
+        job.time_limit = timedelta(seconds=self._cancel_grace_period)
         self.wait(job)
 
     def wait(self, job):
@@ -143,8 +143,7 @@ def wait(self, job):
 
         # Convert job's time_limit to seconds
         if job.time_limit is not None:
-            h, m, s = job.time_limit
-            timeout = h * 3600 + m * 60 + s
+            timeout = job.time_limit.total_seconds()
         else:
             timeout = 0
 

reframe/core/schedulers/pbs.py

@@ -22,6 +22,7 @@
 from reframe.core.exceptions import SpawnedProcessError, JobError
 from reframe.core.logging import getlogger
 from reframe.core.schedulers.registry import register_scheduler
+from reframe.utility import seconds_to_hms
 
 
 # Time to wait after a job is finished for its standard output/error to be
@@ -79,8 +80,9 @@ def emit_preamble(self, job):
         ]
 
         if job.time_limit is not None:
+            h, m, s = seconds_to_hms(job.time_limit.total_seconds())
             preamble.append(
-                self._format_option('-l walltime=%d:%d:%d' % job.time_limit))
+                self._format_option('-l walltime=%d:%d:%d' % (h, m, s)))
 
         if job.sched_partition:
             preamble.append(

reframe/core/schedulers/slurm.py

@@ -20,6 +20,7 @@
                                      JobBlockedError, JobError)
 from reframe.core.logging import getlogger
 from reframe.core.schedulers.registry import register_scheduler
+from reframe.utility import seconds_to_hms
 
 
 def slurm_state_completed(state):
@@ -155,8 +156,9 @@ def emit_preamble(self, job):
                      self._format_option(job.stderr, errfile_fmt)]
 
         if job.time_limit is not None:
+            h, m, s = seconds_to_hms(job.time_limit.total_seconds())
             preamble.append(
-                self._format_option('%d:%d:%d' % job.time_limit, '--time={0}')
+                self._format_option('%d:%d:%d' % (h, m, s), '--time={0}')
             )
 
         if job.sched_exclusive_access:

reframe/utility/__init__.py

@@ -16,6 +16,14 @@
 from collections import UserDict
 
 
+def seconds_to_hms(seconds):
+    '''Convert time in seconds to a tuple of ``(hour, minutes, seconds)``.'''
+
+    m, s = divmod(seconds, 60)
+    h, m = divmod(m, 60)
+    return h, m, s
+
+
 def _get_module_name(filename):
     barename, _ = os.path.splitext(filename)
     if os.path.basename(filename) == '__init__.py':

tutorial/advanced/advanced_example5.py

@@ -14,7 +14,7 @@ def __init__(self):
                       'of a user-defined time limit')
         self.valid_systems = ['daint:gpu', 'daint:mc']
         self.valid_prog_environs = ['*']
-        self.time_limit = (0, 1, 0)
+        self.time_limit = '1m'
         self.executable = 'sleep'
         self.executable_opts = ['100']
         self.sanity_patterns = sn.assert_found(