Merge pull request #2099 from quanteda/fix-thread-options

Fixes warning that occurs on Debian devel
quanteda · Mar 25, 2021 · 75432cf · 75432cf
2 parents 9e506ff + 77fefd5
commit 75432cf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/R/quanteda_options.R b/R/quanteda_options.R
@@ -13,9 +13,8 @@
 #' \item{`verbose`}{logical; if `TRUE` then use this as the default
 #' for all functions with a `verbose` argument}
 #' \item{`threads`}{integer; specifies the number of threads to use in
-#' parallelized functions; defaults to `RcppParallel::defaultNumThreads()` 
-#' unless `OMP_THREAD_LIMIT` is set; the number of threads can be changed 
-#' only once in a session}
+#' parallelized functions; defaults to `RcppParallel::defaultNumThreads()`; 
+#' the number of threads can be changed only once in a session}
 #' \item{`print_dfm_max_ndoc`}{integer; specifies the number of documents
 #' to display when using the defaults for printing a dfm}
 #' \item{`print_dfm_max_nfeat`}{integer; specifies the number of
@@ -129,13 +128,8 @@ set_option_value <- function(key, value) {
             warning("Setting threads instead to maximum available ", thread["max"], call. = FALSE)
             value <- thread["max"]
         }
-        if (is.na(thread["tbb"])) {
-            if (value != thread["max"])
-                RcppParallel::setThreadOptions(value)
-        } else {
-            if (value != thread["tbb"])
-                warning("Number of threads can be changed only once in a session", call. = FALSE)   
-        }
+        if (value != thread["max"])
+            RcppParallel::setThreadOptions(value)
     }
 
     # assign the key-value
@@ -146,8 +140,7 @@ set_option_value <- function(key, value) {
 
 # returns thread settings
 get_threads <- function() {
-    c("omp" = as.integer(Sys.getenv("OMP_THREAD_LIMIT")),
-      "tbb" = as.integer(Sys.getenv("RCPP_PARALLEL_NUM_THREADS")),
+    c("tbb" = as.integer(Sys.getenv("RCPP_PARALLEL_NUM_THREADS")),
       "max" = RcppParallel::defaultNumThreads())
 }
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,8 +1,6 @@
 # Resubmission notes
 
-- We submitted this a second time after commenting out a single test that failed on Debian (R Under development (unstable) (2021-03-21 r80102)), apparently due to a reported issue with RcppParallel.  We've skipped that test now.
-
-- We avoided the "Found the following (possibly) invalid URLs" warning from https://www.hashtags.org/featured/what-characters-can-a-hashtag-include/ by removing it as a hyperlink.
+- We submitted this after fixing an issue with a warning when threads were set, which caused a warning on Debian (R Under development (unstable) (2021-03-21 r80102)).  It was determined that this warning was unnecessary so we removed it.
 
 # Submission notes
 

diff --git a/man/quanteda_options.Rd b/man/quanteda_options.Rd
diff --git a/tests/testthat/test-quanteda_options.R b/tests/testthat/test-quanteda_options.R
@@ -68,7 +68,7 @@ test_that("quanteda_options reset works correctly", {
 })
 
 test_that("quanteda_options works with threads", {
-    skip_on_cran()
+#    skip_on_cran()
     if (RcppParallel::defaultNumThreads() == 2) {
         quanteda_options(threads = 1)
     } else {
@@ -78,10 +78,10 @@ test_that("quanteda_options works with threads", {
         as.numeric(Sys.getenv('RCPP_PARALLEL_NUM_THREADS')),
         quanteda_options("threads")
     )
-    expect_warning(
-        quanteda_options(threads = 4),
-        "Number of threads can be changed only once"
-    )
+    # expect_warning(
+    #     quanteda_options(threads = 4),
+    #     "Number of threads can be changed only once"
+    # )
     expect_error(quanteda_options(threads = 0),
                  "^Number of threads must be greater or equal to 1")
     expect_warning(quanteda_options(threads = 100),