Skip to content

Commit 44fc242

Browse files
committed
memory adjusted for different partitions. Coverage viz checked and updated
1 parent dbab5e6 commit 44fc242

32 files changed

Lines changed: 72 additions & 281 deletions

‎config/config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@
22
high:
33
mem_mb: 45000 # memory in MB
44
t: 32 # number of threads
5+
partition: "himem"
56

67
# Set memory and threads for medium demanding rules
78
medium:
89
mem_mb: 16000 # memory in MB
910
t: 16 # number of threads
11+
partition: "medium" # partition to use for medium memory jobs
1012

1113
# Set memory and threads for low demanding rules
1214
low:
1315
mem_mb: 5000 # memory in MB
1416
t: 8 # number of threads
17+
partition: "short" # partition to use for low memory jobs
1518

1619
# Set the path to the input directory (this directory must contain
1720
# one subdirectory for each sample, and the subdirectories must be named after the sample)

‎config/test_config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ low:
1818

1919
# Set the path to the input directory (this directory must contain
2020
# one subdirectory for each sample, and the subdirectories must be named after the sample)
21-
input_dir: "/home/lia/git_repos/FSP_assembly_benchmarking/test_data/" # use absolute path and add trailing slash
21+
input_dir: "/home/lobinu/git_repos/FSP_assembly_benchmarking/test_data/" # use absolute path and add trailing slash
2222

2323
# Customise the results directory
24-
output_dir: "/home/lia/git_repos/FSP_assembly_benchmarking/results_2/" # use absolute path and add trailing slash
24+
output_dir: "/home/lobinu/git_repos/FSP_assembly_benchmarking/results_merged/" # use absolute path and add trailing slash
2525

2626
# K-mer size determination strategy
2727
# Note that if you set this to "manual", you must also set the k-mer size for spades, megahit, abyss, sparseassembler, minia, and masurca.
@@ -32,7 +32,7 @@ output_dir: "/home/lia/git_repos/FSP_assembly_benchmarking/results_2/" # use abs
3232
# For the other assemblers only the predicted k-mer will be used when kmer_strategy is set to "kmergenie" or "reads_length".
3333

3434
kmer_strategy:
35-
mode: "kmergenie" # "kmergenie" for KmerGenie, "reads_length" to calculate the k-mer size based on the median reads length, "manual" for user-defined k-mer sizes.
35+
mode: "manual" # "kmergenie" for KmerGenie, "reads_length" to calculate the k-mer size based on the median reads length, "manual" for user-defined k-mer sizes.
3636

3737
# Customise kmergenie parameters
3838
kmergenie:
@@ -47,7 +47,7 @@ assemblers:
4747
abyss: True
4848
sparseassembler: True
4949
minia: True
50-
masurca: True
50+
masurca: False
5151

5252
# Customise spades parameters
5353
# please do not use the `-o` option here, it is set into the workflow
@@ -105,8 +105,8 @@ masurca:
105105

106106
# Customise busco parameters
107107
busco:
108-
lineage_general: "/home/lia/git_repos/FSP_assembly_benchmarking/resources/fungi_odb12" # chose a "general" dataset, in our case "fungi_odb10"
109-
lineage_specific: "/home/lia/git_repos/FSP_assembly_benchmarking/resources/basidiomycota_odb12" # chose a more specific dataset, for example "basidiomycota_odb12", "ascomycota_odb12", etc.
108+
lineage_general: "/home/lobinu/git_repos/FSP_assembly_benchmarking/resources/fungi_odb12" # chose a "general" dataset, in our case "fungi_odb10"
109+
lineage_specific: "/home/lobinu/git_repos/FSP_assembly_benchmarking/resources/basidiomycota_odb12" # chose a more specific dataset, for example "basidiomycota_odb12", "ascomycota_odb12", etc.
110110
optional_params: # if you do not want to use any optional parameters, add `{}` here
111111
"--mode": "genome"
112112
# "--metaeuk": True

‎workflow/rules/abyss_merged.smk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ rule abyss:
2828
threads: get_high_threads
2929
resources:
3030
mem_mb=get_high_mem,
31+
partition=config["high"]["partition"],
3132
log:
3233
"logs/{sample}/abyss.log",
3334
benchmark:

‎workflow/rules/busco_2.smk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ rule busco_2:
1919
threads: get_medium_threads
2020
resources:
2121
mem_mb=get_medium_mem,
22+
partition=config["medium"]["partition"],
2223
log:
2324
"logs/{sample}/busco_best_assembly_pilon.log",
2425
benchmark:

‎workflow/rules/bwa_mem2_samtools.smk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ rule bwa_mem2_samtools:
2020
threads: get_high_threads
2121
resources:
2222
mem_mb=get_high_mem,
23+
partition=config["high"]["partition"],
2324
log:
2425
"logs/{sample}/bwa_mem2_best_assembly.log",
2526
benchmark:

‎workflow/rules/bwa_mem2_samtools_2.smk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ rule bwa_mem2_samtools_2:
2222
threads: get_high_threads
2323
resources:
2424
mem_mb=get_high_mem,
25+
partition=config["high"]["partition"],
2526
log:
2627
"logs/{sample}/bwa_mem2_best_assembly_pilon.log",
2728
benchmark:

‎workflow/rules/coverage_viz.smk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ rule coverage_viz:
1212
threads: 1
1313
resources:
1414
mem_mb=get_low_mem,
15+
partition=config["low"]["partition"],
1516
log:
1617
"logs/{sample}/coverage_viz_best_assembly_pilon.log",
1718
benchmark:

‎workflow/rules/decompress_reads_merged.smk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ rule decompress_reads:
1212
threads: 1
1313
resources:
1414
mem_mb=get_low_mem,
15+
partition=config["low"]["partition"],
1516
conda:
1617
"../envs/basic.yaml"
1718
log:

‎workflow/rules/fastK.smk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ rule fastk:
2121
threads: get_medium_threads
2222
resources:
2323
mem_mb=get_medium_mem,
24+
partition=config["medium"]["partition"],
2425
log:
2526
"logs/{sample}/fastk.log",
2627
benchmark:

‎workflow/rules/fastK_merged.smk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ rule fastk:
2020
threads: get_medium_threads
2121
resources:
2222
mem_mb=get_medium_mem,
23+
partition=config["medium"]["partition"],
2324
log:
2425
"logs/{sample}/fastk.log",
2526
benchmark:

0 commit comments

Comments
 (0)