From 7cb69cb2188f8e343783d8edb0a43696f0d96686 Mon Sep 17 00:00:00 2001 From: gilbertocamara Date: Sat, 23 Nov 2024 23:05:25 -0300 Subject: [PATCH] update initial load package message --- R/zzz.R | 11 +++++++++++ src/Makevars | 3 --- src/Makevars.win | 3 +-- tests/testthat/test-tuning.R | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 src/Makevars diff --git a/R/zzz.R b/R/zzz.R index 757c32f2c..e51bbab93 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -10,6 +10,17 @@ "https://e-sensing.github.io/sitsbook/" ) ) + if (Sys.info()["sysname"] == "Darwin") { + if (grepl("4.4", R.version.string)) { + packageStartupMessage( + sprintf( + "Running R-4.4 on MacOS. + Please read section \"Fixing problems in MacOS\" in + https://github.com/e-sensing/sits." + ) + ) + } + } } .onLoad <- function(lib, pkg) { Sys.setenv(R_CONFIG_FILE = "config.yml") diff --git a/src/Makevars b/src/Makevars deleted file mode 100644 index f9ff63f89..000000000 --- a/src/Makevars +++ /dev/null @@ -1,3 +0,0 @@ -# CXX_STD = CXX14 -PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/src/Makevars.win b/src/Makevars.win index f9ff63f89..a692e7a7f 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,3 +1,2 @@ # CXX_STD = CXX14 -PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/tests/testthat/test-tuning.R b/tests/testthat/test-tuning.R index b0e5c8a37..af46762e9 100644 --- a/tests/testthat/test-tuning.R +++ b/tests/testthat/test-tuning.R @@ -1,5 +1,5 @@ test_that("Tuning - random search", { - Sys.setenv("OMP_NUM_THREADS" = 1) + #Sys.setenv("OMP_NUM_THREADS" = 1) set.seed(123) torch::torch_manual_seed(1234)