diff --git a/fwk/wutils.py b/fwk/wutils.py index 46d19993e2fc56dd8d7ef72d00120201e4544dbf..b914d2eb6facce8ef53d623f903856664a414f20 100644 --- a/fwk/wutils.py +++ b/fwk/wutils.py @@ -137,14 +137,6 @@ def initDLL(): # ------------------------------------------------------------------------------ -def initTBB(): - # For TBB <= 2019.4, needed to include global_control - # @todo to be removed - import os - os.environ['TBB_PREVIEW_GLOBAL_CONTROL'] = 'TRUE' - -#------------------------------------------------------------------------------- - def initMKL(nthreads): import os # we try to have full control over the threading environment diff --git a/tbox/src/CMakeLists.txt b/tbox/src/CMakeLists.txt index dac492f9f574ed62f953d8dc0db225303640eab6..51a04a10f072ee1f4427c28b5cbc57043ad565c9 100644 --- a/tbox/src/CMakeLists.txt +++ b/tbox/src/CMakeLists.txt @@ -25,6 +25,9 @@ TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${PROJECT_SOURCE_DIR}/tbox/src) FIND_PACKAGE(TBB REQUIRED) SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${TBB_CXX_FLAGS_DEBUG}") TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${TBB_INCLUDE_DIRS}) +IF(TBB_VERSION_INTERFACE LESS 11004) + TARGET_COMPILE_DEFINITIONS(tbox PUBLIC TBB_PREVIEW_GLOBAL_CONTROL) +ENDIF() TARGET_LINK_LIBRARIES(tbox ${TBB_LIBRARIES}) # -- MKL/BLAS/LAPACK --