Small fix to mod_SLURM and mod_CV_fit

Author: elgabbas

R/mod_CV_fit.R

@@ -408,11 +408,21 @@ mod_CV_fit <- function(
   # Save model fitting commands -----
   IASDT.R::cat_time("Save model fitting commands")
 
-  CommandFile <- IASDT.R::path(Path_CV, "Commands2Fit.txt")
-  f <- file(CommandFile, open = "wb")
-  on.exit(invisible(try(close(f), silent = TRUE)), add = TRUE)
-  cat(unlist(CV_DT$Command_HPC), sep = "\n", append = FALSE, file = f)
-  close(f)
+  purrr::walk(
+    .x = CV_name,
+    .f = ~{
+      Curr_CV_Name <- stringr::str_remove_all(.x, "CV_")
+      CommandFile <- IASDT.R::path(Path_CV, paste0("Commands2Fit_", .x, ".txt"))
+      f <- file(CommandFile, open = "wb")
+      on.exit(invisible(try(close(f), silent = TRUE)), add = TRUE)
+
+      CV_DT %>%
+        dplyr::filter(CV_name == Curr_CV_Name) %>%
+        dplyr::pull(Command_HPC) %>%
+        unlist() %>%
+        cat(sep = "\n", append = FALSE, file = f)
+      close(f)
+    })
 
   ## # ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 

R/mod_SLURM.R

@@ -98,14 +98,12 @@ mod_SLURM <- function(
     "HPC_partition", "path_Hmsc", "ProjNum", "Path_GPU_Check",
     "command_prefix", "SLURM_prefix")
   IASDT.R::check_args(
-    args_all = AllArgs, args_to_check = CharArgs,
-    args_type = "character")
+    args_all = AllArgs, args_to_check = CharArgs, args_type = "character")
 
   # numeric arguments
   NumericArgs <- c("gpus_per_node", "cpus_per_task", "ntasks")
   IASDT.R::check_args(
-    args_all = AllArgs, args_to_check = NumericArgs,
-    args_type = "numeric")
+    args_all = AllArgs, args_to_check = NumericArgs, args_type = "numeric")
 
   rm(AllArgs, envir = environment())
 
@@ -131,15 +129,27 @@ mod_SLURM <- function(
     .x = seq_len(NCommandFiles),
     .f = function(x) {
 
-      if (NCommandFiles == 1) {
-        OutFile <- paste0(SLURM_prefix, ".slurm")
-        JobName0 <- job_name
+      SLURM_suffix <- basename(ListCommands[x]) %>%
+        stringr::str_remove_all(
+          paste0(c(command_prefix, "CV_", ".txt"), collapse = "|")) %>%
+        stringr::str_remove_all("^_")
+
+      if (nchar(SLURM_suffix) > 0) {
+        OutFile <- c(SLURM_prefix, SLURM_suffix) %>%
+          paste0(collapse = "_") %>%
+          paste0(".slurm")
+        JobName0 <- stringr::str_remove_all(OutFile, "_Fit|_Bash|.slurm$")
       } else {
-        OutFile <- paste0(SLURM_prefix, "_", x, ".slurm")
-        JobName0 <- paste0(job_name, "_", x)
+        if (NCommandFiles == 1) {
+          OutFile <- paste0(SLURM_prefix, ".slurm")
+          JobName0 <- job_name
+        } else {
+          OutFile <- paste0(SLURM_prefix, "_", x, ".slurm")
+          JobName0 <- paste0(job_name, "_", x)
+        }
       }
-      NJobs <- R.utils::countLines(ListCommands[x])[1]
 
+      NJobs <- R.utils::countLines(ListCommands[x])[1]
 
       # create connection to SLURM file