fix bsub time format

Author: hpratt

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 }
 
 group = "io.krews"
-version = "0.14.9"
+version = "0.14.10"
 
 repositories {
     maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") }

src/main/kotlin/krews/executor/bsub/BsubExecutor.kt

@@ -74,16 +74,14 @@ class BsubExecutor(private val workflowConfig: WorkflowConfig) : LocallyDirected
 
         val mem = taskConfig.bsub?.mem ?: taskRunContexts.map { it.memory }.maxBy { it?.bytes ?: -1 }
         val cpus = taskConfig.bsub?.cpus ?: taskRunContexts.map { it.cpus }.maxBy { it ?: -1 }
-        val timePerTask = taskConfig.bsub?.time ?: taskRunContexts.map { it.cpus }.maxBy { it ?: -1 }
-        val time = if (timePerTask != null) timePerTask * taskRunContexts.size else null
         val gpus = taskConfig.bsub?.gpu ?: "\"\""
 
         appendBsubParam(bsubScript, "J", bsubWorkflowJobName)
         appendBsubParam(bsubScript, "o", logsPath.resolve("out.txt"))
         appendBsubParam(bsubScript, "e", logsPath.resolve("err.txt"))
         appendBsubParam(bsubScript, "R", taskConfig.bsub?.rUsage)
         appendBsubParam(bsubScript, "n", cpus)
-        appendBsubParam(bsubScript, "W", time)
+        appendBsubParam(bsubScript, "W", taskConfig.bsub?.time)
         appendBsubParam(bsubScript, "q", taskConfig.bsub?.partition)
         appendBsubParam(bsubScript, "gpu", gpus)
         for ((argName, argVal) in taskConfig.bsub?.sbatchArgs ?: mapOf()) {