diff --git a/build.gradle.kts b/build.gradle.kts index ca5fc90..4926b05 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } group = "io.krews" -version = "0.14.7" +version = "0.14.8" repositories { maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") } diff --git a/src/main/kotlin/krews/config/BsubConfig.kt b/src/main/kotlin/krews/config/BsubConfig.kt index a51635f..212cfb1 100644 --- a/src/main/kotlin/krews/config/BsubConfig.kt +++ b/src/main/kotlin/krews/config/BsubConfig.kt @@ -22,5 +22,7 @@ data class BsubTaskConfig( // SBatch partition to use. val partition: String? = null, // Additional bsub arguments - val sbatchArgs: Map? = null + val sbatchArgs: Map? = null, + // Additional rusage parameters + val rUsage: String? = null ) diff --git a/src/main/kotlin/krews/executor/bsub/BsubExecutor.kt b/src/main/kotlin/krews/executor/bsub/BsubExecutor.kt index 11219fd..a52142b 100644 --- a/src/main/kotlin/krews/executor/bsub/BsubExecutor.kt +++ b/src/main/kotlin/krews/executor/bsub/BsubExecutor.kt @@ -81,7 +81,7 @@ class BsubExecutor(private val workflowConfig: WorkflowConfig) : LocallyDirected appendBsubParam(bsubScript, "J", bsubWorkflowJobName) appendBsubParam(bsubScript, "o", logsPath.resolve("out.txt")) appendBsubParam(bsubScript, "e", logsPath.resolve("err.txt")) - appendBsubParam(bsubScript, "M", mem) + appendBsubParam(bsubScript, "R", taskConfig.bsub?.rUsage) appendBsubParam(bsubScript, "n", cpus) appendBsubParam(bsubScript, "W", time) appendBsubParam(bsubScript, "q", taskConfig.bsub?.partition)