mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8814 from woodychow:openmp_num_threads

Browse Source
This commit is contained in:
Alexander Alekhin 2017-05-29 13:17:41 +00:00
commit 36918b3bb8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ void cv::parallel_for_(const cv::Range& range, const cv::ParallelLoopBody& body,
#elif defined HAVE_OPENMP
#pragma omp parallel for schedule(dynamic)
#pragma omp parallel for schedule(dynamic) num_threads(numThreads > 0 ? numThreads : numThreadsMax)
for (int i = stripeRange.start; i < stripeRange.end; ++i)
pbody(Range(i, i + 1));
@ -418,7 +418,10 @@ int cv::getNumThreads(void)
#elif defined HAVE_OPENMP
return omp_get_max_threads();
return numThreads > 0
? numThreads
: numThreadsMax;
#elif defined HAVE_GCD
@ -463,10 +466,7 @@ void cv::setNumThreads( int threads )
#elif defined HAVE_OPENMP
if(omp_in_parallel())
return; // can't change number of openmp threads inside a parallel region
omp_set_num_threads(threads > 0 ? threads : numThreadsMax);
return; // nothing needed as num_threads clause is used in #pragma omp parallel for
#elif defined HAVE_GCD