diff --git a/modules/gpu/perf/perf_features2d.cpp b/modules/gpu/perf/perf_features2d.cpp index c29f3ebe21..68e3a7b60f 100644 --- 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()); diff --git a/modules/gpu/test/test_features2d.cpp b/modules/gpu/test/test_features2d.cpp index 0a198b2689..647f56bc2a 100644 --- 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];