Merge pull request #460 from stan-dev/use_shortpath_and_cleanup

use shortpath and cleanup

Author: rok-cesnovar

.github/workflows/R-CMD-check.yaml

@@ -35,6 +35,7 @@ jobs:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       NOT_CRAN: true
+      CMDSTAN_VERSION: "2.26.1"
 
     steps:
       - uses: n1hility/cancel-previous-runs@v2
@@ -91,7 +92,7 @@ jobs:
           install.packages("posterior", repos = c("https://mc-stan.org/r-packages/", getOption("repos")), type="source")
           install.packages("cmdstanr", repos = c("https://mc-stan.org/r-packages/", getOption("repos")), type="source")
           install.packages("curl")
-          cmdstanr::install_cmdstan(cores = 2, overwrite = TRUE)
+          cmdstanr::install_cmdstan(cores = 2, overwrite = TRUE, version = Sys.getenv("CMDSTAN_VERSION"))
         shell: Rscript {0}
 
       - name: Session info

NEWS.md

@@ -4,6 +4,8 @@
 
 * Fixed issue with retrieving draws with models with spaces in their names. (#453)
 
+* Fixed bug with spaces in path to the temporary folder on Windows. (#460)
+
 ### New features
 
 * New function `as_cmdstan_fit()` that creates CmdStanMCMC/MLE/VB objects
@@ -22,7 +24,6 @@ Stan programs requires CmdStan >= 2.26. (#434)
 
 * New check for invalid parameter names when supplying init values. (#452)
 
-
 # cmdstanr 0.3.0
 
 ### Bug fixes

R/install.R

@@ -158,27 +158,6 @@ install_cmdstan <- function(dir = NULL,
         append = TRUE
       )
     }
-    if (version < "2.24") {
-      # disable warnings cmdstan <= 2.23 prints with RTools 4.0 on Windows
-      cmdstan_make_local(
-        dir = dir_cmdstan,
-        cpp_options = list(
-          "ifeq (gcc,$(CXX_TYPE))",
-          "CXXFLAGS_WARNINGS+= -Wno-int-in-bool-context -Wno-attributes",
-          "endif"
-        ),
-        append = TRUE
-      )
-    }
-    if (version > "2.22" && version < "2.24") {
-      # cmdstan 2.23 unnecessarily required chmod after moving the windows-stanc
-      # this moves the exe file so the make command that requires chmod is not used
-      windows_stanc <- file.path(dir_cmdstan, "bin", "windows-stanc")
-      bin_stanc_exe <- file.path(dir_cmdstan, "bin", "stanc.exe")
-      if (file.exists(windows_stanc)) {
-        file.copy(windows_stanc, bin_stanc_exe)
-      }
-    }
   }
   # Setting up native M1 compilation of CmdStan and its downstream libraries
   if (is_rosetta2()) {
@@ -189,18 +168,6 @@ install_cmdstan <- function(dir = NULL,
       ),
       append = TRUE
     )
-    try(
-      suppressWarnings({
-        macos_inc <- "https://raw.githubusercontent.com/stan-dev/math/92fce0218c9fb15fd405ef031f488cad05c5546b/lib/tbb_2019_U8/build/macos.inc"
-        dest_macos_inc <- file.path(dir_cmdstan, "stan", "lib", "stan_math", "lib", "tbb_2019_U8", "build", "macos.inc")
-        file.remove(dest_macos_inc)
-        utils::download.file(url = macos_inc,
-                             destfile = dest_macos_inc,
-                             quiet = quiet,
-                             headers = github_auth_token())
-      }),
-      silent = TRUE
-    )
   }
 
   message("* Building CmdStan binaries...")

R/model.R

@@ -434,6 +434,9 @@ compile <- function(quiet = TRUE,
   file.copy(self$stan_file(), temp_stan_file, overwrite = TRUE)
   temp_file_no_ext <- strip_ext(temp_stan_file)
   tmp_exe <- cmdstan_ext(temp_file_no_ext) # adds .exe on Windows
+  if(os_is_windows()) {
+    tmp_exe <- utils::shortPathName(tmp_exe)
+  }
   private$hpp_file_ <- paste0(temp_file_no_ext, ".hpp")
 
   # add path to the TBB library to the PATH variable to avoid copying the dll file