fixed gpu-vs-cpu performance tests

This commit is contained in:
Vladislav Vinogradov 2012-05-22 11:27:45 +00:00
parent 61fd5ed0e1
commit 9bddac1099
4 changed files with 6 additions and 6 deletions

View File

@ -596,6 +596,6 @@ GPU_PERF_TEST(GEMM, cv::gpu::DeviceInfo, cv::Size)
INSTANTIATE_TEST_CASE_P(Arithm, GEMM, testing::Combine( INSTANTIATE_TEST_CASE_P(Arithm, GEMM, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
testing::Values(cv::Size(512, 512), cv::Size(1024, 1024), cv::Size(2048, 2048)))); testing::Values(cv::Size(512, 512), cv::Size(1024, 1024))));
#endif #endif

View File

@ -100,7 +100,7 @@ GPU_PERF_TEST_1(SURF, cv::gpu::DeviceInfo)
cv::SURF surf; cv::SURF surf;
declare.time(10.0); declare.time(30.0);
TEST_CYCLE() TEST_CYCLE()
{ {

View File

@ -79,7 +79,7 @@ GPU_PERF_TEST(LinearFilter, cv::gpu::DeviceInfo, cv::Size, perf::MatType, int)
cv::Ptr<cv::FilterEngine> filter = cv::createLinearFilter(type, type, cv::Mat::ones(ksize, ksize, CV_8U)); cv::Ptr<cv::FilterEngine> filter = cv::createLinearFilter(type, type, cv::Mat::ones(ksize, ksize, CV_8U));
declare.time(1.0); declare.time(10.0);
TEST_CYCLE() TEST_CYCLE()
{ {
@ -111,7 +111,7 @@ GPU_PERF_TEST(SeparableLinearFilter, cv::gpu::DeviceInfo, cv::Size, perf::MatTyp
cv::Mat kernel = cv::getGaussianKernel(ksize, 0.5, CV_32F); cv::Mat kernel = cv::getGaussianKernel(ksize, 0.5, CV_32F);
cv::Ptr<cv::FilterEngine> filter = cv::createSeparableLinearFilter(type, type, kernel, kernel); cv::Ptr<cv::FilterEngine> filter = cv::createSeparableLinearFilter(type, type, kernel, kernel);
declare.time(1.0); declare.time(10.0);
TEST_CYCLE() TEST_CYCLE()
{ {

View File

@ -45,7 +45,7 @@ GPU_PERF_TEST_1(MeanShiftFiltering, cv::gpu::DeviceInfo)
cv::Mat dst; cv::Mat dst;
declare.time(15.0); declare.time(100.0);
TEST_CYCLE() TEST_CYCLE()
{ {
@ -133,7 +133,7 @@ GPU_PERF_TEST(Threshold, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
INSTANTIATE_TEST_CASE_P(ImgProc, Threshold, testing::Combine( INSTANTIATE_TEST_CASE_P(ImgProc, Threshold, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1))); testing::Values(CV_8UC1, CV_32FC1)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Resize // Resize