diff --git a/ingest/profiles/default/config.yaml b/ingest/profiles/default/config.yaml new file mode 100644 index 0000000..9ca2358 --- /dev/null +++ b/ingest/profiles/default/config.yaml @@ -0,0 +1,3 @@ +cores: all +printshellcmds: true +rerun-incomplete: true diff --git a/ingest/rules/nextclade.smk b/ingest/rules/nextclade.smk index 7796715..efd5b16 100644 --- a/ingest/rules/nextclade.smk +++ b/ingest/rules/nextclade.smk @@ -65,11 +65,13 @@ rule nextclade_classify: dataset=config["nextclade"]["nextclade_dataset_path"], output: nextclade_tsv="data/nextclade_results/nextclade.tsv", + threads: workflow.cores, shell: """ nextclade3 run \ --input-dataset {input.dataset} \ --output-tsv {output.nextclade_tsv} \ + --jobs {threads:q} \ --silent \ {input.sequences} """ diff --git a/phylogenetic/profiles/default/config.yaml b/phylogenetic/profiles/default/config.yaml new file mode 100644 index 0000000..9ca2358 --- /dev/null +++ b/phylogenetic/profiles/default/config.yaml @@ -0,0 +1,3 @@ +cores: all +printshellcmds: true +rerun-incomplete: true diff --git a/phylogenetic/rules/construct_phylogeny.smk b/phylogenetic/rules/construct_phylogeny.smk index 1c18cae..60da9a2 100644 --- a/phylogenetic/rules/construct_phylogeny.smk +++ b/phylogenetic/rules/construct_phylogeny.smk @@ -29,15 +29,14 @@ rule tree: "logs/tree.txt", benchmark: "benchmarks/tree.txt" - params: - threads = workflow.cores, + threads: workflow.cores shell: """ augur tree \ --alignment {input.alignment} \ --output {output.tree} \ --method raxml \ - --nthreads {threads} 2>&1 | tee {log} + --nthreads {threads:q} 2>&1 | tee {log} """ rule refine: diff --git a/phylogenetic/rules/prepare_sequences.smk b/phylogenetic/rules/prepare_sequences.smk index b38265b..06f4dbf 100644 --- a/phylogenetic/rules/prepare_sequences.smk +++ b/phylogenetic/rules/prepare_sequences.smk @@ -61,8 +61,7 @@ rule align: "logs/align.txt", benchmark: "benchmarks/align.txt" - params: - threads = workflow.cores + threads: workflow.cores shell: """ augur align \ @@ -70,5 +69,5 @@ rule align: --output {output.alignment} \ --fill-gaps \ --reference-sequence {input.reference} \ - --nthreads {threads} 2>&1 | tee {log} + --nthreads {threads:q} 2>&1 | tee {log} """