complete class DataPipe and DataPipeline(only work with data_parallel_pipeline.cpp because of fixed buffer type)

“phrygiangates” · “phrygiangates” · commit 56b4285137d9 · 2022-06-02T22:28:23.000+08:00
diff --git a/examples/data_parallel_pipeline b/examples/data_parallel_pipeline
diff --git a/examples/data_parallel_pipeline.cpp b/examples/data_parallel_pipeline.cpp
@@ -13,7 +13,7 @@ int main() {
   // std::array<int, num_lines> buffer;
 
   tf::DataPipeline pl(num_lines,
-    tf::DataPipe<void, int>{tf::PipeType::SERIAL, [&](tf::Pipeflow& pf) -> int{
+    tf::DataPipe<tf::Pipeflow&, int>{tf::PipeType::SERIAL, [&](tf::Pipeflow& pf) -> int{
       if(pf.token() == 5) {
         pf.stop();
       }
diff --git a/taskflow/algorithm/pipeline.hpp b/taskflow/algorithm/pipeline.hpp
@@ -835,7 +835,7 @@ class DataPipeline {
   std::vector<Task> _tasks;
   std::vector<Pipeflow> _pipeflows;
   //to modify
-  std::vector<int> _buffer;
+  std::vector<std::variant<int, std::string, float> > _buffer;
 
   template <size_t... I>
   auto _gen_meta(std::tuple<Ps...>&&, std::index_sequence<I...>);
@@ -963,11 +963,11 @@ void DataPipeline<Ps...>::_on_pipe(Pipeflow& pf, Runtime& rt) {
     if constexpr (std::is_invocable_v<callable_t, Pipeflow&>) {
       _buffer[pf._line] = pipe._callable(pf);
     }
-    else if constexpr (std::is_invocable_v<callable_t, int>) {
+    else if constexpr (std::is_invocable_v<callable_t, input_t>) {
       if constexpr (std::is_void_v<output_t>) {
-        pipe._callable(_buffer[pf._line]);
+        pipe._callable(std::get<input_t>(_buffer[pf._line]));
       } else {
-        _buffer[pf._line] = pipe._callable(_buffer[pf._line]);
+        _buffer[pf._line] = pipe._callable(std::get<input_t>(_buffer[pf._line]));
       }
     }
     else if constexpr(std::is_invocable_v<callable_t, Pipeflow&, Runtime&>) {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ int main() {`
`13`	`13`	`// std::array<int, num_lines> buffer;`
`14`	`14`
`15`	`15`	`tf::DataPipeline pl(num_lines,`
`16`		`- tf::DataPipe<void, int>{tf::PipeType::SERIAL, [&](tf::Pipeflow& pf) -> int{`
	`16`	`+ tf::DataPipe<tf::Pipeflow&, int>{tf::PipeType::SERIAL, [&](tf::Pipeflow& pf) -> int{`
`17`	`17`	`if(pf.token() == 5) {`
`18`	`18`	`pf.stop();`
`19`	`19`	`}`