fixed parallel_for bug and added unittest

tsung-wei-huang · tsung-wei-huang · commit 709f78738cb0 · 2018-05-31T23:42:09.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,7 +79,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/unittest)
 add_executable(taskflow unittest/taskflow.cpp)
 target_link_libraries(taskflow Threads::Threads)
 
-add_test(unittest ${PROJECT_SOURCE_DIR}/unittest/taskflow)
+add_test(builder ${PROJECT_SOURCE_DIR}/unittest/taskflow -tc=Taskflow.Builder)
+add_test(dispatch ${PROJECT_SOURCE_DIR}/unittest/taskflow -tc=Taskflow.Dispatch)
+add_test(parallel_for ${PROJECT_SOURCE_DIR}/unittest/taskflow -tc=Taskflow.ParallelFor)
 
 
 
diff --git a/example/parallel_for.cpp b/example/parallel_for.cpp
@@ -1,4 +1,5 @@
 #include "taskflow.hpp"
+#include <cassert>
 
 // Function: fib
 int fib(int n) {
@@ -28,7 +29,7 @@ void taskflow(int N) {
   for(int n=0; n<N; ++n) {
     range[n] = n;
   }
-  tf.parallel_for(range.begin(), range.end(), [&] (int& i) { 
+  tf.parallel_for(range.begin(), range.end(), [&range] (int& i) { 
     printf("fib[%d]=%d\n", i, fib(i));
   });
   tf.wait_for_all();
diff --git a/taskflow.hpp b/taskflow.hpp
@@ -815,7 +815,7 @@ auto BasicTaskflow<F>::parallel_for(I beg, I end, C&& c) {
   auto target = placeholder();
 
   for(; beg != end; ++beg) {
-    auto task = silent_emplace([&, itr=beg] (){ c(*itr); });
+    auto task = silent_emplace([c, itr=beg] (){ c(*itr); });
     source.precede(task);
     task.precede(target);
   }
diff --git a/unittest/taskflow.cpp b/unittest/taskflow.cpp
@@ -198,6 +198,40 @@ TEST_CASE("Taskflow.Dispatch") {
   }
 }
 
+// --------------------------------------------------------
+// Testcase: Taskflow.ParallelFor
+// --------------------------------------------------------
+TEST_CASE("Taskflow.ParallelFor") {
+    
+  using namespace std::chrono_literals;
+
+  std::vector<int> vec(1024, 0);
+
+  tf::Taskflow tf;
+
+  // map
+  SUBCASE("Map") {
+    tf.parallel_for(vec.begin(), vec.end(), [] (int& v) { v = 64; });
+    for(const auto v : vec) {
+      REQUIRE(v == 0);
+    }
+    tf.wait_for_all();
+    for(const auto v : vec) {
+      REQUIRE(v == 64);
+    }
+  }
+
+  // reduce
+  SUBCASE("Reduce") {
+    std::atomic<int> sum(0);
+    tf.parallel_for(vec.begin(), vec.end(), [&](auto) { ++sum; });
+    REQUIRE(sum == 0);
+    tf.wait_for_all();
+    REQUIRE(sum == vec.size());
+  }
+}
+  
+
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -815,7 +815,7 @@ auto BasicTaskflow<F>::parallel_for(I beg, I end, C&& c) {`
`815`	`815`	`auto target = placeholder();`
`816`	`816`
`817`	`817`	`for(; beg != end; ++beg) {`
`818`		`- auto task = silent_emplace([&, itr=beg] (){ c(*itr); });`
	`818`	`+ auto task = silent_emplace([c, itr=beg] (){ c(*itr); });`
`819`	`819`	`source.precede(task);`
`820`	`820`	`task.precede(target);`
`821`	`821`	`}`