generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made tests record in the XML output which parallel framework was used.

Browse Source
This commit is contained in:
Roman Donchenko
2013-06-17 21:06:15 +04:00
parent 843094a07f
commit 24d84a45b1
4 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/core/include/opencv2/core/internal.hpp
View File

@@ -50,6 +50,8 @@
#include <vector>
#include "cvconfig.h"
#if defined WIN32 || defined _WIN32
# ifndef WIN32
# define WIN32
@@ -184,6 +186,30 @@ CV_INLINE IppiSize ippiSize(int width, int height)
# include "opencv2/core/eigen.hpp"
#endif
#ifdef _OPENMP
# define HAVE_OPENMP
#endif
#ifdef __APPLE__
# define HAVE_GCD
#endif
#if defined _MSC_VER && _MSC_VER >= 1600
# define HAVE_CONCURRENCY
#endif
#if defined HAVE_TBB && TBB_VERSION_MAJOR*100 + TBB_VERSION_MINOR >= 202
# define CV_PARALLEL_FRAMEWORK "tbb"
#elif defined HAVE_CSTRIPES
# define CV_PARALLEL_FRAMEWORK "cstripes"
#elif defined HAVE_OPENMP
# define CV_PARALLEL_FRAMEWORK "openmp"
#elif defined HAVE_GCD
# define CV_PARALLEL_FRAMEWORK "gcd"
#elif defined HAVE_CONCURRENCY
# define CV_PARALLEL_FRAMEWORK "ms-concurrency"
#endif
#ifdef __cplusplus
namespace cv