fixed tests for BruteForceMatcher_GPU::radiusMatch

14 years ago · d6d7ac9cee
parent d3cd2cb5c0
commit d6d7ac9cee
2 changed files with 3 additions and 3 deletions
--- a/modules/gpu/perf/perf_features2d.cpp
+++ b/modules/gpu/perf/perf_features2d.cpp
@ -68,7 +68,7 @@ PERF_TEST_P(DevInfo_K_DescSize, BruteForceMatcher_knnMatch, testing::Combine(tes
    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)))
 {
    DeviceInfo devInfo = std::tr1::get<0>(GetParam());
--- a/modules/gpu/test/test_features2d.cpp
+++ b/modules/gpu/test/test_features2d.cpp
@ -534,7 +534,7 @@ TEST_P(BruteForceMatcher, KnnMatchAdd3)

 TEST_P(BruteForceMatcher, RadiusMatch)
 {
-    if (!supportFeature(devInfo, cv::gpu::GLOBAL_ATOMICS))
+    if (!supportFeature(devInfo, cv::gpu::SHARED_ATOMICS))
        return;

    const char* distStr = dists[distType];
@ -573,7 +573,7 @@ TEST_P(BruteForceMatcher, RadiusMatch)

 TEST_P(BruteForceMatcher, RadiusMatchAdd)
 {
-    if (!supportFeature(devInfo, cv::gpu::GLOBAL_ATOMICS))
+    if (!supportFeature(devInfo, cv::gpu::SHARED_ATOMICS))
        return;

    const char* distStr = dists[distType];