Commit d6d7ac9c authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

fixed tests for BruteForceMatcher_GPU::radiusMatch

parent d3cd2cb5
...@@ -68,7 +68,7 @@ PERF_TEST_P(DevInfo_K_DescSize, BruteForceMatcher_knnMatch, testing::Combine(tes ...@@ -68,7 +68,7 @@ PERF_TEST_P(DevInfo_K_DescSize, BruteForceMatcher_knnMatch, testing::Combine(tes
SANITY_CHECK(distance_host); SANITY_CHECK(distance_host);
} }
PERF_TEST_P(DevInfo_DescSize, BruteForceMatcher_radiusMatch, testing::Combine(testing::ValuesIn(devices(GLOBAL_ATOMICS)), PERF_TEST_P(DevInfo_DescSize, BruteForceMatcher_radiusMatch, testing::Combine(testing::ValuesIn(devices(SHARED_ATOMICS)),
testing::Values(64, 128))) testing::Values(64, 128)))
{ {
DeviceInfo devInfo = std::tr1::get<0>(GetParam()); DeviceInfo devInfo = std::tr1::get<0>(GetParam());
......
...@@ -534,7 +534,7 @@ TEST_P(BruteForceMatcher, KnnMatchAdd3) ...@@ -534,7 +534,7 @@ TEST_P(BruteForceMatcher, KnnMatchAdd3)
TEST_P(BruteForceMatcher, RadiusMatch) TEST_P(BruteForceMatcher, RadiusMatch)
{ {
if (!supportFeature(devInfo, cv::gpu::GLOBAL_ATOMICS)) if (!supportFeature(devInfo, cv::gpu::SHARED_ATOMICS))
return; return;
const char* distStr = dists[distType]; const char* distStr = dists[distType];
...@@ -573,7 +573,7 @@ TEST_P(BruteForceMatcher, RadiusMatch) ...@@ -573,7 +573,7 @@ TEST_P(BruteForceMatcher, RadiusMatch)
TEST_P(BruteForceMatcher, RadiusMatchAdd) TEST_P(BruteForceMatcher, RadiusMatchAdd)
{ {
if (!supportFeature(devInfo, cv::gpu::GLOBAL_ATOMICS)) if (!supportFeature(devInfo, cv::gpu::SHARED_ATOMICS))
return; return;
const char* distStr = dists[distType]; const char* distStr = dists[distType];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment