Skip to content

Commit 01b1c56

Browse files
feat: annotate access patterns
1 parent 5dc02f6 commit 01b1c56

7 files changed

Lines changed: 23 additions & 19 deletions

File tree

workflow/Snakefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ scattergather:
1313
calling=16,
1414

1515

16+
input_default:
17+
access.seq,
18+
19+
1620
# Allow users to fix the underlying OS via singularity.
1721
container: "docker://continuumio/miniconda3"
1822

workflow/rules/annotation.smk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
rule annotate_candidate_variants:
22
input:
33
calls="results/candidate-calls/{group}.{caller}.{scatteritem}.bcf",
4-
cache="resources/vep/cache",
5-
plugins="resources/vep/plugins",
6-
fasta=genome,
4+
cache=access.random("resources/vep/cache"),
5+
plugins=access.random("resources/vep/plugins"),
6+
fasta=access.random(genome),
77
fai=genome_fai,
88
output:
99
calls="results/candidate-calls/{group}.{caller}.{scatteritem}.annotated.bcf",
@@ -25,11 +25,11 @@ rule annotate_candidate_variants:
2525
rule annotate_variants:
2626
input:
2727
calls="results/calls/{group}.{calling_type}.{scatteritem}.bcf",
28-
cache="resources/vep/cache",
29-
plugins="resources/vep/plugins",
28+
cache=access.random("resources/vep/cache"),
29+
plugins=access.random("resources/vep/plugins"),
3030
revel=lambda wc: get_plugin_aux("REVEL"),
3131
revel_tbi=lambda wc: get_plugin_aux("REVEL", True),
32-
fasta=genome,
32+
fasta=access.random(genome),
3333
fai=genome_fai,
3434
output:
3535
calls="results/calls/{group}.{calling_type}.{scatteritem}.annotated.bcf",

workflow/rules/calling.smk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ rule varlociraptor_preprocess:
4444
input:
4545
ref=genome,
4646
ref_idx=genome_fai,
47-
candidates=get_candidate_calls,
47+
candidates=access.multi(get_candidate_calls),
4848
bam="results/recal/{sample}.bam",
4949
bai="results/recal/{sample}.bai",
5050
alignment_props=get_alignment_props,

workflow/rules/candidate_calling.smk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
rule freebayes:
22
input:
3-
ref=genome,
3+
ref=access.random(genome),
44
ref_idx=genome_fai,
55
regions="results/regions/{group}.expanded_regions.filtered.bed",
66
# you can have a list of samples here
7-
alns=lambda w: get_group_bams(w),
7+
alns=access.random(lambda w: get_group_bams(w)),
88
idxs=lambda w: get_group_bams(w, bai=True),
99
output:
1010
"results/candidate-calls/{group}.freebayes.bcf",
@@ -25,9 +25,9 @@ rule freebayes:
2525

2626
rule delly:
2727
input:
28-
ref=genome,
28+
ref=access.random(genome),
2929
ref_idx=genome_fai,
30-
alns=lambda w: get_group_bams(w),
30+
alns=access.random(lambda w: get_group_bams(w)),
3131
index=lambda w: get_group_bams(w, bai=True),
3232
exclude=get_delly_excluded_regions(),
3333
output:

workflow/rules/fusion_calling.smk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ rule annotate_exons:
6262
"""
6363

6464

65-
# Use script provide by arriba once new version is released
65+
# Use script provided by arriba once new version is released
6666
rule convert_fusions:
6767
input:
6868
fasta=rules.get_genome.output,

workflow/rules/mapping.smk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
rule map_reads_bwa:
22
input:
33
reads=get_map_reads_input,
4-
idx=rules.bwa_index.output,
4+
idx=access.random(rules.bwa_index.output),
55
output:
66
temp("results/mapped/bwa/{sample}.bam"),
77
log:
@@ -50,10 +50,10 @@ rule create_reference_paths:
5050
rule map_reads_vg:
5151
input:
5252
reads=get_map_reads_input,
53-
graph=f"{pangenome_prefix}.gbz",
54-
kmers="results/kmers/{sample}.kff",
55-
hapl=f"{pangenome_prefix}.hapl",
56-
paths="resources/reference_paths.txt",
53+
graph=access.random(f"{pangenome_prefix}.gbz"),
54+
kmers=access.random("results/kmers/{sample}.kff"),
55+
hapl=access.random(f"{pangenome_prefix}.hapl"),
56+
paths=access.random("resources/reference_paths.txt"),
5757
output:
5858
bam=temp("results/mapped/vg/{sample}.preprocessed.bam"),
5959
indexes=temp(
@@ -226,7 +226,7 @@ rule calc_consensus_reads:
226226
rule map_consensus_reads:
227227
input:
228228
reads=get_processed_consensus_input,
229-
idx=rules.bwa_index.output,
229+
idx=access.random(rules.bwa_index.output),
230230
output:
231231
temp("results/consensus/{sample}.consensus.{read_type}.mapped.bam"),
232232
params:

workflow/rules/primers.smk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ rule trim_primers:
4747
rule map_primers:
4848
input:
4949
reads=lambda wc: get_panel_primer_input(wc.panel),
50-
idx=rules.bwa_index.output,
50+
idx=access.random(rules.bwa_index.output),
5151
output:
5252
"results/primers/{panel}_primers.bam",
5353
log:

0 commit comments

Comments
 (0)