From f2e41ce3916ecc53d9ffff0b34d6627b9aefeb64 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 9 Aug 2016 15:35:50 +0300 Subject: [PATCH] ocl: fix input data for Canny perf test "declare.in(img, WARMUP_RNG)" overrides input image with random values Also added support for different input sizes (via cv::resize) --- modules/imgproc/perf/opencl/perf_imgproc.cpp | 21 +++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/modules/imgproc/perf/opencl/perf_imgproc.cpp b/modules/imgproc/perf/opencl/perf_imgproc.cpp index f441bd9b32..6d9b1a0287 100644 --- a/modules/imgproc/perf/opencl/perf_imgproc.cpp +++ b/modules/imgproc/perf/opencl/perf_imgproc.cpp @@ -299,33 +299,30 @@ OCL_PERF_TEST_P(CLAHEFixture, CLAHE, OCL_TEST_SIZES) ///////////// Canny //////////////////////// -typedef tuple CannyParams; +typedef tuple CannyParams; typedef TestBaseWithParam 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(); - int apertureSize = get<0>(params); - bool L2Grad = get<1>(params); + const CannyParams& params = GetParam(); + cv::Size imgSize = get<0>(params); + int apertureSize = get<1>(params); + bool L2Grad = get<2>(params); Mat _img = imread(getDataPath("gpu/stereobm/aloe-L.png"), cv::IMREAD_GRAYSCALE); ASSERT_TRUE(!_img.empty()) << "can't open aloe-L.png"; UMat img; - _img.copyTo(img); + cv::resize(_img, img, imgSize); 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); - if (apertureSize == 3) - SANITY_CHECK(edges); - else - SANITY_CHECK_NOTHING(); + SANITY_CHECK_NOTHING(); } - } } // namespace cvtest::ocl #endif // HAVE_OPENCL