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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/objdetect/src/_lsvm_matching.h
View File

@ -11,8 +11,6 @@
#include "_lsvm_fft.h" #include "_lsvm_fft.h"
#include "_lsvm_routine.h" #include "_lsvm_routine.h"
#undef HAVE_TBB
#ifdef HAVE_TBB #ifdef HAVE_TBB
#include "_lsvm_tbbversion.h" #include "_lsvm_tbbversion.h"
#endif #endif
@ -358,8 +356,6 @@ int thresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,
CvPoint **points, int **levels, int *kPoints, CvPoint **points, int **levels, int *kPoints,
CvPoint ***partsDisplacement); CvPoint ***partsDisplacement);
#undef HAVE_TBB
#ifdef HAVE_TBB #ifdef HAVE_TBB
/* /*
// int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n, // int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,

2
modules/objdetect/src/latentsvm.cpp
View File

@ -2,8 +2,6 @@
#include "_latentsvm.h" #include "_latentsvm.h"
#include "_lsvm_matching.h" #include "_lsvm_matching.h"
#undef HAVE_TBB
/* /*
// Transformation filter displacement from the block space // Transformation filter displacement from the block space
// to the space of pixels at the initial image // to the space of pixels at the initial image

4
modules/objdetect/src/lsvmtbbversion.cpp
View File

@ -1,7 +1,5 @@
#include "precomp.hpp" #include "precomp.hpp"
#undef HAVE_TBB
#ifdef HAVE_TBB #ifdef HAVE_TBB
#include "_lsvm_tbbversion.h" #include "_lsvm_tbbversion.h"
@ -48,7 +46,7 @@ public:
for (i = 0; i < kLevels; i++) for (i = 0; i < kLevels; i++)
{ {
level = procLevels[i]; level = procLevels[i];
partsLevel = level - H->lambda; partsLevel = level - LAMBDA;//H->lambda;
res = thresholdFunctionalScoreFixedLevel( res = thresholdFunctionalScoreFixedLevel(
filters, n, H, level, b, filters, n, H, level, b,
maxXBorder, maxYBorder, scoreThreshold, &(score[partsLevel]), maxXBorder, maxYBorder, scoreThreshold, &(score[partsLevel]),

7
modules/objdetect/src/matching.cpp
View File

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

2
modules/objdetect/test/test_latentsvmdetector.cpp
View File

@ -42,8 +42,6 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#undef HAVE_TBB
#include <string> #include <string>
#ifdef HAVE_CVCONFIG_H #ifdef HAVE_CVCONFIG_H