replaced gpu->cuda in files names

modules/cuda/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cuda.hpp"
 #include "opencv2/calib3d.hpp"

modules/cuda/test/test_precomp.hpp

@@ -54,7 +54,7 @@
 #include <fstream>
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cuda.hpp"
 #include "opencv2/core.hpp"

modules/cudaarithm/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudaarithm.hpp"
 #include "opencv2/core.hpp"

modules/cudaarithm/test/test_precomp.hpp

@@ -54,7 +54,7 @@
 #include <functional>
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudaarithm.hpp"
 #include "opencv2/core.hpp"

modules/cudabgsegm/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudabgsegm.hpp"
 #include "opencv2/video.hpp"

modules/cudabgsegm/test/test_precomp.hpp

@@ -54,7 +54,7 @@
 #include <fstream>
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudabgsegm.hpp"
 #include "opencv2/video.hpp"

modules/cudacodec/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudacodec.hpp"
 #include "opencv2/highgui.hpp"

modules/cudacodec/test/test_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudacodec.hpp"
 #include "opencv2/highgui.hpp"

modules/cudafeatures2d/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudafeatures2d.hpp"
 #include "opencv2/features2d.hpp"

modules/cudafeatures2d/test/test_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudafeatures2d.hpp"
 #include "opencv2/features2d.hpp"

modules/cudafilters/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudafilters.hpp"
 #include "opencv2/imgproc.hpp"

modules/cudafilters/test/test_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudafilters.hpp"
 #include "opencv2/imgproc.hpp"

modules/cudaimgproc/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudaimgproc.hpp"
 #include "opencv2/imgproc.hpp"

modules/cudaimgproc/test/test_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudaimgproc.hpp"
 #include "opencv2/imgproc.hpp"

modules/cudalegacy/test/test_precomp.hpp

@@ -66,7 +66,7 @@
 #include <fstream>
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/core/cuda.hpp"
 #include "opencv2/cudalegacy.hpp"

modules/cudaoptflow/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudaoptflow.hpp"
 #include "opencv2/video.hpp"

modules/cudaoptflow/test/test_precomp.hpp

@@ -54,7 +54,7 @@
 #include <fstream>
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudaoptflow.hpp"
 #include "opencv2/video.hpp"

modules/cudastereo/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudastereo.hpp"
 #include "opencv2/calib3d.hpp"

modules/cudastereo/test/test_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudastereo.hpp"
 #include "opencv2/calib3d.hpp"

modules/cudawarping/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudawarping.hpp"
 #include "opencv2/imgproc.hpp"

modules/cudawarping/test/test_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudawarping.hpp"
 #include "opencv2/imgproc.hpp"

modules/cudev/test/test_precomp.hpp

@@ -50,7 +50,7 @@
 #include "opencv2/cudev.hpp"
 
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "cvconfig.h"
 

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

@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_NONFREE_GPU_HPP__
-#define __OPENCV_NONFREE_GPU_HPP__
+#ifndef __OPENCV_NONFREE_CUDA_HPP__
+#define __OPENCV_NONFREE_CUDA_HPP__
 
 #include "opencv2/core/cuda.hpp"
 
@@ -123,4 +123,4 @@ public:
 
 }} // namespace cv { namespace cuda {
 
-#endif // __OPENCV_NONFREE_GPU_HPP__
+#endif // __OPENCV_NONFREE_CUDA_HPP__

modules/nonfree/perf/perf_main.cpp

 #include "perf_precomp.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 static const char * impls[] = {
 #ifdef HAVE_CUDA

modules/nonfree/perf/perf_precomp.hpp

@@ -21,7 +21,7 @@
 #endif
 
 #ifdef HAVE_CUDA
-#  include "opencv2/nonfree/gpu.hpp"
+#  include "opencv2/nonfree/cuda.hpp"
 #endif
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY

modules/nonfree/perf/perf_gpu.cpp → modules/nonfree/perf/perf_surf.cuda.cpp

@@ -44,7 +44,7 @@
 
 #ifdef HAVE_CUDA
 
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 using namespace std;
 using namespace testing;

modules/nonfree/src/precomp.hpp

@@ -49,7 +49,7 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
 
-#include "opencv2/nonfree/gpu.hpp"
+#include "opencv2/nonfree/cuda.hpp"
 #include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"

modules/nonfree/test/test_precomp.hpp

@@ -11,12 +11,12 @@
 
 #include <iostream>
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/nonfree.hpp"
 
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 #include "cvconfig.h"
@@ -26,7 +26,7 @@
 #endif
 
 #ifdef HAVE_CUDA
-#  include "opencv2/nonfree/gpu.hpp"
+#  include "opencv2/nonfree/cuda.hpp"
 #endif
 
 #endif

modules/photo/include/opencv2/photo/gpu.hpp → modules/photo/include/opencv2/photo/cuda.hpp

@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_PHOTO_GPU_HPP__
-#define __OPENCV_PHOTO_GPU_HPP__
+#ifndef __OPENCV_PHOTO_CUDA_HPP__
+#define __OPENCV_PHOTO_CUDA_HPP__
 
 #include "opencv2/core/cuda.hpp"
 
@@ -68,4 +68,4 @@ private:
 
 }} // namespace cv { namespace cuda {
 
