refactoring of gpu perf. tests

This commit is contained in:
Alexey Spizhevoy 2011-01-24 10:56:11 +00:00
parent b9ed1489fa
commit 581018354f
2 changed files with 8 additions and 17 deletions

View File

@ -4,20 +4,9 @@
using namespace std;
using namespace cv;
void Test::gen(Mat& mat, int rows, int cols, int type, Scalar low, Scalar high)
{
mat.create(rows, cols, type);
RNG rng(0);
rng.fill(mat, RNG::UNIFORM, low, high);
}
void Test::gen(Mat& mat, int rows, int cols, int type)
{
mat.create(rows, cols, type);
Mat mat8u(rows, cols * mat.elemSize(), CV_8U, mat.data, mat.step);
RNG rng(0);
@ -35,7 +24,6 @@ void TestSystem::run()
vector<Test*>::iterator it = tests_.begin();
for (; it != tests_.end(); ++it)
{
can_flush_ = false;
Test* test = *it;
cout << endl << test->name() << ":\n";
@ -82,6 +70,7 @@ void TestSystem::flush()
description_.str("");
cout << resetiosflags(ios_base::fixed | ios_base::left) << endl;
can_flush_ = false;
}

View File

@ -1,3 +1,6 @@
#ifndef OPENCV_GPU_SAMPLE_PERFORMANCE_H_
#define OPENCV_GPU_SAMPLE_PERFORMANCE_H_
#include <iostream>
#include <cstdio>
#include <vector>
@ -7,13 +10,10 @@
class Test
{
public:
Test(const std::string& name): name_(name) {}
explicit Test(const std::string& name): name_(name) {}
const std::string& name() const { return name_; }
void gen(cv::Mat& mat, int rows, int cols, int type,
cv::Scalar low, cv::Scalar high);
void gen(cv::Mat& mat, int rows, int cols, int type);
virtual void run() = 0;
@ -96,4 +96,6 @@ private:
#define CPU_OFF TestSystem::instance()->cpuOff()
#define GPU_OFF TestSystem::instance()->gpuOff()
#define SUBTEST TestSystem::instance()->subtest()
#define DESCRIPTION TestSystem::instance()->subtest()
#define DESCRIPTION TestSystem::instance()->subtest()
#endif // OPENCV_GPU_SAMPLE_PERFORMANCE_H_