updated subflow.cpp

tsung-wei-huang · tsung-wei-huang · commit 7215a2d2b35b · 2018-08-24T17:22:28.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 #set(USE_WERROR ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -std=libc++")
 message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE})
 message(STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER})
 message(STATUS "CMAKE_CXX_COMPILER_VERSION: " ${CMAKE_CXX_COMPILER_VERSION})
diff --git a/example/subflow.cpp b/example/subflow.cpp
@@ -4,6 +4,11 @@
 // We first create four tasks A, B, C, and D. During the execution
 // of B, it uses flow builder to creates another three tasks
 // B1, B2, and B3, and adds dependencies from B1 and B2 to B3.
+//
+// We use dispatch and get to wait until the graph finished.
+// Do so is difference from "wait_for_all" which will clean up the
+// finished graphs. After the graph finished, we dump the topology
+// for inspection.
 
 #include <taskflow.hpp>  
 
@@ -53,9 +58,13 @@ int main() {
   B.precede(D);  // D runs after B 
   C.precede(D);  // D runs after C 
                                    
-  tf.wait_for_all();  // block until finished
+  tf.dispatch().get();  // block until finished
+
+  // Now we can dump the topology
+  std::cout << tf.dump_topologies();
 
   return 0;
 }
 
 
+
diff --git a/taskflow.hpp b/taskflow.hpp
@@ -20,8 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#ifndef TASKFLOW_HPP_
-#define TASKFLOW_HPP_
+#pragma once
 
 #include <iostream>
 #include <cstdio>
@@ -1758,14 +1757,6 @@ using FlowBuilder = typename Taskflow::FlowBuilderType;
 };  // end of namespace tf. ---------------------------------------------------
 
 
-#endif
-
-
-
-
-
-
-
 
 
 
diff --git a/unittest/taskflow.cpp b/unittest/taskflow.cpp
@@ -375,7 +375,7 @@ TEST_CASE("Taskflow.ReduceMax" * doctest::timeout(5)) {
 }
 
 // --------------------------------------------------------
-// Testcase: Taskflow.Subflow
+// Testcase: Taskflow.JoinedSubflow
 // -------------------------------------------------------- 
 TEST_CASE("Taskflow.JoinedSubflow" * doctest::timeout(5)){
 
@@ -545,7 +545,9 @@ TEST_CASE("Taskflow.JoinedSubflow" * doctest::timeout(5)){
   }
 }
 
-// Testcase: Subflow.Detach
+// --------------------------------------------------------
+// Testcase: Taskflow.DetachedSubflow
+// --------------------------------------------------------
 TEST_CASE("Taskflow.DetachedSubflow" * doctest::timeout(5)) {
   
   using namespace std::literals::chrono_literals;

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ TEST_CASE("Taskflow.ReduceMax" * doctest::timeout(5)) {`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`// --------------------------------------------------------`
`378`		`-// Testcase: Taskflow.Subflow`
	`378`	`+// Testcase: Taskflow.JoinedSubflow`
`379`	`379`	`// --------------------------------------------------------`
`380`	`380`	`TEST_CASE("Taskflow.JoinedSubflow" * doctest::timeout(5)){`
`381`	`381`
`@@ -545,7 +545,9 @@ TEST_CASE("Taskflow.JoinedSubflow" * doctest::timeout(5)){`
`545`	`545`	`}`
`546`	`546`	`}`
`547`	`547`
`548`		`-// Testcase: Subflow.Detach`
	`548`	`+// --------------------------------------------------------`
	`549`	`+// Testcase: Taskflow.DetachedSubflow`
	`550`	`+// --------------------------------------------------------`
`549`	`551`	`TEST_CASE("Taskflow.DetachedSubflow" * doctest::timeout(5)) {`
`550`	`552`
`551`	`553`	`using namespace std::literals::chrono_literals;`