master-like performance tests
This commit is contained in:
@@ -46,8 +46,13 @@
|
||||
#include "perf_precomp.hpp"
|
||||
|
||||
using namespace perf;
|
||||
using namespace std;
|
||||
using namespace cv;
|
||||
using std::tr1::make_tuple;
|
||||
using std::tr1::get;
|
||||
|
||||
///////////// Haar ////////////////////////
|
||||
|
||||
PERF_TEST(HaarFixture, Haar)
|
||||
{
|
||||
vector<Rect> faces;
|
||||
@@ -84,23 +89,16 @@ PERF_TEST(HaarFixture, Haar)
|
||||
OCL_PERF_ELSE
|
||||
}
|
||||
|
||||
using namespace std;
|
||||
using namespace cv;
|
||||
using namespace perf;
|
||||
using std::tr1::make_tuple;
|
||||
using std::tr1::get;
|
||||
typedef std::tr1::tuple<std::string, std::string, int> Cascade_Image_MinSize_t;
|
||||
typedef perf::TestBaseWithParam<Cascade_Image_MinSize_t> Cascade_Image_MinSize;
|
||||
|
||||
typedef std::tr1::tuple<std::string, std::string, int> OCL_Cascade_Image_MinSize_t;
|
||||
typedef perf::TestBaseWithParam<OCL_Cascade_Image_MinSize_t> OCL_Cascade_Image_MinSize;
|
||||
|
||||
PERF_TEST_P( OCL_Cascade_Image_MinSize, CascadeClassifier,
|
||||
testing::Combine(
|
||||
testing::Values( string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt.xml"),
|
||||
string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt2.xml") ),
|
||||
testing::Values( string("cv/shared/lena.png"),
|
||||
string("cv/cascadeandhog/images/bttf301.png")/*,
|
||||
string("cv/cascadeandhog/images/class57.png")*/ ),
|
||||
testing::Values(30, 64, 90) ) )
|
||||
OCL_PERF_TEST_P(Cascade_Image_MinSize, DISABLED_CascadeClassifier,
|
||||
testing::Combine(testing::Values( string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt.xml"),
|
||||
string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt2.xml") ),
|
||||
testing::Values(string("cv/shared/lena.png"),
|
||||
string("cv/cascadeandhog/images/bttf301.png")/*,
|
||||
string("cv/cascadeandhog/images/class57.png")*/ ),
|
||||
testing::Values(30, 64, 90)))
|
||||
{
|
||||
const string cascasePath = get<0>(GetParam());
|
||||
const string imagePath = get<1>(GetParam());
|
||||
@@ -109,7 +107,7 @@ PERF_TEST_P( OCL_Cascade_Image_MinSize, CascadeClassifier,
|
||||
vector<Rect> faces;
|
||||
|
||||
Mat img = imread(getDataPath(imagePath), IMREAD_GRAYSCALE);
|
||||
ASSERT_TRUE(!img.empty()) << "Can't load source image: " << getDataPath(imagePath);
|
||||
ASSERT_FALSE(img.empty()) << "Can't load source image: " << getDataPath(imagePath);
|
||||
equalizeHist(img, img);
|
||||
declare.in(img);
|
||||
|
||||
@@ -146,7 +144,7 @@ PERF_TEST_P( OCL_Cascade_Image_MinSize, CascadeClassifier,
|
||||
else
|
||||
OCL_PERF_ELSE
|
||||
|
||||
//sort(faces.begin(), faces.end(), comparators::RectLess());
|
||||
SANITY_CHECK_NOTHING();//(faces, min_size/5);
|
||||
// using SANITY_CHECK_NOTHING() since OCL and PLAIN version may find different faces number
|
||||
//sort(faces.begin(), faces.end(), comparators::RectLess());
|
||||
SANITY_CHECK_NOTHING();//(faces, min_size/5);
|
||||
// using SANITY_CHECK_NOTHING() since OCL and PLAIN version may find different faces number
|
||||
}
|
||||
|
Reference in New Issue
Block a user