From 2e0f613c38099cc0fd06b8e8e31b46fe9fe410f9 Mon Sep 17 00:00:00 2001 From: Jin Ma Date: Wed, 11 Sep 2013 10:19:02 +0800 Subject: [PATCH 1/3] Added performance for Kalman Filter. --- modules/ocl/perf/perf_kalman.cpp | 94 ++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 modules/ocl/perf/perf_kalman.cpp diff --git a/modules/ocl/perf/perf_kalman.cpp b/modules/ocl/perf/perf_kalman.cpp new file mode 100644 index 000000000..bed346cf0 --- /dev/null +++ b/modules/ocl/perf/perf_kalman.cpp @@ -0,0 +1,94 @@ +/*M/////////////////////////////////////////////////////////////////////////////////////// +// +// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. +// +// By downloading, copying, installing or using the software you agree to this license. +// If you do not agree to this license, do not download, install, +// copy or use the software. +// +// +// License Agreement +// For Open Source Computer Vision Library +// +// Copyright (C) 2010-2012, Multicoreware, Inc., all rights reserved. +// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved. +// Third party copyrights are property of their respective owners. +// +// @Authors +// Fangfang Bai, fangfang@multicorewareinc.com +// Jin Ma, jin@multicorewareinc.com +// +// Redistribution and use in source and binary forms, with or without modification, +// are permitted provided that the following conditions are met: +// +// * Redistribution's of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// * Redistribution's in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other oclMaterials provided with the distribution. +// +// * The name of the copyright holders may not be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// This software is provided by the copyright holders and contributors as is and +// any express or implied warranties, including, but not limited to, the implied +// warranties of merchantability and fitness for a particular purpose are disclaimed. +// In no event shall the Intel Corporation or contributors be liable for any direct, +// indirect, incidental, special, exemplary, or consequential damages +// (including, but not limited to, procurement of substitute goods or services; +// loss of use, data, or profits; or business interruption) however caused +// and on any theory of liability, whether in contract, strict liability, +// or tort (including negligence or otherwise) arising in any way out of +// the use of this software, even if advised of the possibility of such damage. +// +//M*/ +#include "perf_precomp.hpp" +using namespace perf; +using namespace std; +using namespace cv::ocl; +using namespace cv; +using std::tr1::tuple; +using std::tr1::get; +///////////// Kalman Filter //////////////////////// + +typedef tuple KalmanFilterType; +typedef TestBaseWithParam KalmanFilterFixture; + +PERF_TEST_P(KalmanFilterFixture, KalmanFilter, + ::testing::Values(1000, 1500)) +{ + KalmanFilterType params = GetParam(); + const int dim = get<0>(params); + + cv::Mat sample(dim, 1, CV_32FC1), dresult; + randu(sample, -1, 1); + cv::ocl::oclMat dsample(sample); + + cv::Mat statePre_; + + if(RUN_PLAIN_IMPL) + { + TEST_CYCLE() + { + cv::KalmanFilter kalman; + kalman.init(dim, dim); + kalman.correct(sample); + kalman.predict(); + statePre_ = kalman.statePre; + } + SANITY_CHECK(statePre_); + }else if(RUN_OCL_IMPL) + { + OCL_TEST_CYCLE() + { + cv::ocl::KalmanFilter kalman_ocl; + kalman_ocl.init(dim, dim); + kalman_ocl.correct(dsample); + kalman_ocl.predict(); + kalman_ocl.statePre.download(statePre_); + } + SANITY_CHECK(statePre_); + }else + OCL_PERF_ELSE +} \ No newline at end of file From b9d7e67589ae716ff063f5038004a0e05ec2cfa4 Mon Sep 17 00:00:00 2001 From: Jin Ma Date: Wed, 11 Sep 2013 11:28:36 +0800 Subject: [PATCH 2/3] Removed whitespace. --- modules/ocl/perf/perf_kalman.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocl/perf/perf_kalman.cpp b/modules/ocl/perf/perf_kalman.cpp index bed346cf0..67bbb9238 100644 --- a/modules/ocl/perf/perf_kalman.cpp +++ b/modules/ocl/perf/perf_kalman.cpp @@ -83,7 +83,7 @@ PERF_TEST_P(KalmanFilterFixture, KalmanFilter, OCL_TEST_CYCLE() { cv::ocl::KalmanFilter kalman_ocl; - kalman_ocl.init(dim, dim); + kalman_ocl.init(dim, dim); kalman_ocl.correct(dsample); kalman_ocl.predict(); kalman_ocl.statePre.download(statePre_); From f4d0c9b13c524313f6be2357695112081e2d210f Mon Sep 17 00:00:00 2001 From: Jin Ma Date: Thu, 12 Sep 2013 09:43:30 +0800 Subject: [PATCH 3/3] Revised the code according to the feedback of the community. --- modules/ocl/perf/perf_kalman.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/ocl/perf/perf_kalman.cpp b/modules/ocl/perf/perf_kalman.cpp index 67bbb9238..b5f713be9 100644 --- a/modules/ocl/perf/perf_kalman.cpp +++ b/modules/ocl/perf/perf_kalman.cpp @@ -63,32 +63,31 @@ PERF_TEST_P(KalmanFilterFixture, KalmanFilter, cv::Mat sample(dim, 1, CV_32FC1), dresult; randu(sample, -1, 1); - cv::ocl::oclMat dsample(sample); cv::Mat statePre_; if(RUN_PLAIN_IMPL) { + cv::KalmanFilter kalman; TEST_CYCLE() { - cv::KalmanFilter kalman; kalman.init(dim, dim); kalman.correct(sample); kalman.predict(); - statePre_ = kalman.statePre; } - SANITY_CHECK(statePre_); + statePre_ = kalman.statePre; }else if(RUN_OCL_IMPL) { + cv::ocl::oclMat dsample(sample); + cv::ocl::KalmanFilter kalman_ocl; OCL_TEST_CYCLE() { - cv::ocl::KalmanFilter kalman_ocl; kalman_ocl.init(dim, dim); kalman_ocl.correct(dsample); kalman_ocl.predict(); - kalman_ocl.statePre.download(statePre_); } - SANITY_CHECK(statePre_); + kalman_ocl.statePre.download(statePre_); }else OCL_PERF_ELSE + SANITY_CHECK(statePre_); } \ No newline at end of file