From 7d97e8112aa78045525d3fde55839a5bb8a05436 Mon Sep 17 00:00:00 2001 From: yao Date: Mon, 6 Aug 2012 15:51:27 +0800 Subject: [PATCH] fix bugs in tests, set device for each test case Signed-off-by: yao --- modules/ocl/test/test_blend.cpp | 5 +++-- modules/ocl/test/test_columnsum.cpp | 3 +++ modules/ocl/test/test_match_template.cpp | 6 ++++++ modules/ocl/test/test_pyrdown.cpp | 4 ++-- modules/ocl/test/test_pyrup.cpp | 12 +++--------- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/modules/ocl/test/test_blend.cpp b/modules/ocl/test/test_blend.cpp index f1649bf..a0391b1 100644 --- a/modules/ocl/test/test_blend.cpp +++ b/modules/ocl/test/test_blend.cpp @@ -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*/) { - //cv::gpu::DeviceInfo devInfo; + std::vector oclinfo; cv::Size size; int type; bool useRoi; @@ -45,7 +45,8 @@ PARAM_TEST_CASE(Blend, cv::Size, MatType/*, UseRoi*/) type = GET_PARAM(1); /*useRoi = GET_PARAM(3);*/ - //cv::gpu::setDevice(devInfo.deviceID()); + int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE); + CV_Assert(devnums > 0); } }; diff --git a/modules/ocl/test/test_columnsum.cpp b/modules/ocl/test/test_columnsum.cpp index fe73dca..94e109d 100644 --- a/modules/ocl/test/test_columnsum.cpp +++ b/modules/ocl/test/test_columnsum.cpp @@ -60,11 +60,14 @@ PARAM_TEST_CASE(ColumnSum, cv::Size, bool ) cv::Size size; cv::Mat src; bool useRoi; + std::vector oclinfo; virtual void SetUp() { size = GET_PARAM(0); useRoi = GET_PARAM(1); + int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE); + CV_Assert(devnums > 0); } }; diff --git a/modules/ocl/test/test_match_template.cpp b/modules/ocl/test/test_match_template.cpp index 683e181..7d599a6 100644 --- a/modules/ocl/test/test_match_template.cpp +++ b/modules/ocl/test/test_match_template.cpp @@ -60,6 +60,7 @@ PARAM_TEST_CASE(MatchTemplate8U, cv::Size, TemplateSize, Channels, TemplateMetho cv::Size templ_size; int cn; int method; + std::vector oclinfo; virtual void SetUp() { @@ -67,6 +68,8 @@ PARAM_TEST_CASE(MatchTemplate8U, cv::Size, TemplateSize, Channels, TemplateMetho templ_size = GET_PARAM(1); cn = GET_PARAM(2); 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; int cn; int method; + std::vector oclinfo; virtual void SetUp() { @@ -116,6 +120,8 @@ PARAM_TEST_CASE(MatchTemplate32F, cv::Size, TemplateSize, Channels, TemplateMeth templ_size = GET_PARAM(1); cn = GET_PARAM(2); method = GET_PARAM(3); + int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE); + CV_Assert(devnums > 0); } }; diff --git a/modules/ocl/test/test_pyrdown.cpp b/modules/ocl/test/test_pyrdown.cpp index a3fd149..f2270b4 100644 --- a/modules/ocl/test/test_pyrdown.cpp +++ b/modules/ocl/test/test_pyrdown.cpp @@ -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)); - //int devnums = getDevice(oclinfo); - //CV_Assert(devnums > 0); + int devnums = getDevice(oclinfo); + CV_Assert(devnums > 0); //if you want to use undefault device, set it here //setDevice(oclinfo[0]); } diff --git a/modules/ocl/test/test_pyrup.cpp b/modules/ocl/test/test_pyrup.cpp index eac7fe1..c6c5b9c 100644 --- a/modules/ocl/test/test_pyrup.cpp +++ b/modules/ocl/test/test_pyrup.cpp @@ -49,22 +49,16 @@ #ifdef HAVE_OPENCL - - - - - - - - - PARAM_TEST_CASE(PyrUp,cv::Size,int) { cv::Size size; int type; + std::vector oclinfo; virtual void SetUp() { + int devnums = cv::ocl::getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE); + CV_Assert(devnums > 0); size = GET_PARAM(0); type = GET_PARAM(1); } -- 2.7.4