mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

added support of old CC into GPU mean shift routines

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-07-08 13:59:23 +00:00
parent b50428bf65
commit e9837b0aa9
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/src/cuda/imgproc.cu
View File

@ -251,9 +251,11 @@ namespace cv { namespace gpu { namespace imgproc
}
extern "C" void meanShiftFiltering_gpu(const DevMem2D& src, DevMem2D dst, int sp, int sr, int maxIter, float eps)
{
{
printFuncAttrib(meanshift_kernel);
dim3 grid(1, 1, 1);
dim3 threads(32, 16, 1);
dim3 threads(32, 8, 1);
grid.x = divUp(src.cols, threads.x);
grid.y = divUp(src.rows, threads.y);
@ -269,7 +271,7 @@ namespace cv { namespace gpu { namespace imgproc
extern "C" void meanShiftProc_gpu(const DevMem2D& src, DevMem2D dstr, DevMem2D dstsp, int sp, int sr, int maxIter, float eps)
{
dim3 grid(1, 1, 1);
dim3 threads(32, 16, 1);
dim3 threads(32, 8, 1);
grid.x = divUp(src.cols, threads.x);
grid.y = divUp(src.rows, threads.y);

4
modules/gpu/src/imgproc_gpu.cpp
View File

@ -129,8 +129,6 @@ void cv::gpu::remap(const GpuMat& src, GpuMat& dst, const GpuMat& xmap, const Gp
void cv::gpu::meanShiftFiltering(const GpuMat& src, GpuMat& dst, int sp, int sr, TermCriteria criteria)
{
CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));
if( src.empty() )
CV_Error( CV_StsBadArg, "The input image is empty" );
@ -157,8 +155,6 @@ void cv::gpu::meanShiftFiltering(const GpuMat& src, GpuMat& dst, int sp, int sr,
void cv::gpu::meanShiftProc(const GpuMat& src, GpuMat& dstr, GpuMat& dstsp, int sp, int sr, TermCriteria criteria)
{
CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));
if( src.empty() )
CV_Error( CV_StsBadArg, "The input image is empty" );

2
modules/gpu/src/mssegmentation.cpp
View File

@ -227,8 +227,6 @@ inline int dist2(const cv::Vec2s& lhs, const cv::Vec2s& rhs)
void cv::gpu::meanShiftSegmentation(const GpuMat& src, Mat& dst, int sp, int sr, int minsize, TermCriteria criteria)
{
CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));
CV_Assert(src.type() == CV_8UC4);
const int nrows = src.rows;
const int ncols = src.cols;

4
modules/gpu/test/test_imgproc.cpp
View File

@ -1478,7 +1478,7 @@ TEST_P(MeanShift, Proc)
EXPECT_MAT_NEAR(spmap_template, spmap, 0.0);
}
INSTANTIATE_TEST_CASE_P(ImgProc, MeanShift, testing::ValuesIn(devices(cv::gpu::FEATURE_SET_COMPUTE_12)));
INSTANTIATE_TEST_CASE_P(ImgProc, MeanShift, testing::ValuesIn(devices()));
struct MeanShiftSegmentation : testing::TestWithParam< std::tr1::tuple<cv::gpu::DeviceInfo, int> >
{
@ -1540,7 +1540,7 @@ TEST_P(MeanShiftSegmentation, Regression)
}
INSTANTIATE_TEST_CASE_P(ImgProc, MeanShiftSegmentation, testing::Combine(
testing::ValuesIn(devices(cv::gpu::FEATURE_SET_COMPUTE_12)),
testing::ValuesIn(devices()),
testing::Values(0, 4, 20, 84, 340, 1364)));
////////////////////////////////////////////////////////////////////////////////