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

core: fix kmeans multi-threaded performance

Browse Source
This commit is contained in:
Alexander Alekhin 2018-01-17 17:39:23 +03:00
parent a5cd62f7bf
commit 46470d92a0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/core/src/kmeans.cpp
View File

@ -42,12 +42,16 @@
//M*/
#include "precomp.hpp"
#include <opencv2/core/utils/configuration.private.hpp>
////////////////////////////////////////// kmeans ////////////////////////////////////////////
namespace cv
{
static int CV_KMEANS_PARALLEL_GRANULARITY = (int)utils::getConfigurationParameterSizeT("OPENCV_KMEANS_PARALLEL_GRANULARITY", 1000);
static void generateRandomCenter(const std::vector<Vec2f>& box, float* center, RNG& rng)
{
size_t j, dims = box.size();
@ -134,7 +138,8 @@ static void generateCentersPP(const Mat& _data, Mat& _out_centers,
int ci = i;
parallel_for_(Range(0, N),
KMeansPPDistanceComputer(tdist2, data, dist, dims, step, step*ci));
KMeansPPDistanceComputer(tdist2, data, dist, dims, step, step*ci),
divUp(dims * N, CV_KMEANS_PARALLEL_GRANULARITY));
for( i = 0; i < N; i++ )
{
s += tdist2[i];
@ -447,7 +452,8 @@ double cv::kmeans( InputArray _data, int K,
// assign labels
dists = 0;
double* dist = dists.ptr<double>(0);
parallel_for_(Range(0, N), KMeansDistanceComputer(dist, labels, data, centers, isLastIter));
parallel_for_(Range(0, N), KMeansDistanceComputer(dist, labels, data, centers, isLastIter),
divUp(dims * N * (isLastIter ? 1 : K), CV_KMEANS_PARALLEL_GRANULARITY));
compactness = sum(dists)[0];
if (isLastIter)