From 82c3422b5d8bfdc969adf89bb4224d8f3d18bfd6 Mon Sep 17 00:00:00 2001 From: pjvan_thof Date: Thu, 20 Apr 2017 16:59:16 +0200 Subject: [PATCH] Fix memory corrections --- .../nl/lumc/sasc/biopet/core/CommandLineResources.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala b/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala index ccbd1f722..99c2bdaa2 100644 --- a/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala +++ b/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala @@ -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") } } -- GitLab