i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 17:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dictionary: fixed L2SQR format for GPU BF

Browse Source
This commit is contained in:
matlabbe
2020-04-23 22:56:42 -04:00
parent e8be3f21fa
commit bc8d811f69
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
corelib/src/VWDictionary.cpp
View File

@@ -777,6 +777,7 @@ std::list<int> VWDictionary::addNewWords(
cv::Mat dists;
std::vector<std::vector<cv::DMatch> > matches;
bool bruteForce = false;
bool isL2NotSqr = false;
UTimer timerLocal;
timerLocal.start();
@@ -812,6 +813,7 @@ std::list<int> VWDictionary::addNewWords(
{
cv::gpu::BruteForceMatcher_GPU<cv::L2<float> > gpuMatcher;
gpuMatcher.knnMatch(newDescriptorsGpu, lastDescriptorsGpu, matches, k);
isL2NotSqr = true;
}
#else
UERROR("Cannot use brute Force GPU because OpenCV is not built with gpu module.");
@@ -830,6 +832,7 @@ std::list<int> VWDictionary::addNewWords(
{
gpuMatcher = cv::cuda::DescriptorMatcher::createBFMatcher(cv::NORM_L2);
gpuMatcher->knnMatch(newDescriptorsGpu, lastDescriptorsGpu, matches, k);
isL2NotSqr = true;
}
#else
UERROR("Cannot use brute Force GPU because OpenCV is not built with cuda module.");
@@ -889,6 +892,11 @@ std::list<int> VWDictionary::addNewWords(
int id = uValue(_mapIndexId, matches.at(i).at(j).trainIdx);
if(d >= 0.0f && id != 0)
{
if(isL2NotSqr)
{
// Make it compatible with L2SQR format of flann
d*=d;
}
fullResults.insert(std::pair<float, int>(d, id));
}
else
@@ -1097,6 +1105,7 @@ std::vector<int> VWDictionary::findNN(const cv::Mat & queryIn) const
std::vector<std::vector<cv::DMatch> > matches;
bool bruteForce = false;
bool isL2NotSqr = false;
cv::Mat results;
cv::Mat dists;
@@ -1131,6 +1140,7 @@ std::vector<int> VWDictionary::findNN(const cv::Mat & queryIn) const
{
cv::gpu::BruteForceMatcher_GPU<cv::L2<float> > gpuMatcher;
gpuMatcher.knnMatch(newDescriptorsGpu, lastDescriptorsGpu, matches, k);
isL2NotSqr = true;
}
#else
UERROR("Cannot use brute Force GPU because OpenCV is not built with gpu module.");
@@ -1150,6 +1160,7 @@ std::vector<int> VWDictionary::findNN(const cv::Mat & queryIn) const
{
gpuMatcher = cv::cuda::DescriptorMatcher::createBFMatcher(cv::NORM_L2);
gpuMatcher->knnMatchAsync(newDescriptorsGpu, lastDescriptorsGpu, matchesGpu, k);
isL2NotSqr = true;
}
gpuMatcher->knnMatchConvert(matchesGpu, matches);
#else
@@ -1243,6 +1254,11 @@ std::vector<int> VWDictionary::findNN(const cv::Mat & queryIn) const
int id = uValue(_mapIndexId, matches.at(i).at(j).trainIdx);
if(d >= 0.0f && id != 0)
{
if(isL2NotSqr)
{
// make it compatible with L2SQR from FLANN
d*=d;
}
fullResults.insert(std::pair<float, int>(d, id));
}
}