From c55f3be5ec1e528b5da4d392c17a7b90ed9b14f0 Mon Sep 17 00:00:00 2001
From: Laurent Modolo <laurent.modolo@ens-lyon.fr>
Date: Mon, 4 Mar 2019 11:24:04 +0100
Subject: [PATCH] fastqc: add singularity to nf files

---
 src/nf_modules/fastqc/fastqc_paired.config | 11 +++++++++++
 src/nf_modules/fastqc/fastqc_single.config | 11 +++++++++++
 src/nf_modules/fastqc/fastqc_single.nf     |  1 -
 src/nf_modules/fastqc/tests.sh             | 20 ++++++++++++++++++--
 src/nf_modules/urqt/trimming_paired.config |  2 +-
 src/nf_modules/urqt/trimming_single.config |  2 +-
 6 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/nf_modules/fastqc/fastqc_paired.config b/src/nf_modules/fastqc/fastqc_paired.config
index 9fda3d1..94baaa2 100644
--- a/src/nf_modules/fastqc/fastqc_paired.config
+++ b/src/nf_modules/fastqc/fastqc_paired.config
@@ -5,6 +5,16 @@ profiles {
     process {
       withName: fastqc_fastq {
         container = "fastqc:0.11.5"
+        cpus = 1
+      }
+    }
+  }
+  singularity {
+    singularity.enabled = true
+    process {
+      withName: fastqc_fastq {
+        cpus = 1
+        container = "file://bin/fastqc:0.11.5.sif"
       }
     }
   }
@@ -15,6 +25,7 @@ profiles {
         module = "FastQC/0.11.5"
         executor = "sge"
         clusterOptions = "-m e -cwd -V"
+        cpus = 1
         memory = "20GB"
         time = "12h"
         queue = 'monointeldeb128'
diff --git a/src/nf_modules/fastqc/fastqc_single.config b/src/nf_modules/fastqc/fastqc_single.config
index 9fda3d1..94baaa2 100644
--- a/src/nf_modules/fastqc/fastqc_single.config
+++ b/src/nf_modules/fastqc/fastqc_single.config
@@ -5,6 +5,16 @@ profiles {
     process {
       withName: fastqc_fastq {
         container = "fastqc:0.11.5"
+        cpus = 1
+      }
+    }
+  }
+  singularity {
+    singularity.enabled = true
+    process {
+      withName: fastqc_fastq {
+        cpus = 1
+        container = "file://bin/fastqc:0.11.5.sif"
       }
     }
   }
@@ -15,6 +25,7 @@ profiles {
         module = "FastQC/0.11.5"
         executor = "sge"
         clusterOptions = "-m e -cwd -V"
+        cpus = 1
         memory = "20GB"
         time = "12h"
         queue = 'monointeldeb128'
diff --git a/src/nf_modules/fastqc/fastqc_single.nf b/src/nf_modules/fastqc/fastqc_single.nf
index 4598416..ab7e22a 100644
--- a/src/nf_modules/fastqc/fastqc_single.nf
+++ b/src/nf_modules/fastqc/fastqc_single.nf
@@ -11,7 +11,6 @@ Channel
 process fastqc_fastq {
   tag "$file_id"
   publishDir "results/fastq/fastqc/", mode: 'copy'
-  cpus = 1
 
   input:
   set file_id, file(reads) from fastq_files
diff --git a/src/nf_modules/fastqc/tests.sh b/src/nf_modules/fastqc/tests.sh
index 1882ded..7002e71 100755
--- a/src/nf_modules/fastqc/tests.sh
+++ b/src/nf_modules/fastqc/tests.sh
@@ -1,9 +1,25 @@
 ./nextflow src/nf_modules/fastqc/fastqc_paired.nf \
   -c src/nf_modules/fastqc/fastqc_paired.config \
   -profile docker \
-  --fastq "data/tiny_dataset/fastq/tiny_R{1,2}.fastq"
+  --fastq "data/tiny_dataset/fastq/tiny_R{1,2}.fastq" \
+  -resume
 
 ./nextflow src/nf_modules/fastqc/fastqc_single.nf \
   -c src/nf_modules/fastqc/fastqc_single.config \
   -profile docker \
-  --fastq "data/tiny_dataset/fastq/tiny_S.fastq"
+  --fastq "data/tiny_dataset/fastq/tiny_S.fastq" \
+  -resume
+
+if [ -x "$(command -v singularity)" ]; then
+./nextflow src/nf_modules/fastqc/fastqc_paired.nf \
+  -c src/nf_modules/fastqc/fastqc_paired.config \
+  -profile singularity \
+  --fastq "data/tiny_dataset/fastq/tiny_R{1,2}.fastq" \
+  -resume
+
+./nextflow src/nf_modules/fastqc/fastqc_single.nf \
+  -c src/nf_modules/fastqc/fastqc_single.config \
+  -profile singularity \
+  --fastq "data/tiny_dataset/fastq/tiny_S.fastq" \
+  -resume
+fi
diff --git a/src/nf_modules/urqt/trimming_paired.config b/src/nf_modules/urqt/trimming_paired.config
index fb4ffb9..c2b4e3f 100644
--- a/src/nf_modules/urqt/trimming_paired.config
+++ b/src/nf_modules/urqt/trimming_paired.config
@@ -14,7 +14,7 @@ profiles {
     process {
       withName: trimming {
         cpus = 4
-        container = "file://bin/UrQt:d62c1f8.sif"
+        container = "file://bin/urqt:d62c1f8.sif"
       }
     }
   }
diff --git a/src/nf_modules/urqt/trimming_single.config b/src/nf_modules/urqt/trimming_single.config
index 32802a0..b102d8b 100644
--- a/src/nf_modules/urqt/trimming_single.config
+++ b/src/nf_modules/urqt/trimming_single.config
@@ -13,7 +13,7 @@ profiles {
     singularity.enabled = true
     process {
       withName: trimming {
-        container = "file://bin/UrQt:d62c1f8.sif"
+        container = "file://bin/urqt:d62c1f8.sif"
         cpus = 4
       }
     }
-- 
GitLab