generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bugs in tests, set device for each test case

Browse Source 
Signed-off-by: yao <bitwangyaoyao@gmail.com>
This commit is contained in:
yao 2012-08-06 15:51:27 +08:00
parent 505cda43d1
commit 7d97e8112a
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ocl/test/test_blend.cpp
View File

@ -33,7 +33,7 @@ void blendLinearGold(const cv::Mat& img1, const cv::Mat& img2, const cv::Mat& we
PARAM_TEST_CASE(Blend, cv::Size, MatType/*, UseRoi*/) PARAM_TEST_CASE(Blend, cv::Size, MatType/*, UseRoi*/)
{ {
//cv::gpu::DeviceInfo devInfo; std::vector<cv::ocl::Info> oclinfo;
cv::Size size; cv::Size size;
int type; int type;
bool useRoi; bool useRoi;
@ -45,7 +45,8 @@ PARAM_TEST_CASE(Blend, cv::Size, MatType/*, UseRoi*/)
type = GET_PARAM(1); type = GET_PARAM(1);
/*useRoi = GET_PARAM(3);*/ /*useRoi = GET_PARAM(3);*/
//cv::gpu::setDevice(devInfo.deviceID()); int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
CV_Assert(devnums > 0);
} }
}; };

3
modules/ocl/test/test_columnsum.cpp
View File

@ -60,11 +60,14 @@ PARAM_TEST_CASE(ColumnSum, cv::Size, bool )
cv::Size size; cv::Size size;
cv::Mat src; cv::Mat src;
bool useRoi; bool useRoi;
std::vector<cv::ocl::Info> oclinfo;
virtual void SetUp() virtual void SetUp()
{ {
size = GET_PARAM(0); size = GET_PARAM(0);
useRoi = GET_PARAM(1); useRoi = GET_PARAM(1);
int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
CV_Assert(devnums > 0);
} }
}; };

6
modules/ocl/test/test_match_template.cpp
View File

@ -60,6 +60,7 @@ PARAM_TEST_CASE(MatchTemplate8U, cv::Size, TemplateSize, Channels, TemplateMetho
cv::Size templ_size; cv::Size templ_size;
int cn; int cn;
int method; int method;
std::vector<cv::ocl::Info> oclinfo;
virtual void SetUp() virtual void SetUp()
{ {
@ -67,6 +68,8 @@ PARAM_TEST_CASE(MatchTemplate8U, cv::Size, TemplateSize, Channels, TemplateMetho
templ_size = GET_PARAM(1); templ_size = GET_PARAM(1);
cn = GET_PARAM(2); cn = GET_PARAM(2);
method = GET_PARAM(3); method = GET_PARAM(3);
int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
CV_Assert(devnums > 0);
} }
}; };
@ -109,6 +112,7 @@ PARAM_TEST_CASE(MatchTemplate32F, cv::Size, TemplateSize, Channels, TemplateMeth
cv::Size templ_size; cv::Size templ_size;
int cn; int cn;
int method; int method;
std::vector<cv::ocl::Info> oclinfo;
virtual void SetUp() virtual void SetUp()
{ {
@ -116,6 +120,8 @@ PARAM_TEST_CASE(MatchTemplate32F, cv::Size, TemplateSize, Channels, TemplateMeth
templ_size = GET_PARAM(1); templ_size = GET_PARAM(1);
cn = GET_PARAM(2); cn = GET_PARAM(2);
method = GET_PARAM(3); method = GET_PARAM(3);
int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
CV_Assert(devnums > 0);
} }
}; };

4
modules/ocl/test/test_pyrdown.cpp
View File

@ -119,8 +119,8 @@ PARAM_TEST_CASE(PyrDown, MatType, bool)
val = cv::Scalar(rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0)); val = cv::Scalar(rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0));
//int devnums = getDevice(oclinfo); int devnums = getDevice(oclinfo);
//CV_Assert(devnums > 0); CV_Assert(devnums > 0);
//if you want to use undefault device, set it here //if you want to use undefault device, set it here
//setDevice(oclinfo[0]); //setDevice(oclinfo[0]);
} }

12
modules/ocl/test/test_pyrup.cpp
View File

@ -49,22 +49,16 @@
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
PARAM_TEST_CASE(PyrUp,cv::Size,int) PARAM_TEST_CASE(PyrUp,cv::Size,int)
{ {
cv::Size size; cv::Size size;
int type; int type;
std::vector<cv::ocl::Info> oclinfo;
virtual void SetUp() virtual void SetUp()
{ {
int devnums = cv::ocl::getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
CV_Assert(devnums > 0);
size = GET_PARAM(0); size = GET_PARAM(0);
type = GET_PARAM(1); type = GET_PARAM(1);
} }