From: Timo Heister Date: Wed, 3 Jun 2020 15:27:11 +0000 (-0400) Subject: rename cpp-taskflow to taskflow X-Git-Tag: v9.3.0-rc1~1490^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd3716ea267e66f65385f518f714ebacd41bbd3;p=dealii.git rename cpp-taskflow to taskflow 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. --- diff --git a/bundled/CMakeLists.txt b/bundled/CMakeLists.txt index 470732069b..ae7ea16927 100644 --- a/bundled/CMakeLists.txt +++ b/bundled/CMakeLists.txt @@ -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 ) diff --git a/bundled/setup_bundled.cmake b/bundled/setup_bundled.cmake index 896a2c2072..38f5b5e782 100644 --- a/bundled/setup_bundled.cmake +++ b/bundled/setup_bundled.cmake @@ -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") # diff --git a/bundled/cpp-taskflow-2.4.0/LICENSE b/bundled/taskflow-2.4.0/LICENSE similarity index 100% rename from bundled/cpp-taskflow-2.4.0/LICENSE rename to bundled/taskflow-2.4.0/LICENSE diff --git a/bundled/cpp-taskflow-2.4.0/README.md b/bundled/taskflow-2.4.0/README.md similarity index 100% rename from bundled/cpp-taskflow-2.4.0/README.md rename to bundled/taskflow-2.4.0/README.md diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/error.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/error.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/error.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/error.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/executor.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/executor.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/executor.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/executor.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/flow_builder.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/flow_builder.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/flow_builder.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/flow_builder.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/graph.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/graph.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/graph.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/graph.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/notifier.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/notifier.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/notifier.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/notifier.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/observer.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/observer.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/observer.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/observer.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/task.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/task.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/task.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/task.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/taskflow.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/taskflow.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/taskflow.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/taskflow.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/topology.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/topology.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/topology.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/topology.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/core/tsq.hpp b/bundled/taskflow-2.4.0/include/taskflow/core/tsq.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/core/tsq.hpp rename to bundled/taskflow-2.4.0/include/taskflow/core/tsq.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_device.hpp b/bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_device.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_device.hpp rename to bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_device.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_error.hpp b/bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_error.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_error.hpp rename to bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_error.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_flow.hpp b/bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_flow.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_flow.hpp rename to bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_flow.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_graph.hpp b/bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_graph.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_graph.hpp rename to bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_graph.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_task.hpp b/bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_task.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/cuda/cuda_task.hpp rename to bundled/taskflow-2.4.0/include/taskflow/cuda/cuda_task.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/declarations.hpp b/bundled/taskflow-2.4.0/include/taskflow/declarations.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/declarations.hpp rename to bundled/taskflow-2.4.0/include/taskflow/declarations.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/any.hpp b/bundled/taskflow-2.4.0/include/taskflow/nstd/any.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/any.hpp rename to bundled/taskflow-2.4.0/include/taskflow/nstd/any.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/optional.hpp b/bundled/taskflow-2.4.0/include/taskflow/nstd/optional.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/optional.hpp rename to bundled/taskflow-2.4.0/include/taskflow/nstd/optional.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/variant.hpp b/bundled/taskflow-2.4.0/include/taskflow/nstd/variant.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/nstd/variant.hpp rename to bundled/taskflow-2.4.0/include/taskflow/nstd/variant.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/taskflow.hpp b/bundled/taskflow-2.4.0/include/taskflow/taskflow.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/taskflow.hpp rename to bundled/taskflow-2.4.0/include/taskflow/taskflow.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/utility/object_pool.hpp b/bundled/taskflow-2.4.0/include/taskflow/utility/object_pool.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/object_pool.hpp rename to bundled/taskflow-2.4.0/include/taskflow/utility/object_pool.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/utility/os.hpp b/bundled/taskflow-2.4.0/include/taskflow/utility/os.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/os.hpp rename to bundled/taskflow-2.4.0/include/taskflow/utility/os.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/utility/passive_vector.hpp b/bundled/taskflow-2.4.0/include/taskflow/utility/passive_vector.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/passive_vector.hpp rename to bundled/taskflow-2.4.0/include/taskflow/utility/passive_vector.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/utility/singleton.hpp b/bundled/taskflow-2.4.0/include/taskflow/utility/singleton.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/singleton.hpp rename to bundled/taskflow-2.4.0/include/taskflow/utility/singleton.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/utility/stringify.hpp b/bundled/taskflow-2.4.0/include/taskflow/utility/stringify.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/stringify.hpp rename to bundled/taskflow-2.4.0/include/taskflow/utility/stringify.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/utility/traits.hpp b/bundled/taskflow-2.4.0/include/taskflow/utility/traits.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/traits.hpp rename to bundled/taskflow-2.4.0/include/taskflow/utility/traits.hpp diff --git a/bundled/cpp-taskflow-2.4.0/include/taskflow/utility/uuid.hpp b/bundled/taskflow-2.4.0/include/taskflow/utility/uuid.hpp similarity index 100% rename from bundled/cpp-taskflow-2.4.0/include/taskflow/utility/uuid.hpp rename to bundled/taskflow-2.4.0/include/taskflow/utility/uuid.hpp diff --git a/cmake/configure/configure_1_cpp_taskflow.cmake b/cmake/configure/configure_1_taskflow.cmake similarity index 61% rename from cmake/configure/configure_1_cpp_taskflow.cmake rename to cmake/configure/configure_1_taskflow.cmake index b7f6b42263..d4ed1d561b 100644 --- a/cmake/configure/configure_1_cpp_taskflow.cmake +++ b/cmake/configure/configure_1_taskflow.cmake @@ -14,30 +14,30 @@ ## --------------------------------------------------------------------- # -# 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) diff --git a/cmake/modules/FindCPP_TASKFLOW.cmake b/cmake/modules/FindTASKFLOW.cmake similarity index 52% rename from cmake/modules/FindCPP_TASKFLOW.cmake rename to cmake/modules/FindTASKFLOW.cmake index 6c486fd134..8b4059e6df 100644 --- a/cmake/modules/FindCPP_TASKFLOW.cmake +++ b/cmake/modules/FindTASKFLOW.cmake @@ -18,41 +18,41 @@ # # 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 ) diff --git a/doc/doxygen/options.dox.in b/doc/doxygen/options.dox.in index f68e45112c..92351079d7 100644 --- a/doc/doxygen/options.dox.in +++ b/doc/doxygen/options.dox.in @@ -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 \ diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 39446a918f..c1f1c96bd8 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -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 diff --git a/include/deal.II/base/multithread_info.h b/include/deal.II/base/multithread_info.h index 8476510c80..c45caf3d3e 100644 --- a/include/deal.II/base/multithread_info.h +++ b/include/deal.II/base/multithread_info.h @@ -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 executor; diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc index c4de3074a8..d2d4628980 100644 --- a/source/base/multithread_info.cc +++ b/source/base/multithread_info.cc @@ -27,7 +27,7 @@ #endif -#ifdef DEAL_II_WITH_CPP_TASKFLOW +#ifdef DEAL_II_WITH_TASKFLOW DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include 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(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() {