Merge remote-tracking branch 'niehs/main' into nlopt-update

R/model_averaging_fits.R

@@ -55,7 +55,6 @@ ma_continuous_fit <- function(D, Y, model_list = NA, fit_type = "laplace",
   Y <- as.matrix(Y)
   D <- as.matrix(D)
   .setseedGSL(seed)
-  .set_threads(threads)
   is_neg <- .check_negative_response(Y)
 
   DATA <- cbind(D, Y)

src/code_base/seeder.cpp

@@ -1,3 +1,3 @@
 #include <seeder.h>
 
-THREAD_LOCAL gsl_rng* Seeder::rng = nullptr;
+THREAD_LOCAL gsl_rng* Seeder::rng = nullptr;

src/include/seeder.h

@@ -38,6 +38,27 @@ class Seeder {
     return &instance;
   }
 
+  void reset_max_threads(int threads) {
+  #ifndef NO_OMP
+    if(max_threads < threads) {
+      int num_prev_threads = max_threads;
+      max_threads = threads;
+
+      rngs.reserve(threads);
+      #pragma omp parallel for
+      for (int i = 0; i < threads; i++) {
+        int thread_num = omp_get_thread_num();
+        if (thread_num < num_prev_threads) {
+          continue;
+        }
+        thread_local gsl_rng* r_local = gsl_rng_alloc(T);
+        gsl_rng_set(r_local, currentSeed);
+        rngs[thread_num] = r_local;
+      }
+    }
+  #endif
+  }
+
   ~Seeder() {
     if (rng) {
       gsl_rng_free(rng);
@@ -56,7 +77,7 @@ class Seeder {
     nlopt_srand(seed);
     currentSeed = seed;
   }
-
+  
   double get_uniform() {
     if (!rng) {
       Rcpp::warning("Error: RNG not initialized.");

src/set_omp_threads.cpp

@@ -17,7 +17,6 @@ int set_threads(int num_threads) {
   #ifndef NO_OMP
   if(omp_get_max_threads() > 1){
     if (num_threads > omp_get_num_threads()) {
-      #pragma omp master
       { omp_set_num_threads(num_threads); }
       // Rcpp::Rcout << "OpenMP threads set to " << num_threads << std::endl;
       return 1;