Skip to content

Commit 59e757c

Browse files
committed
fix resource requirements
1 parent 3f449f0 commit 59e757c

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

FastOMA.nf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,12 @@ process hog_big{
260260
memory {
261261
def max_filesize = Utils.getMaxFileSize(rhogsbig)
262262
def mem_base = Utils.mem_cat( max_filesize, nr_species as int )
263-
return Math.max( 6.GB, mem_base ) * params.memory_multiplier * task.attempt
263+
return [6.GB, mem_base].max() * params.memory_multiplier * task.attempt
264264
}
265265
time {
266266
def max_filesize = Utils.getMaxFileSize(rhogsbig)
267267
def time_base = Utils.time_cat(max_filesize, nr_species as int)
268-
return Math.max( 2.h, time_base) * params.time_multiplier * task.attempt
268+
return [2.h, time_base].max() * params.time_multiplier * task.attempt
269269
}
270270

271271
publishDir path: params.temp_output, enabled: params.debug_enabled, pattern: "pickle_hogs"

conf/base.config

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,12 @@ process {
4444
withName: "infer_roothogs" {
4545
memory = {
4646
def nr_genomes = hogmaps.size()
47-
def base_memory = 516.MB + (nr_genomes * 32.MB)
47+
def base_memory = 2.GB + (nr_genomes * 32.MB)
4848
return base_memory * task.attempt * params.memory_multiplier
4949
}
5050
time = { 12.h * task.attempt * params.time_multiplier }
5151
}
5252

53-
withName: "hog_big" {
54-
memory = {
55-
def max_filesize = Utils.getMaxFileSize(rhogsbig)
56-
def mem_base = Utils.mem_cat( max_filesize, nr_species as int )
57-
return Math.max( 6.GB, mem_base ) * params.memory_multiplier * task.attempt
58-
}
59-
time = {
60-
def max_filesize = Utils.getMaxFileSize(rhogsbig)
61-
def time_base = Utils.time_cat(max_filesize, nr_species as int)
62-
return Math.max( 2.h, time_base) * params.time_multiplier * task.attempt
63-
}
64-
}
65-
6653
withName: "collect_subhogs" {
6754
cpus = { 1 }
6855
}

0 commit comments

Comments
 (0)