Skip to content

[feat] Improve OAR preamble commands #2318

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 2 commits into from
Dec 6, 2021
Merged

[feat] Improve OAR preamble commands #2318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f756e23
Improve OAR preamble commands
mahendrapaipuri Dec 6, 2021
d47968f
Merge branch 'master' into tidy-up-oar-scheduler
Dec 6, 2021
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
10 changes: 3 additions & 7 deletions reframe/core/schedulers/oar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ def emit_preamble(self, job):
# avoid writing them in the working dir
preamble = [
self._format_option(f'-n "{job.name}"'),
self._format_option(f'-O {os.path.join(job.workdir, job.stdout)}'),
self._format_option(f'-E {os.path.join(job.workdir, job.stderr)}'),
self._format_option(f'-O {job.stdout}'),
self._format_option(f'-E {job.stderr}'),
]

if job.time_limit is not None:
Expand All @@ -98,14 +98,10 @@ def emit_preamble(self, job):
else:
preamble.append(self._format_option(opt))

# OAR starts the job in the home directory by default
preamble.append(f'cd {job.workdir}')
return preamble

def submit(self, job):
# For some reason OAR job manager says that job launching dir is
# working dir of the repo and not stage dir. A workaround is to give
# full path of script to oarsub
# OAR batch submission mode needs full path to the job script
job_script_fullpath = os.path.join(job.workdir, job.script_filename)

# OAR needs -S to submit job in batch mode
Expand Down