diff --git a/src/bolero.nf b/src/bolero.nf index 20ecfa9936eae381d09ea8cdad5364dc3a49a7c4..308996dbb86eb7249f1d39b27eca0f1b687c5076 100755 --- a/src/bolero.nf +++ b/src/bolero.nf @@ -31,8 +31,8 @@ def helpMessage() { Mandatory arguments: --input [path] Path to the folder containing fast5 files. If skip basecalling option enabled, path to fastq files folder. - --adapt [str] Sequence of 5'RACE adapter. - --gsp [str] Sequence of gene-specific primer used in 5'RACE amplification step. + --adapt [file] Path to the txt/fasta file containing the sequence of 5'RACE adapter. + --gsp [file] Path to the txt/fasta file containing the sequence of gene-specific primer used in 5'RACE amplification step. References: --genome [file] Path to the fasta file containing the genome. @@ -128,11 +128,18 @@ Channel .ifEmpty { error "No fast5/q folder defined." } .set { input } +/* Channel - .of( params.adapt ) + .fromPath( params.adapt ) .ifEmpty { error "No adapter sequence defined." } .set { adapt } +Channel + .fromPath( params.gsp ) + .ifEmpty { error "No adapter sequence defined." } + .set { gsp } +*/ + Channel .fromPath( params.genome ) .ifEmpty { error "No genome defined, a fasta file containing the full length preC RNA from HBV genome." } @@ -164,7 +171,10 @@ if(!params.skipBC) { } } +<<<<<<< HEAD // include { barecode } from "./nf_modules/barecode/main.nf" +======= +>>>>>>> c281bb3789a8d844085e21f749580c29d43b35d6 include { concatenate } from "./nf_modules/seqkit/main.nf" include { cut_5pRACE } from "./nf_modules/cutadapt/main.nf" include { hbv_genome } from "./nf_modules/minimap2/main.nf" @@ -187,7 +197,6 @@ include { rna_count } from "./nf_modules/rna_count/main.nf" workflow { - //######################## BASECALLING ######################## if(params.skipBC) { // we take fastq files as input and skip basecalling diff --git a/src/nextflow.config b/src/nextflow.config index 51cbdb799e28f24a5d3748e63135982d1cfa8dc5..54e515f2fa82bc3e92068cc6b19727516db42ac9 100755 --- a/src/nextflow.config +++ b/src/nextflow.config @@ -18,7 +18,7 @@ profiles { docker.enabled = true process { errorStrategy = 'finish' - memory = '16GB' + memory = '12GB' withLabel: big_mem_mono_cpus { cpus = 1 } @@ -47,7 +47,7 @@ profiles { podman.enabled = true process { errorStrategy = 'finish' - memory = '16GB' + memory = '12GB' withLabel: big_mem_mono_cpus { cpus = 1 } @@ -72,13 +72,45 @@ profiles { } } } + pollux { + singularity.enabled = true + singularity.cacheDir = "./bin/" + singularity.bind = "/home" + process { + errorStrategy = 'finish' + memory = '32GB' + withLabel: big_mem_mono_cpus { + cpus = 1 + } + withLabel: big_mem_multi_cpus { + cpus = 16 + } + withLabel: small_mem_mono_cpus { + cpus = 1 + memory = '2GB' + } + withLabel: small_mem_multi_cpus { + cpus = 8 + memory = '2GB' + } + withLabel: mid_mem_mono_cpus { + cpus = 1 + memory = '8GB' + } + withLabel: mid_mem_multi_cpus { + cpus = 8 + memory = '8GB' + } + } + } + singularity { singularity.enabled = true singularity.cacheDir = "./bin/" singularity.bind = "/home" process { errorStrategy = 'finish' - memory = '16GB' + memory = '12GB' withLabel: big_mem_mono_cpus { cpus = 1 } diff --git a/src/nf_modules/junction_nanosplicer/main.nf b/src/nf_modules/junction_nanosplicer/main.nf index 337ed6fc04e92f575352662ff68061b4f69001fb..fb391396b8bee9ee39bee4a80818d7db4947e586 100644 --- a/src/nf_modules/junction_nanosplicer/main.nf +++ b/src/nf_modules/junction_nanosplicer/main.nf @@ -23,6 +23,5 @@ process junctions_nanosplicer{ mkdir ${barcode} cd ${barcode}/ Rscript /Junctions_NanoSplicer.R -c ../${txt} -j ../${csv} - mv identified_SPvariants.csv ${barcode}_identified_SPvariants.csv """ } \ No newline at end of file diff --git a/src/nf_modules/ont-guppy/main.nf b/src/nf_modules/ont-guppy/main.nf index adc9ff9ea8fef8dba19a24412ceabf1d254f19e8..19aecb1de06db473e08fcbd750c196be09506f12 100644 --- a/src/nf_modules/ont-guppy/main.nf +++ b/src/nf_modules/ont-guppy/main.nf @@ -39,8 +39,10 @@ process basecall_fast5_gpu { """ echo "Start basecalling using GPUs." # guppy_basecaller --print_workflows +find -type f -name "*.fast5" > allfast5files.txt guppy_basecaller --compress_fastq \ -i ${fast5_folder} \ + --input_file_list allfast5files.txt \ -s . \ --flowcell ${params.flowcell} \ --kit ${params.kit} \ @@ -82,8 +84,10 @@ process basecall_fast5_cpu { script: """ echo "Start basecalling using CPUs." +find ${fast5_folder} -type f -name "*.fast5" > allfast5files.txt guppy_basecaller --compress_fastq \ - -i ${fast5_folder} \ + -i / \ + --input_file_list allfast5files.txt \ -s . \ --cpu_threads_per_caller ${params.cpu_threads_per_caller} \ --num_callers ${params.num_callers} \ diff --git a/src/nf_modules/start_positions/main.nf b/src/nf_modules/start_positions/main.nf index 49f14e65553998264276ed853fb038abe257cd64..668d50a5726464764d78c9d73061b12452631263 100644 --- a/src/nf_modules/start_positions/main.nf +++ b/src/nf_modules/start_positions/main.nf @@ -23,8 +23,6 @@ process start_position_individuals{ mkdir ${barcode} cd ${barcode}/ Rscript /Start_positions.R -i ../${start_position_counts} - mv classification_of_reads_per_RNA.txt ${barcode}_classification_of_reads_per_RNA.txt - mv Count_reads_per_promoter.tsv ${barcode}_count_reads_per_promoter.tsv mv Rplots.pdf ${barcode}_Rplots.pdf """ } \ No newline at end of file