Revert "Merge pull request #836 from jet47:gpu-modules"

This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.

modules/nonfree/CMakeLists.txt

@@ -3,5 +3,4 @@ if(BUILD_ANDROID_PACKAGE)
 endif()
 
 set(the_description "Functionality with possible limitations on the use")
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
-ocv_define_module(nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_gpuarithm opencv_ocl)
+ocv_define_module(nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_gpu opencv_ocl)

modules/nonfree/include/opencv2/nonfree/gpu.hpp

@@ -43,7 +43,11 @@
 #ifndef __OPENCV_NONFREE_GPU_HPP__
 #define __OPENCV_NONFREE_GPU_HPP__
 
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/opencv_modules.hpp"
+
+#if defined(HAVE_OPENCV_GPU)
+
+#include "opencv2/gpu.hpp"
 
 namespace cv { namespace gpu {
 
@@ -156,6 +160,10 @@ private:
     GpuMat samples_;
 };
 
-}} // namespace cv { namespace gpu {
+} // namespace gpu
+
+} // namespace cv
+
+#endif // defined(HAVE_OPENCV_GPU)
 
 #endif // __OPENCV_NONFREE_GPU_HPP__

modules/nonfree/perf/perf_gpu.cpp

@@ -42,7 +42,7 @@
 
 #include "perf_precomp.hpp"
 
-#ifdef HAVE_CUDA
+#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
 
 #include "opencv2/ts/gpu_perf.hpp"
 
@@ -65,8 +65,6 @@ using namespace perf;
 //////////////////////////////////////////////////////////////////////
 // SURF
 
-#ifdef HAVE_OPENCV_GPUARITHM
-
 DEF_PARAM_TEST_1(Image, string);
 
 PERF_TEST_P(Image, GPU_SURF,
@@ -110,8 +108,6 @@ PERF_TEST_P(Image, GPU_SURF,
     }
 }
 
-#endif // HAVE_OPENCV_GPUARITHM
-
 //////////////////////////////////////////////////////
 // VIBE
 
@@ -181,6 +177,6 @@ PERF_TEST_P(Video_Cn, GPU_VIBE,
     }
 }
 
-#endif // BUILD_WITH_VIDEO_INPUT_SUPPORT
+#endif
 
-#endif // HAVE_CUDA
+#endif

modules/nonfree/perf/perf_precomp.hpp

@@ -19,8 +19,9 @@
 #  include "opencv2/nonfree/ocl.hpp"
 #endif
 
-#ifdef HAVE_CUDA
-#  include "opencv2/nonfree/gpu.hpp"
+#ifdef HAVE_OPENCV_GPU
+    #include "opencv2/nonfree/gpu.hpp"
+    #include "opencv2/ts/gpu_perf.hpp"
 #endif
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY

modules/nonfree/src/cuda/surf.cu

@@ -42,7 +42,7 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPUARITHM
+#ifdef HAVE_OPENCV_GPU
 
 #include "opencv2/core/cuda/common.hpp"
 #include "opencv2/core/cuda/limits.hpp"
@@ -957,4 +957,5 @@ namespace cv { namespace gpu { namespace cudev
     } // namespace surf
 }}} // namespace cv { namespace gpu { namespace cudev
 
-#endif // HAVE_OPENCV_GPUARITHM
+
+#endif /* CUDA_DISABLER */

modules/nonfree/src/cuda/vibe.cu

@@ -40,6 +40,10 @@
 //
 //M*/
 
+#include "opencv2/opencv_modules.hpp"
+
+#ifdef HAVE_OPENCV_GPU
+
 #include "opencv2/core/cuda/common.hpp"
 
 namespace cv { namespace gpu { namespace cudev
@@ -263,3 +267,5 @@ namespace cv { namespace gpu { namespace cudev
         }
     }
 }}}
+
+#endif

modules/nonfree/src/precomp.hpp

@@ -49,13 +49,11 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
 
