Avoid fragile file checks on WSL CmdStan paths

Author: jgabry

R/install.R

@@ -327,11 +327,17 @@ cmdstan_make_local <- function(dir = cmdstan_path(),
     }
     write(built_flags, file = make_local_path, append = append)
   }
-  if (file.exists(make_local_path)) {
-    return(trimws(strsplit(trimws(readChar(make_local_path, file.info(make_local_path)$size)), "\n")[[1]]))
-  } else {
+  make_local_contents <- tryCatch(
+    suppressWarnings(readLines(make_local_path, warn = FALSE)),
+    error = function(e) NULL
+  )
+  if (is.null(make_local_contents)) {
     return(NULL)
   }
+  if (length(make_local_contents) == 0) {
+    return("")
+  }
+  trimws(strsplit(trimws(paste(make_local_contents, collapse = "\n")), "\n", fixed = TRUE)[[1]])
 }
 
 #' @rdname install_cmdstan

R/path.R

@@ -253,14 +253,6 @@ cmdstan_default_path <- function(dir = NULL) {
 
 latest_cmdstan_installed <- function(installs_path) {
   cmdstan_installs <- list.dirs(path = installs_path, recursive = FALSE, full.names = FALSE)
-  # if installed in cmdstan folder with no version move to cmdstan-version folder
-  if ("cmdstan" %in% cmdstan_installs) {
-    ver <- read_cmdstan_version(file.path(installs_path, "cmdstan"))
-    old_path <- file.path(installs_path, "cmdstan")
-    new_path <- file.path(installs_path, paste0("cmdstan-", ver))
-    file.rename(old_path, new_path)
-    cmdstan_installs <- list.dirs(path = installs_path, recursive = FALSE, full.names = FALSE)
-  }
   latest_cmdstan <- ""
   if (length(cmdstan_installs) > 0) {
     cmdstan_installs <- grep("^cmdstan-", cmdstan_installs, value = TRUE)
@@ -282,15 +274,18 @@ latest_cmdstan_installed <- function(installs_path) {
 #' @return Version number as a string.
 read_cmdstan_version <- function(path) {
   makefile_path <- file.path(path, "makefile")
-  if (!file.exists(makefile_path)) {
+  makefile <- tryCatch(
+    suppressWarnings(readLines(makefile_path, warn = FALSE)),
+    error = function(e) NULL
+  )
+  if (is.null(makefile)) {
     warning(
       "Can't find CmdStan makefile to detect version number. ",
       "Path may not point to valid installation.",
       call. = FALSE
     )
     return(NULL)
   }
-  makefile <- readLines(makefile_path)
   version_line <- grep("^CMDSTAN_VERSION :=", makefile, value = TRUE)
   if (length(version_line) == 0) {
     stop("CmdStan makefile is missing a version number.", call. = FALSE)

tests/testthat/test-path.R

@@ -203,6 +203,18 @@ test_that("cmdstan_default_path() returns NULL for empty custom install director
   expect_null(cmdstan_default_path(dir = installs))
 })
 
+test_that("cmdstan_default_path() ignores unversioned cmdstan directory", {
+  installs <- withr::local_tempdir(pattern = "cmdstan-legacy-installs")
+  dir.create(file.path(installs, "cmdstan"), recursive = TRUE, showWarnings = FALSE)
+  dir.create(file.path(installs, "cmdstan-2.36.0"), recursive = TRUE, showWarnings = FALSE)
+
+  expect_equal(
+    cmdstan_default_path(dir = installs),
+    file.path(installs, "cmdstan-2.36.0")
+  )
+  expect_true(dir.exists(file.path(installs, "cmdstan")))
+})
+
 test_that("CmdStan version helpers handle invalid inputs", {
   expect_identical(cmdstan_min_version(), "2.35.0")
   expect_false(is_supported_cmdstan_version(NULL))

tests/testthat/test-utils.R

@@ -196,6 +196,14 @@ test_that("cmdstan_make_local() works", {
   cmdstan_make_local(cpp_options = as.list(exisiting_make_local), append = FALSE)
 })
 
+test_that("cmdstan_make_local() preserves empty make/local behavior", {
+  dir <- withr::local_tempdir()
+  dir.create(file.path(dir, "make"), recursive = TRUE, showWarnings = FALSE)
+  file.create(file.path(dir, "make", "local"))
+
+  expect_identical(cmdstan_make_local(dir = dir), "")
+})
+
 test_that("matching_variables() works", {
   ret <- matching_variables(c("beta"),  c("alpha", "beta[1]", "beta[2]", "beta[3]"))
   expect_equal(