Commit 35b671ef authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

disabled utility code in gpu tests when WITH_CUDA=false

parent fd77ef7e
#ifndef __main_test_nvidia_h__ #ifndef __main_test_nvidia_h__
#define __main_test_nvidia_h__ #define __main_test_nvidia_h__
#include <string>
enum OutputLevel enum OutputLevel
{ {
OutputLevelNone, OutputLevelNone,
......
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
using namespace cvtest; using namespace cvtest;
using namespace testing; using namespace testing;
OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;
struct NVidiaTest : TestWithParam<cv::gpu::DeviceInfo> struct NVidiaTest : TestWithParam<cv::gpu::DeviceInfo>
{ {
cv::gpu::DeviceInfo devInfo; cv::gpu::DeviceInfo devInfo;
......
...@@ -61,24 +61,24 @@ ...@@ -61,24 +61,24 @@
#include "cvconfig.h" #include "cvconfig.h"
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/video.hpp"
#include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/legacy/legacy.hpp"
#include "utility.hpp"
#include "interpolation.hpp"
#include "main_test_nvidia.h"
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
#include <cuda.h> #include <cuda.h>
#include <cuda_runtime.h> #include <cuda_runtime.h>
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/video.hpp"
#include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/legacy/legacy.hpp"
#include "utility.hpp"
#include "interpolation.hpp"
#include "main_test_nvidia.h"
#endif #endif
#endif #endif
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_CUDA
using namespace std; using namespace std;
using namespace cv; using namespace cv;
using namespace cv::gpu; using namespace cv::gpu;
...@@ -418,3 +420,5 @@ void showDiff(InputArray gold_, InputArray actual_, double eps) ...@@ -418,3 +420,5 @@ void showDiff(InputArray gold_, InputArray actual_, double eps)
waitKey(); waitKey();
} }
#endif // HAVE_CUDA
...@@ -42,14 +42,6 @@ ...@@ -42,14 +42,6 @@
#ifndef __OPENCV_TEST_UTILITY_HPP__ #ifndef __OPENCV_TEST_UTILITY_HPP__
#define __OPENCV_TEST_UTILITY_HPP__ #define __OPENCV_TEST_UTILITY_HPP__
#include <vector>
#include <string>
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp"
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// random generators // random generators
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment