Merge branch 'expose_new_stan_args' of https://github.com/venpopov/cmdstanr into pr/932

Author: jgabry

R/args.R

@@ -289,9 +289,6 @@ SampleArgs <- R6::R6Class(
       if (is.logical(self$save_metric)) {
         self$save_metric <- as.integer(self$save_metric)
       }
-      if (!self$adapt_engaged & !is.null(self$save_metric)) {
-        self$save_metric <- 0
-      }
       invisible(self)
     },
     validate = function(num_procs) {
@@ -820,6 +817,10 @@ validate_sample_args <- function(self, num_procs) {
                                len = 1,
                                null.ok = TRUE)
 
+  if (is.null(self$adapt_engaged) || (!self$adapt_engaged && !is.null(self$save_metric))) {
+    self$save_metric <- 0
+  }
+
   invisible(TRUE)
 }
 

R/run.R

@@ -76,7 +76,8 @@ CmdStanRun <- R6::R6Class(
     },
     config_files = function(include_failed = FALSE) {
       files <- private$config_files_
-      if (!length(files) || !any(file.exists(files))) {
+      files_win_path <- sapply(private$config_files_, wsl_safe_path, revert = TRUE)
+      if (!length(files) || !any(file.exists(files_win_path))) {
         stop(
           "No CmdStan config files found. ",
           "Set 'save_cmdstan_config=TRUE' when fitting the model.",
@@ -92,7 +93,8 @@ CmdStanRun <- R6::R6Class(
     },
     metric_files = function(include_failed = FALSE) {
       files <- private$metric_files_
-      if (!length(files) || !any(file.exists(files))) {
+      files_win_path <- sapply(private$metric_files_, wsl_safe_path, revert = TRUE)
+      if (!length(files) || !any(file.exists(files_win_path))) {
         stop(
           "No metric files found. ",
           "Set 'save_metric=TRUE' when fitting the model.",

man/model-method-laplace.Rd

@@ -33,18 +33,24 @@ test_that("all fitting methods work with output_dir", {
     # from the original tempdir(), so need to normalise both for comparison
     expect_equal(normalizePath(fit$runset$args$output_dir),
                  normalizePath(method_dir))
-    files <- list.files(method_dir, full.names = TRUE)
+    files <- normalizePath(list.files(method_dir, full.names = TRUE))
     # in 2.34.0 we also save the config files for all methods and the metric
     # for sample
     if (cmdstan_version() < "2.34.0") {
       mult <- 1
     } else if (method == "sample") {
       mult <- 3
-      expect_equal(repair_path(files[grepl("metric", files)]), fit$metric_files())
-      expect_equal(repair_path(files[grepl("config", files)]), fit$config_files())
+      expect_equal(files[grepl("metric", files)],
+                   normalizePath(sapply(fit$metric_files(), wsl_safe_path, revert = TRUE,
+                                        USE.NAMES = FALSE)))
+      expect_equal(files[grepl("config", files)],
+                   normalizePath(sapply(fit$config_files(), wsl_safe_path, revert = TRUE,
+                                        USE.NAMES = FALSE)))
     } else {
       mult <- 2
-      expect_equal(repair_path(files[grepl("config", files)]), fit$config_files())
+      expect_equal(files[grepl("config", files)],
+                   normalizePath(sapply(fit$config_files(), wsl_safe_path, revert = TRUE,
+                                        USE.NAMES = FALSE)))
     }
     expect_equal(length(list.files(method_dir)), mult * fit$num_procs())