remove fastflow support

Author: Gonzalo Juarez

CMakeLists.txt

@@ -101,37 +101,6 @@ if (GRPPI_OMP_ENABLE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif (GRPPI_OMP_ENABLE)
 
-#FastFlow library
-find_package(FF)
-if (FF_FOUND)
-  if (${CMAKE_CXX_STANDARD} STREQUAL "17")
-    option(GRPPI_FF_ENABLE "Require FastFlow library" OFF)
-    set(GRPPI_FF_ENABLE OFF CACHE BOOL "Require FastFlow library" FORCE)
-    message(STATUS "FastFlow not supported in C++17")
-  else ()
-    option(GRPPI_FF_ENABLE "Require FastFlow library" ON)
-    message(STATUS "FastFlow found")
-  endif ()
-else ()
-  option(GRPPI_FF_ENABLE "Require FastFlow library" OFF)
-  set(GRPPI_FF_ENABLE OFF CACHE BOOL "Require FastFlow library" FORCE)
-  message(STATUS "FastFlow not found")
-  message(STATUS "  GRPPI_FF_ENABLE has been set to OFF")
-  message(STATUS "  To enable it, please, first install FastFlow")
-  message(STATUS "  https://github.com/fastflow/fastflow")
-endif ()
-
-message(STATUS "FastFlow: " ${GRPPI_FF_ENABLE})
-if (GRPPI_FF_ENABLE)
-  if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-    set(GRPPI_FF_ENABLE OFF CACHE BOOL "Require Fastflow library" FORCE)
-    message(WARNING "Fastflow is not currently supported in Clang")
-  else ()
-    add_definitions(-DGRPPI_FF)
-    include_directories(${FF_INCLUDE_DIRS})
-  endif ()
-endif (GRPPI_FF_ENABLE)
-
 # Doxygen Documentation
 option(GRPPI_DOXY_ENABLE "Require Doxygen library" OFF)
 if (GRPPI_DOXY_ENABLE)

cmake.modules/FindFF.cmake

@@ -31,7 +31,6 @@ enum class execution_backend {
   native,
   omp,
   tbb,
-  ff
 };
 
 inline std::ostream & operator<<(std::ostream & os, execution_backend be) {
@@ -40,7 +39,6 @@ inline std::ostream & operator<<(std::ostream & os, execution_backend be) {
     case execution_backend::native: return os << "native";
     case execution_backend::omp: return os << "omp";
     case execution_backend::tbb: return os << "tbb";
-    case execution_backend::ff: return os << "ff";
     default: return os << "unknown";
   }
 }
@@ -155,9 +153,6 @@ class configuration {
      else if (std::strcmp("tbb", str) == 0) {
        dynamic_backend_ = execution_backend::tbb;
      }
-     else if (std::strcmp("ff", str) == 0) {
-       dynamic_backend_ = execution_backend::ff;
-     }
      else {
        std::cerr << "GrPPI: Invalid backend \"" << str << "\"\n";
      }

include/grppi/common/configuration.h

@@ -20,7 +20,6 @@
 #include "../native/parallel_execution_native.h"
 #include "../tbb/parallel_execution_tbb.h"
 #include "../omp/parallel_execution_omp.h"
-#include "../ff/parallel_execution_ff.h"
 #include "../common/configuration.h"
 
 #include <memory>
@@ -46,9 +45,6 @@ class dynamic_execution {
       case execution_backend::tbb:
         execution_ = make_execution<parallel_execution_tbb>();
         break;
-      case execution_backend::ff:
-        execution_ = make_execution<parallel_execution_ff>();
-        break;
     }
   }
 
@@ -324,26 +320,11 @@ GRPPI_TRY_PATTERN(parallel_execution_tbb,PATTERN,__VA_ARGS__)
 #define GRPPI_TRY_PATTERN_TBB(PATTERN,...)
 #endif
 
-#ifdef GRPPI_FF
-#define GRPPI_TRY_PATTERN_FF(PATTERN,...) \
-GRPPI_TRY_PATTERN(parallel_execution_ff,PATTERN,__VA_ARGS__)
-#else
-#define GRPPI_TRY_PATTERN_FF(PATTERN,...)
-#endif
-
 #define GRPPI_TRY_PATTERN_ALL(...) \
 GRPPI_TRY_PATTERN(sequential_execution, __VA_ARGS__) \
 GRPPI_TRY_PATTERN(parallel_execution_native, __VA_ARGS__) \
 GRPPI_TRY_PATTERN_OMP(__VA_ARGS__) \
 GRPPI_TRY_PATTERN_TBB(__VA_ARGS__) \
-GRPPI_TRY_PATTERN_FF(__VA_ARGS__) \
-GRPPI_PATTERN_NOT_IMPLEMENTED(__VA_ARGS__)\
-
-#define GRPPI_TRY_PATTERN_ALL_NOFF(...) \
-GRPPI_TRY_PATTERN(sequential_execution, __VA_ARGS__) \
-GRPPI_TRY_PATTERN(parallel_execution_native, __VA_ARGS__) \
-GRPPI_TRY_PATTERN_OMP(__VA_ARGS__) \
-GRPPI_TRY_PATTERN_TBB(__VA_ARGS__) \
 GRPPI_PATTERN_NOT_IMPLEMENTED(__VA_ARGS__)\
 
 template <typename ... InputIterators, typename OutputIterator, 
@@ -403,7 +384,7 @@ auto dynamic_execution::divide_conquer(
     Solver && solve_op, 
     Combiner && combine_op) const
 {
-  GRPPI_TRY_PATTERN_ALL_NOFF(divide_conquer, std::forward<Input>(input),
+  GRPPI_TRY_PATTERN_ALL(divide_conquer, std::forward<Input>(input),
       std::forward<Divider>(divide_op),
       std::forward<Solver>(solve_op),
       std::forward<Combiner>(combine_op));
@@ -442,7 +423,7 @@ void dynamic_execution::stream_pool(Population & population,
                 Evaluation && eval_op,
                 Predicate && termination_op) const
 {
- GRPPI_TRY_PATTERN_ALL_NOFF(stream_pool, population, std::forward<Selection>
+ GRPPI_TRY_PATTERN_ALL(stream_pool, population, std::forward<Selection>
      (selection_op),
       std::forward<Evolution>(evolve_op),
       std::forward<Evaluation>(eval_op),