renamed gpunvidia -> gpulegacy

modules/gpuarithm/CMakeLists.txt

@@ -6,7 +6,7 @@ set(the_description "GPU-accelerated Operations on Matrices")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
 
-ocv_define_module(gpuarithm opencv_core OPTIONAL opencv_gpunvidia opencv_imgproc)
+ocv_define_module(gpuarithm opencv_core OPTIONAL opencv_gpulegacy opencv_imgproc)
 
 if(HAVE_CUBLAS)
   CUDA_ADD_CUBLAS_TO_TARGET(${the_module})

modules/gpuarithm/src/arithm.cpp

@@ -824,7 +824,7 @@ void cv::gpu::integralBuffered(const GpuMat& src, GpuMat& sum, GpuMat& buffer, S
     }
     else
     {
-#ifndef HAVE_OPENCV_GPUNVIDIA
+#ifndef HAVE_OPENCV_GPULEGACY
     throw_no_cuda();
 #else
         sum.create(src.rows + 1, src.cols + 1, CV_32SC1);
@@ -856,7 +856,7 @@ void cv::gpu::integralBuffered(const GpuMat& src, GpuMat& sum, GpuMat& buffer, S
 
 void cv::gpu::sqrIntegral(const GpuMat& src, GpuMat& sqsum, Stream& s)
 {
-#ifndef HAVE_OPENCV_GPUNVIDIA
+#ifndef HAVE_OPENCV_GPULEGACY
     (void) src;
     (void) sqsum;
     (void) s;

modules/gpuarithm/src/precomp.hpp

@@ -53,9 +53,9 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPUNVIDIA
+#ifdef HAVE_OPENCV_GPULEGACY
-#  include "opencv2/gpunvidia.hpp"
+#  include "opencv2/gpulegacy.hpp"
-#  include "opencv2/gpunvidia/private.hpp"
+#  include "opencv2/gpulegacy/private.hpp"
 #endif
 
 #ifdef HAVE_CUBLAS

modules/gpulegacy/CMakeLists.txt

@@ -0,0 +1,9 @@
+if(NOT HAVE_CUDA)
+  ocv_module_disable(gpulegacy)
+endif()
+
+set(the_description "GPU-accelerated Computer Vision (legacy)")
+
+ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wuninitialized)
+
+ocv_define_module(gpulegacy opencv_core OPTIONAL opencv_objdetect)

modules/gpulegacy/include/opencv2/gpulegacy.hpp

@@ -40,13 +40,13 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPUNVIDIA_HPP__
+#ifndef __OPENCV_GPULEGACY_HPP__
-#define __OPENCV_GPUNVIDIA_HPP__
+#define __OPENCV_GPULEGACY_HPP__
 
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
-#include "opencv2/gpunvidia/NPP_staging.hpp"
+#include "opencv2/gpulegacy/NPP_staging.hpp"
-#include "opencv2/gpunvidia/NCVPyramid.hpp"
+#include "opencv2/gpulegacy/NCVPyramid.hpp"
-#include "opencv2/gpunvidia/NCVHaarObjectDetection.hpp"
+#include "opencv2/gpulegacy/NCVHaarObjectDetection.hpp"
-#include "opencv2/gpunvidia/NCVBroxOpticalFlow.hpp"
+#include "opencv2/gpulegacy/NCVBroxOpticalFlow.hpp"
 
-#endif /* __OPENCV_GPUNVIDIA_HPP__ */
+#endif /* __OPENCV_GPULEGACY_HPP__ */

modules/gpulegacy/include/opencv2/gpulegacy/NCVBroxOpticalFlow.hpp

@@ -60,7 +60,7 @@
 #ifndef _ncv_optical_flow_h_
 #define _ncv_optical_flow_h_
 
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
 
 /// \brief Model and solver parameters
 struct NCVBroxOpticalFlowDescriptor

modules/gpulegacy/include/opencv2/gpulegacy/NCVHaarObjectDetection.hpp

@@ -59,7 +59,7 @@
 #ifndef _ncvhaarobjectdetection_hpp_
 #define _ncvhaarobjectdetection_hpp_
 
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
 
 
 //==============================================================================

modules/gpulegacy/include/opencv2/gpulegacy/NCVPyramid.hpp

@@ -45,7 +45,17 @@
 
 #include <memory>
 #include <vector>
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
+#include "opencv2/core/cuda/common.hpp"
+
+namespace cv { namespace gpu { namespace cudev
+{
+    namespace pyramid
+    {
+        template <typename T> void kernelDownsampleX2_gpu(PtrStepSzb src, PtrStepSzb dst, cudaStream_t stream);
+        template <typename T> void kernelInterpolateFrom1_gpu(PtrStepSzb src, PtrStepSzb dst, cudaStream_t stream);
+    }
+}}}
 
 #if 0 //def _WIN32
 

modules/gpulegacy/include/opencv2/gpulegacy/NPP_staging.hpp

@@ -43,7 +43,7 @@
 #ifndef _npp_staging_hpp_
 #define _npp_staging_hpp_
 
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
 
 
 /**

modules/gpulegacy/include/opencv2/gpulegacy/private.hpp

@@ -41,8 +41,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_CORE_GPUNVIDIA_PRIVATE_HPP__
+#ifndef __OPENCV_CORE_GPULEGACY_PRIVATE_HPP__
-#define __OPENCV_CORE_GPUNVIDIA_PRIVATE_HPP__
+#define __OPENCV_CORE_GPULEGACY_PRIVATE_HPP__
 
 #ifndef __OPENCV_BUILD
 #  error this is a private header which should not be used from outside of the OpenCV library
@@ -51,10 +51,10 @@
 #include "opencv2/core/gpu_private.hpp"
 
 #ifndef HAVE_CUDA
-#  error gpunvidia module requires CUDA
+#  error gpulegacy module requires CUDA
 #endif
 
-#include "opencv2/gpunvidia.hpp"
+#include "opencv2/gpulegacy.hpp"
 
 namespace cv { namespace gpu
 {
@@ -93,4 +93,4 @@ namespace cv { namespace gpu
     #define ncvSafeCall(expr)  cv::gpu::checkNcvError(expr, __FILE__, __LINE__, "")
 #endif
 
-#endif // __OPENCV_CORE_GPUNVIDIA_PRIVATE_HPP__
+#endif // __OPENCV_CORE_GPULEGACY_PRIVATE_HPP__

modules/gpulegacy/src/cuda/NCV.cu

@@ -43,7 +43,7 @@
 #include <iostream>
 #include <vector>
 
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
 
 //===================================================================
 //

modules/gpulegacy/src/cuda/NCVAlg.hpp

@@ -43,7 +43,7 @@
 #ifndef _ncv_alg_hpp_
 #define _ncv_alg_hpp_
 
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
 
 
 template <class T>

modules/gpulegacy/src/cuda/NCVBroxOpticalFlow.cu

@@ -63,8 +63,8 @@
 
 #include "opencv2/core/cuda/utility.hpp"
 
-#include "opencv2/gpunvidia/NPP_staging.hpp"
+#include "opencv2/gpulegacy/NPP_staging.hpp"
-#include "opencv2/gpunvidia/NCVBroxOpticalFlow.hpp"
+#include "opencv2/gpulegacy/NCVBroxOpticalFlow.hpp"
 
 
 typedef NCVVectorAlloc<Ncv32f> FloatVector;

modules/gpulegacy/src/cuda/NCVHaarObjectDetection.cu

@@ -68,9 +68,9 @@
 #  include "opencv2/objdetect.hpp"
 #endif
 
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
-#include "opencv2/gpunvidia/NPP_staging.hpp"
+#include "opencv2/gpulegacy/NPP_staging.hpp"
-#include "opencv2/gpunvidia/NCVHaarObjectDetection.hpp"
+#include "opencv2/gpulegacy/NCVHaarObjectDetection.hpp"
 
 #include "NCVRuntimeTemplates.hpp"
 #include "NCVAlg.hpp"

modules/gpulegacy/src/cuda/NCVPixelOperations.hpp

@@ -45,7 +45,7 @@
 
 #include <limits.h>
 #include <float.h>
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
 
 template<typename TBase> inline __host__ __device__ TBase _pixMaxVal();
 template<> static inline __host__ __device__ Ncv8u  _pixMaxVal<Ncv8u>()  {return UCHAR_MAX;}

modules/gpulegacy/src/cuda/NCVPyramid.cu

@@ -45,8 +45,8 @@
 
 #include "opencv2/core/cuda/common.hpp"
 
-#include "opencv2/gpunvidia/NCV.hpp"
+#include "opencv2/gpulegacy/NCV.hpp"
-#include "opencv2/gpunvidia/NCVPyramid.hpp"
+#include "opencv2/gpulegacy/NCVPyramid.hpp"
 
 #include "NCVAlg.hpp"
 #include "NCVPixelOperations.hpp"

modules/gpulegacy/src/cuda/NPP_staging.cu

@@ -48,7 +48,7 @@
 #include "opencv2/core/cuda/warp.hpp"
 #include "opencv2/core/cuda/warp_shuffle.hpp"
 
-#include "opencv2/gpunvidia/NPP_staging.hpp"
+#include "opencv2/gpulegacy/NPP_staging.hpp"
 
 
 texture<Ncv8u,  1, cudaReadModeElementType> tex8u;

modules/gpulegacy/src/precomp.hpp

@@ -47,7 +47,7 @@
 #include <iostream>
 #include <algorithm>
 
-#include "opencv2/gpunvidia.hpp"
+#include "opencv2/gpulegacy.hpp"
 #include "opencv2/core/utility.hpp"
 
 #include "opencv2/opencv_modules.hpp"
@@ -57,6 +57,6 @@
 #endif
 
 #include "opencv2/core/gpu_private.hpp"
-#include "opencv2/gpunvidia/private.hpp"
+#include "opencv2/gpulegacy/private.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpulegacy/test/NCVTest.hpp

@@ -56,7 +56,7 @@
 
 #include <cuda_runtime.h>
 
-#include "opencv2/gpunvidia.hpp"
+#include "opencv2/gpulegacy.hpp"
 
 
 struct NCVTestReport

modules/gpulegacy/test/NCVTestSourceProvider.hpp

@@ -46,7 +46,7 @@
 #include <memory>
 
 #include "opencv2/highgui.hpp"
-#include "opencv2/gpunvidia.hpp"
+#include "opencv2/gpulegacy.hpp"
 
 
 template <class T>

modules/gpulegacy/test/test_nvidia.cpp

@@ -140,13 +140,12 @@ GPU_TEST_P(NCV, HypothesesFiltration)
 
 GPU_TEST_P(NCV, Visualization)
 {
-    // this functionality doesn't used in gpu module
     bool res = nvidia_NCV_Visualization(_path, nvidiaTestOutputLevel);
 
     ASSERT_TRUE(res);
 }
 
-INSTANTIATE_TEST_CASE_P(GPU_NVidia, NPPST, ALL_DEVICES);
+INSTANTIATE_TEST_CASE_P(GPU_Legacy, NPPST, ALL_DEVICES);
-INSTANTIATE_TEST_CASE_P(GPU_NVidia, NCV, ALL_DEVICES);
+INSTANTIATE_TEST_CASE_P(GPU_Legacy, NCV, ALL_DEVICES);
 
 #endif // HAVE_CUDA

modules/gpulegacy/test/test_precomp.hpp

@@ -69,7 +69,7 @@
 #include "opencv2/ts/gpu_test.hpp"
 
 #include "opencv2/core/gpumat.hpp"
-#include "opencv2/gpunvidia.hpp"
+#include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui.hpp"
 
 #include "opencv2/core/gpu_private.hpp"

modules/gpunvidia/CMakeLists.txt

@@ -1,9 +0,0 @@
-if(NOT HAVE_CUDA)
-  ocv_module_disable(gpunvidia)
-endif()
-
-set(the_description "GPU-accelerated Computer Vision (HAL module)")
-
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
-
-ocv_define_module(gpunvidia opencv_core OPTIONAL opencv_objdetect)

modules/gpuobjdetect/CMakeLists.txt

@@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Object Detection")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
 
-ocv_define_module(gpuobjdetect opencv_objdetect opencv_gpuimgproc OPTIONAL opencv_gpunvidia)
+ocv_define_module(gpuobjdetect opencv_objdetect opencv_gpuimgproc OPTIONAL opencv_gpulegacy)

modules/gpuobjdetect/src/precomp.hpp

@@ -53,8 +53,8 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPUNVIDIA
+#ifdef HAVE_OPENCV_GPULEGACY
-#  include "opencv2/gpunvidia/private.hpp"
+#  include "opencv2/gpulegacy/private.hpp"
 #endif
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpuvideo/CMakeLists.txt

@@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Video Analysis")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
 
-ocv_define_module(gpuvideo opencv_video opencv_legacy opencv_gpufilters opencv_gpuimgproc OPTIONAL opencv_gpunvidia)
+ocv_define_module(gpuvideo opencv_video opencv_legacy opencv_gpufilters opencv_gpuimgproc OPTIONAL opencv_gpulegacy)

modules/gpuvideo/src/precomp.hpp

@@ -57,8 +57,8 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPUNVIDIA
+#ifdef HAVE_OPENCV_GPULEGACY
-#  include "opencv2/gpunvidia/private.hpp"
+#  include "opencv2/gpulegacy/private.hpp"
 #endif
 
 #ifdef HAVE_CUDA

samples/gpu/CMakeLists.txt

@@ -2,7 +2,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope
                                      opencv_ml opencv_video opencv_objdetect opencv_features2d
                                      opencv_calib3d opencv_legacy opencv_contrib opencv_gpu
                                      opencv_nonfree opencv_softcascade opencv_superres
-                                     opencv_gpucodec opencv_gpuarithm opencv_gpufilters opencv_gpunvidia opencv_gpuimgproc opencv_gpufeatures2d opencv_gpuvideo opencv_gpuobjdetect
+                                     opencv_gpucodec opencv_gpuarithm opencv_gpufilters opencv_gpulegacy opencv_gpuimgproc opencv_gpufeatures2d opencv_gpuvideo opencv_gpuobjdetect
                                      opencv_gpucalib3d)
 
 ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})

samples/gpu/cascadeclassifier_nvidia_api.cpp

@@ -11,7 +11,7 @@
 #include "opencv2/objdetect/objdetect_c.h"
 
 #ifdef HAVE_CUDA
-#include "opencv2/gpunvidia.hpp"
+#include "opencv2/gpulegacy.hpp"
 #endif
 
 using namespace std;

samples/gpu/opticalflow_nvidia_api.cpp

@@ -16,7 +16,7 @@
 #include "opencv2/highgui/highgui_c.h"
 
 #ifdef HAVE_CUDA
-#include "opencv2/gpunvidia.hpp"
+#include "opencv2/gpulegacy.hpp"
 #endif
 
 #if !defined(HAVE_CUDA)