Skip to content
Snippets Groups Projects
Commit fb215ab1 authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Fix bug on vmem

parent c008141f
No related branches found
No related tags found
No related merge requests found
...@@ -15,13 +15,11 @@ ...@@ -15,13 +15,11 @@
*/ */
package nl.lumc.sasc.biopet.core package nl.lumc.sasc.biopet.core
//import java.io.BufferedInputStream
import java.io.File import java.io.File
import nl.lumc.sasc.biopet.core.config.Configurable import nl.lumc.sasc.biopet.core.config.Configurable
import org.broadinstitute.gatk.queue.QException import org.broadinstitute.gatk.queue.QException
import org.broadinstitute.gatk.queue.function.CommandLineFunction import org.broadinstitute.gatk.queue.function.CommandLineFunction
import org.broadinstitute.gatk.utils.commandline.{ Input, Argument } import org.broadinstitute.gatk.utils.commandline.{ Input, Argument }
//import scala.io.Source
import scala.sys.process.{ Process, ProcessLogger } import scala.sys.process.{ Process, ProcessLogger }
import scala.util.matching.Regex import scala.util.matching.Regex
import java.io.FileInputStream import java.io.FileInputStream
...@@ -62,7 +60,7 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab ...@@ -62,7 +60,7 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab
vmem = config("vmem") vmem = config("vmem")
if (vmem.isEmpty && defaultVmem.nonEmpty) vmem = Some(defaultVmem) if (vmem.isEmpty && defaultVmem.nonEmpty) vmem = Some(defaultVmem)
} }
if (vmem != null) jobResourceRequests :+= "h_vmem=" + vmem if (vmem.isDefined) jobResourceRequests :+= "h_vmem=" + vmem.get
jobName = configName + ":" + (if (firstOutput != null) firstOutput.getName else jobOutputFile) jobName = configName + ":" + (if (firstOutput != null) firstOutput.getName else jobOutputFile)
super.freezeFieldValues() super.freezeFieldValues()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment