Skip to content

Commit c6b8b35

Browse files
authored
Merge pull request #208 from luisas/fix_again_pr
Fix singularity config
2 parents 367df34 + 439a33c commit c6b8b35

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

nextflow.config

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,22 +123,21 @@ profiles {
123123
}
124124
docker {
125125
docker.enabled = true
126-
docker.runOptions = params.use_gpu ? '--gpus all' : '-u $(id -u):$(id -g)'
126+
docker.runOptions = params.use_gpu ? '--gpus all' : '-u $(id -u):$(id -g)'
127127
conda.enabled = false
128128
singularity.enabled = false
129129
podman.enabled = false
130130
shifter.enabled = false
131131
charliecloud.enabled = false
132132
apptainer.enabled = false
133-
docker.runOptions = '-u $(id -u):$(id -g)'
134133
}
135134
arm {
136-
docker.runOptions = params.use_gpu ? '-u $(id -u):$(id -g) --platform=linux/amd64 --gpus all' : '-u $(id -u):$(id -g) --platform=linux/amd64'
135+
docker.runOptions = params.use_gpu ? '-u $(id -u):$(id -g) --platform=linux/amd64 --gpus all' : '-u $(id -u):$(id -g) --platform=linux/amd64'
137136
}
138137
singularity {
139138
singularity.enabled = true
140139
singularity.autoMounts = true
141-
singularity.runOptions = params.use_gpu ? '--nv' : singularity.runOptions
140+
singularity.runOptions = params.use_gpu ? '--nv' : ""
142141
conda.enabled = false
143142
docker.enabled = false
144143
podman.enabled = false
@@ -177,7 +176,7 @@ profiles {
177176
apptainer {
178177
apptainer.enabled = true
179178
apptainer.autoMounts = true
180-
apptainer.runOptions = params.use_gpu ? '--nv' : apptainer.runOptions
179+
apptainer.runOptions = params.use_gpu ? '--nv' : ""
181180
conda.enabled = false
182181
docker.enabled = false
183182
singularity.enabled = false
@@ -236,7 +235,6 @@ charliecloud.registry = 'quay.io'
236235
// Export these variables to prevent local Python/R libraries from conflicting with those in the container
237236
// The JULIA depot path has been adjusted to a fixed path `/usr/local/share/julia` that needs to be used for packages in the container.
238237
// See https://apeltzer.github.io/post/03-julia-lang-nextflow/ for details on that. Once we have a common agreement on where to keep Julia packages, this is adjustable.
239-
240238
env {
241239
PYTHONNOUSERSITE = 1
242240
R_PROFILE_USER = "/.Rprofile"

0 commit comments

Comments
 (0)