From 5860b76cbe8e25efd426b0c921555d051072b26e Mon Sep 17 00:00:00 2001 From: Jiri Horner Date: Wed, 7 Jun 2017 15:19:17 +0200 Subject: [PATCH] feature2d: rework opencl perf tests use the same configuration as cpu tests --- modules/features2d/perf/opencl/perf_fast.cpp | 47 ---------- .../features2d/perf/opencl/perf_feature2d.cpp | 81 +++++++++++++++++ modules/features2d/perf/opencl/perf_orb.cpp | 87 ------------------- modules/features2d/perf/perf_feature2d.cpp | 78 +---------------- modules/features2d/perf/perf_feature2d.hpp | 79 +++++++++++++++++ 5 files changed, 161 insertions(+), 211 deletions(-) delete mode 100644 modules/features2d/perf/opencl/perf_fast.cpp create mode 100644 modules/features2d/perf/opencl/perf_feature2d.cpp delete mode 100644 modules/features2d/perf/opencl/perf_orb.cpp create mode 100644 modules/features2d/perf/perf_feature2d.hpp diff --git a/modules/features2d/perf/opencl/perf_fast.cpp b/modules/features2d/perf/opencl/perf_fast.cpp deleted file mode 100644 index be310bacbf..0000000000 --- a/modules/features2d/perf/opencl/perf_fast.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "../perf_precomp.hpp" -#include "opencv2/ts/ocl_perf.hpp" - -#ifdef HAVE_OPENCL - -namespace cvtest { -namespace ocl { - -enum { TYPE_5_8 =FastFeatureDetector::TYPE_5_8, TYPE_7_12 = FastFeatureDetector::TYPE_7_12, TYPE_9_16 = FastFeatureDetector::TYPE_9_16 }; -CV_ENUM(FastType, TYPE_5_8, TYPE_7_12) - -typedef std::tr1::tuple File_Type_t; -typedef TestBaseWithParam FASTFixture; - -#define FAST_IMAGES \ - "cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png",\ - "stitching/a3.png" - -OCL_PERF_TEST_P(FASTFixture, FastDetect, testing::Combine( - testing::Values(FAST_IMAGES), - FastType::all() - )) -{ - string filename = getDataPath(get<0>(GetParam())); - int type = get<1>(GetParam()); - Mat mframe = imread(filename, IMREAD_GRAYSCALE); - - if (mframe.empty()) - FAIL() << "Unable to load source image " << filename; - - UMat frame; - mframe.copyTo(frame); - declare.in(frame); - - Ptr fd = FastFeatureDetector::create(20, true, type); - ASSERT_FALSE( fd.empty() ); - vector points; - - OCL_TEST_CYCLE() fd->detect(frame, points); - - SANITY_CHECK_KEYPOINTS(points); -} - -} // ocl -} // cvtest - -#endif // HAVE_OPENCL diff --git a/modules/features2d/perf/opencl/perf_feature2d.cpp b/modules/features2d/perf/opencl/perf_feature2d.cpp new file mode 100644 index 0000000000..c1ad793478 --- /dev/null +++ b/modules/features2d/perf/opencl/perf_feature2d.cpp @@ -0,0 +1,81 @@ +#include "../perf_precomp.hpp" +#include "opencv2/ts/ocl_perf.hpp" +#include "../perf_feature2d.hpp" + +#ifdef HAVE_OPENCL + +namespace cvtest { +namespace ocl { + +OCL_PERF_TEST_P(feature2d, detect, testing::Combine(Feature2DType::all(), TEST_IMAGES)) +{ + Ptr detector = getFeature2D(get<0>(GetParam())); + std::string filename = getDataPath(get<1>(GetParam())); + Mat mimg = imread(filename, IMREAD_GRAYSCALE); + + ASSERT_FALSE(mimg.empty()); + ASSERT_TRUE(detector); + + UMat img, mask; + mimg.copyTo(img); + declare.in(img); + vector points; + + OCL_TEST_CYCLE() detector->detect(img, points, mask); + + EXPECT_GT(points.size(), 20u); + SANITY_CHECK_NOTHING(); +} + +OCL_PERF_TEST_P(feature2d, extract, testing::Combine(testing::Values(DETECTORS_EXTRACTORS), TEST_IMAGES)) +{ + Ptr detector = AKAZE::create(); + Ptr extractor = getFeature2D(get<0>(GetParam())); + std::string filename = getDataPath(get<1>(GetParam())); + Mat mimg = imread(filename, IMREAD_GRAYSCALE); + + ASSERT_FALSE(mimg.empty()); + ASSERT_TRUE(extractor); + + UMat img, mask; + mimg.copyTo(img); + declare.in(img); + vector points; + detector->detect(img, points, mask); + + EXPECT_GT(points.size(), 20u); + + UMat descriptors; + + OCL_TEST_CYCLE() extractor->compute(img, points, descriptors); + + EXPECT_EQ((size_t)descriptors.rows, points.size()); + SANITY_CHECK_NOTHING(); +} + +OCL_PERF_TEST_P(feature2d, detectAndExtract, testing::Combine(testing::Values(DETECTORS_EXTRACTORS), TEST_IMAGES)) +{ + Ptr detector = getFeature2D(get<0>(GetParam())); + std::string filename = getDataPath(get<1>(GetParam())); + Mat mimg = imread(filename, IMREAD_GRAYSCALE); + + ASSERT_FALSE(mimg.empty()); + ASSERT_TRUE(detector); + + UMat img, mask; + mimg.copyTo(img); + declare.in(img); + vector points; + UMat descriptors; + + OCL_TEST_CYCLE() detector->detectAndCompute(img, mask, points, descriptors, false); + + EXPECT_GT(points.size(), 20u); + EXPECT_EQ((size_t)descriptors.rows, points.size()); + SANITY_CHECK_NOTHING(); +} + +} // ocl +} // cvtest + +#endif // HAVE_OPENCL diff --git a/modules/features2d/perf/opencl/perf_orb.cpp b/modules/features2d/perf/opencl/perf_orb.cpp deleted file mode 100644 index 5d9aa2fec1..0000000000 --- a/modules/features2d/perf/opencl/perf_orb.cpp +++ /dev/null @@ -1,87 +0,0 @@ -#include "../perf_precomp.hpp" -#include "opencv2/ts/ocl_perf.hpp" - -#ifdef HAVE_OPENCL - -namespace cvtest { -namespace ocl { - -typedef ::perf::TestBaseWithParam ORBFixture; - -#define ORB_IMAGES OCL_PERF_ENUM("cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png", "stitching/a3.png") - -OCL_PERF_TEST_P(ORBFixture, ORB_Detect, ORB_IMAGES) -{ - string filename = getDataPath(GetParam()); - Mat mframe = imread(filename, IMREAD_GRAYSCALE); - - if (mframe.empty()) - FAIL() << "Unable to load source image " << filename; - - UMat frame, mask; - mframe.copyTo(frame); - - declare.in(frame); - Ptr detector = ORB::create(1500, 1.3f, 1); - vector points; - - OCL_TEST_CYCLE() detector->detect(frame, points, mask); - - EXPECT_GT(points.size(), 20u); - SANITY_CHECK_NOTHING(); -} - -OCL_PERF_TEST_P(ORBFixture, ORB_Extract, ORB_IMAGES) -{ - string filename = getDataPath(GetParam()); - Mat mframe = imread(filename, IMREAD_GRAYSCALE); - - if (mframe.empty()) - FAIL() << "Unable to load source image " << filename; - - UMat mask, frame; - mframe.copyTo(frame); - - declare.in(frame); - - Ptr detector = ORB::create(1500, 1.3f, 1); - vector points; - detector->detect(frame, points, mask); - EXPECT_GT(points.size(), 20u); - - UMat descriptors; - - OCL_TEST_CYCLE() detector->compute(frame, points, descriptors); - - EXPECT_EQ((size_t)descriptors.rows, points.size()); - SANITY_CHECK_NOTHING(); -} - -OCL_PERF_TEST_P(ORBFixture, ORB_Full, ORB_IMAGES) -{ - string filename = getDataPath(GetParam()); - Mat mframe = imread(filename, IMREAD_GRAYSCALE); - - if (mframe.empty()) - FAIL() << "Unable to load source image " << filename; - - UMat mask, frame; - mframe.copyTo(frame); - - declare.in(frame); - Ptr detector = ORB::create(1500, 1.3f, 1); - - vector points; - UMat descriptors; - - OCL_TEST_CYCLE() detector->detectAndCompute(frame, mask, points, descriptors, false); - - EXPECT_GT(points.size(), 20u); - EXPECT_EQ((size_t)descriptors.rows, points.size()); - SANITY_CHECK_NOTHING(); -} - -} // ocl -} // cvtest - -#endif // HAVE_OPENCL diff --git a/modules/features2d/perf/perf_feature2d.cpp b/modules/features2d/perf/perf_feature2d.cpp index b899749551..91bb07761f 100644 --- a/modules/features2d/perf/perf_feature2d.cpp +++ b/modules/features2d/perf/perf_feature2d.cpp @@ -1,80 +1,4 @@ -#include "perf_precomp.hpp" - -using namespace std; -using namespace cv; -using namespace perf; -using std::tr1::make_tuple; -using std::tr1::get; -// detectors/descriptors configurations to test -#define DETECTORS_ONLY \ - FAST_DEFAULT, FAST_20_TRUE_TYPE5_8, FAST_20_TRUE_TYPE7_12, FAST_20_TRUE_TYPE9_16, \ - FAST_20_FALSE_TYPE5_8, FAST_20_FALSE_TYPE7_12, FAST_20_FALSE_TYPE9_16, \ - \ - AGAST_DEFAULT, AGAST_5_8, AGAST_7_12d, AGAST_7_12s, AGAST_OAST_9_16, \ - \ - MSER_DEFAULT - -#define DETECTORS_EXTRACTORS \ - ORB_DEFAULT, ORB_1500_13_1, \ - AKAZE_DEFAULT, AKAZE_DESCRIPTOR_KAZE, \ - BRISK_DEFAULT, \ - KAZE_DEFAULT - -enum { DETECTORS_ONLY, DETECTORS_EXTRACTORS }; -CV_ENUM(Feature2DType, DETECTORS_ONLY, DETECTORS_EXTRACTORS) - -typedef std::tr1::tuple Feature2DType_String_t; -typedef perf::TestBaseWithParam feature2d; - -#define TEST_IMAGES testing::Values(\ - "cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png",\ - "stitching/a3.png") - -static inline Ptr getFeature2D(Feature2DType type) -{ - switch(type) { - case ORB_DEFAULT: - return ORB::create(); - case ORB_1500_13_1: - return ORB::create(1500, 1.3f, 1); - case FAST_DEFAULT: - return FastFeatureDetector::create(); - case FAST_20_TRUE_TYPE5_8: - return FastFeatureDetector::create(20, true, FastFeatureDetector::TYPE_5_8); - case FAST_20_TRUE_TYPE7_12: - return FastFeatureDetector::create(20, true, FastFeatureDetector::TYPE_7_12); - case FAST_20_TRUE_TYPE9_16: - return FastFeatureDetector::create(20, true, FastFeatureDetector::TYPE_9_16); - case FAST_20_FALSE_TYPE5_8: - return FastFeatureDetector::create(20, false, FastFeatureDetector::TYPE_5_8); - case FAST_20_FALSE_TYPE7_12: - return FastFeatureDetector::create(20, false, FastFeatureDetector::TYPE_7_12); - case FAST_20_FALSE_TYPE9_16: - return FastFeatureDetector::create(20, false, FastFeatureDetector::TYPE_9_16); - case AGAST_DEFAULT: - return AgastFeatureDetector::create(); - case AGAST_5_8: - return AgastFeatureDetector::create(70, true, AgastFeatureDetector::AGAST_5_8); - case AGAST_7_12d: - return AgastFeatureDetector::create(70, true, AgastFeatureDetector::AGAST_7_12d); - case AGAST_7_12s: - return AgastFeatureDetector::create(70, true, AgastFeatureDetector::AGAST_7_12s); - case AGAST_OAST_9_16: - return AgastFeatureDetector::create(70, true, AgastFeatureDetector::OAST_9_16); - case AKAZE_DEFAULT: - return AKAZE::create(); - case AKAZE_DESCRIPTOR_KAZE: - return AKAZE::create(AKAZE::DESCRIPTOR_KAZE); - case BRISK_DEFAULT: - return BRISK::create(); - case KAZE_DEFAULT: - return KAZE::create(); - case MSER_DEFAULT: - return MSER::create(); - default: - return Ptr(); - } -} +#include "perf_feature2d.hpp" PERF_TEST_P(feature2d, detect, testing::Combine(Feature2DType::all(), TEST_IMAGES)) { diff --git a/modules/features2d/perf/perf_feature2d.hpp b/modules/features2d/perf/perf_feature2d.hpp new file mode 100644 index 0000000000..eef58621f4 --- /dev/null +++ b/modules/features2d/perf/perf_feature2d.hpp @@ -0,0 +1,79 @@ +#include "perf_precomp.hpp" + +/* cofiguration for tests of detectors/descriptors. shared between ocl and cpu tests. */ + +using namespace std; +using namespace cv; +using namespace perf; +using std::tr1::make_tuple; +using std::tr1::get; +// detectors/descriptors configurations to test +#define DETECTORS_ONLY \ + FAST_DEFAULT, FAST_20_TRUE_TYPE5_8, FAST_20_TRUE_TYPE7_12, FAST_20_TRUE_TYPE9_16, \ + FAST_20_FALSE_TYPE5_8, FAST_20_FALSE_TYPE7_12, FAST_20_FALSE_TYPE9_16, \ + \ + AGAST_DEFAULT, AGAST_5_8, AGAST_7_12d, AGAST_7_12s, AGAST_OAST_9_16, \ + \ + MSER_DEFAULT + +#define DETECTORS_EXTRACTORS \ + ORB_DEFAULT, ORB_1500_13_1, \ + AKAZE_DEFAULT, AKAZE_DESCRIPTOR_KAZE, \ + BRISK_DEFAULT, \ + KAZE_DEFAULT + +enum { DETECTORS_ONLY, DETECTORS_EXTRACTORS }; +CV_ENUM(Feature2DType, DETECTORS_ONLY, DETECTORS_EXTRACTORS) + +typedef std::tr1::tuple Feature2DType_String_t; +typedef perf::TestBaseWithParam feature2d; + +#define TEST_IMAGES testing::Values(\ + "cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png",\ + "stitching/a3.png") + +static inline Ptr getFeature2D(Feature2DType type) +{ + switch(type) { + case ORB_DEFAULT: + return ORB::create(); + case ORB_1500_13_1: + return ORB::create(1500, 1.3f, 1); + case FAST_DEFAULT: + return FastFeatureDetector::create(); + case FAST_20_TRUE_TYPE5_8: + return FastFeatureDetector::create(20, true, FastFeatureDetector::TYPE_5_8); + case FAST_20_TRUE_TYPE7_12: + return FastFeatureDetector::create(20, true, FastFeatureDetector::TYPE_7_12); + case FAST_20_TRUE_TYPE9_16: + return FastFeatureDetector::create(20, true, FastFeatureDetector::TYPE_9_16); + case FAST_20_FALSE_TYPE5_8: + return FastFeatureDetector::create(20, false, FastFeatureDetector::TYPE_5_8); + case FAST_20_FALSE_TYPE7_12: + return FastFeatureDetector::create(20, false, FastFeatureDetector::TYPE_7_12); + case FAST_20_FALSE_TYPE9_16: + return FastFeatureDetector::create(20, false, FastFeatureDetector::TYPE_9_16); + case AGAST_DEFAULT: + return AgastFeatureDetector::create(); + case AGAST_5_8: + return AgastFeatureDetector::create(70, true, AgastFeatureDetector::AGAST_5_8); + case AGAST_7_12d: + return AgastFeatureDetector::create(70, true, AgastFeatureDetector::AGAST_7_12d); + case AGAST_7_12s: + return AgastFeatureDetector::create(70, true, AgastFeatureDetector::AGAST_7_12s); + case AGAST_OAST_9_16: + return AgastFeatureDetector::create(70, true, AgastFeatureDetector::OAST_9_16); + case AKAZE_DEFAULT: + return AKAZE::create(); + case AKAZE_DESCRIPTOR_KAZE: + return AKAZE::create(AKAZE::DESCRIPTOR_KAZE); + case BRISK_DEFAULT: + return BRISK::create(); + case KAZE_DEFAULT: + return KAZE::create(); + case MSER_DEFAULT: + return MSER::create(); + default: + return Ptr(); + } +}