提交 9f33de70 编写于 作者: V Vladislav Vinogradov

added cvconfig.hpp header file to gpu tests

it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
上级 473ca084
......@@ -52,4 +52,6 @@
#include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp"
#include "cvconfig.h"
#endif
......@@ -62,4 +62,6 @@
#include "opencv2/calib3d.hpp"
#include "opencv2/objdetect.hpp"
#include "cvconfig.h"
#endif
......@@ -60,4 +60,6 @@
#include "opencv2/core.hpp"
#include "opencv2/imgproc.hpp"
#include "cvconfig.h"
#endif
......@@ -60,5 +60,6 @@
#include "opencv2/video.hpp"
#include "opencv2/opencv_modules.hpp"
#include "cvconfig.h"
#endif
......@@ -57,4 +57,6 @@
#include "opencv2/gpucodec.hpp"
#include "opencv2/highgui.hpp"
#include "cvconfig.h"
#endif
......@@ -57,4 +57,6 @@
#include "opencv2/gpufeatures2d.hpp"
#include "opencv2/features2d.hpp"
#include "cvconfig.h"
#endif
......@@ -57,4 +57,6 @@
#include "opencv2/gpufilters.hpp"
#include "opencv2/imgproc.hpp"
#include "cvconfig.h"
#endif
......@@ -57,4 +57,6 @@
#include "opencv2/gpuimgproc.hpp"
#include "opencv2/imgproc.hpp"
#include "cvconfig.h"
#endif
......@@ -74,6 +74,8 @@
#include "opencv2/core/private.gpu.hpp"
#include "cvconfig.h"
#include "NCVTest.hpp"
#include "NCVAutoTestLister.hpp"
#include "NCVTestSourceProvider.hpp"
......
......@@ -59,4 +59,6 @@
#include "opencv2/gpuoptflow.hpp"
#include "opencv2/video.hpp"
#include "cvconfig.h"
#endif
......@@ -57,4 +57,6 @@
#include "opencv2/gpustereo.hpp"
#include "opencv2/calib3d.hpp"
#include "cvconfig.h"
#endif
......@@ -57,6 +57,8 @@
#include "opencv2/gpuwarping.hpp"
#include "opencv2/imgproc.hpp"
#include "cvconfig.h"
#include "interpolation.hpp"
#endif
......@@ -14,6 +14,7 @@
#include "opencv2/highgui.hpp"
#include "opencv2/opencv_modules.hpp"
#include "cvconfig.h"
#ifdef HAVE_OPENCV_OCL
# include "opencv2/nonfree/ocl.hpp"
......
......@@ -19,6 +19,7 @@
#include "opencv2/ts/gpu_test.hpp"
#include "opencv2/opencv_modules.hpp"
#include "cvconfig.h"
#ifdef HAVE_OPENCV_OCL
# include "opencv2/nonfree/ocl.hpp"
......
......@@ -46,6 +46,7 @@
#include "opencv2/ts/gpu_test.hpp"
#include "opencv2/opencv_modules.hpp"
#include "cvconfig.h"
#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUIMGPROC)
......
......@@ -313,4 +313,4 @@ INSTANTIATE_TEST_CASE_P(cuda_accelerated, SCascadeTestAll, testing::Combine( ALL
testing::Values(Fixture("cascades/inria_caltech-17.01.2013.xml", 7),
Fixture("cascades/sc_cvpr_2012_to_opencv_new_format.xml", 1291))));
#endif
\ No newline at end of file
#endif
......@@ -51,10 +51,11 @@
#ifndef __OPENCV_TEST_PRECOMP_HPP__
#define __OPENCV_TEST_PRECOMP_HPP__
# include "opencv2/ts.hpp"
# include "opencv2/softcascade.hpp"
# include "opencv2/imgproc.hpp"
# include "opencv2/highgui.hpp"
# include "utility.hpp"
#include "opencv2/ts.hpp"
#include "opencv2/softcascade.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "cvconfig.h"
#include "utility.hpp"
#endif
......@@ -56,6 +56,7 @@
#include "opencv2/imgproc.hpp"
#include "opencv2/ts.hpp"
#include "opencv2/superres.hpp"
#include "cvconfig.h"
#include "input_array_utility.hpp"
#endif
......@@ -274,12 +274,16 @@ TEST_F(SuperResolution, BTVL1_GPU)
{
RunTest(cv::superres::createSuperResolution_BTVL1_GPU());
}
#endif
#if defined(HAVE_OPENCV_OCL) && defined(HAVE_OPENCL)
TEST_F(SuperResolution, BTVL1_OCL)
{
std::vector<cv::ocl::Info> infos;
cv::ocl::getDevice(infos);
RunTest(cv::superres::createSuperResolution_BTVL1_OCL());
}
#endif
#endif
......@@ -47,6 +47,7 @@
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/ts/ts_perf.hpp"
#include "cvconfig.h"
namespace perf
{
......
......@@ -44,6 +44,7 @@
#define __OPENCV_GPU_TEST_UTILITY_HPP__
#include <stdexcept>
#include "cvconfig.h"
#include "opencv2/core.hpp"
#include "opencv2/core/gpu.hpp"
#include "opencv2/highgui.hpp"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册