mirror of
https://github.com/opencv/opencv.git
synced 2024-11-29 13:47:32 +08:00
Merge pull request #4116 from alalek:fix-pthread-pf
This commit is contained in:
Vadim Pisarevsky
commit
e79c184b2d
@ -188,7 +188,7 @@ OCV_OPTION(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF
|
||||
OCV_OPTION(WITH_TBB "Include Intel TBB support" OFF IF (NOT IOS AND NOT WINRT) )
|
||||
OCV_OPTION(WITH_OPENMP "Include OpenMP support" OFF)
|
||||
OCV_OPTION(WITH_CSTRIPES "Include C= support" OFF IF (WIN32 AND NOT WINRT) )
|
||||
OCV_OPTION(WITH_PTHREADS_PF "Use pthreads-based parallel_for" OFF IF (NOT WIN32) )
|
||||
OCV_OPTION(WITH_PTHREADS_PF "Use pthreads-based parallel_for" ON IF (NOT WIN32) )
|
||||
OCV_OPTION(WITH_TIFF "Include TIFF support" ON IF (NOT IOS) )
|
||||
OCV_OPTION(WITH_UNICAP "Include Unicap support (GPL)" OFF IF (UNIX AND NOT APPLE AND NOT ANDROID) )
|
||||
OCV_OPTION(WITH_V4L "Include Video 4 Linux support" ON IF (UNIX AND NOT ANDROID) )
|
||||
@ -1026,6 +1026,27 @@ if(DEFINED WITH_GPHOTO2)
|
||||
endif(DEFINED WITH_GPHOTO2)
|
||||
|
||||
|
||||
# Order is similar to CV_PARALLEL_FRAMEWORK in core/src/parallel.cpp
|
||||
ocv_clear_vars(CV_PARALLEL_FRAMEWORK)
|
||||
if(HAVE_TBB)
|
||||
set(CV_PARALLEL_FRAMEWORK "TBB (ver ${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR} interface ${TBB_INTERFACE_VERSION})")
|
||||
elseif(HAVE_CSTRIPES)
|
||||
set(CV_PARALLEL_FRAMEWORK "C=")
|
||||
elseif(HAVE_OPENMP)
|
||||
set(CV_PARALLEL_FRAMEWORK "OpenMP")
|
||||
elseif(HAVE_GCD)
|
||||
set(CV_PARALLEL_FRAMEWORK "GCD")
|
||||
elseif(WINRT OR HAVE_CONCURRENCY)
|
||||
set(CV_PARALLEL_FRAMEWORK "Concurrency")
|
||||
elseif(HAVE_PTHREADS_PF)
|
||||
set(CV_PARALLEL_FRAMEWORK "pthreads")
|
||||
else()
|
||||
set(CV_PARALLEL_FRAMEWORK "none")
|
||||
endif()
|
||||
status("")
|
||||
status(" Parallel framework:" TRUE THEN "${CV_PARALLEL_FRAMEWORK}" ELSE NO)
|
||||
|
||||
|
||||
# ========================== Other third-party libraries ==========================
|
||||
status("")
|
||||
status(" Other third-party libraries:")
|
||||
@ -1045,12 +1066,6 @@ status(" Use IPP Async:" HAVE_IPP_A THEN "YES" ELSE NO)
|
||||
endif(DEFINED WITH_IPP_A)
|
||||
|
||||
status(" Use Eigen:" HAVE_EIGEN THEN "YES (ver ${EIGEN_WORLD_VERSION}.${EIGEN_MAJOR_VERSION}.${EIGEN_MINOR_VERSION})" ELSE NO)
|
||||
status(" Use TBB:" HAVE_TBB THEN "YES (ver ${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR} interface ${TBB_INTERFACE_VERSION})" ELSE NO)
|
||||
status(" Use OpenMP:" HAVE_OPENMP THEN YES ELSE NO)
|
||||
status(" Use GCD" HAVE_GCD THEN YES ELSE NO)
|
||||
status(" Use Concurrency" HAVE_CONCURRENCY THEN YES ELSE NO)
|
||||
status(" Use C=:" HAVE_CSTRIPES THEN YES ELSE NO)
|
||||
status(" Use pthreads for parallel for:" HAVE_PTHREADS_PF THEN YES ELSE NO)
|
||||
status(" Use Cuda:" HAVE_CUDA THEN "YES (ver ${CUDA_VERSION_STRING})" ELSE NO)
|
||||
status(" Use OpenCL:" HAVE_OPENCL THEN YES ELSE NO)
|
||||
|
||||
|
||||
@ -120,12 +120,16 @@ if(WITH_OPENMP)
|
||||
set(HAVE_OPENMP "${OPENMP_FOUND}")
|
||||
endif()
|
||||
|
||||
if(UNIX OR ANDROID)
|
||||
if(NOT APPLE AND NOT HAVE_TBB AND NOT HAVE_OPENMP)
|
||||
set(HAVE_PTHREADS_PF 1)
|
||||
else()
|
||||
set(HAVE_PTHREADS_PF 0)
|
||||
endif()
|
||||
if(NOT MSVC AND NOT DEFINED HAVE_PTHREADS)
|
||||
set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/pthread_test.cpp")
|
||||
file(WRITE "${_fname}" "#include <pthread.h>\nint main() { (void)pthread_self(); return 0; }\n")
|
||||
try_compile(HAVE_PTHREADS "${CMAKE_BINARY_DIR}" "${_fname}")
|
||||
file(REMOVE "${_fname}")
|
||||
endif()
|
||||
|
||||
ocv_clear_vars(HAVE_PTHREADS_PF)
|
||||
if(WITH_PTHREADS_PF)
|
||||
set(HAVE_PTHREADS_PF ${HAVE_PTHREADS})
|
||||
else()
|
||||
set(HAVE_PTHREADS_PF 0)
|
||||
endif()
|
||||
|
||||
@ -139,6 +139,12 @@
|
||||
/* PNG codec */
|
||||
#cmakedefine HAVE_PNG
|
||||
|
||||
/* Posix threads (pthreads) */
|
||||
#cmakedefine HAVE_PTHREADS
|
||||
|
||||
/* parallel_for with pthreads */
|
||||
#cmakedefine HAVE_PTHREADS_PF
|
||||
|
||||
/* Qt support */
|
||||
#cmakedefine HAVE_QT
|
||||
|
||||
|
||||
@ -80,6 +80,7 @@
|
||||
4. HAVE_GCD - system wide, used automatically (APPLE only)
|
||||
5. WINRT - system wide, used automatically (Windows RT only)
|
||||
6. HAVE_CONCURRENCY - part of runtime, used automatically (Windows only - MSVS 10, MSVS 11)
|
||||
7. HAVE_PTHREADS_PF - pthreads if available
|
||||
*/
|
||||
|
||||
#if defined HAVE_TBB
|
||||
@ -125,15 +126,21 @@
|
||||
# define CV_PARALLEL_FRAMEWORK "winrt-concurrency"
|
||||
#elif defined HAVE_CONCURRENCY
|
||||
# define CV_PARALLEL_FRAMEWORK "ms-concurrency"
|
||||
#elif defined HAVE_PTHREADS
|
||||
#elif defined HAVE_PTHREADS_PF
|
||||
# define CV_PARALLEL_FRAMEWORK "pthreads"
|
||||
#endif
|
||||
|
||||
namespace cv
|
||||
{
|
||||
ParallelLoopBody::~ParallelLoopBody() {}
|
||||
#ifdef HAVE_PTHREADS_PF
|
||||
void parallel_for_pthreads(const cv::Range& range, const cv::ParallelLoopBody& body, double nstripes);
|
||||
size_t parallel_pthreads_get_threads_num();
|
||||
void parallel_pthreads_set_threads_num(int num);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
namespace
|
||||
{
|
||||
#ifdef CV_PARALLEL_FRAMEWORK
|
||||
@ -300,8 +307,8 @@ void cv::parallel_for_(const cv::Range& range, const cv::ParallelLoopBody& body,
|
||||
Concurrency::CurrentScheduler::Detach();
|
||||
}
|
||||
|
||||
#elif defined HAVE_PTHREADS
|
||||
void parallel_for_pthreads(const Range& range, const ParallelLoopBody& body, double nstripes);
|
||||
#elif defined HAVE_PTHREADS_PF
|
||||
|
||||
parallel_for_pthreads(range, body, nstripes);
|
||||
|
||||
#else
|
||||
@ -359,9 +366,7 @@ int cv::getNumThreads(void)
|
||||
? Concurrency::CurrentScheduler::Get()->GetNumberOfVirtualProcessors()
|
||||
: pplScheduler->GetNumberOfVirtualProcessors());
|
||||
|
||||
#elif defined HAVE_PTHREADS
|
||||
|
||||
size_t parallel_pthreads_get_threads_num();
|
||||
#elif defined HAVE_PTHREADS_PF
|
||||
|
||||
return parallel_pthreads_get_threads_num();
|
||||
|
||||
@ -422,9 +427,7 @@ void cv::setNumThreads( int threads )
|
||||
Concurrency::MaxConcurrency, threads-1));
|
||||
}
|
||||
|
||||
#elif defined HAVE_PTHREADS
|
||||
|
||||
void parallel_pthreads_set_threads_num(int num);
|
||||
#elif defined HAVE_PTHREADS_PF
|
||||
|
||||
parallel_pthreads_set_threads_num(threads);
|
||||
|
||||
@ -450,6 +453,8 @@ int cv::getThreadNum(void)
|
||||
return 0;
|
||||
#elif defined HAVE_CONCURRENCY
|
||||
return std::max(0, (int)Concurrency::Context::VirtualProcessorId()); // zero for master thread, unique number for others but not necessary 1,2,3,...
|
||||
#elif defined HAVE_PTHREADS_PF
|
||||
return (int)(size_t)(void*)pthread_self(); // no zero-based indexing
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
|
||||
#include "precomp.hpp"
|
||||
|
||||
#if defined HAVE_PTHREADS && HAVE_PTHREADS
|
||||
#ifdef HAVE_PTHREADS_PF
|
||||
|
||||
#include <algorithm>
|
||||
#include <pthread.h>
|
||||
|
||||
@ -292,12 +292,6 @@ TLSData<CoreTLSData>& getCoreTlsData();
|
||||
#define CL_RUNTIME_EXPORT
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_PTHREADS
|
||||
#if !(defined WIN32 || defined _WIN32 || defined WINCE || defined HAVE_WINRT)
|
||||
#define HAVE_PTHREADS 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
extern bool __termination; // skip some cleanups, because process is terminating
|
||||
// (for example, if ExitProcess() was already called)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user