mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ocl: fix input data for Canny perf test

Browse Source 
"declare.in(img, WARMUP_RNG)" overrides input image with random values

Also added support for different input sizes (via cv::resize)
This commit is contained in:
Alexander Alekhin 2016-08-09 15:35:50 +03:00
parent 5f30a0a076
commit f2e41ce391
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/imgproc/perf/opencl/perf_imgproc.cpp
View File

@ -299,33 +299,30 @@ OCL_PERF_TEST_P(CLAHEFixture, CLAHE, OCL_TEST_SIZES)
///////////// Canny //////////////////////// ///////////// Canny ////////////////////////
typedef tuple<int, bool> CannyParams; typedef tuple<Size, int, bool> CannyParams;
typedef TestBaseWithParam<CannyParams> CannyFixture; typedef TestBaseWithParam<CannyParams> CannyFixture;
OCL_PERF_TEST_P(CannyFixture, Canny, ::testing::Combine(OCL_PERF_ENUM(3, 5), Bool())) OCL_PERF_TEST_P(CannyFixture, Canny, ::testing::Combine(OCL_TEST_SIZES, OCL_PERF_ENUM(3, 5), Bool()))
{ {
const CannyParams params = GetParam(); const CannyParams& params = GetParam();
int apertureSize = get<0>(params); cv::Size imgSize = get<0>(params);
bool L2Grad = get<1>(params); int apertureSize = get<1>(params);
bool L2Grad = get<2>(params);
Mat _img = imread(getDataPath("gpu/stereobm/aloe-L.png"), cv::IMREAD_GRAYSCALE); Mat _img = imread(getDataPath("gpu/stereobm/aloe-L.png"), cv::IMREAD_GRAYSCALE);
ASSERT_TRUE(!_img.empty()) << "can't open aloe-L.png"; ASSERT_TRUE(!_img.empty()) << "can't open aloe-L.png";
UMat img; UMat img;
_img.copyTo(img); cv::resize(_img, img, imgSize);
UMat edges(img.size(), CV_8UC1); UMat edges(img.size(), CV_8UC1);
declare.in(img, WARMUP_RNG).out(edges); declare.in(img).out(edges);
OCL_TEST_CYCLE() cv::Canny(img, edges, 50.0, 100.0, apertureSize, L2Grad); OCL_TEST_CYCLE() cv::Canny(img, edges, 50.0, 100.0, apertureSize, L2Grad);
if (apertureSize == 3) SANITY_CHECK_NOTHING();
SANITY_CHECK(edges);
else
SANITY_CHECK_NOTHING();
} }
} } // namespace cvtest::ocl } } // namespace cvtest::ocl
#endif // HAVE_OPENCL #endif // HAVE_OPENCL