Skip to content

FIX: PBS plugin fix #2344

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.

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
Jan 19, 2018
Merged

FIX: PBS plugin fix #2344

merged 6 commits into from
Jan 19, 2018

Conversation

achetverikov
Copy link
Contributor

Fixes #2343.

Changes proposed in this pull request

  • another possible way to check that the job is done on Torque cluster
  • fix undeclared variable 'e' in pbs.py
  • fix incorrect format specification on line 284 in base.py ('inf' is a string)

@mgxd mgxd requested review from oesteban and removed request for oesteban December 15, 2017 23:55
@mgxd
Copy link
Member

mgxd commented Dec 15, 2017

@achetverikov this LGTM - don't forget to add yourself to the zenodo file

@@ -47,18 +47,20 @@ def __init__(self, **kwargs):
super(PBSPlugin, self).__init__(template, **kwargs)

def _is_pending(self, taskid):
result = CommandLine('qstat {}'.format(taskid),
result = CommandLine('qstat -f {}'.format(taskid),
environ=dict(os.environ),
terminal_output='allatonce',
Copy link
Contributor

@oesteban oesteban Dec 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest changing terminal_output to 'file_split'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oesteban why? & where can I read about file_split, it seems to be not documented yet (http://nipype.readthedocs.io/en/latest/interfaces/generated/interfaces.base/core.html#parameters)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mgxd
Copy link
Member

mgxd commented Jan 5, 2018

ping @achetverikov - this is very close to merge

@oesteban oesteban added this to the 0.14.1 milestone Jan 7, 2018
@achetverikov
Copy link
Contributor Author

Changed PBS plugin output to file_split as suggested by @oesteban

@effigies
Copy link
Member

@mgxd Good to merge?

@mgxd mgxd merged commit 6dd7703 into nipy:master Jan 19, 2018
@effigies effigies modified the milestones: 0.14.1, 1.0 Jan 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Problems with PBS plugin
4 participants