-
Notifications
You must be signed in to change notification settings - Fork 928
Add fq2bam fq align dd bwamem #9309
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
…dules into add_fq2bam_fq_align_dd_bwamem
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes in nf-test.config is something that needs to be double checked.
…dules into add_fq2bam_fq_align_dd_bwamem
Removed and added to specific subworkflow tests directives! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, quite a few things I should have spotted in the first round.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't touch this file, undo any edits here please
| run("BWA_INDEX") { | ||
| script "../../../../modules/nf-core/bwa/index/main.nf" | ||
| process { | ||
| """ | ||
| input[0] = Channel.of([ | ||
| [ id:'test' ], // meta map | ||
| file('https://github.com/nf-core/test-datasets/raw/methylseq/reference/genome.fa', checkIfExists: true) | ||
| ]) | ||
| """ | ||
| } | ||
| } | ||
|
|
||
| run("BWA_INDEX", alias: 'BWA_INDEX_PE') { | ||
| script "../../../../modules/nf-core/bwa/index/main.nf" | ||
| process { | ||
| """ | ||
| input[0] = Channel.of([ | ||
| [ id:'test' ], // meta map | ||
| file('https://github.com/nf-core/test-datasets/raw/methylseq/reference/genome.fa', checkIfExists: true) | ||
| ]) | ||
| """ | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it's the same genome why do we need to run the same indexing twice? We can just have a single global setup.
| params { | ||
| use_gpu = true | ||
| bwa_prefix = 'genome.fa' | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you include this? It shouldn't be necessary for the subworkflow, everything is passed as an input. Best to keep it as simple as possible, remove it everywhere
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aah, now I see. You got your inspiration from the parabricks/fq2bam module. You can do this but then also need to update the config file, to parse these params in the correct variables.
Given the amount of arguments that there already are in the nextflow.config file, I would just delete this param section.
| } | ||
| } | ||
|
|
||
| test("Params: parabricks/fq2bam single-end | use_gpu ") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't follow nf-core naming convetion guidelines .
Please also update all other test names
| test("Params: parabricks/fq2bam single-end | use_gpu ") { | |
| test("Sarscov2 fasta - SE - deduplicate- with GPU ") { | |
| input[4] = false // skip_deduplication | ||
| input[5] = true // use_gpu | ||
| input[6] = Channel.empty() // interval_file | ||
| input[7] = Channel.empty() // known_sites |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please align these comments .
| tag "gpu" | ||
| tag "subworkflows" | ||
| tag "subworkflows_nfcore" | ||
| tag "subworkflows/fastq_align_dedup_bwamem" | ||
| tag "parabricks/fq2bam" | ||
| tag "samtools/index" | ||
| tag "picard/markduplicates" | ||
| tag "untar" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Think you are missing a few in here, mostly all the samtools ones.
| tag "gpu" | ||
| tag "subworkflows" | ||
| tag "subworkflows_nfcore" | ||
| tag "subworkflows/fastq_align_dedup_bwamem" | ||
| tag "parabricks/fq2bam" | ||
| tag "samtools/index" | ||
| tag "picard/markduplicates" | ||
| tag "untar" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe i missed it, where are you using untar?
| { assert snapshot( | ||
| workflow.out.bam.collect { meta, bamfile -> bam(bamfile).getReadsMD5() }, | ||
| workflow.out.bai.collect { meta, bai -> file(bai).name }, | ||
| workflow.out.samtools_flagstat, | ||
| workflow.out.samtools_stats, | ||
| workflow.out.samtools_index_stats, | ||
| workflow.out.picard_metrics.collect { meta, metrics -> file(metrics).name }, | ||
| workflow.out.multiqc.flatten().collect { path -> file(path).name }, | ||
| workflow.out.versions | ||
| ).match() } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the stub run, we can just leave it as is.
| assertAll( | ||
| { assert workflow.success }, | ||
| { assert snapshot(workflow.out).match() } | ||
| ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| assertAll( | |
| { assert workflow.success }, | |
| { assert snapshot(workflow.out).match() } | |
| ) | |
| assertAll( | |
| { assert workflow.success }, | |
| { assert snapshot( | |
| workflow.out, | |
| workflow.out.versions.collect{ path(it).yaml } | |
| ).match() } | |
| ) | |
| @@ -0,0 +1,160 @@ | |||
| { | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah none of the tests seems to have ran.
PR checklist
Closes #XXX
versions.ymlfile.labelnf-core modules test <MODULE> --profile dockernf-core modules test <MODULE> --profile singularitynf-core modules test <MODULE> --profile condanf-core subworkflows test <SUBWORKFLOW> --profile dockernf-core subworkflows test <SUBWORKFLOW> --profile singularitynf-core subworkflows test <SUBWORKFLOW> --profile conda