Merge pull request #122 from orichters/conoptspy

let rs2 detect if run was canceled
pik-piam · Jan 13, 2025 · 10fc170 · 10fc170
2 parents 509b69f + 18ce714
commit 10fc170
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '4433039'
+ValidationKey: '4462422'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'
@@ -8,3 +8,4 @@ AutocreateReadme: yes
 allowLinterWarnings: yes
 enforceVersionUpdate: no
 skipCoverage: no
+AutocreateCITATION: yes
diff --git a/CITATION.cff b/CITATION.cff
@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'modelstats: Run Analysis Tools'
-version: 0.22.1
-date-released: '2024-12-02'
+version: 0.22.2
+date-released: '2025-01-13'
 abstract: A collection of tools to analyze model runs.
 authors:
 - family-names: Giannousakis

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: modelstats
 Type: Package
 Title: Run Analysis Tools
-Version: 0.22.1
-Date: 2024-12-02
+Version: 0.22.2
+Date: 2025-01-13
 Authors@R: c(
     person("Anastasis", "Giannousakis", email = "[email protected]", role = c("aut","cre")),
     person("Oliver", "Richters", role = "aut")

diff --git a/R/getRunStatus.R b/R/getRunStatus.R
@@ -164,7 +164,7 @@ getRunStatus <- function(mydir = dir(), sort = "nf", user = NULL) {
         if (out[i, "jobInSLURM"] == "no" || grepl("pending$", out[i, "jobInSLURM"])) {
           if (file.exists(logtxt)) {
             slurmerror <- NULL
-            suppressWarnings(try(slurmerror <- system(paste0("grep 'slurmstepd: error' ", logtxt), intern = TRUE), silent = TRUE))
+            suppressWarnings(try(slurmerror <- system(paste0("grep 'slurmstepd.*error' ", logtxt), intern = TRUE), silent = TRUE))
             if (isTRUE(any(grepl("DUE TO TIME LIMIT", slurmerror)))) {
               out[i, "RunStatus"] <- "Timeout interrupt"
             } else if (isTRUE(any(grepl("memory|oom-kill", slurmerror)))) {
@@ -173,6 +173,8 @@ getRunStatus <- function(mydir = dir(), sort = "nf", user = NULL) {
               out[i, "RunStatus"] <- "Preempt interrupt"
             } else if (isTRUE(any(grepl("DUE TO JOB REQUEUE", slurmerror)))) {
               out[i, "RunStatus"] <- "Run requeued"
+            } else if (isTRUE(any(grepl("CANCELLED", slurmerror)))) {
+              out[i, "RunStatus"] <- "Run cancelled"
             }
           } else {
             out[i, "RunStatus"] <- if (out[i, "jobInSLURM"] == "no") "Run interrupted" else "Run restarted"

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Run Analysis Tools
 
-R package **modelstats**, version **0.22.1**
+R package **modelstats**, version **0.22.2**
 
-[![CRAN status](https://www.r-pkg.org/badges/version/modelstats)](https://cran.r-project.org/package=modelstats)  [![R build status](https://github.com/pik-piam/modelstats/workflows/check/badge.svg)](https://github.com/pik-piam/modelstats/actions) [![codecov](https://codecov.io/gh/pik-piam/modelstats/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/modelstats) [![r-universe](https://pik-piam.r-universe.dev/badges/modelstats)](https://pik-piam.r-universe.dev/builds)
+[![CRAN status](https://www.r-pkg.org/badges/version/modelstats)](https://cran.r-project.org/package=modelstats) [![R build status](https://github.com/pik-piam/modelstats/workflows/check/badge.svg)](https://github.com/pik-piam/modelstats/actions) [![codecov](https://codecov.io/gh/pik-piam/modelstats/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/modelstats) [![r-universe](https://pik-piam.r-universe.dev/badges/modelstats)](https://pik-piam.r-universe.dev/builds)
 
 ## Purpose and Functionality
 
@@ -47,16 +47,17 @@ In case of questions / problems please contact Anastasis Giannousakis <giannou@p
 
 To cite package **modelstats** in publications use:
 
-Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.22.1, <https://github.com/pik-piam/modelstats>.
+Giannousakis A, Richters O (2025). "modelstats: Run Analysis Tools." Version: 0.22.2, <https://github.com/pik-piam/modelstats>.
 
 A BibTeX entry for LaTeX users is
 
  ```latex
-@Manual{,
+@Misc{,
   title = {modelstats: Run Analysis Tools},
   author = {Anastasis Giannousakis and Oliver Richters},
-  year = {2024},
-  note = {R package version 0.22.1},
+  date = {2025-01-13},
+  year = {2025},
   url = {https://github.com/pik-piam/modelstats},
+  note = {Version: 0.22.2},
 }
 ```