}\r
\r
extern "C" void meanShiftFiltering_gpu(const DevMem2D& src, DevMem2D dst, int sp, int sr, int maxIter, float eps)\r
- { \r
+ {\r
+ printFuncAttrib(meanshift_kernel);\r
+\r
dim3 grid(1, 1, 1);\r
- dim3 threads(32, 16, 1);\r
+ dim3 threads(32, 8, 1);\r
grid.x = divUp(src.cols, threads.x);\r
grid.y = divUp(src.rows, threads.y);\r
\r
extern "C" void meanShiftProc_gpu(const DevMem2D& src, DevMem2D dstr, DevMem2D dstsp, int sp, int sr, int maxIter, float eps) \r
{\r
dim3 grid(1, 1, 1);\r
- dim3 threads(32, 16, 1);\r
+ dim3 threads(32, 8, 1);\r
grid.x = divUp(src.cols, threads.x);\r
grid.y = divUp(src.rows, threads.y);\r
\r
\r
void cv::gpu::meanShiftFiltering(const GpuMat& src, GpuMat& dst, int sp, int sr, TermCriteria criteria)\r
{\r
- CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));\r
-\r
if( src.empty() )\r
CV_Error( CV_StsBadArg, "The input image is empty" );\r
\r
\r
void cv::gpu::meanShiftProc(const GpuMat& src, GpuMat& dstr, GpuMat& dstsp, int sp, int sr, TermCriteria criteria)\r
{\r
- CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));\r
-\r
if( src.empty() )\r
CV_Error( CV_StsBadArg, "The input image is empty" );\r
\r
\r
void cv::gpu::meanShiftSegmentation(const GpuMat& src, Mat& dst, int sp, int sr, int minsize, TermCriteria criteria)\r
{\r
- CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));\r
-\r
CV_Assert(src.type() == CV_8UC4);\r
const int nrows = src.rows;\r
const int ncols = src.cols;\r
EXPECT_MAT_NEAR(spmap_template, spmap, 0.0);\r
}\r
\r
-INSTANTIATE_TEST_CASE_P(ImgProc, MeanShift, testing::ValuesIn(devices(cv::gpu::FEATURE_SET_COMPUTE_12)));\r
+INSTANTIATE_TEST_CASE_P(ImgProc, MeanShift, testing::ValuesIn(devices()));\r
\r
struct MeanShiftSegmentation : testing::TestWithParam< std::tr1::tuple<cv::gpu::DeviceInfo, int> >\r
{\r
}\r
\r
INSTANTIATE_TEST_CASE_P(ImgProc, MeanShiftSegmentation, testing::Combine(\r
- testing::ValuesIn(devices(cv::gpu::FEATURE_SET_COMPUTE_12)), \r
+ testing::ValuesIn(devices()),\r
testing::Values(0, 4, 20, 84, 340, 1364)));\r
\r
////////////////////////////////////////////////////////////////////////////////\r