From b7ec673001731dd07789a2fdcce8f79c9134ac56 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 21 Aug 2013 10:00:40 +0400 Subject: [PATCH 1/2] added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros --- modules/ts/src/precomp.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ts/src/precomp.hpp b/modules/ts/src/precomp.hpp index a74417da47..1133978f95 100644 --- a/modules/ts/src/precomp.hpp +++ b/modules/ts/src/precomp.hpp @@ -1,6 +1,7 @@ #include "opencv2/core/core_c.h" #include "opencv2/core/internal.hpp" #include "opencv2/ts/ts.hpp" +#include "cvconfig.h" #ifdef GTEST_LINKED_AS_SHARED_LIBRARY #error ts module should not have GTEST_LINKED_AS_SHARED_LIBRARY defined From 2899d558acfe861569ee5cb6766f56b82667701a Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 21 Aug 2013 10:12:44 +0400 Subject: [PATCH 2/2] record cuda gpu name to output report --- modules/ts/src/ts_perf.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp index d84db18866..f36ff09dfe 100644 --- a/modules/ts/src/ts_perf.cpp +++ b/modules/ts/src/ts_perf.cpp @@ -741,6 +741,14 @@ void TestBase::RecordRunParameters() { ::testing::Test::RecordProperty("cv_implementation", param_impl); ::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()