i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-10-06 01:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed cuda capable checks

Browse Source
This commit is contained in:
matlabbe
2026-06-10 20:07:30 -07:00
parent b9fe30970a
commit e75c31238e
6 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
corelib/test/test_vwdictionary.cpp
+14 -14
View File
@@ -62,17 +62,11 @@ TEST_F(VWDictionaryTest, AddNewWordsIncremental)
for(VWDictionary::NNStrategy strategy : strategies)
{
// Reset dictionary for each strategy
dict->clear();
dict->setNNStrategy(strategy);
EXPECT_TRUE(dict->isIncremental());
if(strategy == VWDictionary::kNNBruteForceGPU)
{
#if CV_MAJOR_VERSION < 3
#ifdef HAVE_OPENCV_GPU
if(!cv::gpu::getCudaEnabledDeviceCount())
if(cv::gpu::getCudaEnabledDeviceCount() <= 0)
{
strategy = VWDictionary::kNNBruteForce;
}
@@ -81,7 +75,7 @@ TEST_F(VWDictionaryTest, AddNewWordsIncremental)
#endif
#else
#ifdef HAVE_OPENCV_CUDAFEATURES2D
if(!cv::cuda::getCudaEnabledDeviceCount())
if(cv::cuda::getCudaEnabledDeviceCount() <= 0)
{
strategy = VWDictionary::kNNBruteForce;
}
@@ -90,6 +84,12 @@ TEST_F(VWDictionaryTest, AddNewWordsIncremental)
#endif
#endif
}
// Reset dictionary for each strategy
dict->clear();
dict->setNNStrategy(strategy);
EXPECT_TRUE(dict->isIncremental());
EXPECT_EQ(dict->getNNStrategy(), strategy);
// Add initial words to dictionary (2D descriptors)
@@ -636,15 +636,11 @@ TEST_F(VWDictionaryTest, SerializeDeserializeIndex)
for(VWDictionary::NNStrategy strategy : strategies)
{
// Reset dictionary for each strategy
dict->clear();
dict->setNNStrategy(strategy);
if(strategy == VWDictionary::kNNBruteForceGPU)
{
#if CV_MAJOR_VERSION < 3
#ifdef HAVE_OPENCV_GPU
if(!cv::gpu::getCudaEnabledDeviceCount())
if(cv::gpu::getCudaEnabledDeviceCount() <= 0)
{
continue; // Skip if no GPU available
}
@@ -653,7 +649,7 @@ TEST_F(VWDictionaryTest, SerializeDeserializeIndex)
#endif
#else
#ifdef HAVE_OPENCV_CUDAFEATURES2D
if(!cv::cuda::getCudaEnabledDeviceCount())
if(cv::cuda::getCudaEnabledDeviceCount() <= 0)
{
continue; // Skip if no GPU available
}
@@ -663,6 +659,10 @@ TEST_F(VWDictionaryTest, SerializeDeserializeIndex)
#endif
}
// Reset dictionary for each strategy
dict->clear();
dict->setNNStrategy(strategy);
// Add words and build index
cv::Mat descriptors(5, 32, CV_32F);
cv::randu(descriptors, cv::Scalar(0), cv::Scalar(1));