mirror of
https://github.com/opencv/opencv.git
synced 2024-12-02 07:39:57 +08:00
a5b5684670
[GSOC] Enable OCL for AKAZE (#9330)
* revert e0489cb - reenable OCL for AKAZE
* deal with conversion internally in AKAZE
* pass InputArray directly to AKAZE to allow distiguishing input Mat/UMat. deal with conversion there
* ensure that keypoints orientations are always computed. prevents misuse of internal AKAZE class.
* covert internal AKAZE functions to use InputArray/OutputArray
* make internal functions private in AKAZE
* split OCL and CPU paths in AKAZE
* create 2 separate pyramids, 1 for OCL and 1 for CPU
* template functions that use temporaries to always store them as correct type (UMat/Mat)
* remove variable used only in OCL path
causes unused variable warning
* update AKAZE documentation
* run ocl version only when ocl is enabled
* add tests for OCL path in AKAZE
* relax condition for keypoints angle
73 lines
2.0 KiB
C++
73 lines
2.0 KiB
C++
// This file is part of OpenCV project.
|
|
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
|
// of this distribution and at http://opencv.org/license.html
|
|
|
|
#include "../test_precomp.hpp"
|
|
#include "cvconfig.h"
|
|
#include "opencv2/ts/ocl_test.hpp"
|
|
|
|
#ifdef HAVE_OPENCL
|
|
|
|
namespace cvtest {
|
|
namespace ocl {
|
|
|
|
#define TEST_IMAGES testing::Values(\
|
|
"detectors_descriptors_evaluation/images_datasets/leuven/img1.png",\
|
|
"../stitching/a3.png", \
|
|
"../stitching/s2.jpg")
|
|
|
|
PARAM_TEST_CASE(Feature2DFixture, Ptr<Feature2D>, std::string)
|
|
{
|
|
std::string filename;
|
|
Mat image, descriptors;
|
|
vector<KeyPoint> keypoints;
|
|
UMat uimage, udescriptors;
|
|
vector<KeyPoint> ukeypoints;
|
|
Ptr<Feature2D> feature;
|
|
|
|
virtual void SetUp()
|
|
{
|
|
feature = GET_PARAM(0);
|
|
filename = GET_PARAM(1);
|
|
|
|
image = readImage(filename);
|
|
|
|
ASSERT_FALSE(image.empty());
|
|
|
|
image.copyTo(uimage);
|
|
|
|
OCL_OFF(feature->detect(image, keypoints));
|
|
OCL_ON(feature->detect(uimage, ukeypoints));
|
|
// note: we use keypoints from CPU for GPU too, to test descriptors separately
|
|
OCL_OFF(feature->compute(image, keypoints, descriptors));
|
|
OCL_ON(feature->compute(uimage, keypoints, udescriptors));
|
|
}
|
|
};
|
|
|
|
OCL_TEST_P(Feature2DFixture, KeypointsSame)
|
|
{
|
|
EXPECT_EQ(keypoints.size(), ukeypoints.size());
|
|
|
|
for (size_t i = 0; i < keypoints.size(); ++i)
|
|
{
|
|
EXPECT_GE(KeyPoint::overlap(keypoints[i], ukeypoints[i]), 0.95);
|
|
EXPECT_NEAR(keypoints[i].angle, ukeypoints[i].angle, 0.001);
|
|
}
|
|
}
|
|
|
|
OCL_TEST_P(Feature2DFixture, DescriptorsSame)
|
|
{
|
|
EXPECT_MAT_NEAR(descriptors, udescriptors, 0.001);
|
|
}
|
|
|
|
OCL_INSTANTIATE_TEST_CASE_P(AKAZE, Feature2DFixture,
|
|
testing::Combine(testing::Values(AKAZE::create()), TEST_IMAGES));
|
|
|
|
OCL_INSTANTIATE_TEST_CASE_P(AKAZE_DESCRIPTOR_KAZE, Feature2DFixture,
|
|
testing::Combine(testing::Values(AKAZE::create(AKAZE::DESCRIPTOR_KAZE)), TEST_IMAGES));
|
|
|
|
}//ocl
|
|
}//cvtest
|
|
|
|
#endif //HAVE_OPENCL
|