move parallel-for stuff into cpp

Author: kevinushey

R/zzz.R

@@ -37,7 +37,7 @@ loadTbbLibrary <- function(name) {
       .tbbMallocProxyDllInfo <<- loadTbbLibrary("tbbmalloc_proxy")
 
    # load RcppParallel library if available
-   .dllInfo <<- library.dynam("RcppParallel", pkgname, libname)
+   .dllInfo <<- library.dynam("RcppParallel", pkgname, libname, local = FALSE)
 
 }
 

inst/include/RcppParallel/TBB.h

@@ -54,37 +54,6 @@ struct TBBReducer
    Reducer& reducer_;
 };
 
-class TBBParallelForExecutor
-{
-public:
-   
-   TBBParallelForExecutor(Worker& worker,
-                          std::size_t begin,
-                          std::size_t end,
-                          std::size_t grainSize)
-      : worker_(worker),
-        begin_(begin),
-        end_(end),
-        grainSize_(grainSize)
-   {
-   }
-   
-   void operator()() const
-   {
-      TBBWorker tbbWorker(worker_);
-      tbb::parallel_for(
-         tbb::blocked_range<std::size_t>(begin_, end_, grainSize_),
-         tbbWorker
-      );
-   }
-   
-private:
-   Worker& worker_;
-   std::size_t begin_;
-   std::size_t end_;
-   std::size_t grainSize_;
-};
-
 template <typename Reducer>
 class TBBParallelReduceExecutor
 {
@@ -117,38 +86,6 @@ class TBBParallelReduceExecutor
    std::size_t grainSize_;
 };
 
-class TBBArenaParallelForExecutor
-{
-public:
-   
-   TBBArenaParallelForExecutor(tbb::task_group& group,
-                               Worker& worker,
-                               std::size_t begin,
-                               std::size_t end,
-                               std::size_t grainSize)
-      : group_(group),
-        worker_(worker),
-        begin_(begin),
-        end_(end),
-        grainSize_(grainSize)
-   {
-   }
-   
-   void operator()() const
-   {
-      TBBParallelForExecutor executor(worker_, begin_, end_, grainSize_);
-      group_.run_and_wait(executor);
-   }
-   
-private:
-   
-   tbb::task_group& group_;
-   Worker& worker_;
-   std::size_t begin_;
-   std::size_t end_;
-   std::size_t grainSize_;
-};
-
 template <typename Reducer>
 class TBBArenaParallelReduceExecutor
 {
@@ -182,20 +119,11 @@ class TBBArenaParallelReduceExecutor
    std::size_t grainSize_;
 };
 
-inline void tbbParallelFor(std::size_t begin,
-                           std::size_t end, 
-                           Worker& worker,
-                           std::size_t grainSize = 1,
-                           int numThreads = -1)
-{
-   ThreadStackSizeControl control;
-   
-   tbb::task_group group;
-   TBBArenaParallelForExecutor executor(group, worker, begin, end, grainSize);
-   
-   tbb::task_arena arena(numThreads);
-   arena.execute(executor);
-}
+void tbbParallelFor(std::size_t begin,
+                    std::size_t end,
+                    Worker& worker,
+                    std::size_t grainSize = 1,
+                    int numThreads = -1);
 
 template <typename Reducer>
 inline void tbbParallelReduce(std::size_t begin,

src/tbb.cpp

@@ -1,14 +1,6 @@
 
-
 #include <RcppParallel/Common.h>
-
-#ifndef TBB_PREVIEW_GLOBAL_CONTROL
-# define TBB_PREVIEW_GLOBAL_CONTROL 1
-#endif
-
-#include <tbb/tbb.h>
-#include <tbb/global_control.h>
-#include <tbb/scalable_allocator.h>
+#include <RcppParallel/TBB.h>
 
 namespace RcppParallel {
 
@@ -39,4 +31,82 @@ ThreadStackSizeControl::~ThreadStackSizeControl()
 #endif
 }
 
+class TBBParallelForExecutor
+{
+public:
+   
+   TBBParallelForExecutor(Worker& worker,
+                          std::size_t begin,
+                          std::size_t end,
+                          std::size_t grainSize)
+      : worker_(worker),
+        begin_(begin),
+        end_(end),
+        grainSize_(grainSize)
+   {
+   }
+   
+   void operator()() const
+   {
+      TBBWorker tbbWorker(worker_);
+      tbb::parallel_for(
+         tbb::blocked_range<std::size_t>(begin_, end_, grainSize_),
+         tbbWorker
+      );
+   }
+   
+private:
+   Worker& worker_;
+   std::size_t begin_;
+   std::size_t end_;
+   std::size_t grainSize_;
+};
+
+class TBBArenaParallelForExecutor
+{
+public:
+   
+   TBBArenaParallelForExecutor(tbb::task_group& group,
+                               Worker& worker,
+                               std::size_t begin,
+                               std::size_t end,
+                               std::size_t grainSize)
+      : group_(group),
+        worker_(worker),
+        begin_(begin),
+        end_(end),
+        grainSize_(grainSize)
+   {
+   }
+   
+   void operator()() const
+   {
+      TBBParallelForExecutor executor(worker_, begin_, end_, grainSize_);
+      group_.run_and_wait(executor);
+   }
+   
+private:
+   
+   tbb::task_group& group_;
+   Worker& worker_;
+   std::size_t begin_;
+   std::size_t end_;
+   std::size_t grainSize_;
+};
+
+void tbbParallelFor(std::size_t begin,
+                    std::size_t end,
+                    Worker& worker,
+                    std::size_t grainSize,
+                    int numThreads)
+{
+   ThreadStackSizeControl control;
+   
+   tbb::task_group group;
+   TBBArenaParallelForExecutor executor(group, worker, begin, end, grainSize);
+   
+   tbb::task_arena arena(numThreads);
+   arena.execute(executor);
+}
+
 } // end namespace RcppParallel