-#endif /* __OPENCV_PHOTO_GPU_HPP__ */
+#endif /* __OPENCV_PHOTO_CUDA_HPP__ */

modules/photo/perf/perf_gpu.cpp → modules/photo/perf/perf_cuda.cpp

@@ -42,8 +42,8 @@
 
 #include "perf_precomp.hpp"
 
-#include "opencv2/photo/gpu.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/photo/cuda.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/photo/perf/perf_main.cpp

 #include "perf_precomp.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 static const char * impls[] = {
 #ifdef HAVE_CUDA

modules/photo/src/denoising_gpu.cpp → modules/photo/src/denoising.cuda.cpp

@@ -42,7 +42,7 @@
 
 #include "precomp.hpp"
 
-#include "opencv2/photo/gpu.hpp"
+#include "opencv2/photo/cuda.hpp"
 #include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"

modules/photo/test/test_denoising_gpu.cpp → modules/photo/test/test_denoising.cuda.cpp

@@ -42,8 +42,8 @@
 
 #include "test_precomp.hpp"
 
-#include "opencv2/photo/gpu.hpp"
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/photo/cuda.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 #include "cvconfig.h"

modules/softcascade/perf/perf_main.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include "perf_precomp.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 
 static const char * impls[] = {
 #ifdef HAVE_CUDA

modules/stitching/include/opencv2/stitching/detail/matchers.hpp

@@ -49,7 +49,7 @@
 #include "opencv2/opencv_modules.hpp"
 
 #ifdef HAVE_OPENCV_NONFREE
-#  include "opencv2/nonfree/gpu.hpp"
+#  include "opencv2/nonfree/cuda.hpp"
 #endif
 
 namespace cv {

modules/stitching/src/precomp.hpp

@@ -85,7 +85,7 @@
 #endif
 
 #ifdef HAVE_OPENCV_NONFREE
-#  include "opencv2/nonfree/gpu.hpp"
+#  include "opencv2/nonfree/cuda.hpp"
 #endif
 
 #include "../../imgproc/src/gcgraph.hpp"

modules/superres/perf/perf_precomp.hpp

@@ -54,7 +54,7 @@
 #include "opencv2/core.hpp"
 #include "opencv2/core/cuda.hpp"
 #include "opencv2/ts.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 #include "opencv2/superres.hpp"
 #include "opencv2/superres/optical_flow.hpp"
 

modules/ts/include/opencv2/ts/gpu_perf.hpp → modules/ts/include/opencv2/ts/cuda_perf.hpp

@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPU_PERF_UTILITY_HPP__
-#define __OPENCV_GPU_PERF_UTILITY_HPP__
+#ifndef __OPENCV_CUDA_PERF_UTILITY_HPP__
+#define __OPENCV_CUDA_PERF_UTILITY_HPP__
 
 #include "opencv2/core.hpp"
 #include "opencv2/highgui.hpp"
@@ -124,4 +124,4 @@ namespace perf
 #endif
 }
 
-#endif // __OPENCV_GPU_PERF_UTILITY_HPP__
+#endif // __OPENCV_CUDA_PERF_UTILITY_HPP__

modules/ts/include/opencv2/ts/gpu_test.hpp → modules/ts/include/opencv2/ts/cuda_test.hpp

@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPU_TEST_UTILITY_HPP__
-#define __OPENCV_GPU_TEST_UTILITY_HPP__
+#ifndef __OPENCV_CUDA_TEST_UTILITY_HPP__
+#define __OPENCV_CUDA_TEST_UTILITY_HPP__
 
 #include <stdexcept>
 #include "cvconfig.h"
@@ -410,4 +410,4 @@ namespace cv { namespace cuda
 #endif // HAVE_CUDA
 
 
-#endif // __OPENCV_GPU_TEST_UTILITY_HPP__
+#endif // __OPENCV_CUDA_TEST_UTILITY_HPP__

modules/ts/src/gpu_perf.cpp → modules/ts/src/cuda_perf.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include "precomp.hpp"
-#include "opencv2/ts/gpu_perf.hpp"
+#include "opencv2/ts/cuda_perf.hpp"
 #include "opencv2/core/cuda.hpp"
 
 #ifdef HAVE_CUDA

modules/ts/src/gpu_test.cpp → modules/ts/src/cuda_test.cpp

@@ -40,7 +40,7 @@
 //
 //M*/
 
-#include "opencv2/ts/gpu_test.hpp"
+#include "opencv2/ts/cuda_test.hpp"
 #include <stdexcept>
 
 using namespace cv;

samples/gpu/performance/tests.cpp

@@ -18,7 +18,7 @@
 #include "opencv2/opencv_modules.hpp"
 
 #ifdef HAVE_OPENCV_NONFREE
-#include "opencv2/nonfree/gpu.hpp"
+#include "opencv2/nonfree/cuda.hpp"
 #include "opencv2/nonfree/nonfree.hpp"
 #endif
 

samples/gpu/surf_keypoint_matcher.cpp

@@ -8,7 +8,7 @@
 #include "opencv2/features2d/features2d.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/cudafeatures2d.hpp"
-#include "opencv2/nonfree/gpu.hpp"
+#include "opencv2/nonfree/cuda.hpp"
 
 using namespace std;
 using namespace cv;