generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1314 from jet47:ts-gpu-fix

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-21 11:56:29 +04:00 committed by OpenCV Buildbot
commit 7831a2d45c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/ts/src/precomp.hpp
View File

@ -1,6 +1,7 @@
#include "opencv2/core/core_c.h" #include "opencv2/core/core_c.h"
#include "opencv2/core/internal.hpp" #include "opencv2/core/internal.hpp"
#include "opencv2/ts/ts.hpp" #include "opencv2/ts/ts.hpp"
#include "cvconfig.h"
#ifdef GTEST_LINKED_AS_SHARED_LIBRARY #ifdef GTEST_LINKED_AS_SHARED_LIBRARY
#error ts module should not have GTEST_LINKED_AS_SHARED_LIBRARY defined #error ts module should not have GTEST_LINKED_AS_SHARED_LIBRARY defined

8
modules/ts/src/ts_perf.cpp
View File

@ -741,6 +741,14 @@ void TestBase::RecordRunParameters()
{ {
::testing::Test::RecordProperty("cv_implementation", param_impl); ::testing::Test::RecordProperty("cv_implementation", param_impl);
::testing::Test::RecordProperty("cv_num_threads", param_threads); ::testing::Test::RecordProperty("cv_num_threads", param_threads);
#ifdef HAVE_CUDA
if (param_impl == "cuda")
{
cv::gpu::DeviceInfo info(param_cuda_device);
::testing::Test::RecordProperty("cv_cuda_gpu", info.name());
}
#endif
} }
std::string TestBase::getSelectedImpl() std::string TestBase::getSelectedImpl()