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

adding finish() to flush CL queue, renaming the test to match 'master' branch

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-01-13 18:12:30 +04:00
parent a7821c60e5
commit 4c99196399
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ocl/perf/perf_haar.cpp
View File

@ -90,10 +90,10 @@ using namespace perf;
using std::tr1::make_tuple; using std::tr1::make_tuple;
using std::tr1::get; using std::tr1::get;
typedef std::tr1::tuple<std::string, std::string, int> Cascade_Image_MinSize_t; typedef std::tr1::tuple<std::string, std::string, int> OCL_Cascade_Image_MinSize_t;
typedef perf::TestBaseWithParam<Cascade_Image_MinSize_t> Cascade_Image_MinSize; typedef perf::TestBaseWithParam<OCL_Cascade_Image_MinSize_t> OCL_Cascade_Image_MinSize;
PERF_TEST_P( Cascade_Image_MinSize, CascadeClassifier_UMat, PERF_TEST_P( OCL_Cascade_Image_MinSize, CascadeClassifier,
testing::Combine( testing::Combine(
testing::Values( string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt.xml") ), testing::Values( string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt.xml") ),
testing::Values( string("cv/shared/lena.png"), testing::Values( string("cv/shared/lena.png"),
@ -135,6 +135,7 @@ PERF_TEST_P( Cascade_Image_MinSize, CascadeClassifier_UMat,
while (next()) while (next())
{ {
faces.clear(); faces.clear();
ocl::finish();
startTimer(); startTimer();
cc.detectMultiScale(uimg, faces, 1.1, 3, 0, minSize); cc.detectMultiScale(uimg, faces, 1.1, 3, 0, minSize);
@ -146,4 +147,5 @@ PERF_TEST_P( Cascade_Image_MinSize, CascadeClassifier_UMat,
//sort(faces.begin(), faces.end(), comparators::RectLess()); //sort(faces.begin(), faces.end(), comparators::RectLess());
SANITY_CHECK_NOTHING();//(faces, min_size/5); SANITY_CHECK_NOTHING();//(faces, min_size/5);
// using SANITY_CHECK_NOTHING() since OCL and PLAIN version may find different faces number
} }