mirror of
https://github.com/opencv/opencv.git
synced 2026-07-27 22:33:03 +04:00
Anand Mahesh
4acd2ed6cc
BFMatcher::match() with crossCheck=true previously skipped the OCL dispatch in knnMatchImpl entirely, falling back to CPU even when UMat inputs and an OpenCL device were available. This adds ocl_matchWithCrossCheck() for CV_32FC1 descriptors (e.g. SIFT, SURF): both the forward and reverse nearest-neighbour passes run on the GPU via the existing ocl_matchSingle() kernel, then the cross-check filter runs on the CPU. Only two small index arrays (1×N ints) are downloaded — the O(N²×D) distance work stays on the device. The OCL dispatch in knnMatchImpl is also refactored to unify the Mat/UMat train collection selection before branching on crossCheck. On a NVIDIA RTX 3060 with SIFT descriptors the OCL path is 6–9× faster than CPU at 2k–10k features per image. Binary descriptors (ORB, BRIEF — CV_8U) are unaffected; the existing type guard in ocl_matchSingle keeps them on the CPU path as before. Also adds a correctness test (Features2d_BFMatcher_CrossCheck) and an OCL perf test (BruteForceMatcherFixture/MatchCrossCheck).
151 lines
5.2 KiB
C++
151 lines
5.2 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.
|
|
//
|
|
//
|
|
// License Agreement
|
|
// For Open Source Computer Vision Library
|
|
//
|
|
// Copyright (C) 2010-2012, Multicoreware, Inc., all rights reserved.
|
|
// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
|
|
// Third party copyrights are property of their respective owners.
|
|
//
|
|
// @Authors
|
|
// Fangfang Bai, fangfang@multicorewareinc.com
|
|
// Jin Ma, jin@multicorewareinc.com
|
|
//
|
|
// 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 the copyright holders 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 "../perf_precomp.hpp"
|
|
#include "opencv2/ts/ocl_perf.hpp"
|
|
|
|
#ifdef HAVE_OPENCL
|
|
|
|
namespace opencv_test {
|
|
namespace ocl {
|
|
|
|
//////////////////// BruteForceMatch /////////////////
|
|
|
|
typedef Size_MatType BruteForceMatcherFixture;
|
|
|
|
OCL_PERF_TEST_P(BruteForceMatcherFixture, Match, ::testing::Combine(OCL_PERF_ENUM(OCL_SIZE_1, OCL_SIZE_2, OCL_SIZE_3), OCL_PERF_ENUM((MatType)CV_32FC1) ) )
|
|
{
|
|
const Size_MatType_t params = GetParam();
|
|
const Size srcSize = get<0>(params);
|
|
const int type = get<1>(params);
|
|
|
|
checkDeviceMaxMemoryAllocSize(srcSize, type);
|
|
|
|
vector<DMatch> matches;
|
|
UMat uquery(srcSize, type), utrain(srcSize, type);
|
|
|
|
declare.in(uquery, utrain, WARMUP_RNG);
|
|
|
|
BFMatcher matcher(NORM_L2);
|
|
|
|
OCL_TEST_CYCLE()
|
|
matcher.match(uquery, utrain, matches);
|
|
|
|
SANITY_CHECK_MATCHES(matches, 1e-3);
|
|
}
|
|
|
|
OCL_PERF_TEST_P(BruteForceMatcherFixture, KnnMatch, ::testing::Combine(OCL_PERF_ENUM(OCL_SIZE_1, OCL_SIZE_2, OCL_SIZE_3), OCL_PERF_ENUM((MatType)CV_32FC1) ) )
|
|
{
|
|
const Size_MatType_t params = GetParam();
|
|
const Size srcSize = get<0>(params);
|
|
const int type = get<1>(params);
|
|
|
|
checkDeviceMaxMemoryAllocSize(srcSize, type);
|
|
|
|
vector< vector<DMatch> > matches;
|
|
UMat uquery(srcSize, type), utrain(srcSize, type);
|
|
|
|
declare.in(uquery, utrain, WARMUP_RNG);
|
|
|
|
BFMatcher matcher(NORM_L2);
|
|
|
|
OCL_TEST_CYCLE()
|
|
matcher.knnMatch(uquery, utrain, matches, 2);
|
|
|
|
vector<DMatch> & matches0 = matches[0], & matches1 = matches[1];
|
|
SANITY_CHECK_MATCHES(matches0, 1e-3);
|
|
SANITY_CHECK_MATCHES(matches1, 1e-3);
|
|
|
|
}
|
|
|
|
OCL_PERF_TEST_P(BruteForceMatcherFixture, RadiusMatch, ::testing::Combine(OCL_PERF_ENUM(OCL_SIZE_1, OCL_SIZE_2, OCL_SIZE_3), OCL_PERF_ENUM((MatType)CV_32FC1) ) )
|
|
{
|
|
const Size_MatType_t params = GetParam();
|
|
const Size srcSize = get<0>(params);
|
|
const int type = get<1>(params);
|
|
|
|
checkDeviceMaxMemoryAllocSize(srcSize, type);
|
|
|
|
vector< vector<DMatch> > matches;
|
|
UMat uquery(srcSize, type), utrain(srcSize, type);
|
|
|
|
declare.in(uquery, utrain, WARMUP_RNG);
|
|
|
|
BFMatcher matcher(NORM_L2);
|
|
|
|
OCL_TEST_CYCLE()
|
|
matcher.radiusMatch(uquery, utrain, matches, 2.0f);
|
|
|
|
vector<DMatch> & matches0 = matches[0], & matches1 = matches[1];
|
|
SANITY_CHECK_MATCHES(matches0, 1e-3);
|
|
SANITY_CHECK_MATCHES(matches1, 1e-3);
|
|
}
|
|
|
|
OCL_PERF_TEST_P(BruteForceMatcherFixture, MatchCrossCheck, ::testing::Combine(OCL_PERF_ENUM(OCL_SIZE_1, OCL_SIZE_2, OCL_SIZE_3), OCL_PERF_ENUM((MatType)CV_32FC1) ) )
|
|
{
|
|
const Size_MatType_t params = GetParam();
|
|
const Size srcSize = get<0>(params);
|
|
const int type = get<1>(params);
|
|
|
|
checkDeviceMaxMemoryAllocSize(srcSize, type);
|
|
|
|
vector<DMatch> matches;
|
|
UMat uquery(srcSize, type), utrain(srcSize, type);
|
|
|
|
declare.in(uquery, utrain, WARMUP_RNG);
|
|
|
|
BFMatcher matcher(NORM_L2, true /*crossCheck*/);
|
|
|
|
OCL_TEST_CYCLE()
|
|
matcher.match(uquery, utrain, matches);
|
|
|
|
SANITY_CHECK_MATCHES(matches, 1e-3);
|
|
}
|
|
|
|
} // ocl
|
|
} // cvtest
|
|
|
|
#endif // HAVE_OPENCL
|