version 5.0.0

Author: kevinushey

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RcppParallel
 Type: Package
 Title: Parallel Programming Tools for 'Rcpp'
-Version: 4.4.4
+Version: 5.0.0
 Authors@R: c(
  person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"),
  person("Romain", "Francois", role = c("aut", "cph")),
@@ -28,7 +28,7 @@ URL: http://rcppcore.github.io/RcppParallel,
 Biarch: TRUE
 Collate: 'build.R' 'hooks.R' 'options.R' 'skeleton.R'
 NeedsCompilation: yes
-Packaged: 2019-09-25 16:06:48 UTC; kevinushey
+Packaged: 2020-03-10 19:14:58 UTC; kevinushey
 Author: JJ Allaire [aut],
  Romain Francois [aut, cph],
  Kevin Ushey [aut, cre],
@@ -41,4 +41,4 @@ Author: JJ Allaire [aut],
  Microsoft [cph]
 Maintainer: Kevin Ushey <kevin@rstudio.com>
 Repository: CRAN
-Date/Publication: 2019-09-27 08:50:10 UTC
+Date/Publication: 2020-03-11 23:10:22 UTC

MD5

@@ -1,21 +1,22 @@
-4785c7aa919dd342f638704419dca769 *DESCRIPTION
+26e59102bf659e5991dc7837854ac4ec *DESCRIPTION
 50d75b4d42421eb8dc927070d5b190d4 *NAMESPACE
 5a1495bf7a04c7ba544b8d4c4c002d79 *R/build.R
-1c89f724d1263d253689bb19202fc187 *R/hooks.R
-0cb36faf871ae59f97c4d2408469651b *R/options.R
+e40b3b2f751d79e1eeccbd56d333f4dd *R/hooks.R
+9af62c399b678118175782c155c8ec68 *R/options.R
 c738dae81e6eb1863eca51006694f2fb *R/skeleton.R
 390aa2da7fa4a9d9cafe36ea98b1605b *cleanup
 b655b8ee83719d6f623567248466e2d4 *cleanup.win
 cde1332e18de6608b528526313571267 *configure
 b481df59119f55840bf861e8e1c1a9f9 *configure.win
-f9d8bed7ec9c56f52984b19a1004144b *inst/NEWS
-5ff513fb33023d45231d644c6cd9e7ba *inst/include/RcppParallel.h
+e1995fada10f36a24aff1b4af444016b *inst/NEWS
+a621d9e091b717f24ce5033323c85ba2 *inst/include/RcppParallel.h
+a6c056a4c7e284fb4a0258a525669340 *inst/include/RcppParallel/Backend.h
 d4ab7ad2384f150a32637a284e831bc0 *inst/include/RcppParallel/Common.h
 3749562d299d4065cc99f275e7f2585a *inst/include/RcppParallel/RMatrix.h
 7b0de08055d8aa0b21de7a1260083041 *inst/include/RcppParallel/RVector.h
 70ea4c28bcd015bcf2eef88bb1d45ced *inst/include/RcppParallel/TBB.h
 804a6a70a3eefef66c5700bd0fbbfe9b *inst/include/RcppParallel/Timer.h
-640b20f47726aabcc8cf501ab43375e1 *inst/include/RcppParallel/TinyThread.h
+cba41cd9cc316a5edd076c4bc6abaa4c *inst/include/RcppParallel/TinyThread.h
 719fca47bf2eb469426db8b3dd0d1b9b *inst/include/index.html
 cbc1275e9a34dd943d4d1d31863b15bf *inst/include/serial/tbb/parallel_for.h
 cb129f0cecff46bdea633d23db82a17f *inst/include/serial/tbb/tbb_annotate.h
@@ -139,19 +140,17 @@ b218740313281a0ee2832de9777e71e3 *inst/skeleton/vector-sum.Rd
 2b9284692fea3fa494038f0a684f53d0 *inst/skeleton/vector-sum.cpp
 c7e35f89b0b1ffb309920b6596b13d62 *inst/tests/cpp/distance.cpp
 b9e5bbe1cadd17714288718fa225e49c *inst/tests/cpp/innerproduct.cpp
-7e29328ca6927d0297b4ff2d2f498305 *inst/tests/cpp/malloc.cpp
 8ca3bc3f887c91b7dfd38ab0192b4bcc *inst/tests/cpp/sum.cpp
 8ec8d03260257d2fffb8e39442ebe66b *inst/tests/cpp/transform.cpp
 61a8898bd23f20c9487bebe52c92fb6a *inst/tests/runit.distance.R
 d201cb80099dba62315a39eaadc0eb67 *inst/tests/runit.innerproduct.R
-0f0fa4e7ed653cd99d6cd3a26a6a3e6c *inst/tests/runit.malloc.R
 3b28677a7432e04b31b7cb91ca17855f *inst/tests/runit.sum.R
 bcb7cccabfbd3e3f24834d40d1f014a0 *inst/tests/runit.transform.R
 cee8e00decc99c13c084f3af8256c9df *man/RcppParallel-package.Rd
 cf21b0e90c8e12da67f81db0f9e3edad *man/RcppParallel.package.skeleton.Rd
 5b33e213c19d4da27cf4f401a2020518 *man/RcppParallelFlags.Rd
-f3b91a97f7f2c4cbe658b0858d74017e *man/setThreadOptions.Rd
-7ba831317b47182ed1693e2bb196cbd7 *src/Makevars.in
+d5aa6a871c5b1ef15377dca51706277c *man/setThreadOptions.Rd
+eec626907c1276435e752210c4b5e79c *src/Makevars.in
 577ff72d88540ba48b61c11fe1d0cb3c *src/init.cpp
 32ee0b5805df0877ee7e81d97619ec96 *src/options.cpp
 ab34a7f2db75a1b1ad2eeddeefd330ce *src/tbb/CHANGES
@@ -221,7 +220,7 @@ e9637b87056560f0280e2c2509fc9971 *src/tbb/build/vs2013/makefile.sln
 b59924ca71fcbd1043f40334227b93b9 *src/tbb/build/windows.cl.inc
 a233345a54f6f6396a97b2968d5d42b2 *src/tbb/build/windows.gcc.inc
 7ee8d7b31d57eb476bb5179079fe6086 *src/tbb/build/windows.icl.inc
-dda1ef69f72e1950f857e2fc85a53666 *src/tbb/build/windows.inc
+c37d52688295e2fd1b05c3e3ededabb7 *src/tbb/build/windows.inc
 719fca47bf2eb469426db8b3dd0d1b9b *src/tbb/include/index.html
 7fedae3af7bb81b25e0f2978f758395e *src/tbb/include/serial/tbb/parallel_for.h
 9155bd2dece2303d826feb03ecebf951 *src/tbb/include/serial/tbb/tbb_annotate.h
@@ -516,7 +515,7 @@ b765d41fdcdfb8d68d72103a524b3f90 *src/tbb/src/tbbmalloc/tbbmalloc_internal_api.h
 da1bd66f7c1bc19cd4542daac9ddfa5e *src/tbb/src/tbbmalloc/win64-tbbmalloc-export.def
 14f025a300e77c2f4c50f075a7315208 *src/tbb/src/tbbproxy/tbbproxy-windows.asm
 7eab0aae6dc1101e7220bbdde0408ec9 *src/tbb/src/tbbproxy/tbbproxy.cpp
-9c42494a8a946f4e7d9a1dd823c3fca9 *tests/doRUnit.R
+f583b9e335d83e862b59f19b35f38f58 *tests/doRUnit.R
 af8e7488d578542b16949cb62833f616 *tools/config.R
 b564bb610841dd8709edc843eeca49a0 *tools/config/cleanup.R
-51aada6d029f16bc6e80bc8195c410e2 *tools/config/configure.R
+1f65577b20dd2a9696d235baf850e5fd *tools/config/configure.R

R/hooks.R

@@ -25,13 +25,6 @@ mallocDllInfo <- NULL
  # load the package library
  library.dynam("RcppParallel", pkgname, libname)
 
- # set default thread options
- numThreads <- "auto"
- numThreadsEnv <- Sys.getenv("RCPP_PARALLEL_NUM_THREADS", unset = NA)
- if (!is.na(numThreadsEnv))
- setThreadOptions(numThreads = as.integer(numThreadsEnv))
- else
- setThreadOptions(numThreads = "auto")
 }
 
 .onUnload <- function(libpath) {

R/options.R

@@ -1,4 +1,8 @@
 
+isUsingTbb <- function() {
+ backend <- Sys.getenv("RCPP_PARALLEL_BACKEND", "tbb")
+ identical(backend, "tbb")
+}
 
 setThreadOptions <- function(numThreads = "auto", stackSize = "auto") {
 
@@ -19,18 +23,27 @@ setThreadOptions <- function(numThreads = "auto", stackSize = "auto") {
  stackSize <- as.integer(stackSize)
 
  # Call setThreadOptions if using tbb
- if (!is.null(dllInfo)) {
- invisible(.Call("setThreadOptions", numThreads, stackSize, 
- PACKAGE = "RcppParallel"))
- } 
+ if (!is.null(dllInfo) && isUsingTbb())
+ setTbbThreadOptions(numThreads, stackSize)
 
  if (numThreads == -1L)
  Sys.unsetenv("RCPP_PARALLEL_NUM_THREADS")
  else
  Sys.setenv(RCPP_PARALLEL_NUM_THREADS = numThreads)
 }
 
-defaultNumThreads <- function() {
- .Call("defaultNumThreads", PACKAGE = "RcppParallel")
+setTbbThreadOptions <- function(numThreads, stackSize) {
+ .Call(
+ "setThreadOptions",
+ as.integer(numThreads),
+ as.integer(stackSize),
+ PACKAGE = "RcppParallel"
+ )
 }
 
+defaultNumThreads <- function() {
+ .Call(
+ "defaultNumThreads",
+ PACKAGE = "RcppParallel"
+ )
+}

inst/NEWS

@@ -1,3 +1,10 @@
+RcppParallel 5.0.0
+------------------------------------------------------------------------
+* RcppParallel backend can now be customized with RCPP_PARALLEL_BACKEND
+ environment variable (supported values are 'tbb' and 'tinythread')
+* Fixed issue when compiling RcppParallel on macOS Catalina
+* Fixed issue when compiling RcppParallel with Rtools40
+
 RcppParallel 4.4.4
 ------------------------------------------------------------------------
 * Fixed an issue when compiling RcppParallel with clang-9 on Fedora

inst/include/RcppParallel.h

@@ -10,44 +10,53 @@
 // compatibility with CRAN packages not previously configured
 // to link to TBB in Makevars.win)
 #ifndef RCPP_PARALLEL_USE_TBB
-#if defined(__APPLE__) || defined(__gnu_linux__) || ((defined(__sun) && defined(__SVR4) && !defined(__sparc)))
-#define RCPP_PARALLEL_USE_TBB 1
-#include "RcppParallel/TBB.h"
-#else
-#define RCPP_PARALLEL_USE_TBB 0
-#endif
+# if defined(__APPLE__) || defined(__gnu_linux__) || (defined(__sun) && defined(__SVR4) && !defined(__sparc))
+# define RCPP_PARALLEL_USE_TBB 1
+# else
+# define RCPP_PARALLEL_USE_TBB 0
+# endif
 #endif
 
 #if RCPP_PARALLEL_USE_TBB
- #include "RcppParallel/TBB.h"
+# include "RcppParallel/TBB.h"
 #endif
 
+#include "RcppParallel/Backend.h"
+
 #include "RcppParallel/RVector.h"
 #include "RcppParallel/RMatrix.h"
 
 namespace RcppParallel {
 
-inline void parallelFor(std::size_t begin, std::size_t end, 
- Worker& worker, std::size_t grainSize = 1) {
- 
+inline void parallelFor(std::size_t begin,
+ std::size_t end, 
+ Worker& worker,
+ std::size_t grainSize = 1)
+{
 #if RCPP_PARALLEL_USE_TBB
- tbbParallelFor(begin, end, worker, grainSize);
+ if (internal::backend() == internal::BACKEND_TBB)
+ tbbParallelFor(begin, end, worker, grainSize);
+ else
+ ttParallelFor(begin, end, worker, grainSize);
 #else
  ttParallelFor(begin, end, worker, grainSize);
 #endif
-
 }
 
 template <typename Reducer>
-inline void parallelReduce(std::size_t begin, std::size_t end, 
- Reducer& reducer, std::size_t grainSize = 1) {
- 
+inline void parallelReduce(std::size_t begin,
+ std::size_t end, 
+ Reducer& reducer,
+ std::size_t grainSize = 1)
+{
 #if RCPP_PARALLEL_USE_TBB
- tbbParallelReduce(begin, end, reducer, grainSize);
+ if (internal::backend() == internal::BACKEND_TBB)
+ tbbParallelReduce(begin, end, reducer, grainSize);
+ else
+ ttParallelReduce(begin, end, reducer, grainSize);
 #else
  ttParallelReduce(begin, end, reducer, grainSize);
 #endif
-
 }
 
 } // namespace RcppParallel

inst/include/RcppParallel/Backend.h

@@ -0,0 +1,84 @@
+
+#ifndef __RCPP_PARALLEL_BACKEND__
+#define __RCPP_PARALLEL_BACKEND__
+
+#include <cstdlib>
+#include <cstring>
+
+extern "C" {
+void REprintf(const char*, ...);
+}
+
+namespace RcppParallel {
+namespace internal {
+
+enum backend_type {
+ BACKEND_TBB,
+ BACKEND_TINYTHREAD
+};
+
+#if RCPP_PARALLEL_USE_TBB
+
+inline backend_type defaultBackend()
+{
+ return BACKEND_TBB;
+}
+
+#else
+
+inline backend_type defaultBackend()
+{
+ return BACKEND_TINYTHREAD;
+}
+
+#endif
+
+inline const char* backendToString(backend_type backend)
+{
+ switch (backend)
+ {
+ case BACKEND_TBB:
+ return "tbb";
+ case BACKEND_TINYTHREAD:
+ return "tinythread";
+ }
+
+ // shouldn't be reached but need to silence compiler warnings
+ return "tbb";
+}
+
+inline backend_type backend()
+{
+ const char* requestedBackend = std::getenv("RCPP_PARALLEL_BACKEND");
+ if (requestedBackend == NULL)
+ {
+ return defaultBackend();
+ }
+ else if (std::strcmp(requestedBackend, "tbb") == 0)
+ {
+#if RCPP_PARALLEL_USE_TBB
+ return BACKEND_TBB;
+#else
+ const char* msg =
+ "tbb backend is not available; using tinythread instead";
+ 
+ REprintf("%s\n", msg);
+ return BACKEND_TINYTHREAD;
+#endif
+ }
+ else if (strcmp(requestedBackend, "tinythread") == 0)
+ {
+ return BACKEND_TINYTHREAD;
+ }
+ else
+ {
+ const char* fmt = "unknown parallel backend '%s'; using '%s' instead\n";
+ REprintf(fmt, requestedBackend, backendToString(defaultBackend()));
+ return defaultBackend();
+ }
+}
+
+} // namespace internal
+} // namespace RcppParallel
+
+#endif /* __RCPP_PARALLEL_BACKEND__ */

inst/include/RcppParallel/TinyThread.h

@@ -2,12 +2,12 @@
 #define __RCPP_PARALLEL_TINYTHREAD__
 
 #include <cstdlib>
+#include <cstdio>
 
 #include "Common.h"
 
 #include <tthread/tinythread.h>
 
-#include <stdio.h>
 
 #include <vector>