Commit 4dc63273 authored by Roman Donchenko's avatar Roman Donchenko

Renamed ocl tests' precomp files according to convention.

Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.
parent 6d7f29a0
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
int main(int argc, const char *argv[]) int main(int argc, const char *argv[])
{ {
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// Lut //////////////////////// ///////////// Lut ////////////////////////
PERFTEST(lut) PERFTEST(lut)
{ {
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// blend //////////////////////// ///////////// blend ////////////////////////
template <typename T> template <typename T>
void blendLinearGold(const cv::Mat &img1, const cv::Mat &img2, const cv::Mat &weights1, const cv::Mat &weights2, cv::Mat &result_gold) void blendLinearGold(const cv::Mat &img1, const cv::Mat &img2, const cv::Mat &weights1, const cv::Mat &weights2, cv::Mat &result_gold)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
//////////////////// BruteForceMatch ///////////////// //////////////////// BruteForceMatch /////////////////
PERFTEST(BruteForceMatcher) PERFTEST(BruteForceMatcher)
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// StereoMatchBM //////////////////////// ///////////// StereoMatchBM ////////////////////////
PERFTEST(StereoMatchBM) PERFTEST(StereoMatchBM)
{ {
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// Canny //////////////////////// ///////////// Canny ////////////////////////
PERFTEST(Canny) PERFTEST(Canny)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// cvtColor//////////////////////// ///////////// cvtColor////////////////////////
PERFTEST(cvtColor) PERFTEST(cvtColor)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// dft //////////////////////// ///////////// dft ////////////////////////
PERFTEST(dft) PERFTEST(dft)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// Blur//////////////////////// ///////////// Blur////////////////////////
PERFTEST(Blur) PERFTEST(Blur)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// gemm //////////////////////// ///////////// gemm ////////////////////////
PERFTEST(gemm) PERFTEST(gemm)
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// GoodFeaturesToTrack //////////////////////// ///////////// GoodFeaturesToTrack ////////////////////////
PERFTEST(GoodFeaturesToTrack) PERFTEST(GoodFeaturesToTrack)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// Haar //////////////////////// ///////////// Haar ////////////////////////
namespace cv namespace cv
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// HOG//////////////////////// ///////////// HOG////////////////////////
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// equalizeHist //////////////////////// ///////////// equalizeHist ////////////////////////
PERFTEST(equalizeHist) PERFTEST(equalizeHist)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
/////////// matchTemplate //////////////////////// /////////// matchTemplate ////////////////////////
//void InitMatchTemplate() //void InitMatchTemplate()
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// ConvertTo//////////////////////// ///////////// ConvertTo////////////////////////
PERFTEST(ConvertTo) PERFTEST(ConvertTo)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// Moments //////////////////////// ///////////// Moments ////////////////////////
PERFTEST(Moments) PERFTEST(Moments)
{ {
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// norm//////////////////////// ///////////// norm////////////////////////
PERFTEST(norm) PERFTEST(norm)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// PyrLKOpticalFlow //////////////////////// ///////////// PyrLKOpticalFlow ////////////////////////
PERFTEST(PyrLKOpticalFlow) PERFTEST(PyrLKOpticalFlow)
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
#if GTEST_OS_WINDOWS #if GTEST_OS_WINDOWS
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
......
...@@ -40,6 +40,9 @@ ...@@ -40,6 +40,9 @@
// //
//M*/ //M*/
#ifndef __OPENCV_PERF_PRECOMP_HPP__
#define __OPENCV_PERF_PRECOMP_HPP__
#include <iomanip> #include <iomanip>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
...@@ -99,7 +102,7 @@ int EeceptDoubleEQ(T1 expected, T1 actual) ...@@ -99,7 +102,7 @@ int EeceptDoubleEQ(T1 expected, T1 actual)
testing::internal::Double lhs(expected); testing::internal::Double lhs(expected);
testing::internal::Double rhs(actual); testing::internal::Double rhs(actual);
if (lhs.AlmostEquals(rhs)) if (lhs.AlmostEquals(rhs))
{ {
return 1; return 1;
} }
...@@ -352,7 +355,7 @@ public: ...@@ -352,7 +355,7 @@ public:
if(accurate_diff_ <= eps) if(accurate_diff_ <= eps)
is_accurate_ = 1; is_accurate_ = 1;
else else
is_accurate_ = 0; is_accurate_ = 0;
} }
std::stringstream &getCurSubtestDescription() std::stringstream &getCurSubtestDescription()
...@@ -369,7 +372,7 @@ private: ...@@ -369,7 +372,7 @@ private:
speedup_full_faster_count_(0), speedup_full_slower_count_(0), speedup_full_equal_count_(0), is_list_mode_(false), speedup_full_faster_count_(0), speedup_full_slower_count_(0), speedup_full_equal_count_(0), is_list_mode_(false),
num_iters_(10), cpu_num_iters_(2), num_iters_(10), cpu_num_iters_(2),
gpu_warmup_iters_(1), cur_iter_idx_(0), cur_warmup_idx_(0), gpu_warmup_iters_(1), cur_iter_idx_(0), cur_warmup_idx_(0),
record_(0), recordname_("performance"), itname_changed_(true), record_(0), recordname_("performance"), itname_changed_(true),
is_accurate_(-1), accurate_diff_(0.) is_accurate_(-1), accurate_diff_(0.)
{ {
cpu_times_.reserve(num_iters_); cpu_times_.reserve(num_iters_);
...@@ -506,3 +509,5 @@ struct name##_test: Runnable { \ ...@@ -506,3 +509,5 @@ struct name##_test: Runnable { \
#define WARMUP_OFF \ #define WARMUP_OFF \
ocl::finish();\ ocl::finish();\
} TestSystem::instance().warmupComplete() } TestSystem::instance().warmupComplete()
#endif
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// pyrDown ////////////////////// ///////////// pyrDown //////////////////////
PERFTEST(pyrDown) PERFTEST(pyrDown)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "perf_precomp.hpp"
///////////// Merge//////////////////////// ///////////// Merge////////////////////////
PERFTEST(Merge) PERFTEST(Merge)
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
//#define PRINT_TIME //#define PRINT_TIME
#include "precomp.hpp" #include "test_precomp.hpp"
#include <iomanip> #include <iomanip>
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#include <iomanip> #include <iomanip>
using namespace cv; using namespace cv;
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
namespace namespace
{ {
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#include <iomanip> #include <iomanip>
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
//#define MAT_DEBUG //#define MAT_DEBUG
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
using namespace std; using namespace std;
#ifdef HAVE_CLAMDFFT #ifdef HAVE_CLAMDFFT
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
using namespace std; using namespace std;
#ifdef HAVE_CLAMDBLAS #ifdef HAVE_CLAMDBLAS
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
#include "precomp.hpp" #include "test_precomp.hpp"
#include <iomanip> #include <iomanip>
#include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc_c.h"
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/objdetect/objdetect.hpp" #include "opencv2/objdetect/objdetect.hpp"
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#include <iomanip> #include <iomanip>
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#include <iomanip> #include <iomanip>
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
//M*/ //M*/
#include <map> #include <map>
#include <functional> #include <functional>
#include "precomp.hpp" #include "test_precomp.hpp"
using namespace std; using namespace std;
using namespace cvtest; using namespace cvtest;
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "test_precomp.hpp"
#define VARNAME(A) #A #define VARNAME(A) #A
using namespace std; using namespace std;
using namespace cv; using namespace cv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment