Skip to content

PR 6096 continued #6854

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

Merged
sklam merged 10 commits into from
Mar 26, 2021
Merged

PR 6096 continued #6854

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dd28a48
task_scheduler_init was removed in latest tbb version
Aug 3, 2020
46bd515
fix
Aug 4, 2020
f960964
use task scheduler handle
Aug 6, 2020
2faea44
Adapt fork handling changes
Mar 22, 2021
65062f9
CI for tbb builds
stuartarchibald Mar 23, 2021
7d41603
Use Numba channel.
stuartarchibald Mar 24, 2021
9bebb9c
Clean up.
stuartarchibald Mar 24, 2021
11836a9
Force tbb 2021
stuartarchibald Mar 24, 2021
2c3c759
Sort out tbb for windows
stuartarchibald Mar 24, 2021
902891e
Update conda packaging restriction
stuartarchibald Mar 26, 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
Prev Previous commit
Next Next commit
use task scheduler handle
  • Loading branch information
Ivan Butygin ivan.butygin
Ivan Butygin authored and ivan.butygin committed Mar 22, 2021
commit f960964c352b094062702706cdde1e799ee5d949
20 changes: 19 additions & 1 deletion numba/np/ufunc/tbbpool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Implement parallel vectorize workqueue on top of Intel TBB.
#endif

#define HAS_TASK_SCHEDULER_INIT (TBB_INTERFACE_VERSION < 12002)
#define HAS_TASK_SCHEDULER_HANDLE (TBB_INTERFACE_VERSION >= 12003)

#if HAS_TASK_SCHEDULER_INIT
#define TSI_INIT(count) tbb::task_scheduler_init(count)
Expand All @@ -48,6 +49,10 @@ static tbb::task_scheduler_init *tsi = NULL;
static int tsi_count = 0;
#endif

#if HAS_TASK_SCHEDULER_HANDLE
static tbb::task_scheduler_handle tsh;
#endif

#ifdef _MSC_VER
#define THREAD_LOCAL(ty) __declspec(thread) ty
#else
Expand Down Expand Up @@ -261,6 +266,12 @@ static void prepare_fork(void)
}
}
#endif
#if HAS_TASK_SCHEDULER_HANDLE
if (!tbb::finalize(tsh, std::nothrow))
{
puts("Unable to join threads to shut down before fork(). It can break multithreading in child process\n");
}
#endif
}

static void reset_after_fork(void)
Expand Down Expand Up @@ -303,6 +314,10 @@ static void unload_tbb(void)
tsi = NULL;
}
#endif
#if HAS_TASK_SCHEDULER_HANDLE
// bloking terminate is not strictly required here, ignore return value
(void)tbb::finalize(tsh, std::nothrow);
#endif
}
#endif

Expand All @@ -320,6 +335,10 @@ static void launch_threads(int count)
tsi_count = count;
tsi = new tbb::task_scheduler_init(count);
#endif

#if HAS_TASK_SCHEDULER_HANDLE
tsh = tbb::task_scheduler_handle::get();
#endif
tg = new tbb::task_group;
tg->run([] {}); // start creating threads asynchronously

Expand All @@ -341,7 +360,6 @@ static void ready(void)
{
}


MOD_INIT(tbbpool)
{
PyObject *m;
Expand Down