mirror of
https://github.com/opencv/opencv.git
synced 2024-11-30 22:40:17 +08:00
bb6496d9e5
[GSOC] Speeding-up AKAZE, part #2 (#8951)
* feature2d: instrument more functions used in AKAZE
* rework Compute_Determinant_Hessian_Response
* this takes 84% of time of Feature_Detection
* run everything in parallel
* compute Scharr kernels just once
* compute sigma more efficiently
* allocate all matrices in evolution without zeroing
* features2d: add one bigger image to tests
* now test have images: 600x768, 900x600 and 1385x700 to cover different resolutions
* explicitly zero Lx and Ly
* add Lflow and Lstep to evolution as in original AKAZE code
* reworked computing keypoints orientation
integrated faster function from https://github.com/h2suzuki/fast_akaze
* use standard fastAtan2 instead of getAngle
* compute keypoints orientation in parallel
* fix visual studio warnings
* replace some wrapped functions with direct calls to OpenCV functions
* improved readability for people familiar with opencv
* do not same image twice in base level
* rework diffusity stencil
* use one pass stencil for diffusity from https://github.com/h2suzuki/fast_akaze
* improve locality in Create_Scale_Space
* always compute determinat od hessian and spacial derivatives
* this needs to be computed always as we need derivatives while computing descriptors
* fixed tests of AKAZE with KAZE descriptors which have been affected by this
Currently it computes all first and second order derivatives together and the determiant of the hessian. For descriptors it would be enough to compute just first order derivates, but it is not probably worth it optimize for scenario where descriptors and keypoints are computed separately, since it is already very inefficient. When computing keypoint and descriptors together it is faster to do it the current way (preserves locality).
* parallelize non linear diffusion computation
* do multiplication right in the nlp diffusity kernel
* rework kfactor computation
* get rid of sharing buffers when creating scale space pyramid, the performace impact is neglegible
* features2d: initialize TBB scheduler in perf tests
* ensures more stable output
* more reasonable profiles, since the first call of parallel_for_ is not getting big performace hit
* compute_kfactor: interleave finding of maximum and computing distance
* no need to go twice through the data
* start to use UMats in AKAZE to leverage OpenCl in the future
* fixed bug that prevented computing determinant for scale pyramid of size 1 (just the base image)
* all descriptors now support writing to uninitialized memory
* use InputArray and OutputArray for input image and descriptors, allows to make use UMAt that user passes to us
* enable use of all existing ocl paths in AKAZE
* all parts that uses ocl-enabled functions should use ocl by now
* imgproc: fix dispatching of IPP version when OCL is disabled
* when OCL is disabled IPP version should be always prefered (even when the dst is UMat)
* get rid of copy in DeterminantHessian response
* this slows CPU version considerably
* do no run in parallel when running with OCL
* store derivations as UMat in pyramid
* enables OCL path computing of determint hessian
* will allow to compute descriptors on GPU in the future
* port diffusivity to OCL
* diffusivity itself is not a blocker, but this saves us downloading and uploading derivations
* implement kernel for nonlinear scalar diffusion step
* download the pyramid from GPU just once
we don't want to downlaod matrices ad hoc from gpu when the function in AKAZE needs it. There is a HUGE mapping overhead and without shared memory support a LOT of unnecessary transfers.
This maps/downloads matrices just once.
* fix bug with uninitialized values in non linear diffusion
* this was causing spurious segfaults in stitching tests due to propagation of NaNs
* added new test, which checks for NaNs (added new debug asserts for NaNs)
* valgrind now says everything is ok
* add nonlinear diffusion step OCL implementation
* Lt in pyramid changed to UMat, it will be downlaoded from GPU along with Lx, Ly
* fix bug in pm_g2 kernel. OpenCV mangles dimensions passed to OpenCL, so we need to check for boundaries in each OCL kernel.
* port computing of determinant to OCL
* computing of determinant is not a blocker, but with this change we don't need to download all spatial derivatives to CPU, we only download determinant
* make Ldet in the pyramid UMat, download it from CPU together with the other parts of the pyramid
* add profiling macros
* fix visual studio warning
* instrument non_linear_diffusion
* remove changes I have made to TEvolution
* TEvolution is used only in KAZE now
* Revert "features2d: initialize TBB scheduler in perf tests"
This reverts commit ba81e2a711
.
310 lines
11 KiB
C++
310 lines
11 KiB
C++
/*M///////////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
|
//
|
|
// By downloading, copying, installing or using the software you agree to this license.
|
|
// If you do not agree to this license, do not download, install,
|
|
// copy or use the software.
|
|
//
|
|
//
|
|
// Intel License Agreement
|
|
// For Open Source Computer Vision Library
|
|
//
|
|
// Copyright (C) 2000, Intel Corporation, all rights reserved.
|
|
// Third party copyrights are property of their respective owners.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without modification,
|
|
// are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistribution's of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
//
|
|
// * Redistribution's in binary form must reproduce the above copyright notice,
|
|
// this list of conditions and the following disclaimer in the documentation
|
|
// and/or other materials provided with the distribution.
|
|
//
|
|
// * The name of Intel Corporation may not be used to endorse or promote products
|
|
// derived from this software without specific prior written permission.
|
|
//
|
|
// This software is provided by the copyright holders and contributors "as is" and
|
|
// any express or implied warranties, including, but not limited to, the implied
|
|
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
|
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
|
// indirect, incidental, special, exemplary, or consequential damages
|
|
// (including, but not limited to, procurement of substitute goods or services;
|
|
// loss of use, data, or profits; or business interruption) however caused
|
|
// and on any theory of liability, whether in contract, strict liability,
|
|
// or tort (including negligence or otherwise) arising in any way out of
|
|
// the use of this software, even if advised of the possibility of such damage.
|
|
//
|
|
//M*/
|
|
|
|
#include "test_precomp.hpp"
|
|
|
|
using namespace std;
|
|
using namespace cv;
|
|
|
|
const string FEATURES2D_DIR = "features2d";
|
|
const string IMAGE_FILENAME = "tsukuba.png";
|
|
const string DETECTOR_DIR = FEATURES2D_DIR + "/feature_detectors";
|
|
|
|
/****************************************************************************************\
|
|
* Regression tests for feature detectors comparing keypoints. *
|
|
\****************************************************************************************/
|
|
|
|
class CV_FeatureDetectorTest : public cvtest::BaseTest
|
|
{
|
|
public:
|
|
CV_FeatureDetectorTest( const string& _name, const Ptr<FeatureDetector>& _fdetector ) :
|
|
name(_name), fdetector(_fdetector) {}
|
|
|
|
protected:
|
|
bool isSimilarKeypoints( const KeyPoint& p1, const KeyPoint& p2 );
|
|
void compareKeypointSets( const vector<KeyPoint>& validKeypoints, const vector<KeyPoint>& calcKeypoints );
|
|
|
|
void emptyDataTest();
|
|
void regressionTest(); // TODO test of detect() with mask
|
|
|
|
virtual void run( int );
|
|
|
|
string name;
|
|
Ptr<FeatureDetector> fdetector;
|
|
};
|
|
|
|
void CV_FeatureDetectorTest::emptyDataTest()
|
|
{
|
|
// One image.
|
|
Mat image;
|
|
vector<KeyPoint> keypoints;
|
|
try
|
|
{
|
|
fdetector->detect( image, keypoints );
|
|
}
|
|
catch(...)
|
|
{
|
|
ts->printf( cvtest::TS::LOG, "detect() on empty image must not generate exception (1).\n" );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_OUTPUT );
|
|
}
|
|
|
|
if( !keypoints.empty() )
|
|
{
|
|
ts->printf( cvtest::TS::LOG, "detect() on empty image must return empty keypoints vector (1).\n" );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_OUTPUT );
|
|
return;
|
|
}
|
|
|
|
// Several images.
|
|
vector<Mat> images;
|
|
vector<vector<KeyPoint> > keypointCollection;
|
|
try
|
|
{
|
|
fdetector->detect( images, keypointCollection );
|
|
}
|
|
catch(...)
|
|
{
|
|
ts->printf( cvtest::TS::LOG, "detect() on empty image vector must not generate exception (2).\n" );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_OUTPUT );
|
|
}
|
|
}
|
|
|
|
bool CV_FeatureDetectorTest::isSimilarKeypoints( const KeyPoint& p1, const KeyPoint& p2 )
|
|
{
|
|
const float maxPtDif = 1.f;
|
|
const float maxSizeDif = 1.f;
|
|
const float maxAngleDif = 2.f;
|
|
const float maxResponseDif = 0.1f;
|
|
|
|
float dist = (float)norm( p1.pt - p2.pt );
|
|
return (dist < maxPtDif &&
|
|
fabs(p1.size - p2.size) < maxSizeDif &&
|
|
abs(p1.angle - p2.angle) < maxAngleDif &&
|
|
abs(p1.response - p2.response) < maxResponseDif &&
|
|
p1.octave == p2.octave &&
|
|
p1.class_id == p2.class_id );
|
|
}
|
|
|
|
void CV_FeatureDetectorTest::compareKeypointSets( const vector<KeyPoint>& validKeypoints, const vector<KeyPoint>& calcKeypoints )
|
|
{
|
|
const float maxCountRatioDif = 0.01f;
|
|
|
|
// Compare counts of validation and calculated keypoints.
|
|
float countRatio = (float)validKeypoints.size() / (float)calcKeypoints.size();
|
|
if( countRatio < 1 - maxCountRatioDif || countRatio > 1.f + maxCountRatioDif )
|
|
{
|
|
ts->printf( cvtest::TS::LOG, "Bad keypoints count ratio (validCount = %d, calcCount = %d).\n",
|
|
validKeypoints.size(), calcKeypoints.size() );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_OUTPUT );
|
|
return;
|
|
}
|
|
|
|
int progress = 0, progressCount = (int)(validKeypoints.size() * calcKeypoints.size());
|
|
int badPointCount = 0, commonPointCount = max((int)validKeypoints.size(), (int)calcKeypoints.size());
|
|
for( size_t v = 0; v < validKeypoints.size(); v++ )
|
|
{
|
|
int nearestIdx = -1;
|
|
float minDist = std::numeric_limits<float>::max();
|
|
|
|
for( size_t c = 0; c < calcKeypoints.size(); c++ )
|
|
{
|
|
progress = update_progress( progress, (int)(v*calcKeypoints.size() + c), progressCount, 0 );
|
|
float curDist = (float)norm( calcKeypoints[c].pt - validKeypoints[v].pt );
|
|
if( curDist < minDist )
|
|
{
|
|
minDist = curDist;
|
|
nearestIdx = (int)c;
|
|
}
|
|
}
|
|
|
|
assert( minDist >= 0 );
|
|
if( !isSimilarKeypoints( validKeypoints[v], calcKeypoints[nearestIdx] ) )
|
|
badPointCount++;
|
|
}
|
|
ts->printf( cvtest::TS::LOG, "badPointCount = %d; validPointCount = %d; calcPointCount = %d\n",
|
|
badPointCount, validKeypoints.size(), calcKeypoints.size() );
|
|
if( badPointCount > 0.9 * commonPointCount )
|
|
{
|
|
ts->printf( cvtest::TS::LOG, " - Bad accuracy!\n" );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_BAD_ACCURACY );
|
|
return;
|
|
}
|
|
ts->printf( cvtest::TS::LOG, " - OK\n" );
|
|
}
|
|
|
|
void CV_FeatureDetectorTest::regressionTest()
|
|
{
|
|
assert( !fdetector.empty() );
|
|
string imgFilename = string(ts->get_data_path()) + FEATURES2D_DIR + "/" + IMAGE_FILENAME;
|
|
string resFilename = string(ts->get_data_path()) + DETECTOR_DIR + "/" + string(name) + ".xml.gz";
|
|
|
|
// Read the test image.
|
|
Mat image = imread( imgFilename );
|
|
if( image.empty() )
|
|
{
|
|
ts->printf( cvtest::TS::LOG, "Image %s can not be read.\n", imgFilename.c_str() );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
|
|
return;
|
|
}
|
|
|
|
FileStorage fs( resFilename, FileStorage::READ );
|
|
|
|
// Compute keypoints.
|
|
vector<KeyPoint> calcKeypoints;
|
|
fdetector->detect( image, calcKeypoints );
|
|
|
|
if( fs.isOpened() ) // Compare computed and valid keypoints.
|
|
{
|
|
// TODO compare saved feature detector params with current ones
|
|
|
|
// Read validation keypoints set.
|
|
vector<KeyPoint> validKeypoints;
|
|
read( fs["keypoints"], validKeypoints );
|
|
if( validKeypoints.empty() )
|
|
{
|
|
ts->printf( cvtest::TS::LOG, "Keypoints can not be read.\n" );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
|
|
return;
|
|
}
|
|
|
|
compareKeypointSets( validKeypoints, calcKeypoints );
|
|
}
|
|
else // Write detector parameters and computed keypoints as validation data.
|
|
{
|
|
fs.open( resFilename, FileStorage::WRITE );
|
|
if( !fs.isOpened() )
|
|
{
|
|
ts->printf( cvtest::TS::LOG, "File %s can not be opened to write.\n", resFilename.c_str() );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
|
|
return;
|
|
}
|
|
else
|
|
{
|
|
fs << "detector_params" << "{";
|
|
fdetector->write( fs );
|
|
fs << "}";
|
|
|
|
write( fs, "keypoints", calcKeypoints );
|
|
}
|
|
}
|
|
}
|
|
|
|
void CV_FeatureDetectorTest::run( int /*start_from*/ )
|
|
{
|
|
if( !fdetector )
|
|
{
|
|
ts->printf( cvtest::TS::LOG, "Feature detector is empty.\n" );
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
|
|
return;
|
|
}
|
|
|
|
emptyDataTest();
|
|
regressionTest();
|
|
|
|
ts->set_failed_test_info( cvtest::TS::OK );
|
|
}
|
|
|
|
/****************************************************************************************\
|
|
* Tests registrations *
|
|
\****************************************************************************************/
|
|
|
|
TEST( Features2d_Detector_BRISK, regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-brisk", BRISK::create() );
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_FAST, regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-fast", FastFeatureDetector::create() );
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_AGAST, regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-agast", AgastFeatureDetector::create() );
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_GFTT, regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-gftt", GFTTDetector::create() );
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_Harris, regression )
|
|
{
|
|
Ptr<GFTTDetector> gftt = GFTTDetector::create();
|
|
gftt->setHarrisDetector(true);
|
|
CV_FeatureDetectorTest test( "detector-harris", gftt);
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_MSER, DISABLED_regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-mser", MSER::create() );
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_ORB, regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-orb", ORB::create() );
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_KAZE, regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-kaze", KAZE::create() );
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_AKAZE, regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-akaze", AKAZE::create() );
|
|
test.safe_run();
|
|
}
|
|
|
|
TEST( Features2d_Detector_AKAZE_DESCRIPTOR_KAZE, regression )
|
|
{
|
|
CV_FeatureDetectorTest test( "detector-akaze-with-kaze-desc", AKAZE::create(AKAZE::DESCRIPTOR_KAZE) );
|
|
test.safe_run();
|
|
}
|