]> https://gitweb.dealii.org/ - dealii.git/commitdiff
rename cpp-taskflow to taskflow 10451/head
authorTimo Heister <timo.heister@gmail.com>
Wed, 3 Jun 2020 15:27:11 +0000 (11:27 -0400)
committerTimo Heister <timo.heister@gmail.com>
Wed, 3 Jun 2020 15:27:11 +0000 (11:27 -0400)
with the 2.5.0 release (2020/06/01), the library decided to rebrand as
"taskflow" instead of "cpp-taskflow". Reflect this change by replacing
all references in the library.

37 files changed:
bundled/CMakeLists.txt
bundled/setup_bundled.cmake
bundled/taskflow-2.4.0/LICENSE [moved from bundled/cpp-taskflow-2.4.0/LICENSE with 100% similarity]
bundled/taskflow-2.4.0/README.md [moved from bundled/cpp-taskflow-2.4.0/README.md with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/error.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/error.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/executor.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/executor.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/flow_builder.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/flow_builder.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/graph.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/graph.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/notifier.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/notifier.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/observer.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/observer.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/task.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/task.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/taskflow.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/taskflow.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/topology.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/topology.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/core/tsq.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/core/tsq.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_device.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_device.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_error.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_error.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_flow.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_flow.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_graph.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_graph.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_task.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_task.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/declarations.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/declarations.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/nstd/any.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/any.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/nstd/optional.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/optional.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/nstd/variant.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/variant.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/taskflow.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/taskflow.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/utility/object_pool.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/object_pool.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/utility/os.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/os.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/utility/passive_vector.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/passive_vector.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/utility/singleton.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/singleton.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/utility/stringify.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/stringify.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/utility/traits.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/traits.hpp with 100% similarity]
bundled/taskflow-2.4.0/include/taskflow/utility/uuid.hpp [moved from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/uuid.hpp with 100% similarity]
cmake/configure/configure_1_taskflow.cmake [moved from cmake/configure/configure_1_cpp_taskflow.cmake with 61% similarity]
cmake/modules/FindTASKFLOW.cmake [moved from cmake/modules/FindCPP_TASKFLOW.cmake with 52% similarity]
doc/doxygen/options.dox.in
include/deal.II/base/config.h.in
include/deal.II/base/multithread_info.h
source/base/multithread_info.cc

index 470732069bb845b54448229adf964c8d91d98215..ae7ea1692736da48dd57f7371cfe4afab8219c04 100644 (file)
@@ -37,8 +37,8 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED)
 ENDIF()
 
 