-#include "opencv2/nonfree/gpu.hpp"
-#include "opencv2/core/gpu_private.hpp"
-
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPUARITHM
-#  include "opencv2/gpuarithm.hpp"
+#ifdef HAVE_OPENCV_GPU
+#  include "opencv2/nonfree/gpu.hpp"
+#  include "opencv2/core/gpu_private.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_OCL

modules/nonfree/src/surf_gpu.cpp

@@ -42,10 +42,12 @@
 
 #include "precomp.hpp"
 
+#if defined(HAVE_OPENCV_GPU)
+
 using namespace cv;
 using namespace cv::gpu;
 
-#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_GPUARITHM)
+#if !defined (HAVE_CUDA)
 
 cv::gpu::SURF_GPU::SURF_GPU() { throw_no_cuda(); }
 cv::gpu::SURF_GPU::SURF_GPU(double, int, int, bool, float, bool) { throw_no_cuda(); }
@@ -142,13 +144,13 @@ namespace
 
             bindImgTex(img);
 
-            gpu::integralBuffered(img, surf_.sum, surf_.intBuffer);
+            integralBuffered(img, surf_.sum, surf_.intBuffer);
             sumOffset = bindSumTex(surf_.sum);
 
             if (use_mask)
             {
                 min(mask, 1.0, surf_.mask1);
-                gpu::integralBuffered(surf_.mask1, surf_.maskSum, surf_.intBuffer);
+                integralBuffered(surf_.mask1, surf_.maskSum, surf_.intBuffer);
                 maskOffset = bindMaskSumTex(surf_.maskSum);
             }
         }
@@ -419,3 +421,5 @@ void cv::gpu::SURF_GPU::releaseMemory()
 }
 
 #endif // !defined (HAVE_CUDA)
+
+#endif // defined(HAVE_OPENCV_GPU)

modules/nonfree/src/vibe_gpu.cpp

@@ -42,7 +42,9 @@
 
 #include "precomp.hpp"
 
-#ifndef HAVE_CUDA
+#if defined(HAVE_OPENCV_GPU)
+
+#if !defined HAVE_CUDA || defined(CUDA_DISABLER)
 
 cv::gpu::VIBE_GPU::VIBE_GPU(unsigned long) { throw_no_cuda(); }
 void cv::gpu::VIBE_GPU::initialize(const GpuMat&, Stream&) { throw_no_cuda(); }
@@ -135,3 +137,5 @@ void cv::gpu::VIBE_GPU::release()
 }
 
 #endif
+
+#endif // defined(HAVE_OPENCV_GPU)

modules/nonfree/test/test_gpu.cpp

@@ -42,15 +42,13 @@
 
 #include "test_precomp.hpp"
 
-#ifdef HAVE_CUDA
+#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
 
 using namespace cvtest;
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // SURF
 
-#ifdef HAVE_OPENCV_GPUARITHM
-
 namespace
 {
     IMPLEMENT_PARAM_CLASS(SURF_HessianThreshold, double)
@@ -193,8 +191,6 @@ INSTANTIATE_TEST_CASE_P(GPU_Features2D, SURF, testing::Combine(
     testing::Values(SURF_Extended(false), SURF_Extended(true)),
     testing::Values(SURF_Upright(false), SURF_Upright(true))));
 
-#endif // HAVE_OPENCV_GPUARITHM
-
 //////////////////////////////////////////////////////
 // VIBE
 
@@ -233,4 +229,4 @@ INSTANTIATE_TEST_CASE_P(GPU_Video, VIBE, testing::Combine(
     testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4)),
     WHOLE_SUBMAT));
 
-#endif // HAVE_CUDA
+#endif

modules/nonfree/test/test_precomp.hpp

@@ -24,7 +24,7 @@
 #  include "opencv2/nonfree/ocl.hpp"
 #endif
 
-#ifdef HAVE_CUDA
+#ifdef HAVE_OPENCV_GPU
 #  include "opencv2/nonfree/gpu.hpp"
 #endif