Tweak some miscellaneous things to pass R CMD check on all platforms

inst/include/config.h

@@ -1,7 +1,16 @@
 #pragma once
-#include <Rcpp.h>
-#include <omp.h>
 
+#ifdef _OPENMP
+    #include <omp.h>
+#else
+    #define omp_get_num_threads()  1
+    #define omp_get_thread_num()   0
+    #define omp_get_max_threads()  1
+    #define omp_get_thread_limit() 1
+    #define omp_get_num_procs()    1
+#endif
+
+#include <Rcpp.h>
 #include <cmath>
 #include <cstdlib>
 #include <map>

inst/include/random.h

@@ -1,9 +1,9 @@
 #pragma once
 #include <Rcpp.h>
-#include <omp.h>
-
 #include <trng/yarn2.hpp>
 
+#include "config.h"
+
 /**
  * @brief Singleton class managing a parallel RNG engine for
  * the entire package.

src/mod_mack.f90

@@ -246,7 +246,7 @@ function mack_pairs_boot(trngl, n_boot, n_sim, pgb) result(reserve)
     type(c_ptr), intent(in), value :: pgb
 
     real(c_double) :: reserve(n_boot * n_sim)
-    integer :: i, j, k, i_diag, i_boot, i_sim, i_thread, n_rows, n_obs
+    integer :: i, j, k, i_diag, i_boot, i_sim, n_rows, n_obs
     real(c_double) :: mean, sd
     real(c_double) :: triangle_sim(trngl%n_dev, trngl%n_dev)
     integer :: status
@@ -256,7 +256,6 @@ function mack_pairs_boot(trngl, n_boot, n_sim, pgb) result(reserve)
     logical :: show_progress
 
     show_progress = c_associated(pgb)
-    i_thread = omp_get_thread_num()
 
     i_boot = 1
     main_loop: do while (i_boot <= n_boot)

src/odp.cpp

@@ -174,6 +174,8 @@ Rcpp::List odpSim(arma::mat triangle, options::SimType sim_type, int n_boot,
                                                reserves.colptr(k), pgb);
                                 break;
                             }
+                            case options::PAIRS:
+                                break;
                         }
                     }
                 }
@@ -239,6 +241,8 @@ Rcpp::List odpSim(arma::mat triangle, options::SimType sim_type, int n_boot,
                                            reserves.colptr(i_diag), pgb);
                             break;
                         }
+                        case options::PAIRS:
+                            break;
                     }
                 }
             }
@@ -295,6 +299,8 @@ Rcpp::List odpSim(arma::mat triangle, options::SimType sim_type, int n_boot,
                                            reserves.colptr(i), pgb);
                             break;
                         }
+                        case options::PAIRS:
+                            break;
                     }
                 }
             }

src/pgb.cpp

@@ -1,5 +1,5 @@
 #include <RcppArmadillo.h>
-#include <omp.h>
+#include "config.h"
 
 #include <cmath>
 #include <progress.hpp>

src/random.cpp

@@ -1,14 +1,14 @@
 #include "random.h"
 
 #include <Rcpp.h>
-#include <omp.h>
-
 #include <boost/math/distributions/poisson.hpp>
 #include <trng/gamma_dist.hpp>
 #include <trng/normal_dist.hpp>
 #include <trng/poisson_dist.hpp>
 #include <trng/uniform01_dist.hpp>
 
+#include "config.h"
+
 extern "C" {
 double rnorm(double mean, double sd);
 double rgamma(double shape, double scale);

tests/testthat/test-boot_res.R

@@ -3,6 +3,7 @@ test_that("bootstrap plot works with correct output", {
   announce_snapshot_file(name = "boot_multiple.png")
   skip_on_ci()
   skip_on_os("windows")
+  skip_on_os("mac")
 
   res <- withr::with_seed(
     42,

tests/testthat/test-calendar.R

@@ -2,6 +2,7 @@ test_that("calendar sim plot works with correct output", {
   announce_snapshot_file(name = "sim_calendar.png")
   skip_on_ci()
   skip_on_os("windows")
+  skip_on_os("mac")
 
   withr::local_seed(42)
   restore <- getTrnglSeed()

tests/testthat/test-origin.R

@@ -2,6 +2,7 @@ test_that("origin sim plot works with correct output", {
   announce_snapshot_file(name = "sim_origin.png")
   skip_on_ci()
   skip_on_os("windows")
+  skip_on_os("mac")
 
   withr::local_seed(42)
   restore <- getTrnglSeed()

tests/testthat/test-single.R

@@ -2,6 +2,7 @@ test_that("single sim plot works with correct output", {
   announce_snapshot_file(name = "sim_single.png")
   skip_on_ci()
   skip_on_os("windows")
+  skip_on_os("mac")
 
   withr::local_seed(42)
   restore <- getTrnglSeed()