Merge branch 'master' into bugfix/force-local-not-working

Author: vkarak

cscs-checks/apps/namd/namd_check.py

@@ -19,6 +19,16 @@ def __init__(self, variant, **kwargs):
                                        'NAMD')
         self.executable = 'namd2'
 
+        self.use_multithreading = True
+        self.num_tasks_per_core = 2
+
+        if self.current_system.name == 'dom':
+            self.num_tasks = 6
+            self.num_tasks_per_node = 1
+        else:
+            self.num_tasks = 16
+            self.num_tasks_per_node = 1
+
         energy = sn.avg(sn.extractall(r'ENERGY:(\s+\S+){10}\s+(?P<energy>\S+)',
                         self.stdout, 'energy', float))
         energy_reference = -2451359.5
@@ -52,9 +62,7 @@ def __init__(self, version, **kwargs):
         super().__init__('gpu_%s' % version, **kwargs)
         self.valid_systems = ['daint:gpu', 'dom:gpu']
         self.executable_opts = '+idlepoll +ppn 23 stmv.namd'.split()
-        self.use_multithreading = True
         self.num_cpus_per_task = 24
-        self.num_tasks_per_core = 2
         self.num_gpus_per_node = 1
 
 
@@ -91,15 +99,7 @@ def __init__(self, version, **kwargs):
         super().__init__('cpu_%s' % version, **kwargs)
         self.valid_systems = ['daint:mc', 'dom:mc']
         self.executable_opts = '+idlepoll +ppn 71 stmv.namd'.split()
-        self.use_multithreading = True
         self.num_cpus_per_task = 72
-        self.num_tasks_per_core = 2
-        if self.current_system.name == 'dom':
-            self.num_tasks = 6
-            self.num_tasks_per_node = 1
-        else:
-            self.num_tasks = 16
-            self.num_tasks_per_node = 1
 
 
 class NamdCPUProdCheck(NamdCPUCheck):

reframe/core/schedulers/__init__.py

@@ -41,34 +41,6 @@ class Job(abc.ABC):
     #: :default: ``[]``
     options = fields.TypedListField('options', str)
 
-    #: List of shell commands to execute before launching this job.
-    #:
-    #: :type: :class:`list` of :class:`str`
-    #: :default: ``[]``
-    #:
-    #: .. note::
-    #:    .. deprecated:: 2.10
-    #:       Please use the :attr:`reframe.core.pipeline.RegressionTest.pre_run`
-    #:       field instead.
-    pre_run = fields.DeprecatedField(
-        fields.TypedListField('_pre_run', str),
-        'Use of the pre_run field of Job is deprecated. '
-        'Please use the pre_run field of RegressionTest instead.')
-
-    #: List of shell commands to execute after launching this job.
-    #:
-    #: :type: :class:`list` of :class:`str`
-    #: :default: ``[]``
-    #:
-    #: .. note::
-    #:    .. deprecated:: 2.10
-    #:       Please use the :attr:`reframe.core.pipeline.RegressionTest.post_run`
-    #:       field instead.
-    post_run = fields.DeprecatedField(
-        fields.TypedListField('_post_run', str),
-        'Use of the post_run field of Job is deprecated. '
-        'Please use the post_run field of RegressionTest instead.')
-
     #: The parallel program launcher that will be used to launch the parallel
     #: executable of this job.
     #:

unittests/test_schedulers.py

@@ -225,16 +225,6 @@ def test_cancel_term_ignore(self):
         # Verify that the spawned sleep is killed, too
         self.assertProcessDied(sleep_pid)
 
-    def test_deprecated_pre_run_and_post_run(self):
-        from reframe.core.exceptions import ReframeDeprecationWarning
-
-        self.assertWarns(ReframeDeprecationWarning, exec,
-                         'self.testjob.pre_run = []',
-                         globals(), locals())
-        self.assertWarns(ReframeDeprecationWarning, exec,
-                         'self.testjob.post_run = []',
-                         globals(), locals())
-
 
 class TestSlurmJob(_TestJob):
     @property