Skip to content

Commit

Permalink
Merge pull request #4 from tgen/phoenix-sync
Browse files Browse the repository at this point in the history
Coyote v1.2.1
  • Loading branch information
bryce-turner authored Aug 27, 2021
2 parents 19ee53c + dad7d52 commit d01ef4b
Show file tree
Hide file tree
Showing 58 changed files with 1,808 additions and 804 deletions.
52 changes: 26 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -283,58 +283,58 @@ _Click to show details_
<summary><b>Public Tools Used by the Workflow</b></summary>

All tools build with public easybuild configuration files, available [here](https://github.com/easybuilders/easybuild).<br/>
*Last Updated Jan 29th, 2021*
*Last Updated July 29th, 2021*

| Tool | Version Implemented | Current Version | Dependency and Notes | EasyBuild |
| :---: | :---: | :---: | :--- | :---: |
| [bcftools](https://github.com/samtools/bcftools/releases) | 1.10.2 | **1.11** | | Yes |
| [bcftools](https://github.com/samtools/bcftools/releases) | 1.10.2 | **1.13** | | Yes |
| [bedtools](https://github.com/arq5x/bedtools2/releases) | 2.29.0 | **2.30.0** | delly-filter, addmatchRNA, vardict, vcfmerger2 | Yes |
| [bowtie2](http://bowtie-bio.sourceforge.net/bowtie2/index.shtml) | 2.3.5.1 | **2.4.2** | star-fusion | Yes |
| [bowtie2](http://bowtie-bio.sourceforge.net/bowtie2/index.shtml) | 2.3.5.1 | **2.4.4** | star-fusion | Yes |
| [bwa](https://github.com/lh3/bwa/releases) | 0.7.17 | 0.7.17 | | Yes |
| [cellranger](https://support.10xgenomics.com/single-cell-gene-expression/software/pipelines/latest/using/count) | 3.1.0 | **5.0** | | Yes |
| [cuda-toolkit](https://developer.nvidia.com/cuda-downloads) | 10.1.243 | **11.2** | | No |
| [deepvariant](https://github.com/google/deepvariant/releases) | 0.10.0 | **1.1.0** | singularity container | Yes |
| [cellranger](https://support.10xgenomics.com/single-cell-gene-expression/software/pipelines/latest/using/count) | 6.0 | 6.0 | | Yes |
| [cuda-toolkit](https://developer.nvidia.com/cuda-downloads) | 10.1.243 | **11.4** | | No |
| [deepvariant](https://github.com/google/deepvariant/releases) | 0.10.0 | **1.2.0** | singularity container | Yes |
| [delly](https://github.com/dellytools/delly/releases) | 0.7.6 | **0.8.7** | staying with 0.7.6 for compatibility reasons | Yes |
| [dle](https://github.com/tgen/Discordant_Loci_Extractor/releases) | 0.1.5 | 0.1.5 | private repo | No |
| [freebayes](https://github.com/ekg/freebayes/releases) | 1.3.1 | **1.3.4** | 1.3.2 ensures python3 compatibility | Yes |
| [gatk](https://github.com/broadinstitute/gatk//releases) | 4.1.8.0 | **4.1.9.0** | | Yes |
| [gmap-gsnp](http://research-pub.gene.com/gmap/) | 2019-09-12 | **2020-12-17** | star-fusion | Yes |
| [gridss](https://github.com/PapenfussLab/gridss/releases) | 2.6.3 | **2.10.2** | | |
| [freebayes](https://github.com/ekg/freebayes/releases) | 1.3.1 | **1.3.4** | | Yes |
| [gatk](https://github.com/broadinstitute/gatk//releases) | 4.1.8.0 | **4.2.0.0** | | Yes |
| [gmap-gsnp](http://research-pub.gene.com/gmap/) | 2019-09-12 | **2021-07-23** | star-fusion | Yes |
| [gridss](https://github.com/PapenfussLab/gridss/releases) | 2.6.3 | **2.12.0** | | |
| [hmmcopyutils](https://github.com/shahcompbio/hmmcopy_utils) | 1.0 | 1.0 | no official release | Yes |
| [htseq](https://github.com/htseq/htseq/releases) | 0.12.3 | **0.13.5** | | |
| [htslib](https://github.com/samtools/htslib/releases) | 1.10.2 | **1.11** | star-fusion(bgzip) | Yes |
| [htslib](https://github.com/samtools/htslib/releases) | 1.10.2 | **1.13** | star-fusion(bgzip) | Yes |
| [ichor](https://github.com/broadinstitute/ichorCNA/releases) | 0.2.0 | 0.2.0 | package in R/3.6.1-phoenix module | Yes? |
| [jellyfish](https://github.com/gmarcais/Jellyfish/releases) | 2.3.0 | 2.3.0 | star-fusion | Yes |
| [lancet](https://github.com/nygenome/lancet/releases) | 1.1.0 | 1.1.0 | | Yes |
| [lumosVar2](https://github.com/tgen/lumosVar2/releases) | 1.1 | 1.1 | | Yes |
| [manta](https://github.com/Illumina/manta/releases) | 1.6.0 | 1.6.0 | | Yes |
| [manta_tgen](https://github.com/tgen/manta/releases) | 1.6.0 | 1.6.0 | modified for internal use | No |
| [multiQC](https://github.com/ewels/MultiQC/releases) | 1.9 | 1.9 | python3 pip | Yes |
| [octopus](https://github.com/luntergroup/octopus/releases) | 0.6.3-beta | **0.7.0** | | Yes |
| [openmpi](https://github.com/open-mpi/ompi/releases) | 3.1.3 | **4.1.0** | delly | No |
| [multiQC](https://github.com/ewels/MultiQC/releases) | 1.9 | **1.11**| python3 pip | Yes |
| [octopus](https://github.com/luntergroup/octopus/releases) | 0.6.3-beta | **0.7.4** | | Yes |
| [openmpi](https://github.com/open-mpi/ompi/releases) | 3.1.3 | **4.1.1** | delly | No |
| [pairoscope](https://github.com/genome/pairoscope/releases) | 0.4.2 | 0.4.2 | | Yes |
| [perl](https://github.com/Perl/perl5/releases) | 5.28.1 | **5.33.6** | star-fusion | Yes |
| [perl](https://github.com/Perl/perl5/releases) | 5.28.1 | **5.35.2** | star-fusion | Yes |
| [phaser](https://github.com/secastel/phaser/tree/master/phaser) | 1.1.1 | 1.1.1 | vcfmerger2 | Yes |
| [python2](https://www.python.org/downloads/) | 2.7.15 | **2.7.18** | | Yes |
| [python3](https://www.python.org/downloads/) | 3.7.2 | **3.9.1** | star-fusion, vcfmerger2 | Yes |
| [R](https://www.r-project.org/) | 3.6.1 | **4.0.3** | gatk cnv, varDict, vcfmerger2 | Yes |
| [salmon](https://github.com/COMBINE-lab/salmon/releases) | 1.2.1 | **1.4.0** | self, star-fusion | Yes |
| [python3](https://www.python.org/downloads/) | 3.7.2 | **3.9.6** | star-fusion, vcfmerger2 | Yes |
| [R](https://www.r-project.org/) | 3.6.1 | **4.1.0** | gatk cnv, varDict, vcfmerger2 | Yes |
| [salmon](https://github.com/COMBINE-lab/salmon/releases) | 1.2.1 | **1.5.2** | self, star-fusion | Yes |
| [sambamba](https://github.com/biod/sambamba/releases) | 0.7.0 | **0.8.0** | | |
| [samblaster](https://github.com/GregoryFaust/samblaster/releases) | 0.1.24 | **0.1.26** | | |
| [samtools](https://github.com/samtools/samtools/releases) | 1.10 | **1.11** | | Yes |
| [singularity](https://github.com/sylabs/singularity/releases) | 3.5.2 | **3.7.1** | deepvariant | Yes, release-candidate |
| [samtools](https://github.com/samtools/samtools/releases) | 1.10 | **1.13** | | Yes |
| [singularity](https://github.com/sylabs/singularity/releases) | 3.5.2 | **3.8.1** | deepvariant | Yes |
| [snpEff](https://sourceforge.net/projects/snpeff/files/) | 4.3t | **4.5covid19** | covid related release? | Yes |
| [snpSniffer](https://github.com/tgen/snpSniffer/releases) | 7.0.0 | 7.0.0 | | No |
| [star](https://github.com/alexdobin/STAR/releases) | 2.7.5a | **2.7.7a** | self, star-fusion | Yes |
| [star-fusion](https://github.com/STAR-Fusion/STAR-Fusion/releases) | 1.8.1 | **1.9.1** | | Yes |
| [star](https://github.com/alexdobin/STAR/releases) | 2.7.5a | **2.7.9a** | self, star-fusion | Yes |
| [star-fusion](https://github.com/STAR-Fusion/STAR-Fusion/releases) | 1.8.1 | **1.10.1** | | Yes |
| [strelka](https://github.com/Illumina/strelka/releases) | 2.9.10 | 2.9.10 | | Yes |
| [subread](https://sourceforge.net/projects/subread/) | 2.0.0 | **2.0.1** | part of subread package | Yes |
| [tgen_mutation_burden](https://github.com/tgen/tgen_mutation_burden/releases) | 1.2.1 | 1.2.1 | | No |
| [subread](https://sourceforge.net/projects/subread/) | 2.0.0 | **2.0.3** | part of subread package | Yes |
| [tgen_mutation_burden](https://github.com/tgen/tgen_mutation_burden/releases) | 1.2.3 | 1.2.3 | | No |
| [transParser](https://github.com/tgen/transParser/releases) | 1.0.1 | 1.0.1 | | No |
| [trinityrnaseq](https://github.com/trinityrnaseq/trinityrnaseq/releases) | 2.8.6 | **2.11.0** | star-fusion | Yes |
| [trinityrnaseq](https://github.com/trinityrnaseq/trinityrnaseq/releases) | 2.8.6 | **2.12.0** | star-fusion | Yes |
| [vardictJava](https://github.com/AstraZeneca-NGS/VarDictJava/releases) | 1.7.0 | **1.8.2** | | Yes |
| [vcfmerger2](https://github.com/tgen/vcfMerger2/releases) | 0.8.7 | 0.8.7 | | Yes |
| [vep](https://github.com/Ensembl/ensembl-vep/releases) | 98.3 | **102.0** | | Yes |
| [vep](https://github.com/Ensembl/ensembl-vep/releases) | 98.3 | **104.3** | | Yes |
| [verifybamid2](https://github.com/Griffan/VerifyBamID/releases) | 1.0.6 | **2.0.1** | | Yes |
| [vt](https://github.com/atks/vt/releases) | 0_57721 | 0_57721 | | Yes |

Expand Down
4 changes: 4 additions & 0 deletions modules/constitutional/deepvariant.jst
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% from 'modules/annotation/main.jst' import annotate_vcfs with context %}
{% from 'utilities/vcf_stats.jst' import vcf_stats with context %}

{%- macro deepvariant(sample, aligner='bwa', taskPrefix='Genome') %}

Expand Down Expand Up @@ -152,4 +153,7 @@
bcftools index --tbi --force "{{ pass_vcf }}"

{{- annotate_vcfs(sample, temp_dir, results_dir, pass_vcf, taskPrefix, aligner, 'deepvariant', 'constitutional', 'snp_indel_caller') }}
{{- vcf_stats(pass_vcf, results_dir) }}
{{- vcf_stats(all_vcf, results_dir) }}

{% endmacro %}
74 changes: 74 additions & 0 deletions modules/constitutional/expansion_hunter.jst
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@

{% macro expansion_hunter(sample, aligner='bwa') %}
{% set bam %}{{ sample.gltype }}/alignment/{{ aligner }}/{{ sample.name }}/{{ sample.name }}.{{ aligner }}.bam{% endset %}
{% set temp_dir %}temp/{{ sample.gltype }}/constitutional_variant_calls/expansion_hunter/{{ sample.name }}{% endset %}
{% set results_dir %}{{ sample.gltype }}/constitutional_variant_calls/expansion_hunter/{{ sample.name }}{% endset %}

- name: expansion_hunter_{{ aligner }}_{{ sample.name }}_{{ aligner }}
tags: [{{ sample.gltype }}, repeats, expansion, SRT, {{ sample.name }}]
input: {{ bam }}
output:
- {{ results_dir }}/{{ sample.name }}.expansion_hunter.all.vcf.gz
- {{ results_dir }}/{{ sample.name }}.expansion_hunter.all.vcf.gz.tbi
walltime: "24:00:00"
cpus: 1
mem: 2G
cmd: |
set -eu
set -o pipefail

module load {{ constants.tools.expansion_hunter.module }}
module load {{ constants.tools.bcftools.module }}

rm -r {{ temp_dir }} || true
mkdir -p {{ temp_dir }}
mkdir -p {{ results_dir }}

{# The variant catalog is in the install path, we grab the path here #}
{# ExpansionHunter is in a /bin directory, we want to go one level higher #}
eh_path=$(dirname $(dirname `which ExpansionHunter`))

ExpansionHunter \
--reads {{ bam }} \
--reference {{ constants.coyote.reference_fasta }} \
--variant-catalog ${eh_path}/variant_catalog/grch38/variant_catalog.json \
--output-prefix {{ temp_dir }}/{{ sample.name }}.expansion_hunter

bcftools view \
--output-type z \
--output-file {{ results_dir }}/{{ sample.name }}.expansion_hunter.all.vcf.gz \
{{ temp_dir }}/{{ sample.name }}.expansion_hunter.vcf

bcftools index --tbi --force {{ results_dir }}/{{ sample.name }}.expansion_hunter.all.vcf.gz


- name: expansion_hunter_filter_variants_{{ sample.name }}_{{ aligner }}
tags: [{{ sample.gltype}}, constitutional, snp_indel_caller, deepvariant, {{ sample.name }}]
input:
- {{ results_dir }}/{{ sample.name }}.expansion_hunter.all.vcf.gz
- {{ results_dir }}/{{ sample.name }}.expansion_hunter.all.vcf.gz.tbi
output:
- {{ results_dir }}/{{ sample.name }}.expansion_hunter.pass.vcf.gz
- {{ results_dir }}/{{ sample.name }}.expansion_hunter.pass.vcf.gz.tbi
cpus: 1
mem: 2G
walltime: "12:00:00"
cmd: |
set -eu
set -o pipefail

module load {{ constants.tools.bcftools.module }}

{# Then filter out the PASS variants to a separate file #}
bcftools filter \
--output-type z \
--include 'FILTER == "PASS"' \
{% if sample.gltype == 'exome' %}
--targets-file "{{ sample.capture_kit.extended_bed }}" \
{% endif %}
"{{ results_dir }}/{{ sample.name }}.expansion_hunter.all.vcf.gz" \
> "{{ results_dir }}/{{ sample.name }}.expansion_hunter.pass.vcf.gz"

bcftools index --tbi --force "{{ results_dir }}/{{ sample.name }}.expansion_hunter.pass.vcf.gz"

{% endmacro %}
6 changes: 5 additions & 1 deletion modules/constitutional/freebayes.jst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% from 'modules/annotation/main.jst' import annotate_vcfs with context %}
{% from 'utilities/remove_files.jst' import remove_files with context %}
{% from 'utilities/vcf_stats.jst' import vcf_stats with context %}

{%- macro freebayes(sample, aligner='bwa', taskPrefix='Genome') %}

Expand Down Expand Up @@ -109,4 +110,7 @@


{{- annotate_vcfs(sample, temp_dir, results_dir, pass_vcf, taskPrefix, aligner, 'freebayes', 'constitutional', 'snp_indel_caller') }}
{% endmacro %}
{{- vcf_stats(pass_vcf, results_dir) }}
{{- vcf_stats(all_vcf, results_dir) }}

{% endmacro %}
Loading

0 comments on commit d01ef4b

Please sign in to comment.