add grainSize parameter

jjallaire · jjallaire · commit e076a077df65 · 2014-07-07T16:56:32.000-04:00
diff --git a/inst/include/RcppParallel.h b/inst/include/RcppParallel.h
@@ -17,22 +17,27 @@
 
 namespace RcppParallel {
 
-inline void parallelFor(std::size_t begin, std::size_t end, Worker& worker) {
+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);
+   tbbParallelFor(begin, end, worker, grainSize);
 #else
-   ttParallelFor(begin, end, worker);
+   ttParallelFor(begin, end, worker, grainSize);
 #endif
 
 }
 
 template <typename Reducer>
-inline void parallelReduce(std::size_t begin, std::size_t end, Reducer& reducer) {
+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);
+   tbbParallelReduce(begin, end, reducer, grainSize);
 #else
-   ttParallelReduce(begin, end, reducer);
+   ttParallelReduce(begin, end, reducer, grainSize);
 #endif
+
 }
 
 } // namespace RcppParallel
diff --git a/inst/include/RcppParallel/TBB.h b/inst/include/RcppParallel/TBB.h
@@ -62,15 +62,23 @@ struct TBBReducer
 } // anonymous namespace
 
 
-inline void tbbParallelFor(std::size_t begin, std::size_t end, Worker& worker) {
+inline void tbbParallelFor(std::size_t begin, std::size_t end, 
+                           Worker& worker, std::size_t grainSize = 1) {
+   
    TBBWorker tbbWorker(worker);
-   tbb::parallel_for(tbb::blocked_range<size_t>(begin, end), tbbWorker);
+   
+   tbb::parallel_for(tbb::blocked_range<size_t>(begin, end, grainSize), 
+                     tbbWorker);
 }
 
 template <typename Reducer>
-inline void tbbParallelReduce(std::size_t begin, std::size_t end, Reducer& reducer) {
+inline void tbbParallelReduce(std::size_t begin, std::size_t end, 
+                              Reducer& reducer, std::size_t grainSize = 1) {
+   
    TBBReducer<Reducer> tbbReducer(reducer);
-   tbb::parallel_reduce(tbb::blocked_range<size_t>(begin, end), tbbReducer);
+   
+   tbb::parallel_reduce(tbb::blocked_range<size_t>(begin, end, grainSize), 
+                        tbbReducer);
 }
 
 } // namespace RcppParallel
diff --git a/inst/include/RcppParallel/TinyThread.h b/inst/include/RcppParallel/TinyThread.h
@@ -94,7 +94,8 @@ std::vector<IndexRange> splitInputRange(const IndexRange& range) {
 } // anonymous namespace
 
 // Execute the Worker over the IndexRange in parallel
-inline void ttParallelFor(std::size_t begin, std::size_t end, Worker& worker) {
+inline void ttParallelFor(std::size_t begin, std::size_t end, 
+                          Worker& worker, std::size_t grainSize = 1) {
   
    using namespace tthread;
    
@@ -116,7 +117,8 @@ inline void ttParallelFor(std::size_t begin, std::size_t end, Worker& worker) {
 
 // Execute the IWorker over the range in parallel then join results
 template <typename Reducer>
-inline void ttParallelReduce(std::size_t begin, std::size_t end, Reducer& reducer) {
+inline void ttParallelReduce(std::size_t begin, std::size_t end, 
+                             Reducer& reducer, std::size_t grainSize = 1) {
   
    using namespace tthread;
    
