Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
NearRealTimeCTDAS
CTDAS
Commits
39acbed3
Commit
39acbed3
authored
Dec 18, 2019
by
Woude, Auke van der
Browse files
Merge branch 'master' of
https://git.wur.nl/ctdas/CTDAS
parents
ffec3e5b
8981546c
Changes
1
Hide whitespace changes
Inline
Side-by-side
da/platform/cartesius.py
View file @
39acbed3
...
@@ -108,12 +108,12 @@ class CartesiusPlatform(Platform):
...
@@ -108,12 +108,12 @@ class CartesiusPlatform(Platform):
template
+=
"""#$ -hold_jid depends
\n
"""
template
+=
"""#$ -hold_jid depends
\n
"""
# First replace from passed dictionary
# First replace from passed dictionary
for
k
,
v
in
joboptions
.
items
():
for
k
,
v
in
list
(
joboptions
.
items
()
)
:
while
k
in
template
:
while
k
in
template
:
template
=
template
.
replace
(
k
,
v
)
template
=
template
.
replace
(
k
,
v
)
# Fill remaining values with std_options
# Fill remaining values with std_options
for
k
,
v
in
std_joboptions
.
items
():
for
k
,
v
in
list
(
std_joboptions
.
items
()
)
:
while
k
in
template
:
while
k
in
template
:
template
=
template
.
replace
(
k
,
v
)
template
=
template
.
replace
(
k
,
v
)
...
@@ -132,9 +132,9 @@ class CartesiusPlatform(Platform):
...
@@ -132,9 +132,9 @@ class CartesiusPlatform(Platform):
logging
.
info
(
"A new task will be started (%s)"
%
cmd
)
logging
.
info
(
"A new task will be started (%s)"
%
cmd
)
output
=
subprocess
.
Popen
(
cmd
,
stdout
=
subprocess
.
PIPE
).
communicate
()[
0
]
output
=
subprocess
.
Popen
(
cmd
,
stdout
=
subprocess
.
PIPE
).
communicate
()[
0
]
logging
.
info
(
output
)
logging
.
info
(
output
)
print
'output'
,
output
print
(
'output'
,
output
)
jobid
=
output
.
split
()[
-
1
]
jobid
=
output
.
split
()[
-
1
]
print
'jobid'
,
jobid
print
(
'jobid'
,
jobid
)
else
:
else
:
cmd
=
[
"sbatch"
,
jobfile
]
cmd
=
[
"sbatch"
,
jobfile
]
logging
.
info
(
"A new job will be submitted (%s)"
%
cmd
)
logging
.
info
(
"A new job will be submitted (%s)"
%
cmd
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment