-
Notifications
You must be signed in to change notification settings - Fork 736
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
port parabricks/deepvariant to nf-test #6995
Open
famosab
wants to merge
24
commits into
nf-core:master
Choose a base branch
from
famosab:deepv
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+427
−150
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
d38760a
port to nf-test
famosab 94d726f
remove
famosab 3acb809
update test yaml
famosab f87d2d9
swap to nextflow config
famosab 32e24fa
finalize
famosab 3f7444d
revert changes to nf-test config
famosab 220f99d
revert changes to nf-test config
famosab 35eab5d
add to conda_skip
famosab 45fc76f
Merge branch 'master' into deepv
famosab 053c1d3
add tag gpu
famosab 894bb4a
Merge branch 'master' into deepv
famosab 3c4aa44
Merge branch 'master' into deepv
famosab 13420bb
Update modules/nf-core/parabricks/deepvariant/tests/nextflow.config
famosab dc18210
Update modules/nf-core/parabricks/deepvariant/main.nf
famosab 1d64fdf
Merge branch 'master' into deepv
famosab d13179d
fix tests and add myself as maintainer to other modules
famosab e1297f3
fix meta
famosab 3fea3ae
Merge branch 'master' into deepv
famosab 7f9128e
Merge branch 'master' into deepv
famosab 8dbece3
Merge branch 'master' into deepv
famosab 632de59
Merge branch 'master' into deepv
famosab 19dc4f7
Merge branch 'master' into deepv
famosab 6b8dbe6
Merge branch 'master' into deepv
SPPearce 98b1c2f
add isssue to comment
famosab File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -88,3 +88,4 @@ authors: | |
- "@bsiranosian" | ||
maintainers: | ||
- "@bsiranosian" | ||
- "@famosab" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,3 +50,5 @@ output: | |
pattern: "versions.yml" | ||
authors: | ||
- "@Furentsu" | ||
maintainers: | ||
- "@famosab" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,12 +53,24 @@ output: | |
e.g. [ id:'test' ] | ||
- "*.vcf": | ||
type: file | ||
description: Variant file. | ||
description: vcf file created with deepvariant (does not support .gz for normal vcf), optional | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. But could be gzipped afterwards, other modules do that. |
||
pattern: "*.vcf" | ||
- gvcf: | ||
- meta: | ||
type: map | ||
description: | | ||
Groovy Map containing sample information. | ||
e.g. [ id:'test' ] | ||
- "*.g.vcf.gz": | ||
type: file | ||
description: bgzipped gvcf created with deepvariant, optional | ||
pattern: "*.g.vcf.gz" | ||
- versions: | ||
- versions.yml: | ||
type: file | ||
description: File containing software versions. | ||
pattern: "versions.yml" | ||
authors: | ||
- "@bsiranosian" | ||
maintainers: | ||
- "@famosab" |
223 changes: 223 additions & 0 deletions
223
modules/nf-core/parabricks/deepvariant/tests/main.nf.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,223 @@ | ||
nextflow_process { | ||
|
||
name "Test Process PARABRICKS_DEEPVARIANT" | ||
script "../main.nf" | ||
process "PARABRICKS_DEEPVARIANT" | ||
|
||
tag "modules" | ||
tag "modules_nfcore" | ||
tag "parabricks" | ||
tag "parabricks/deepvariant" | ||
tag "gpu" | ||
|
||
test("human - bam") { | ||
|
||
when { | ||
process { | ||
""" | ||
input[0] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam', checkIfExists: true), | ||
[], // bam.bai not needed unless using intervals | ||
[] | ||
] | ||
input[1] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true) | ||
] | ||
""" | ||
} | ||
} | ||
|
||
then { | ||
assertAll( | ||
{ assert process.success }, | ||
{ assert snapshot( | ||
path(process.out.vcf[0][1]).vcf.variantsMD5, | ||
process.out.versions, | ||
path(process.out.versions[0]).yaml | ||
).match() } | ||
) | ||
} | ||
|
||
} | ||
|
||
test("human - bam - intervals") { | ||
|
||
when { | ||
process { | ||
""" | ||
input[0] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam', checkIfExists: true), | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam.bai', checkIfExists: true), | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/multi_intervals.bed', checkIfExists: true) | ||
] | ||
input[1] = [ | ||
[ id:'ref'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true) | ||
] | ||
""" | ||
} | ||
} | ||
|
||
then { | ||
assertAll( | ||
{ assert process.success }, | ||
{ assert snapshot( | ||
path(process.out.vcf[0][1]).vcf.variantsMD5, | ||
process.out.versions, | ||
path(process.out.versions[0]).yaml | ||
).match() } | ||
) | ||
} | ||
|
||
} | ||
|
||
test("human - bam - gvcf") { | ||
|
||
config './nextflow.config' | ||
|
||
when { | ||
params { | ||
module_args = '--gvcf' | ||
} | ||
process { | ||
""" | ||
input[0] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam', checkIfExists: true), | ||
[], // bam.bai not needed unless using intervals | ||
[] | ||
] | ||
input[1] = [ | ||
[ id:'ref'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true) | ||
] | ||
""" | ||
} | ||
} | ||
|
||
then { | ||
assertAll( | ||
{ assert process.success }, | ||
{ assert snapshot( | ||
path(process.out.gvcf[0][1]).vcf.variantsMD5, | ||
process.out.versions, | ||
path(process.out.versions[0]).yaml | ||
).match() | ||
} | ||
) | ||
} | ||
|
||
} | ||
|
||
test("human - bam - intervals - gvcf") { | ||
|
||
config './nextflow.config' | ||
|
||
when { | ||
params { | ||
module_args = '--gvcf' | ||
} | ||
process { | ||
""" | ||
input[0] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam', checkIfExists: true), | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam.bai', checkIfExists: true), | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/multi_intervals.bed', checkIfExists: true) | ||
] | ||
input[1] = [ | ||
[ id:'ref'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true) | ||
] | ||
""" | ||
} | ||
} | ||
|
||
then { | ||
assertAll( | ||
{ assert process.success }, | ||
{ assert snapshot( | ||
path(process.out.gvcf[0][1]).vcf.variantsMD5, | ||
process.out.versions, | ||
path(process.out.versions[0]).yaml | ||
).match() | ||
} | ||
) | ||
} | ||
|
||
} | ||
|
||
test("human - bam - stub") { | ||
|
||
options "-stub" | ||
|
||
when { | ||
process { | ||
""" | ||
input[0] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam', checkIfExists: true), | ||
[], // bam.bai not needed unless using intervals | ||
[] | ||
] | ||
input[1] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true) | ||
] | ||
""" | ||
} | ||
} | ||
|
||
then { | ||
assertAll( | ||
{ assert process.success }, | ||
{ assert snapshot( | ||
process.out, | ||
path(process.out.versions[0]).yaml | ||
).match() } | ||
) | ||
} | ||
|
||
} | ||
|
||
test("human - bam - intervals - gvcf - stub") { | ||
|
||
config './nextflow.config' | ||
options "-stub" | ||
|
||
when { | ||
params { | ||
module_args = '--gvcf' | ||
} | ||
process { | ||
""" | ||
input[0] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam', checkIfExists: true), | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.recalibrated.sorted.bam.bai', checkIfExists: true), | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/multi_intervals.bed', checkIfExists: true) | ||
] | ||
input[1] = [ | ||
[ id:'test'], | ||
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true) | ||
] | ||
""" | ||
} | ||
} | ||
|
||
then { | ||
assertAll( | ||
{ assert process.success }, | ||
{ assert snapshot( | ||
process.out, | ||
path(process.out.versions[0]).yaml | ||
).match() } | ||
) | ||
} | ||
|
||
} | ||
|
||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 is this one not zipped?
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.
I'll update it
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.
I think deepvariant gives either a vcf or a g.vcf.gz file. Otherwise the container needs to be changed and I am unsure how to do that with parabricks.
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.
Sure, but we can just gzip it afterwards (with whatever the magic way of doing that is for vcf files), presumably these vcf files will be large.
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.
I think we need to install bgzip to the container then.