Skip to content

Commit 0ca1823

Browse files
authored
Merge pull request #12 from eth-cscs/deploy/reframe-2.6
Reframe 2.6 public release
2 parents ba24be2 + bf6a1eb commit 0ca1823

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

reframe/core/pipeline.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class RegressionTest(object):
5454
num_tasks_per_core = IntegerField('num_tasks_per_core', allow_none=True)
5555
num_tasks_per_socket = IntegerField('num_tasks_per_socket', allow_none=True)
5656
use_multithreading = BooleanField('use_multithreading', allow_none=True)
57+
exclusive_access = BooleanField('exclusive_access')
5758
local = BooleanField('local')
5859
prefix = StringField('prefix')
5960
sourcesdir = StringField('sourcesdir', allow_none=True)
@@ -103,6 +104,7 @@ def __init__(self, name, prefix, system, resources):
103104
self.num_tasks_per_core = None
104105
self.num_tasks_per_socket = None
105106
self.use_multithreading = None
107+
self.exclusive_access = False
106108

107109
# True only if check is to be run locally
108110
self.local = False
@@ -277,6 +279,7 @@ def _setup_job(self, **job_opts):
277279
num_tasks_per_core=self.num_tasks_per_core,
278280
num_tasks_per_socket=self.num_tasks_per_socket,
279281
use_smt=self.use_multithreading,
282+
exclusive_access=self.exclusive_access,
280283
launcher=self._launcher_type,
281284
stdout=self.stdout,
282285
stderr=self.stderr,

reframe/core/schedulers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ class SlurmJob(Job):
235235
def __init__(self,
236236
time_limit = (0, 10, 0),
237237
use_smt = None,
238-
exclusive = True,
239238
nodelist = None,
240239
exclude = None,
241240
partition = None,
@@ -245,12 +244,13 @@ def __init__(self,
245244
num_cpus_per_task=None,
246245
num_tasks_per_core=None,
247246
num_tasks_per_socket=None,
247+
exclusive_access = False,
248248
**kwargs):
249249
super().__init__(**kwargs)
250250
self.partition = partition
251251
self.time_limit = time_limit
252252
self.use_smt = use_smt
253-
self.exclusive = exclusive
253+
self.exclusive_access = exclusive_access
254254
self.nodelist = nodelist
255255
self.exclude = exclude
256256
self.reservation = reservation
@@ -291,7 +291,7 @@ def emit_preamble(self, builder):
291291
if self.partition:
292292
builder.verbatim('%s --partition=%s' % (self.prefix, self.partition))
293293

294-
if self.exclusive:
294+
if self.exclusive_access:
295295
builder.verbatim('%s --exclusive' % self.prefix)
296296

297297
if self.account:

reframe/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from reframe.core.fields import ReadOnlyField
99

1010
class RegressionSettings:
11-
version = ReadOnlyField('2.5')
11+
version = ReadOnlyField('2.6')
1212
module_name = ReadOnlyField('reframe')
1313
job_state_poll_intervals = ReadOnlyField([ 1, 2, 3 ])
1414
job_init_poll_intervals = ReadOnlyField([ 1 ])

0 commit comments

Comments
 (0)