-IF(FEATURE_CPP_TASKFLOW_BUNDLED_CONFIGURED)
-  INSTALL(DIRECTORY ${CPP_TASKFLOW_FOLDER}/include/taskflow
+IF(FEATURE_TASKFLOW_BUNDLED_CONFIGURED)
+  INSTALL(DIRECTORY ${TASKFLOW_FOLDER}/include/taskflow
     DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
     COMPONENT library
     )
index 896a2c207206a7f6bce3400d595f0862e112041e..38f5b5e782fdcc491397e238ecfe5226f1a82ff1 100644 (file)
@@ -31,16 +31,16 @@ OPTION(DEAL_II_FORCE_BUNDLED_BOOST
 SET(BOOST_FOLDER "${CMAKE_SOURCE_DIR}/bundled/boost-1.70.0")
 
 #
-# CPP Taskflow
+# Taskflow
 #
 
-SET(FEATURE_CPP_TASKFLOW_HAVE_BUNDLED TRUE)
+SET(FEATURE_TASKFLOW_HAVE_BUNDLED TRUE)
 
-OPTION(DEAL_II_FORCE_BUNDLED_CPP_TASKFLOW
+OPTION(DEAL_II_FORCE_BUNDLED_TASKFLOW
   "Always use the bundled taskflow header library instead of an external one."
   OFF)
 
-SET(CPP_TASKFLOW_FOLDER "${CMAKE_SOURCE_DIR}/bundled/cpp-taskflow-2.4.0")
+SET(TASKFLOW_FOLDER "${CMAKE_SOURCE_DIR}/bundled/taskflow-2.4.0")
 
 
 #
similarity index 61%
rename from cmake/configure/configure_1_cpp_taskflow.cmake
rename to cmake/configure/configure_1_taskflow.cmake
index b7f6b42263dc24a8d9c965c1ea712ff4b25a5ec5..d4ed1d561bed8cb67f74da7db27bc56fdcc3aebf 100644 (file)
 ## ---------------------------------------------------------------------
 
 #
-# Configuration for thread support in deal.II with the help of the CPP
-# Taskflow library:
+# Configuration for thread support in deal.II with the help of the Taskflow
+# library:
 #
 
 
-MACRO(FEATURE_CPP_TASKFLOW_FIND_EXTERNAL var)
-  FIND_PACKAGE(CPP_TASKFLOW)
+MACRO(FEATURE_TASKFLOW_FIND_EXTERNAL var)
+  FIND_PACKAGE(TASKFLOW)
 
-  IF(CPP_TASKFLOW_FOUND)
+  IF(TASKFLOW_FOUND)
     SET(${var} TRUE)
   ENDIF()
 
-  IF(CPP_TASKFLOW_VERSION VERSION_LESS "2.4")
+  IF(TASKFLOW_VERSION VERSION_LESS "2.4")
     # Clear the previously determined version numbers to avoid confusion
-    SET(CPP_TASKFLOW_VERSION "bundled")
-    SET(CPP_TASKFLOW_VERSION_MAJOR "")
-    SET(CPP_TASKFLOW_VERSION_MINOR "")
+    SET(TASKFLOW_VERSION "bundled")
+    SET(TASKFLOW_VERSION_MAJOR "")
+    SET(TASKFLOW_VERSION_MINOR "")
 
     MESSAGE(STATUS
-      "The externally provided Cpp Taskflow library is older than version 2.4, "
+      "The externally provided Taskflow library is older than version 2.4, "
       "which cannot be used with deal.II."
       )
-    SET(CPP_TASKFLOW_ADDITIONAL_ERROR_STRING
-      "The externally provided Cpp Taskflow library is older than version\n"
+    SET(TASKFLOW_ADDITIONAL_ERROR_STRING
+      "The externally provided Taskflow library is older than version\n"
       "2.4, which is the oldest version compatible with deal.II."
       )
     SET(${var} FALSE)
@@ -45,10 +45,10 @@ MACRO(FEATURE_CPP_TASKFLOW_FIND_EXTERNAL var)
 ENDMACRO()
 
 
-MACRO(FEATURE_CPP_TASKFLOW_CONFIGURE_BUNDLED)
-  LIST(APPEND CPP_TASKFLOW_BUNDLED_INCLUDE_DIRS ${CPP_TASKFLOW_FOLDER}/include)
+MACRO(FEATURE_TASKFLOW_CONFIGURE_BUNDLED)
+  LIST(APPEND TASKFLOW_BUNDLED_INCLUDE_DIRS ${TASKFLOW_FOLDER}/include)
 ENDMACRO()
 
 
-CONFIGURE_FEATURE(CPP_TASKFLOW)
+CONFIGURE_FEATURE(TASKFLOW)
 
similarity index 52%
rename from cmake/modules/FindCPP_TASKFLOW.cmake
rename to cmake/modules/FindTASKFLOW.cmake
index 6c486fd1346e168ff22f0f5e579093d5ad5b5877..8b4059e6df60de17e5a48c9a6a70aee925c07bce 100644 (file)
 #
 # This module exports
 #
-#   CPP_TASKFLOW_INCLUDE_DIRS
-#   CPP_TASKFLOW_VERSION
+#   TASKFLOW_INCLUDE_DIRS
+#   TASKFLOW_VERSION
 #
 
-SET(CPP_TASKFLOW_DIR "" CACHE PATH "An optional hint to a Cpp Taskflow installation")
-SET_IF_EMPTY(CPP_TASKFLOW_DIR "$ENV{CPP_TASKFLOW_DIR}")
+SET(TASKFLOW_DIR "" CACHE PATH "An optional hint to a Taskflow installation")
+SET_IF_EMPTY(TASKFLOW_DIR "$ENV{TASKFLOW_DIR}")
 
-FIND_PACKAGE(CPP_TASKFLOW_CONFIG
+FIND_PACKAGE(TASKFLOW_CONFIG
   CONFIG QUIET
-  NAMES Cpp-Taskflow
+  NAMES Taskflow
   HINTS
-    ${CPP_TASKFLOW_DIR}/lib/cmake/Cpp-Taskflow
-    ${CPP_TASKFLOW_DIR}
+    ${TASKFLOW_DIR}/lib/cmake/Taskflow
+    ${TASKFLOW_DIR}
   PATH_SUFFIXES
-    lib64/cmake/Cpp-Taskflow
-    lib/cmake/Cpp-Taskflow
-    lib${LIB_SUFFIX}/cmake/Cpp-Taskflow
+    lib64/cmake/Taskflow
+    lib/cmake/Taskflow
+    lib${LIB_SUFFIX}/cmake/Taskflow
   NO_SYSTEM_ENVIRONMENT_PATH
   )
 
-SET(CPP_TASKFLOW_INCLUDE_DIR ${Cpp-Taskflow_INCLUDE_DIR})
+SET(TASKFLOW_INCLUDE_DIR ${Taskflow_INCLUDE_DIR})
 
 #
 # Extract version numbers:
 #
-SET(CPP_TASKFLOW_VERSION "${CPP_TASKFLOW_CONFIG_VERSION}")
+SET(TASKFLOW_VERSION "${TASKFLOW_CONFIG_VERSION}")
 STRING(REGEX REPLACE
   "^([0-9]+).*$" "\\1"
-  CPP_TASKFLOW_VERSION_MAJOR "${CPP_TASKFLOW_CONFIG_VERSION}")
+  TASKFLOW_VERSION_MAJOR "${TASKFLOW_CONFIG_VERSION}")
 STRING(REGEX REPLACE
   "^[0-9]+\\.([0-9]+).*$" "\\1"
-  CPP_TASKFLOW_VERSION_MINOR "${CPP_TASKFLOW_CONFIG_VERSION}")
+  TASKFLOW_VERSION_MINOR "${TASKFLOW_CONFIG_VERSION}")
 
-DEAL_II_PACKAGE_HANDLE(CPP_TASKFLOW
-  INCLUDE_DIRS REQUIRED CPP_TASKFLOW_INCLUDE_DIR
-  USER_INCLUDE_DIRS REQUIRED CPP_TASKFLOW_INCLUDE_DIR
-  CLEAR CPP_TASKFLOW_CONFIG_DIR
+DEAL_II_PACKAGE_HANDLE(TASKFLOW
+  INCLUDE_DIRS REQUIRED TASKFLOW_INCLUDE_DIR
+  USER_INCLUDE_DIRS REQUIRED TASKFLOW_INCLUDE_DIR
+  CLEAR TASKFLOW_CONFIG_DIR
   )
index f68e45112c8c28ec31e3c52e3b54abd701e6b78a..92351079d7ca97cff268538ed2669832a634b9c6 100644 (file)
@@ -191,7 +191,7 @@ PREDEFINED             = DOXYGEN=1 \
                          DEAL_II_ARPACK_WITH_PARPACK=1 \
                          DEAL_II_WITH_ASSIMP=1 \
                          DEAL_II_WITH_BOOST=1 \
-                         DEAL_II_WITH_CPP_TASKFLOW=1 \
+                         DEAL_II_WITH_TASKFLOW=1 \
                          DEAL_II_WITH_COMPLEX_VALUES=1 \
                          DEAL_II_WITH_CUDA=1 \
                          DEAL_II_COMPILER_CUDA_AWARE=1 \
index 39446a918f28d87e977d3295f130af3f8e9783b7..c1f1c96bd813f17de173a40ba8f0ddf6fc0ba551 100644 (file)
@@ -39,7 +39,6 @@
 #cmakedefine DEAL_II_WITH_ARPACK
 #cmakedefine DEAL_II_WITH_ASSIMP
 #cmakedefine DEAL_II_WITH_COMPLEX_VALUES
-#cmakedefine DEAL_II_WITH_CPP_TASKFLOW
 #cmakedefine DEAL_II_WITH_CUDA
 #cmakedefine DEAL_II_WITH_GINKGO
 #cmakedefine DEAL_II_WITH_GSL
@@ -58,6 +57,7 @@
 #cmakedefine DEAL_II_WITH_SLEPC
 #cmakedefine DEAL_II_WITH_SUNDIALS
 #cmakedefine DEAL_II_WITH_SYMENGINE
+#cmakedefine DEAL_II_WITH_TASKFLOW
 #cmakedefine DEAL_II_WITH_TBB
 #cmakedefine DEAL_II_WITH_TRILINOS
 #cmakedefine DEAL_II_WITH_UMFPACK
@@ -65,7 +65,7 @@
 
 /*
  * Backward compatibility setting:
- * FIXME: Update once transition to cpp-taskflow is complete
+ * FIXME: Update once transition to taskflow is complete
  */
 #ifdef DEAL_II_WITH_TBB
 #define DEAL_II_WITH_THREADS
index 8476510c80858aa0b3edd09aa69720e4203a26e6..c45caf3d3e09a1f3149d4b547d8566fe05bd8609 100644 (file)
@@ -122,9 +122,9 @@ public:
   initialize_multithreading();
 
 
-#  ifdef DEAL_II_WITH_CPP_TASKFLOW
+#  ifdef DEAL_II_WITH_TASKFLOW
   /**
-   * Return a reference to the global Executor from cpp-taskflow.
+   * Return a reference to the global Executor from taskflow.
    *
    * The Executor is set to use n_threads() worker threads that you can
    * control using set_thread_limit() and the DEAL_II_NUM_THREADS environment
@@ -140,9 +140,9 @@ private:
    */
   static unsigned int n_max_threads;
 
-#  ifdef DEAL_II_WITH_CPP_TASKFLOW
+#  ifdef DEAL_II_WITH_TASKFLOW
   /**
-   * Store a cpp-taskflow Executor that is constructed with N workers (from
+   * Store a taskflow Executor that is constructed with N workers (from
    * set_thread_limit).
    */
   static std::unique_ptr<tf::Executor> executor;
index c4de3074a888ca72d20da93df1ae4b90ca35ae02..d2d462898021e4b128f7c8b93adbcbf860310f6d 100644 (file)
@@ -27,7 +27,7 @@
 #endif
 
 
-#ifdef DEAL_II_WITH_CPP_TASKFLOW
+#ifdef DEAL_II_WITH_TASKFLOW
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <taskflow/taskflow.hpp>
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
@@ -101,7 +101,7 @@ MultithreadInfo::set_thread_limit(const unsigned int max_threads)
   dummy.initialize(n_max_threads);
 #endif
 
-#ifdef DEAL_II_WITH_CPP_TASKFLOW
+#ifdef DEAL_II_WITH_TASKFLOW
   executor = std::make_unique<tf::Executor>(n_max_threads);
 #endif
 }
@@ -145,7 +145,7 @@ MultithreadInfo::initialize_multithreading()
   done = true;
 }
 
-#ifdef DEAL_II_WITH_CPP_TASKFLOW
+#ifdef DEAL_II_WITH_TASKFLOW
 tf::Executor &
 MultithreadInfo::get_taskflow_executor()
 {

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.