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
82c3422b
Commit
82c3422b
authored
Apr 20, 2017
by
pjvan_thof
Browse files
Fix memory corrections
parent
ba3a17d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala
View file @
82c3422b
...
...
@@ -124,9 +124,9 @@ trait CommandLineResources extends CommandLineFunction with Configurable {
nCoresRequest
=
nCoresRequest
.
map
(
x
=>
if
(
x
>
maxThreads
.
getOrElse
(
x
))
maxThreads
.
getOrElse
(
x
)
else
x
)
_coreMemory
=
commands
.
map
(
cmd
=>
cmd
.
coreMemory
*
(
cmd
.
threads
.
toDouble
/
threads
.
toDouble
)).
sum
memoryLimit
=
Some
(
_coreMemory
*
threads
)
residentLimit
=
Some
((
_coreMemory
+
(
0.5
*
retry
))
*
residentFactor
*
(
if
(
multiplyRssThreads
)
threads
else
1
))
vmem
=
Some
((
_coreMemory
*
(
vmemFactor
+
(
0.5
*
retry
))
*
(
if
(
multiplyVmemThreads
)
threads
else
1
))
+
"G"
)
memoryLimit
=
Some
(
_coreMemory
*
nCoresRequest
.
getOrElse
(
threads
)
)
residentLimit
=
Some
((
_coreMemory
+
(
0.5
*
retry
))
*
residentFactor
*
(
if
(
multiplyRssThreads
)
nCoresRequest
.
getOrElse
(
threads
)
else
1
))
vmem
=
Some
((
_coreMemory
*
(
vmemFactor
+
(
0.5
*
retry
))
*
(
if
(
multiplyVmemThreads
)
nCoresRequest
.
getOrElse
(
threads
)
else
1
))
+
"G"
)
}
}
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