Skip to content

Commit 4dc7ec3

Browse files
carzeclaude
andcommitted
fix: use machine_mem_gb variable and mem1 instance types in new metagenomics tasks
Hardcoded memory and mem2 instance types were preventing GCP nodes from being scheduled. Switch all new tasks to machine_mem_gb input variable (matching existing task patterns) and downgrade dx_instance_type from mem2 to mem1 across classify_virnucpro_contigs, classify_reads_by_contig, parse_kraken2_reads, summarize_kb_extract_reads, and join_read_classifications. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 5134809 commit 4dc7ec3

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

pipes/WDL/tasks/tasks_metagenomics.wdl

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,6 +1488,7 @@ task classify_virnucpro_contigs {
14881488
String id_col = "Modified_ID"
14891489
String id_pattern = "(NODE_\\d+)"
14901490

1491+
Int machine_mem_gb = 2
14911492
String docker = "quay.io/broadinstitute/py3-bio:0.1.5"
14921493
}
14931494

@@ -1652,7 +1653,7 @@ CODE
16521653

16531654
runtime {
16541655
docker: docker
1655-
memory: "2 GB"
1656+
memory: "~{machine_mem_gb} GB"
16561657
cpu: 1
16571658
disks: "local-disk ~{disk_size} HDD"
16581659
disk: "~{disk_size} GB" # TES
@@ -1675,6 +1676,7 @@ task classify_reads_by_contig {
16751676
Float min_identity = 90.0
16761677
Float min_query_cov = 80.0
16771678

1679+
Int machine_mem_gb = 4
16781680
String docker = "quay.io/broadinstitute/py3-bio:0.1.5"
16791681
}
16801682

@@ -1960,11 +1962,11 @@ CODE
19601962

19611963
runtime {
19621964
docker: docker
1963-
memory: "4 GB"
1965+
memory: "~{machine_mem_gb} GB"
19641966
cpu: 2
19651967
disks: "local-disk ~{disk_size} HDD"
19661968
disk: "~{disk_size} GB" # TES
1967-
dx_instance_type: "mem2_ssd1_v2_x4"
1969+
dx_instance_type: "mem1_ssd1_v2_x4"
19681970
preemptible: 2
19691971
maxRetries: 2
19701972
}
@@ -1984,6 +1986,7 @@ task parse_kraken2_reads {
19841986
else sub(basename(kraken2_reads_output), "\\.kraken2\\.reads\\.txt(\\.gz)?$", "")
19851987
Boolean resolve_strains = false
19861988

1989+
Int machine_mem_gb = 8
19871990
String docker = "quay.io/broadinstitute/py3-bio:0.1.5"
19881991
}
19891992

@@ -2202,11 +2205,11 @@ task parse_kraken2_reads {
22022205

22032206
runtime {
22042207
docker: docker
2205-
memory: "8 GB"
2208+
memory: "~{machine_mem_gb} GB"
22062209
cpu: 1
22072210
disks: "local-disk ~{ceil(size(kraken2_reads_output)*3 + size(taxonomy_db) + 20)} HDD"
22082211
disk: "~{ceil(size(kraken2_reads_output)*3 + size(taxonomy_db) + 20)} GB" # TES
2209-
dx_instance_type: "mem2_ssd1_v2_x2"
2212+
dx_instance_type: "mem1_ssd1_v2_x2"
22102213
preemptible: 2
22112214
maxRetries: 2
22122215
}
@@ -2222,6 +2225,7 @@ task summarize_kb_extract_reads {
22222225
File taxonomy_map_csv
22232226
String taxonomy_level = "highest"
22242227

2228+
Int machine_mem_gb = 4
22252229
String docker = "quay.io/broadinstitute/py3-bio:0.1.5"
22262230
}
22272231

@@ -2382,11 +2386,11 @@ task summarize_kb_extract_reads {
23822386

23832387
runtime {
23842388
docker: docker
2385-
memory: "4 GB"
2389+
memory: "~{machine_mem_gb} GB"
23862390
cpu: 2
23872391
disks: "local-disk ~{disk_size} HDD"
23882392
disk: "~{disk_size} GB" # TES
2389-
dx_instance_type: "mem2_ssd1_v2_x4"
2393+
dx_instance_type: "mem1_ssd1_v2_x4"
23902394
preemptible: 2
23912395
maxRetries: 2
23922396
}
@@ -2530,6 +2534,7 @@ task join_read_classifications {
25302534
File? genomad_virus_summary # geNomad virus summary TSV (LEFT JOIN via VNP_CONTIG_ID)
25312535
String sample_id # Required — filters Kallisto/K2 tables, stamps SAMPLE_ID column
25322536
2537+
Int machine_mem_gb = 16
25332538
String docker = "quay.io/broadinstitute/py3-bio:0.1.5"
25342539
}
25352540

@@ -2893,11 +2898,11 @@ CODE
28932898

28942899
runtime {
28952900
docker: docker
2896-
memory: "16 GB"
2901+
memory: "~{machine_mem_gb} GB"
28972902
cpu: 1
28982903
disks: "local-disk ~{ceil((size(kallisto_summary, 'GB') + size(kraken2_reads, 'GB') + size(vnp_reads, 'GB') + size(genomad_virus_summary, 'GB')) * 4 + 10)} HDD"
28992904
disk: "~{ceil((size(kallisto_summary, 'GB') + size(kraken2_reads, 'GB') + size(vnp_reads, 'GB') + size(genomad_virus_summary, 'GB')) * 4 + 10)} GB"
2900-
dx_instance_type: "mem2_ssd1_v2_x2"
2905+
dx_instance_type: "mem1_ssd1_v2_x2"
29012906
preemptible: 2
29022907
maxRetries: 2
29032908
}

0 commit comments

Comments
 (0)