Skip to content

fix for newer tbb version paths #1568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
timkpaine wants to merge 2 commits into from
Closed

fix for newer tbb version paths #1568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe4aacf
fix for newer tbb versions
timkpaine Oct 5, 2021
2cf0dc7
handle interface change
timkpaine Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions cmake/modules/FindTBB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,18 @@ if(NOT TBB_FOUND)
##################################
# Set version strings
##################################

if(TBB_INCLUDE_DIRS)
file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file)
set(TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1 "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h")
set(TBB_VERSION_FILE_AFTER_TBB_2021_1 "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h")
if (EXISTS "${TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1}")
set(TBB_VERSION_FILE "${TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1}")
elseif (EXISTS "${TBB_VERSION_FILE_AFTER_TBB_2021_1}")
set(TBB_VERSION_FILE "${TBB_VERSION_FILE_AFTER_TBB_2021_1}")
else()
message(FATAL_ERROR "Found TBB installation: ${TBB_INCLUDE_DIRS} missing version header.")
endif()

file(READ "${TBB_VERSION_FILE}" _tbb_version_file)
string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
TBB_VERSION_MAJOR "${_tbb_version_file}")
string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1"
Expand Down
16 changes: 15 additions & 1 deletion python/perspective/perspective/src/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
#include <perspective/python/base.h>
#include <perspective/python/utils.h>

#if TBB_VERSION_MAJOR >= 2021 && TBB_VERSION_MINOR >= 1
#define USE_ONETBB_INTERFACE
#endif

#ifdef PSP_PARALLEL_FOR
#ifndef TBB_PREVIEW_GLOBAL_CONTROL
#define TBB_PREVIEW_GLOBAL_CONTROL 1
Expand All @@ -27,15 +31,25 @@ namespace binding {
std::shared_ptr<tbb::global_control> control =
std::make_shared<tbb::global_control>(
tbb::global_control::max_allowed_parallelism,
#ifdef USE_ONETBB_INTERFACE
oneapi::tbb::info::default_concurrency()
#else
tbb::task_scheduler_init::default_num_threads()
#endif
);
#endif

void _set_nthreads(int nthreads) {
#ifdef PSP_PARALLEL_FOR
control = std::make_shared<tbb::global_control>(
tbb::global_control::max_allowed_parallelism,
nthreads == -1 ? tbb::task_scheduler_init::default_num_threads() : nthreads
nthreads == -1 ?
#ifdef USE_ONETBB_INTERFACE
oneapi::tbb::info::default_concurrency()
#else
tbb::task_scheduler_init::default_num_threads()
#endif
: nthreads
);
#endif
}
Expand Down