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

rewrote perf tests for SURF

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-02-02 18:24:21 +04:00
parent 452ea4c15f
commit ede5b23753
4 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/nonfree/perf/perf_main.cpp
View File

@ -4,6 +4,9 @@
static const char * impls[] = {
#ifdef HAVE_CUDA
"cuda",
#endif
#ifdef HAVE_OPENCL
"ocl",
#endif
"plain"
};

75
modules/nonfree/perf/perf_surf.ocl.cpp → modules/nonfree/perf/perf_surf_ocl.cpp
View File

@ -57,55 +57,68 @@ typedef perf::TestBaseWithParam<std::string> OCL_SURF;
"cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png",\
"stitching/a3.png"
PERF_TEST_P(OCL_SURF, DISABLED_with_data_transfer, testing::Values(SURF_IMAGES))
#define OCL_TEST_CYCLE() for( ; startTimer(), next(); cv::ocl::finish(), stopTimer())
PERF_TEST_P(OCL_SURF, with_data_transfer, testing::Values(SURF_IMAGES))
{
string filename = getDataPath(GetParam());
Mat img = imread(filename, IMREAD_GRAYSCALE);
ASSERT_FALSE(img.empty());
SURF_OCL d_surf;
oclMat d_keypoints;
oclMat d_descriptors;
Mat cpu_kp;
Mat cpu_dp;
Mat src = imread(filename, IMREAD_GRAYSCALE);
ASSERT_FALSE(src.empty());
Mat cpu_kp, cpu_dp;
declare.time(60);
TEST_CYCLE()
if (getSelectedImpl() == "ocl")
{
oclMat d_src(img);
SURF_OCL d_surf;
oclMat d_keypoints, d_descriptors;
d_surf(d_src, oclMat(), d_keypoints, d_descriptors);
OCL_TEST_CYCLE()
{
oclMat d_src(src);
d_keypoints.download(cpu_kp);
d_descriptors.download(cpu_dp);
d_surf(d_src, oclMat(), d_keypoints, d_descriptors);
d_keypoints.download(cpu_kp);
d_descriptors.download(cpu_dp);
}
}
else if (getSelectedImpl() == "plain")
{
cv::SURF surf;
std::vector<cv::KeyPoint> kp;
TEST_CYCLE() surf(src, Mat(), kp, cpu_dp);
}
SANITY_CHECK(cpu_kp, 1);
SANITY_CHECK(cpu_dp, 1);
SANITY_CHECK_NOTHING();
}
PERF_TEST_P(OCL_SURF, DISABLED_without_data_transfer, testing::Values(SURF_IMAGES))
PERF_TEST_P(OCL_SURF, without_data_transfer, testing::Values(SURF_IMAGES))
{
string filename = getDataPath(GetParam());
Mat img = imread(filename, IMREAD_GRAYSCALE);
ASSERT_FALSE(img.empty());
SURF_OCL d_surf;
oclMat d_keypoints;
oclMat d_descriptors;
oclMat d_src(img);
Mat src = imread(filename, IMREAD_GRAYSCALE);
ASSERT_FALSE(src.empty());
Mat cpu_kp, cpu_dp;
declare.time(60);
TEST_CYCLE() d_surf(d_src, oclMat(), d_keypoints, d_descriptors);
if (getSelectedImpl() == "ocl")
{
SURF_OCL d_surf;
oclMat d_keypoints, d_descriptors, d_src(src);
Mat cpu_kp;
Mat cpu_dp;
d_keypoints.download(cpu_kp);
d_descriptors.download(cpu_dp);
SANITY_CHECK(cpu_kp, 1);
SANITY_CHECK(cpu_dp, 1);
OCL_TEST_CYCLE() d_surf(d_src, oclMat(), d_keypoints, d_descriptors);
}
else if (getSelectedImpl() == "plain")
{
cv::SURF surf;
std::vector<cv::KeyPoint> kp;
TEST_CYCLE() surf(src, Mat(), kp, cpu_dp);
}
SANITY_CHECK_NOTHING();
}
#endif // HAVE_OPENCV_OCL

0
modules/nonfree/src/surf.ocl.cpp → modules/nonfree/src/surf_ocl.cpp
View File

0
modules/nonfree/test/test_surf.ocl.cpp → modules/nonfree/test/test_surf_ocl.cpp
View File