renmaed gpu module -> cuda

samples/cpp/stitching_detailed.cpp

@@ -617,7 +617,7 @@ int main(int argc, char* argv[])
         seam_finder = new detail::VoronoiSeamFinder();
     else if (seam_find_type == "gc_color")
     {
-#ifdef HAVE_OPENCV_GPU
+#ifdef HAVE_OPENCV_CUDA
         if (try_gpu && cuda::getCudaEnabledDeviceCount() > 0)
             seam_finder = new detail::GraphCutSeamFinderGpu(GraphCutSeamFinderBase::COST_COLOR);
         else
@@ -626,7 +626,7 @@ int main(int argc, char* argv[])
     }
     else if (seam_find_type == "gc_colorgrad")
     {
-#ifdef HAVE_OPENCV_GPU
+#ifdef HAVE_OPENCV_CUDA
         if (try_gpu && cuda::getCudaEnabledDeviceCount() > 0)
             seam_finder = new detail::GraphCutSeamFinderGpu(GraphCutSeamFinderBase::COST_COLOR_GRAD);
         else

samples/cpp/videostab.cpp

@@ -216,7 +216,7 @@ public:
             outlierRejector = tblor;
         }
 
-#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW)
+#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_CUDA) && defined(HAVE_OPENCV_CUDAOPTFLOW)
         if (gpu)
         {
             KeypointBasedMotionEstimatorGpu *kbest = new KeypointBasedMotionEstimatorGpu(est);
@@ -257,7 +257,7 @@ public:
             outlierRejector = tblor;
         }
 
-#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW)
+#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_CUDA) && defined(HAVE_OPENCV_CUDAOPTFLOW)
         if (gpu)
         {
             KeypointBasedMotionEstimatorGpu *kbest = new KeypointBasedMotionEstimatorGpu(est);
@@ -342,7 +342,7 @@ int main(int argc, const char **argv)
             return 0;
         }
 
-#ifdef HAVE_OPENCV_GPU
+#ifdef HAVE_OPENCV_CUDA
         if (arg("gpu") == "yes")
         {
             cout << "initializing GPU..."; cout.flush();
@@ -420,7 +420,7 @@ int main(int argc, const char **argv)
             {
                 MoreAccurateMotionWobbleSuppressorBase *ws = new MoreAccurateMotionWobbleSuppressor();
                 if (arg("gpu") == "yes")
-#ifdef HAVE_OPENCV_GPU
+#ifdef HAVE_OPENCV_CUDA
                     ws = new MoreAccurateMotionWobbleSuppressorGpu();
 #else
                     throw runtime_error("OpenCV is built without GPU support");

samples/gpu/CMakeLists.txt

@@ -1,6 +1,6 @@
 SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc opencv_highgui
                                      opencv_ml opencv_video opencv_objdetect opencv_features2d
-                                     opencv_calib3d opencv_legacy opencv_contrib opencv_gpu
+                                     opencv_calib3d opencv_legacy opencv_contrib opencv_cuda
                                      opencv_nonfree opencv_softcascade opencv_superres
                                      opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_cudaimgproc
                                      opencv_cudafeatures2d opencv_cudaoptflow opencv_cudabgsegm

samples/gpu/cascadeclassifier.cpp

@@ -10,7 +10,7 @@
 #include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/gpu.hpp"
+#include "opencv2/cuda.hpp"
 #include "opencv2/cudaimgproc.hpp"
 #include "opencv2/cudawarping.hpp"
 

samples/gpu/hog.cpp

@@ -5,7 +5,7 @@
 #include <iomanip>
 #include <stdexcept>
 #include <opencv2/core/utility.hpp>
-#include "opencv2/gpu.hpp"
+#include "opencv2/cuda.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/objdetect.hpp"
 #include "opencv2/imgproc.hpp"

samples/gpu/performance/performance.h

@@ -7,7 +7,7 @@
 #include <numeric>
 #include <string>
 #include <opencv2/core/utility.hpp>
-#include "opencv2/gpu.hpp"
+#include "opencv2/cuda.hpp"
 
 #define TAB "    "
 

samples/gpu/performance/tests.cpp

@@ -3,7 +3,7 @@
 #include "opencv2/highgui.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/video.hpp"
-#include "opencv2/gpu.hpp"
+#include "opencv2/cuda.hpp"
 #include "opencv2/cudaimgproc.hpp"
 #include "opencv2/cudaarithm.hpp"
 #include "opencv2/cudawarping.hpp"

samples/gpu/softcascade.cpp

@@ -1,5 +1,5 @@
 #include <opencv2/core/utility.hpp>
-#include <opencv2/gpu.hpp>
+#include <opencv2/cuda.hpp>
 #include <opencv2/softcascade.hpp>
 #include <opencv2/highgui.hpp>
 #include <iostream>