From 365cc3ff7140825d4adeee5f9c6cde3ad9cabecb Mon Sep 17 00:00:00 2001 From: wlandau Date: Tue, 23 Jul 2024 15:20:04 -0400 Subject: [PATCH] Fix launcher bug/typo where parameters were supplied to container overrides --- DESCRIPTION | 2 +- NEWS.md | 3 ++- R/crew_definition_aws_batch.R | 2 +- R/crew_launcher_aws_batch.R | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 433f453..0c8345e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -13,7 +13,7 @@ Description: In computationally demanding analysis projects, 'clustermq' by Schubert (2019) ), and 'batchtools' by Lang, Bischl, and Surmann (2017). . -Version: 0.0.6.9001 +Version: 0.0.6.9002 License: MIT + file LICENSE URL: https://wlandau.github.io/crew.aws.batch/, https://github.com/wlandau/crew.aws.batch diff --git a/NEWS.md b/NEWS.md index 8775535..982d56f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,7 @@ -# crew.aws.batch 0.0.6.9001 (development) +# crew.aws.batch 0.0.6.9002 (development) * Send both cancellation and termination requests to end jobs. +* Fix launcher bug/typo where parameters were supplied to container overrides. # crew.aws.batch 0.0.6 diff --git a/R/crew_definition_aws_batch.R b/R/crew_definition_aws_batch.R index 652062a..767cf85 100644 --- a/R/crew_definition_aws_batch.R +++ b/R/crew_definition_aws_batch.R @@ -186,7 +186,7 @@ crew_class_definition_aws_batch <- R6::R6Class( resources$gpus <- list(value = as.character(gpus), type = "GPU") } if (length(resources)) { - args$containerProperties$resourceRequirements <- resources + args$containerProperties$resourceRequirements <- non_null(resources) } args$containerProperties$logConfiguration <- list( logDriver = "awslogs", diff --git a/R/crew_launcher_aws_batch.R b/R/crew_launcher_aws_batch.R index d77e901..033e075 100644 --- a/R/crew_launcher_aws_batch.R +++ b/R/crew_launcher_aws_batch.R @@ -209,7 +209,7 @@ crew_class_launcher_aws_batch <- R6::R6Class( ) }, .args_submit = function(call, name) { - container_overrides <- as.list(private$.aws_batch_parameters) + container_overrides <- as.list(private$.aws_container_overrides) container_overrides$command <- list("R", "-e", call) out <- list( jobName = name, @@ -394,7 +394,7 @@ crew_class_launcher_aws_batch <- R6::R6Class( private$.aws_batch_scheduling_priority_override <- aws_batch_scheduling_priority_override private$.aws_batch_parameters <- aws_batch_parameters - private$.aws_batch_parameters <- aws_batch_container_overrides + private$.aws_batch_container_overrides <- aws_batch_container_overrides private$.aws_batch_node_overrides <- aws_batch_node_overrides private$.aws_batch_retry_strategy <- aws_batch_retry_strategy private$.aws_batch_propagate_tags <- aws_batch_propagate_tags