From 555cfb5a33b135124f717c6910dc7432a3be559b Mon Sep 17 00:00:00 2001 From: Peter van 't Hof <p.j.van_t_hof@lumc.nl> Date: Sat, 19 Mar 2016 15:30:33 +0100 Subject: [PATCH] Fix memory --- .../nl/lumc/sasc/biopet/extensions/qiime/MergeOtuMaps.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/qiime/MergeOtuTables.scala | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/qiime/MergeOtuMaps.scala b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/qiime/MergeOtuMaps.scala index ce070ccff..db9ed0f7e 100644 --- a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/qiime/MergeOtuMaps.scala +++ b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/qiime/MergeOtuMaps.scala @@ -38,7 +38,7 @@ class MergeOtuMaps(val root: Configurable) extends BiopetCommandLineFunction wit var failuresFp: Option[File] = None - override def defaultCoreMemory = 8.0 + override def defaultCoreMemory = 4.0 override def beforeGraph(): Unit = { super.beforeGraph() diff --git a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/qiime/MergeOtuTables.scala b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/qiime/MergeOtuTables.scala index 86b481761..1f5d5d1e9 100644 --- a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/qiime/MergeOtuTables.scala +++ b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/qiime/MergeOtuTables.scala @@ -36,6 +36,8 @@ class MergeOtuTables(val root: Configurable) extends BiopetCommandLineFunction w @Output(required = true) var outputFile: File = _ + override def defaultCoreMemory = 4.0 + override def beforeGraph(): Unit = { super.beforeGraph() require(input.nonEmpty) -- GitLab