mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10697 from woodychow:tbb_task_arena

Browse Source 
* Use Intel TBB's task arena if possible
This commit is contained in:
Woody Chow 2018-01-27 14:46:54 +09:00 committed by Alexander Alekhin
parent 203dc3bb48
commit f1c52e426b
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/core/src/parallel.cpp
View File

@ -298,6 +298,12 @@ namespace
{ {
this->ParallelLoopBodyWrapper::operator()(cv::Range(range.begin(), range.end())); this->ParallelLoopBodyWrapper::operator()(cv::Range(range.begin(), range.end()));
} }
void operator ()() const // run parallel job
{
cv::Range stripeRange = this->stripeRange();
tbb::parallel_for(tbb::blocked_range<int>(stripeRange.start, stripeRange.end), *this);
}
}; };
#elif defined HAVE_CSTRIPES || defined HAVE_OPENMP #elif defined HAVE_CSTRIPES || defined HAVE_OPENMP
typedef ParallelLoopBodyWrapper ProxyLoopBody; typedef ParallelLoopBodyWrapper ProxyLoopBody;
@ -328,7 +334,11 @@ namespace
static int numThreads = -1; static int numThreads = -1;
#if defined HAVE_TBB #if defined HAVE_TBB
static tbb::task_scheduler_init tbbScheduler(tbb::task_scheduler_init::deferred); #if TBB_INTERFACE_VERSION >= 8000
static tbb::task_arena tbbArena(tbb::task_arena::automatic);
#else
static tbb::task_scheduler_init tbbScheduler(tbb::task_scheduler_init::deferred);
#endif
#elif defined HAVE_CSTRIPES #elif defined HAVE_CSTRIPES
// nothing for C= // nothing for C=
#elif defined HAVE_OPENMP #elif defined HAVE_OPENMP
@ -424,7 +434,11 @@ static void parallel_for_impl(const cv::Range& range, const cv::ParallelLoopBody
#if defined HAVE_TBB #if defined HAVE_TBB
tbb::parallel_for(tbb::blocked_range<int>(stripeRange.start, stripeRange.end), pbody); #if TBB_INTERFACE_VERSION >= 8000
tbbArena.execute(pbody);
#else
pbody();
#endif
#elif defined HAVE_CSTRIPES #elif defined HAVE_CSTRIPES
@ -494,9 +508,17 @@ int cv::getNumThreads(void)
#if defined HAVE_TBB #if defined HAVE_TBB
#if TBB_INTERFACE_VERSION >= 9100
return tbbArena.max_concurrency();
#elif TBB_INTERFACE_VERSION >= 8000
return numThreads > 0
? numThreads
: tbb::task_scheduler_init::default_num_threads();
#else
return tbbScheduler.is_active() return tbbScheduler.is_active()
? numThreads ? numThreads
: tbb::task_scheduler_init::default_num_threads(); : tbb::task_scheduler_init::default_num_threads();
#endif
#elif defined HAVE_CSTRIPES #elif defined HAVE_CSTRIPES
@ -545,8 +567,13 @@ void cv::setNumThreads( int threads )
#ifdef HAVE_TBB #ifdef HAVE_TBB
#if TBB_INTERFACE_VERSION >= 8000
if(tbbArena.is_active()) tbbArena.terminate();
if(threads > 0) tbbArena.initialize(threads);
#else
if(tbbScheduler.is_active()) tbbScheduler.terminate(); if(tbbScheduler.is_active()) tbbScheduler.terminate();
if(threads > 0) tbbScheduler.initialize(threads); if(threads > 0) tbbScheduler.initialize(threads);
#endif
#elif defined HAVE_CSTRIPES #elif defined HAVE_CSTRIPES