From d050159f07c2ff3d9c1a66bda765d38be659d03e Mon Sep 17 00:00:00 2001 From: yao Date: Sat, 23 Feb 2013 14:30:04 +0800 Subject: [PATCH] Remove the perf running from ocl::matchTemplate accuracy tests --- modules/ocl/test/test_match_template.cpp | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/modules/ocl/test/test_match_template.cpp b/modules/ocl/test/test_match_template.cpp index 3892513b42..c948e1d533 100644 --- a/modules/ocl/test/test_match_template.cpp +++ b/modules/ocl/test/test_match_template.cpp @@ -44,7 +44,7 @@ #include "precomp.hpp" -//#define PERF_TEST 0 + #ifdef HAVE_OPENCL //////////////////////////////////////////////////////////////////////////////// // MatchTemplate @@ -97,15 +97,7 @@ TEST_P(MatchTemplate8U, Accuracy) cv::Mat mat_dst; dst.download(mat_dst); - EXPECT_MAT_NEAR(dst_gold, mat_dst, templ_size.area() * 1e-1, sss); - -#ifdef PERF_TEST - { - P_TEST_FULL( {}, {cv::ocl::matchTemplate(ocl_image, ocl_templ, dst, method);}, {}); - P_TEST_FULL( {}, {cv::matchTemplate(image, templ, dst_gold, method);}, {}); - } -#endif // PERF_TEST } PARAM_TEST_CASE(MatchTemplate32F, cv::Size, TemplateSize, Channels, TemplateMethod) @@ -144,17 +136,6 @@ TEST_P(MatchTemplate32F, Accuracy) dst.download(mat_dst); EXPECT_MAT_NEAR(dst_gold, mat_dst, templ_size.area() * 1e-1, sss); - -#ifdef PERF_TEST - { - std::cout << "Method: " << TEMPLATE_METHOD_NAMES[method] << std::endl; - std::cout << "Image Size: (" << size.width << ", " << size.height << ")" << std::endl; - std::cout << "Template Size: (" << templ_size.width << ", " << templ_size.height << ")" << std::endl; - std::cout << "Channels: " << cn << std::endl; - P_TEST_FULL( {}, {cv::ocl::matchTemplate(ocl_image, ocl_templ, dst, method);}, {}); - P_TEST_FULL( {}, {cv::matchTemplate(image, templ, dst_gold, method);}, {}); - } -#endif // PERF_TEST } INSTANTIATE_TEST_CASE_P(GPU_ImgProc, MatchTemplate8U,