From c13eb07d4789c3a128d5aef0c4fc0efc4f7b167a Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 23 Oct 2012 12:07:01 +0400 Subject: [PATCH 1/3] Fix argument parsing for old command line parser --- modules/ts/src/ts_perf.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp index e66cbe5be..25e81858e 100644 --- a/modules/ts/src/ts_perf.cpp +++ b/modules/ts/src/ts_perf.cpp @@ -16,7 +16,7 @@ const std::string command_line_keys = "{ |perf_force_samples |100 |force set maximum number of samples for all tests}" "{ |perf_seed |809564 |seed for random numbers generator}" "{ |perf_threads |-1 |the number of worker threads, if parallel execution is enabled}" - "{ |perf_write_sanity | |allow to create new records for sanity checks}" + "{ |perf_write_sanity |false |allow to create new records for sanity checks}" #ifdef ANDROID "{ |perf_time_limit |6.0 |default time limit for a single test (in seconds)}" "{ |perf_affinity_mask |0 |set affinity mask for the main thread}" @@ -25,7 +25,7 @@ const std::string command_line_keys = "{ |perf_time_limit |3.0 |default time limit for a single test (in seconds)}" #endif "{ |perf_max_deviation |1.0 |}" - "{h |help | |print help info}" + "{h |help |false |print help info}" #ifdef HAVE_CUDA "{ |perf_run_cpu |false |run GPU performance tests for analogical CPU functions}" "{ |perf_cuda_device |0 |run GPU test suite onto specific CUDA capable device}" From b45a870d9a3f856a4b0fe71caa903a6a4f5cda0d Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 23 Oct 2012 12:07:32 +0400 Subject: [PATCH 2/3] Limit 32S data in perf test for addWeighted to avoid integer overflow --- modules/core/perf/perf_addWeighted.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/core/perf/perf_addWeighted.cpp b/modules/core/perf/perf_addWeighted.cpp index 742b684be..82ca45a02 100644 --- a/modules/core/perf/perf_addWeighted.cpp +++ b/modules/core/perf/perf_addWeighted.cpp @@ -23,6 +23,13 @@ PERF_TEST_P(Size_MatType, addWeighted, TYPICAL_MATS_ADWEIGHTED) declare.in(src1, src2, dst, WARMUP_RNG).out(dst); + if (CV_MAT_DEPTH(type) == CV_32S) + { + //see ticket 1529: absdiff can be without saturation on 32S + src1 /= 8; + src2 /= 8; + } + TEST_CYCLE() cv::addWeighted( src1, alpha, src2, beta, gamma, dst, dst.type() ); SANITY_CHECK(dst); From 585f3bc3919132eba4e46c704eaed12158d59037 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 23 Oct 2012 12:13:39 +0400 Subject: [PATCH 3/3] Disable perf test for unstable solvePnPRansac --- modules/calib3d/perf/perf_pnp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/calib3d/perf/perf_pnp.cpp b/modules/calib3d/perf/perf_pnp.cpp index b32b96cae..44d390ef7 100644 --- a/modules/calib3d/perf/perf_pnp.cpp +++ b/modules/calib3d/perf/perf_pnp.cpp @@ -96,7 +96,7 @@ PERF_TEST(PointsNum_Algo, solveP3P) SANITY_CHECK(tvec, 1e-6); } -PERF_TEST_P(PointsNum, SolvePnPRansac, testing::Values(4, 3*9, 7*13)) +PERF_TEST_P(PointsNum, DISABLED_SolvePnPRansac, testing::Values(4, 3*9, 7*13)) { int count = GetParam();