Skip to content

Commit b3de108

Browse files
committed
always build RcppParallel with use tbb flag
1 parent 2394425 commit b3de108

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

src/Makevars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
CXX_STD = CXX11
33

4-
PKG_CPPFLAGS += -I../inst/include/
4+
PKG_CPPFLAGS += -I../inst/include/ -DRCPP_PARALLEL_USE_TBB=1
55

66
ifeq ($(OS), Windows_NT)
77

src/options.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ extern "C" SEXP defaultNumThreads() {
4949

5050
#include <tthread/tinythread.h>
5151

52-
extern "C" SEXP setThreadOptions(SEXP numThreadsSEXP, SEXP stackSizeSEXP) {
53-
return R_NilValue;
54-
}
55-
5652
extern "C" SEXP defaultNumThreads() {
5753
SEXP threadsSEXP = Rf_allocVector(INTSXP, 1);
5854
INTEGER(threadsSEXP)[0] = tthread::thread::hardware_concurrency();

0 commit comments

Comments
 (0)