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
)
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")
#
## ---------------------------------------------------------------------
#
-# 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)
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)
#
# 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
)
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 \
#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
#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
/*
* 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
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
*/
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;
#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
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
}
done = true;
}
-#ifdef DEAL_II_WITH_CPP_TASKFLOW
+#ifdef DEAL_II_WITH_TASKFLOW
tf::Executor &
MultithreadInfo::get_taskflow_executor()
{
projects / dealii.git / commitdiff