Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
biopet.biopet
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirrors
biopet.biopet
Commits
db4dcbca
Commit
db4dcbca
authored
9 years ago
by
Peter van 't Hof
Browse files
Options
Downloads
Patches
Plain Diff
Style changes
parent
66f1b6ec
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunction.scala
+4
-9
4 additions, 9 deletions
.../nl/lumc/sasc/biopet/core/BiopetCommandLineFunction.scala
with
4 additions
and
9 deletions
public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunction.scala
+
4
−
9
View file @
db4dcbca
...
...
@@ -26,7 +26,6 @@ import org.ggf.drmaa.JobTemplate
import
scala.collection.mutable
import
scala.io.Source
import
scala.sys.process.
{
Process
,
ProcessLogger
}
import
scala.util.matching.Regex
import
scala.collection.JavaConversions._
/** Biopet command line trait to auto check executable and cluster values */
...
...
@@ -50,20 +49,18 @@ trait BiopetCommandLineFunction extends CommandLineResources { biopetFunction =>
val
writer
=
new
PrintWriter
(
file
)
writer
.
println
(
"set -eubf"
)
writer
.
println
(
"set -o pipefail"
)
lines
.
foreach
(
writer
.
println
(
_
)
)
lines
.
foreach
(
writer
.
println
)
writer
.
close
()
}
// This overrides the default "sh" from queue. For Biopet the default is "bash"
updateJobRun
=
{
case
jt
:
JobTemplate
=>
{
case
jt
:
JobTemplate
=>
changeScript
(
new
File
(
jt
.
getArgs
.
head
.
toString
))
jt
.
setRemoteCommand
(
remoteCommand
)
}
case
ps
:
ProcessSettings
=>
{
case
ps
:
ProcessSettings
=>
changeScript
(
new
File
(
ps
.
getCommand
.
tail
.
head
))
ps
.
setCommand
(
Array
(
remoteCommand
)
++
ps
.
getCommand
.
tail
)
}
}
/**
...
...
@@ -135,10 +132,9 @@ trait BiopetCommandLineFunction extends CommandLineResources { biopetFunction =>
that
.
beforeGraph
()
that
.
internalBeforeGraph
()
this
match
{
case
p
:
BiopetPipe
=>
{
case
p
:
BiopetPipe
=>
p
.
commands
.
last
.
_outputAsStdout
=
true
new
BiopetPipe
(
p
.
commands
:::
that
::
Nil
)
}
case
_
=>
new
BiopetPipe
(
List
(
this
,
that
))
}
}
...
...
@@ -209,7 +205,6 @@ object BiopetCommandLineFunction extends Logging {
if
(
executable
!=
null
)
{
if
(!
BiopetCommandLineFunction
.
executableCache
.
contains
(
executable
))
{
try
{
val
oldExecutable
=
executable
val
buffer
=
new
StringBuffer
()
val
cmd
=
Seq
(
"which"
,
executable
)
val
process
=
Process
(
cmd
).
run
(
ProcessLogger
(
buffer
.
append
(
_
)))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment