diff --git a/src/kallisto_index.pbs b/src/kallisto_index.pbs index 257b301f41d7a55e0f64882ea6f170ae7fa997dc..c34affd34bbad4346ae69e2fe912c48053719f82 100644 --- a/src/kallisto_index.pbs +++ b/src/kallisto_index.pbs @@ -24,6 +24,6 @@ PIPELINE=${SCRATCH}/nextflow/src/nf_modules/kallisto/indexing.nf # change to your project / pipeline ! CONFIG=${SCRATCH}/nextflow/src/nf_modules/kallisto/indexing.config -${NF} ${PIPELINE} -c ${CONFIG} -profile ccin2p3_singularity \ +${NF} ${PIPELINE} -c ${CONFIG} -profile ccin2p3 \ --fasta "${SCRATCH}/nextflow/data/tiny_dataset/fasta/tiny_v2.fasta" \ --w "${SCRATCH}" -ansi-log false +-w "${SCRATCH}" diff --git a/src/nf_modules/kallisto/indexing.config b/src/nf_modules/kallisto/indexing.config index 752c099b9bb8b5287753b15cb68d3cd34f9e3bb3..84722f6daee159d986a7eafbfb0e7d29f6cfe8fd 100644 --- a/src/nf_modules/kallisto/indexing.config +++ b/src/nf_modules/kallisto/indexing.config @@ -33,7 +33,7 @@ profiles { } } } - ccin2p3 { + ccin2p3_conda { process{ withName: index_fasta { beforeScript = "source /sps/lbmc/common/miniconda3/init.sh" @@ -49,19 +49,18 @@ profiles { } } } - ccin2p3_singularity { + ccin2p3 { singularity.enabled = true singularity.runOptions = "--bind /pbs,/sps,/scratch" process{ withName: index_fasta { - beforeScript = "export SINGULARITY_BIND=\"/sps,/scratch:/var/singularity/mnt/\"" container = "/sps/lbmc/common/singularity/kallisto:0.44.0.img" scratch = true stageInMode = "copy" stageOutMode = "rsync" executor = "sge" clusterOptions = "-P P_lbmc -l os=cl7 -l sps=1 -r n \ - -o /sps/lbmc/lmodolo/logs/ -e /sps/lbmc/lmodolo/logs/ -M laurent.modolo@ens-lyon.fr -m beas" + -o ~/logs/ -e ~/logs/" cpus = 1 queue = 'huge' } diff --git a/src/nf_modules/kallisto/indexing.nf b/src/nf_modules/kallisto/indexing.nf index f24b0c1ca645c5f09545c068c46392425e8cda40..ea153569693b5dd057727a072d14dadd0ce77bf5 100644 --- a/src/nf_modules/kallisto/indexing.nf +++ b/src/nf_modules/kallisto/indexing.nf @@ -10,7 +10,6 @@ Channel process index_fasta { tag "$fasta.baseName" publishDir "results/mapping/index/", mode: 'copy' - echo true input: file fasta from fasta_file @@ -21,10 +20,8 @@ process index_fasta { script: """ -pwd kallisto index -k 31 --make-unique -i ${fasta.baseName}.index ${fasta} \ 2> ${fasta.baseName}_kallisto_report.txt -pwd """ }