From f88be98ec4ef5b1c1b45f50c3b1d2dd95a043cd2 Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Wed, 10 Oct 2012 13:36:24 +0400 Subject: [PATCH] print information message about target device for GPU module tests --- modules/gpu/perf/utility.cpp | 2 -- modules/gpu/perf/utility.hpp | 2 -- modules/ts/src/ts_perf.cpp | 5 +++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/gpu/perf/utility.cpp b/modules/gpu/perf/utility.cpp index 0c8c926..2808b85 100644 --- a/modules/gpu/perf/utility.cpp +++ b/modules/gpu/perf/utility.cpp @@ -4,8 +4,6 @@ using namespace std; using namespace cv; using namespace cv::gpu; -bool runOnGpu = true; - void fillRandom(Mat& m, double a, double b) { RNG rng(123456789); diff --git a/modules/gpu/perf/utility.hpp b/modules/gpu/perf/utility.hpp index 7aaaa24..6ce031a 100644 --- a/modules/gpu/perf/utility.hpp +++ b/modules/gpu/perf/utility.hpp @@ -6,8 +6,6 @@ #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/ts/ts_perf.hpp" -extern bool runOnGpu; - void fillRandom(cv::Mat& m, double a = 0.0, double b = 255.0); cv::Mat readImage(const std::string& fileName, int flags = cv::IMREAD_COLOR); diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp index 0a04743..61081b1 100644 --- a/modules/ts/src/ts_perf.cpp +++ b/modules/ts/src/ts_perf.cpp @@ -618,6 +618,11 @@ void TestBase::Init(int argc, const char* const argv[]) #ifdef HAVE_CUDA param_run_cpu = args.has("perf_run_cpu"); + + if (param_run_cpu) + printf("[----------]\n[ GPU INFO ] \tRun test suite on CPU.\n[----------]\n"), fflush(stdout); + else + printf("[----------]\n[ GPU INFO ] \tRun test suite on GPU.\n[----------]\n"), fflush(stdout); #endif if (!args.check()) -- 2.7.4