Skip to content

Commit 9325477

Browse files
authored
Merge branch 'master' into update-cambridge-config
2 parents b8ab4c9 + 47dcc11 commit 9325477

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

conf/bluebear.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env.TMPDIR = "/scratch/${System.getenv('USER')}"
1919
// Enable Singularity (via Apptainer) for all processes
2020
singularity {
2121
enabled = true
22-
autoMount = true
22+
autoMounts = true
2323
runOptions = "-B /scratch/${System.getenv('USER')}"
2424
}
2525

conf/embl_hd.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,19 @@ docker {
1515

1616
apptainer {
1717
autoMounts = true
18-
pullTimeout = "3 hours" // the default is 20 minutes and fails with large images
18+
pullTimeout = "3h" // the default is 20 minutes and fails with large images
1919
envWhitelist = 'CUDA_VISIBLE_DEVICES' // allow the bounding of GPU visible device variable into the containers
2020
libraryDir = '/cvmfs/singularity.galaxyproject.org/all/'
2121
}
2222

2323
singularity {
2424
autoMounts = true
25-
pullTimeout = "3 hours"
25+
pullTimeout = "3h"
2626
envWhitelist = 'CUDA_VISIBLE_DEVICES'
2727
}
2828

2929
process {
30+
executor = 'slurm'
3031
maxRetries = 3
3132
errorStrategy = { task.attempt<3 ? 'retry' : 'ignore' }
3233
cache = 'lenient'
@@ -53,5 +54,5 @@ executor {
5354
submitRateLimit = "10/1sec"
5455
pollInterval = '10sec'
5556
exitReadTimeout = "5 min"
56-
retry.reason = "*"
57+
retry.reason = ".*"
5758
}

conf/kaust.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ params {
88
}
99

1010
// Load genome resources and assets hosted by the Bioinformatics team on IBEX cluster
11-
includeConfig 'https://raw.githubusercontent.com/bioinfo-kaust/references/refs/heads/main/configs/genomes.config'
11+
includeConfig (!System.getenv('NXF_OFFLINE') ? "https://raw.githubusercontent.com/bioinfo-kaust/references/refs/heads/main/configs/genomes.config" : "/dev/null")
1212

1313
singularity {
1414
enabled = true
@@ -17,7 +17,7 @@ singularity {
1717
// Use existing images from the centralized library, if available
1818
libraryDir = "/biocorelab/BIX/resources/singularity/images/"
1919
// Download images that are missing from the library to user space
20-
cacheDir = "/ibex/user/$USER/.singularity/nf_images/"
20+
cacheDir = "/ibex/user/${System.getenv('USER')}/.singularity/nf_images/"
2121
}
2222

2323
process {

conf/mpcdf.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ params {
44
config_profile_url = 'https://www.mpcdf.mpg.de/services/supercomputing'
55
}
66

7+
validation {
8+
ignoreParams = ['max_cpus', 'max_memory', 'max_time']
9+
}
10+
711
profiles {
812

913
raven {

0 commit comments

Comments
 (0)