ok. enabled TBB in LatentSVM, but need to check if it works

This commit is contained in:
Vadim Pisarevsky
2011-07-14 12:11:18 +00:00
parent 36ba3d691e
commit 08f1f5769a
5 changed files with 3 additions and 16 deletions

View File

@@ -2,8 +2,6 @@
#include "_lsvm_matching.h"
#include <stdio.h>
#undef HAVE_TBB
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
@@ -1577,8 +1575,7 @@ int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,
// Computation the number of levels for seaching object,
// first lambda-levels are used for computation values
// of score function for each position of root filter
numLevels = H->countLevel - H->lambda;
numLevels = H->numLevels;
kLevels = (int *)malloc(sizeof(int) * threadsNum);
procLevels = (int **)malloc(sizeof(int*) * threadsNum);
computeBorderSize(maxXBorder, maxYBorder, &bx, &by);
@@ -1648,7 +1645,7 @@ int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,
for (i = 0; i < numLevels; i++)
{
// Computation the number of level
level = i + H->lambda;
level = i + LAMBDA;//H->lambda;
// Addition a set of points
f += tmpKPoints[i];