Skip to content
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.

Sign up for GitHub

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

Add module bcftools/norm to sarek (in progress) #1483

Open
wants to merge 14 commits into
base: dev
Choose a base branch
from
Open

Add module bcftools/norm to sarek (in progress) #1483

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4772da1
First modification to contribute to the bcftools/norm module in Sarek
JC-Delmas Apr 25, 2024
451aaec
Changes in the GERMLINE_VCFS_NORM process
JC-Delmas Apr 25, 2024
d97726b
Add fasta argument to POST_VARIANTCALLING process.
JC-Delmas Apr 25, 2024
e034ff0
add fasta input as argument
JC-Delmas Apr 25, 2024
8469832
remove vcfs in the GERMLINE_VCFS_NORM process, replaced by germline_v…
JC-Delmas Apr 25, 2024
e885888
First modification to contribute to the bcftools/norm module in Sarek
JC-Delmas Apr 25, 2024
9e94a05
Changes in the GERMLINE_VCFS_NORM process
JC-Delmas Apr 25, 2024
2bdba7e
Add fasta argument to POST_VARIANTCALLING process.
JC-Delmas Apr 25, 2024
1214f10
add fasta input as argument
JC-Delmas Apr 25, 2024
b7ba4f2
remove vcfs in the GERMLINE_VCFS_NORM process, replaced by germline_v…
JC-Delmas Apr 25, 2024
34bf47b
Update workflows/sarek/main.nf
JC-Delmas Apr 25, 2024
6dff9af
Resolved merge conflict by keeping changes from branch 34bf47baa9d61f…
JC-Delmas Apr 30, 2024
d289261
Refactor normalization and concatenation of VCF files
JC-Delmas Apr 30, 2024
c78af62
Modify and adjust two scripts to add normalization and integrate FAST…
JC-Delmas May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions conf/modules/post_variant_calling.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@

process {

withName: 'GERMLINE_VCFS_NORM'{
ext.args = { [
'--multiallelics - both', //split multiallelic sites into biallelic records and both SNPs and indels should be merged separately into two records
'--rm-dup all' //output only the first instance of a record which is present multiple times
].join(' ') }
ext.when = { params.concatenate_vcfs }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we expand this to all vcfs

publishDir = [
mode: params.publish_dir_mode,
path: { "${params.outdir}/variant_calling/concat/${meta.id}/" }
]
}

withName: 'GERMLINE_VCFS_CONCAT'{
ext.args = { "-a" }
ext.when = { params.concatenate_vcfs }
Expand Down
7 changes: 7 additions & 0 deletions modules/nf-core/bcftools/norm/environment.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions modules/nf-core/bcftools/norm/main.nf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions modules/nf-core/bcftools/norm/meta.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions subworkflows/local/post_variantcalling/main.nf
View file
Open in desktop
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I've tried an approach, but now I've got a new error:
Process NFCORE_SAREK:SAREK:POST_VARIANTCALLING:CONCATENATE_GERMLINE_VCFS:GERMLINE_VCFS_NORM declares 2 input channels but 1 were specified

-- Check script './workflows/sarek/../../subworkflows/local/post_variantcalling/../vcf_concatenate_germline/main.nf' at line: 27 or see '.nextflow.log' file for more details

I've never done groovy, I think I've broken everything or maybe I'm making it too complex ^^'

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ workflow POST_VARIANTCALLING {

take:
vcfs
fasta
concatenate_vcfs

main:
Expand Down
12 changes: 9 additions & 3 deletions subworkflows/local/vcf_concatenate_germline/main.nf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Concatenation of germline vcf-files
include { ADD_INFO_TO_VCF } from '../../../modules/local/add_info_to_vcf/main'
include { TABIX_BGZIPTABIX as TABIX_EXT_VCF } from '../../../modules/nf-core/tabix/bgziptabix/main'
include { BCFTOOLS_NORM as GERMLINE_VCFS_NORM } from '../../../modules/nf-core/bcftools/norm/main'
include { BCFTOOLS_CONCAT as GERMLINE_VCFS_CONCAT } from '../../../modules/nf-core/bcftools/concat/main'
include { BCFTOOLS_SORT as GERMLINE_VCFS_CONCAT_SORT } from '../../../modules/nf-core/bcftools/sort/main'
include { TABIX_TABIX as TABIX_GERMLINE_VCFS_CONCAT_SORT } from '../../../modules/nf-core/tabix/tabix/main'
Expand All @@ -13,6 +14,7 @@ workflow CONCATENATE_GERMLINE_VCFS {

take:
vcfs
fasta

main:
versions = Channel.empty()
Expand All @@ -23,14 +25,18 @@ workflow CONCATENATE_GERMLINE_VCFS {

// Gather vcfs and vcf-tbis for concatenating germline-vcfs
germline_vcfs_with_tbis = TABIX_EXT_VCF.out.gz_tbi.map{ meta, vcf, tbi -> [ meta.subMap('id'), vcf, tbi ] }.groupTuple()

GERMLINE_VCFS_CONCAT(germline_vcfs_with_tbis)

// Normalize vcf-files and concat
GERMLINE_VCFS_NORM(germline_vcfs_with_tbis, fasta)
GERMLINE_VCFS_CONCAT(GERMLINE_VCFS_NORM.out.vcf)
GERMLINE_VCFS_CONCAT_SORT(GERMLINE_VCFS_CONCAT.out.vcf)
TABIX_GERMLINE_VCFS_CONCAT_SORT(GERMLINE_VCFS_CONCAT_SORT.out.vcf)



// Gather versions of all tools used
versions = versions.mix(ADD_INFO_TO_VCF.out.versions)
versions = versions.mix(TABIX_EXT_VCF.out.versions)
versions = versions.mix(GERMLINE_VCFS_NORM.out.versions)
versions = versions.mix(GERMLINE_VCFS_CONCAT.out.versions)
versions = versions.mix(GERMLINE_VCFS_CONCAT.out.versions)
Copy link
Contributor

@asp8200 asp8200 Apr 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
versions = versions.mix(GERMLINE_VCFS_CONCAT.out.versions)
versions = versions.mix(GERMLINE_VCFS_CONCAT_SORT.out.versions)

That seems like a copy-paste bug. Probably my bad

versions = versions.mix(TABIX_GERMLINE_VCFS_CONCAT_SORT.out.versions)
Expand Down
3 changes: 2 additions & 1 deletion workflows/sarek/main.nf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,8 @@ workflow SAREK {

// POST VARIANTCALLING
POST_VARIANTCALLING(BAM_VARIANT_CALLING_GERMLINE_ALL.out.vcf_all,
params.concatenate_vcfs)
fasta,
params.concatenate_vcfs)

// Gather vcf files for annotation and QC
vcf_to_annotate = Channel.empty()
Expand Down
Loading