Skip to content

[feat] Add node list information for jobs submitted with the Torque backend #1347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 3, 2020
Merged

[feat] Add node list information for jobs submitted with the Torque backend #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e746dbb
add nodelist info for torque
rsarm May 29, 2020
87450bb
fix comments
rsarm Jun 2, 2020
e1f4466
fix comments
rsarm Jun 3, 2020
9bdaf1e
fix type
rsarm Jun 3, 2020
4a31b05
Style enhancements
Jun 3, 2020
6279b44
Merge branch 'master' into feat/nodelist-torque
Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions reframe/core/schedulers/torque.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@
class TorqueJobScheduler(PbsJobScheduler):
TASKS_OPT = '-l nodes={num_nodes}:ppn={num_cpus_per_node}'

def _set_nodelist(self, job, nodespec):
if job.nodelist is not None:
return

job.nodelist = [x.split('/')[0] for x in nodespec.split('+')]
job.nodelist.sort()

def _update_state(self, job):
'''Check the status of the job.'''

Expand All @@ -53,6 +60,13 @@ def _update_state(self, job):
if completed.returncode != 0:
raise JobError('qstat failed: %s' % completed.stderr, job.jobid)

nodelist_match = re.search(
r'exec_host = (?P<nodespec>\S+)', completed.stdout
)
if nodelist_match:
nodespec = nodelist_match.group('nodespec')
self._set_nodelist(job, nodespec)

state_match = re.search(
r'^\s*job_state = (?P<state>[A-Z])', completed.stdout, re.MULTILINE
)
Expand Down
2 changes: 1 addition & 1 deletion unittests/test_schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def test_submit(make_job, exec_ctx):
if sched_name == 'local':
assert [socket.gethostname()] == minimal_job.nodelist
assert 0 == minimal_job.exitcode
elif sched_name == ('slurm', 'squeue'):
elif sched_name == ('slurm', 'squeue', 'pbs', 'torque'):
num_tasks_per_node = minimal_job.num_tasks_per_node or 1
num_nodes = minimal_job.num_tasks // num_tasks_per_node
assert num_nodes == len(minimal_job.nodelist)
Expand Down