-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Update DEEPVARIANT/* to 1.10.0 #11743
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?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ process DEEPVARIANT_MAKEEXAMPLES { | |||
| label 'process_high' | ||||
|
|
||||
| //Conda is not supported at the moment | ||||
| container "docker.io/google/deepvariant:1.9.0" | ||||
| container "docker.io/google/deepvariant:1.10.0" | ||||
|
|
||||
| input: | ||||
| tuple val(meta), path(input), path(index), path(intervals) | ||||
|
|
@@ -13,9 +13,9 @@ process DEEPVARIANT_MAKEEXAMPLES { | |||
| tuple val(meta5), path(par_bed) | ||||
|
|
||||
| output: | ||||
| tuple val(meta), path("${prefix}.examples.tfrecord-*-of-*.gz{,.example_info.json}"), emit: examples | ||||
| tuple val(meta), path("${prefix}.gvcf.tfrecord-*-of-*.gz"), emit: gvcf | ||||
| tuple val(meta), path("${prefix}_call_variant_outputs.examples.tfrecord-*-of-*.gz", arity: "0..*"), emit: small_model_calls | ||||
| tuple val(meta), path("${prefix}.examples.tfrecord-*-of-*.gz{,.example_info.json}") , emit: examples | ||||
| tuple val(meta), path("${prefix}.gvcf.tfrecord-*-of-*.gz") , emit: gvcf | ||||
| tuple val(meta), path("${prefix}_call_variant_outputs.examples.tfrecord-*-of-*.gz", arity: "0..*"), emit: small_model_calls | ||||
| tuple val("${task.process}"), val('deepvariant'), eval("/opt/deepvariant/bin/run_deepvariant --version | sed 's/^.*version //'"), topic: versions, emit: versions_deepvariant | ||||
|
|
||||
| when: | ||||
|
|
@@ -32,6 +32,9 @@ process DEEPVARIANT_MAKEEXAMPLES { | |||
| def par_regions = par_bed ? "--par_regions_bed=${par_bed}" : "" | ||||
|
|
||||
| """ | ||||
| export MPLCONFIGDIR=\$PWD/.matplotlib | ||||
| mkdir -p \$MPLCONFIGDIR | ||||
|
Contributor
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.
Suggested change
|
||||
|
|
||||
| seq 0 ${task.cpus - 1} | parallel -q --halt 2 --line-buffer /opt/deepvariant/bin/make_examples \\ | ||||
| --mode calling \\ | ||||
| --ref "${fasta}" \\ | ||||
|
|
||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| process { | ||
| withName: "DEEPVARIANT_MAKEEXAMPLES" { | ||
| cpus = 2 // The number of output files is determined by cpus - keep it the same for tests | ||
| ext.args = '--checkpoint "/opt/models/wgs" --call_small_model_examples --small_model_indel_gq_threshold "30" --small_model_snp_gq_threshold "25" --small_model_vaf_context_window_size "51" --trained_small_model_path "/opt/smallmodels/wgs"' | ||
| ext.args = '--checkpoint "/opt/models/wgs" --call_small_model_examples --small_model_indel_gq_threshold "30" --small_model_snp_gq_threshold "25" --small_model_vaf_context_window_size "51" --trained_small_model_path "/opt/smallmodels/wgs/model.keras"' | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ process DEEPVARIANT_POSTPROCESSVARIANTS { | |||
| label 'process_medium' | ||||
|
|
||||
| //Conda is not supported at the moment | ||||
| container "docker.io/google/deepvariant:1.9.0" | ||||
| container "docker.io/google/deepvariant:1.10.0" | ||||
|
|
||||
| input: | ||||
| tuple val(meta), path(variant_calls_tfrecord_files), path(gvcf_tfrecords), path(small_model_calls), path(intervals) | ||||
|
|
@@ -57,6 +57,9 @@ process DEEPVARIANT_POSTPROCESSVARIANTS { | |||
| } | ||||
|
|
||||
| """ | ||||
| export MPLCONFIGDIR=\$PWD/.matplotlib | ||||
| mkdir -p \$MPLCONFIGDIR | ||||
|
Contributor
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.
Suggested change
Contributor
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. Afaik not needed, since mpl autogenerates this folder if not present |
||||
|
|
||||
| /opt/deepvariant/bin/postprocess_variants \\ | ||||
| ${args} \\ | ||||
| --ref "${fasta}" \\ | ||||
|
|
||||
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -37,6 +37,9 @@ process DEEPVARIANT_RUNDEEPVARIANT { | |||
| def par_regions = par_bed ? "--par_regions_bed=${par_bed}" : "" | ||||
|
|
||||
| """ | ||||
| export MPLCONFIGDIR=\$PWD/.matplotlib | ||||
| mkdir -p \$MPLCONFIGDIR | ||||
|
Contributor
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.
Suggested change
|
||||
|
|
||||
| /opt/deepvariant/bin/run_deepvariant \\ | ||||
| --ref=${fasta} \\ | ||||
| --reads=${input} \\ | ||||
|
|
@@ -59,5 +62,6 @@ process DEEPVARIANT_RUNDEEPVARIANT { | |||
| echo "stub" | gzip > ${prefix}.vcf.gz | ||||
| echo "stub" | gzip > ${prefix}.vcf.gz.tbi | ||||
| echo "stub" | gzip > ${prefix}.g.vcf.gz | ||||
| echo "stub" | gzip > ${prefix}.g.vcf.gz.tbi """ | ||||
| echo "stub" | gzip > ${prefix}.g.vcf.gz.tbi | ||||
| """ | ||||
| } | ||||
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.