Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
biopet.biopet
Commits
78b45798
Commit
78b45798
authored
Jul 21, 2016
by
Peter van 't Hof
Browse files
Fixed memory correction
parent
cd532363
Changes
1
Hide whitespace changes
Inline
Side-by-side
biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala
View file @
78b45798
...
@@ -87,10 +87,10 @@ trait CommandLineResources extends CommandLineFunction with Configurable {
...
@@ -87,10 +87,10 @@ trait CommandLineResources extends CommandLineFunction with Configurable {
else
memoryLimit
=
Some
(
_coreMemory
*
threads
)
else
memoryLimit
=
Some
(
_coreMemory
*
threads
)
if
(
config
.
contains
(
"resident_limit"
))
residentLimit
=
config
(
"resident_limit"
)
if
(
config
.
contains
(
"resident_limit"
))
residentLimit
=
config
(
"resident_limit"
)
else
residentLimit
=
Some
((
_coreMemory
+
(
0.5
*
retryMultipler
))
*
residentFactor
*
(
if
(
multiplyRssThreads
)
1
else
threads
))
else
residentLimit
=
Some
((
_coreMemory
+
(
0.5
*
retryMultipler
))
*
residentFactor
*
(
if
(
multiplyRssThreads
)
threads
else
1
))
if
(!
config
.
contains
(
"vmem"
))
if
(!
config
.
contains
(
"vmem"
))
vmem
=
Some
((
_coreMemory
*
(
vmemFactor
+
(
0.5
*
retryMultipler
))
*
(
if
(
multiplyVmemThreads
)
1
else
threads
))
+
"G"
)
vmem
=
Some
((
_coreMemory
*
(
vmemFactor
+
(
0.5
*
retryMultipler
))
*
(
if
(
multiplyVmemThreads
)
threads
else
1
))
+
"G"
)
jobName
=
configNamespace
+
":"
+
(
if
(
firstOutput
!=
null
)
firstOutput
.
getName
else
jobOutputFile
)
jobName
=
configNamespace
+
":"
+
(
if
(
firstOutput
!=
null
)
firstOutput
.
getName
else
jobOutputFile
)
}
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment