Merge branch 'master' of github.com:jjallaire/RcppParallel

jjallaire · jjallaire · commit c0d6f55cccad · 2014-07-07T14:37:51.000-04:00
diff --git a/R/options.R b/R/options.R
@@ -3,19 +3,19 @@
 dllInfo <- NULL
 
 .onLoad <- function(libname, pkgname) {
-   
-   # load tbb and make it's symbols available globally
+
+   # load tbb if we aren't on windows
    sysname <- Sys.info()['sysname']
-   if (sysname == "Darwin")
-      ext = ".dylib"
-   else if (sysname == "Linux")
-      ext = ".so.2"
-   else if (sysname == "Windows")
-      ext = ".dll"
-   else
-      ext = .Platform$dynlib.ext
-   dll <- system.file(paste("lib/libtbb", ext, sep = ""), package = "RcppParallel")
-   dllInfo <<- dyn.load(dll, local = FALSE, now = TRUE)
+   if (sysname != "Windows") {
+     if (sysname == "Darwin")
+        ext = ".dylib"
+     else if (sysname == "Linux")
+        ext = ".so.2"
+     else
+        ext = .Platform$dynlib.ext
+     dll <- system.file(paste("lib/libtbb", ext, sep = ""), package = "RcppParallel")
+     dllInfo <<- dyn.load(dll, local = FALSE, now = TRUE)
+   }
    
    # load the package library
    library.dynam("RcppParallel", pkgname, libname)
@@ -29,8 +29,9 @@ dllInfo <- NULL
    # unload the package library
    library.dynam.unload("RcppParallel", libpath)
    
-   # unload tbb
-   dyn.unload(dllInfo[["path"]])
+   # unload tbb if we loaded it (i.e. aren't on windows)
+   if (!is.null(dllInfo))
+      dyn.unload(dllInfo[["path"]])
 }
 
 setThreadOptions <- function(numThreads = "auto", stackSize = "auto") {
diff --git a/src/.gitignore b/src/.gitignore
@@ -1,2 +1,3 @@
 *.o
 *.so
+*.dll
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -0,0 +1,4 @@
+
+PKG_CPPFLAGS += -I../inst/include/
+
+
diff --git a/src/options.cpp b/src/options.cpp
@@ -1,11 +1,13 @@
 
+#include <Rinternals.h>
+
+#ifndef _WIN32
+
 #include <string>
 #include <exception>
 
 #include <tbb/task_scheduler_init.h>
 
-#include <Rinternals.h>
-
 extern "C" SEXP setThreadOptions(SEXP numThreadsSEXP, SEXP stackSizeSEXP) {
 
    static tbb::task_scheduler_init* s_pTaskScheduler = NULL;
@@ -40,3 +42,17 @@ extern "C" SEXP defaultNumThreads() {
    INTEGER(threadsSEXP)[0] = tbb::task_scheduler_init::default_num_threads();
    return threadsSEXP;
 }
+
+#else
+
+extern "C" SEXP setThreadOptions(SEXP numThreadsSEXP, SEXP stackSizeSEXP) {
+  return R_NilValue; 
+}
+
+extern "C" SEXP defaultNumThreads() {
+   SEXP threadsSEXP = Rf_allocVector(INTSXP, 1);
+   INTEGER(threadsSEXP)[0] = 4;
+   return threadsSEXP;
+}
+
+#endif

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +PKG_CPPFLAGS += -I../inst/include/
++
++