From 22cb35b26ae79774af701f695920964c043fdc2e Mon Sep 17 00:00:00 2001
From: acrovato <a.crovato@uliege.be>
Date: Fri, 9 Jul 2021 11:31:13 +0200
Subject: [PATCH] Retry patch
---
fwk/wutils.py | 8 --------
tbox/src/CMakeLists.txt | 3 +++
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/fwk/wutils.py b/fwk/wutils.py
index 46d19993..b914d2eb 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 dac492f9..51a04a10 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 --
--
GitLab