From 8282f6ebc1aeea83b18cb21e45660bed5c81ec68 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 23 Jul 2013 11:33:51 +0400 Subject: [PATCH] renamed gpu::cudev namespace -> cuda::device cudev is used for new device layer --- .../core/include/opencv2/core/cuda/block.hpp | 2 +- .../opencv2/core/cuda/border_interpolate.hpp | 2 +- .../core/include/opencv2/core/cuda/color.hpp | 2 +- .../core/include/opencv2/core/cuda/common.hpp | 2 +- .../opencv2/core/cuda/datamov_utils.hpp | 2 +- .../opencv2/core/cuda/detail/color_detail.hpp | 68 ++++---- .../opencv2/core/cuda/detail/reduce.hpp | 2 +- .../core/cuda/detail/reduce_key_val.hpp | 2 +- .../core/cuda/detail/transform_detail.hpp | 2 +- .../core/cuda/detail/type_traits_detail.hpp | 2 +- .../core/cuda/detail/vec_distance_detail.hpp | 2 +- .../opencv2/core/cuda/dynamic_smem.hpp | 2 +- .../include/opencv2/core/cuda/emulation.hpp | 2 +- .../include/opencv2/core/cuda/filters.hpp | 2 +- .../include/opencv2/core/cuda/funcattrib.hpp | 2 +- .../include/opencv2/core/cuda/functional.hpp | 2 +- .../core/include/opencv2/core/cuda/limits.hpp | 2 +- .../core/include/opencv2/core/cuda/reduce.hpp | 2 +- .../opencv2/core/cuda/saturate_cast.hpp | 2 +- .../core/include/opencv2/core/cuda/scan.hpp | 6 +- .../opencv2/core/cuda/simd_functions.hpp | 2 +- .../include/opencv2/core/cuda/transform.hpp | 2 +- .../include/opencv2/core/cuda/type_traits.hpp | 2 +- .../include/opencv2/core/cuda/utility.hpp | 2 +- .../opencv2/core/cuda/vec_distance.hpp | 2 +- .../include/opencv2/core/cuda/vec_math.hpp | 2 +- .../include/opencv2/core/cuda/vec_traits.hpp | 2 +- .../core/include/opencv2/core/cuda/warp.hpp | 2 +- .../include/opencv2/core/cuda/warp_reduce.hpp | 2 +- .../opencv2/core/cuda/warp_shuffle.hpp | 2 +- modules/gpu/src/calib3d.cpp | 4 +- modules/gpu/src/cascadeclassifier.cpp | 6 +- modules/gpu/src/cuda/calib3d.cu | 6 +- modules/gpu/src/cuda/ccomponetns.cu | 2 +- modules/gpu/src/cuda/global_motion.cu | 2 +- modules/gpu/src/cuda/hog.cu | 2 +- modules/gpu/src/cuda/lbp.cu | 2 +- modules/gpu/src/cuda/lbp.hpp | 2 +- modules/gpu/src/global_motion.cpp | 6 +- modules/gpu/src/graphcuts.cpp | 12 +- modules/gpu/src/hog.cpp | 4 +- modules/gpuarithm/src/arithm.cpp | 8 +- modules/gpuarithm/src/core.cpp | 10 +- modules/gpuarithm/src/cuda/absdiff_mat.cu | 10 +- modules/gpuarithm/src/cuda/absdiff_scalar.cu | 6 +- modules/gpuarithm/src/cuda/add_mat.cu | 12 +- modules/gpuarithm/src/cuda/add_scalar.cu | 8 +- modules/gpuarithm/src/cuda/add_weighted.cu | 6 +- modules/gpuarithm/src/cuda/bitwise_mat.cu | 20 +-- modules/gpuarithm/src/cuda/bitwise_scalar.cu | 10 +- modules/gpuarithm/src/cuda/cmp_mat.cu | 14 +- modules/gpuarithm/src/cuda/cmp_scalar.cu | 6 +- .../gpuarithm/src/cuda/copy_make_border.cu | 2 +- modules/gpuarithm/src/cuda/countnonzero.cu | 6 +- modules/gpuarithm/src/cuda/div_mat.cu | 12 +- modules/gpuarithm/src/cuda/div_scalar.cu | 8 +- modules/gpuarithm/src/cuda/integral.cu | 2 +- modules/gpuarithm/src/cuda/math.cu | 26 +-- modules/gpuarithm/src/cuda/minmax.cu | 6 +- modules/gpuarithm/src/cuda/minmax_mat.cu | 22 +-- modules/gpuarithm/src/cuda/minmaxloc.cu | 2 +- modules/gpuarithm/src/cuda/mul_mat.cu | 12 +- modules/gpuarithm/src/cuda/mul_scalar.cu | 6 +- modules/gpuarithm/src/cuda/mul_spectrums.cu | 2 +- modules/gpuarithm/src/cuda/polar_cart.cu | 2 +- modules/gpuarithm/src/cuda/reduce.cu | 6 +- modules/gpuarithm/src/cuda/split_merge.cu | 2 +- modules/gpuarithm/src/cuda/sub_mat.cu | 12 +- modules/gpuarithm/src/cuda/sub_scalar.cu | 8 +- modules/gpuarithm/src/cuda/sum.cu | 6 +- modules/gpuarithm/src/cuda/threshold.cu | 6 +- modules/gpuarithm/src/cuda/transpose.cu | 2 +- modules/gpuarithm/src/cuda/unroll_detail.hpp | 12 +- modules/gpuarithm/src/element_operations.cpp | 6 +- modules/gpuarithm/src/reductions.cpp | 4 +- modules/gpubgsegm/src/cuda/fgd.cu | 2 +- modules/gpubgsegm/src/cuda/gmg.cu | 2 +- modules/gpubgsegm/src/cuda/mog.cu | 2 +- modules/gpubgsegm/src/cuda/mog2.cu | 2 +- modules/gpubgsegm/src/gmg.cpp | 6 +- modules/gpubgsegm/src/mog.cpp | 6 +- modules/gpubgsegm/src/mog2.cpp | 8 +- modules/gpucodec/src/cuda/nv12_to_rgb.cu | 2 +- modules/gpucodec/src/cuda/rgb_to_yv12.cu | 2 +- modules/gpucodec/src/video_reader.cpp | 4 +- modules/gpucodec/src/video_writer.cpp | 4 +- .../gpufeatures2d/src/brute_force_matcher.cpp | 14 +- modules/gpufeatures2d/src/cuda/bf_knnmatch.cu | 2 +- modules/gpufeatures2d/src/cuda/bf_match.cu | 2 +- .../gpufeatures2d/src/cuda/bf_radius_match.cu | 2 +- modules/gpufeatures2d/src/cuda/fast.cu | 2 +- modules/gpufeatures2d/src/cuda/orb.cu | 2 +- modules/gpufeatures2d/src/fast.cpp | 6 +- modules/gpufeatures2d/src/orb.cpp | 12 +- modules/gpufilters/src/cuda/column_filter.hpp | 2 +- modules/gpufilters/src/cuda/filter2d.cu | 2 +- modules/gpufilters/src/cuda/row_filter.hpp | 2 +- modules/gpufilters/src/filtering.cpp | 14 +- modules/gpuimgproc/src/bilateral_filter.cpp | 4 +- modules/gpuimgproc/src/blend.cpp | 4 +- modules/gpuimgproc/src/color.cpp | 162 +++++++++--------- modules/gpuimgproc/src/corners.cpp | 6 +- .../gpuimgproc/src/cuda/bilateral_filter.cu | 4 +- modules/gpuimgproc/src/cuda/blend.cu | 2 +- .../gpuimgproc/src/cuda/build_point_list.cu | 2 +- modules/gpuimgproc/src/cuda/canny.cu | 6 +- modules/gpuimgproc/src/cuda/clahe.cu | 2 +- modules/gpuimgproc/src/cuda/color.cu | 4 +- modules/gpuimgproc/src/cuda/corners.cu | 2 +- modules/gpuimgproc/src/cuda/debayer.cu | 2 +- .../gpuimgproc/src/cuda/generalized_hough.cu | 4 +- modules/gpuimgproc/src/cuda/gftt.cu | 2 +- modules/gpuimgproc/src/cuda/hist.cu | 6 +- modules/gpuimgproc/src/cuda/hough_circles.cu | 2 +- modules/gpuimgproc/src/cuda/hough_lines.cu | 2 +- modules/gpuimgproc/src/cuda/hough_segments.cu | 2 +- modules/gpuimgproc/src/cuda/match_template.cu | 2 +- modules/gpuimgproc/src/cuda/mean_shift.cu | 2 +- modules/gpuimgproc/src/cvt_color_internal.h | 2 +- modules/gpuimgproc/src/generalized_hough.cpp | 20 +-- modules/gpuimgproc/src/gftt.cpp | 4 +- modules/gpuimgproc/src/hough_circles.cpp | 6 +- modules/gpuimgproc/src/hough_lines.cpp | 6 +- modules/gpuimgproc/src/hough_segments.cpp | 8 +- modules/gpuimgproc/src/match_template.cpp | 18 +- modules/gpuimgproc/src/mean_shift.cpp | 8 +- .../include/opencv2/gpulegacy/NCVPyramid.hpp | 2 +- .../gpulegacy/src/cuda/NCVBroxOpticalFlow.cu | 4 +- .../src/cuda/NCVHaarObjectDetection.cu | 4 +- modules/gpulegacy/src/cuda/NCVPyramid.cu | 4 +- modules/gpulegacy/src/cuda/NPP_staging.cu | 4 +- modules/gpuoptflow/src/cuda/bm.cu | 2 +- modules/gpuoptflow/src/cuda/bm_fast.cu | 2 +- modules/gpuoptflow/src/cuda/farneback.cu | 2 +- modules/gpuoptflow/src/cuda/needle_map.cu | 2 +- modules/gpuoptflow/src/cuda/pyrlk.cu | 2 +- modules/gpuoptflow/src/cuda/tvl1flow.cu | 2 +- modules/gpuoptflow/src/farneback.cpp | 36 ++-- modules/gpuoptflow/src/needle_map.cpp | 4 +- .../src/cuda/disparity_bilateral_filter.cu | 2 +- modules/gpustereo/src/cuda/stereobm.cu | 2 +- modules/gpustereo/src/cuda/stereobp.cu | 4 +- modules/gpustereo/src/cuda/stereocsbp.cu | 4 +- modules/gpustereo/src/cuda/util.cu | 2 +- .../src/disparity_bilateral_filter.cpp | 4 +- modules/gpustereo/src/stereobm.cpp | 4 +- modules/gpustereo/src/stereobp.cpp | 8 +- modules/gpustereo/src/stereocsbp.cpp | 4 +- modules/gpustereo/src/util.cpp | 8 +- .../gpuwarping/src/cuda/build_warp_maps.cu | 2 +- modules/gpuwarping/src/cuda/pyr_down.cu | 2 +- modules/gpuwarping/src/cuda/pyr_up.cu | 2 +- modules/gpuwarping/src/cuda/remap.cu | 2 +- modules/gpuwarping/src/cuda/resize.cu | 2 +- modules/gpuwarping/src/cuda/warp.cu | 2 +- modules/gpuwarping/src/pyramids.cpp | 12 +- modules/gpuwarping/src/remap.cpp | 4 +- modules/gpuwarping/src/resize.cpp | 14 +- modules/gpuwarping/src/warp.cpp | 22 +-- modules/nonfree/src/cuda/surf.cu | 6 +- modules/nonfree/src/surf_gpu.cpp | 4 +- modules/photo/src/cuda/nlm.cu | 12 +- modules/photo/src/denoising_gpu.cpp | 14 +- modules/softcascade/src/cuda/channels.cu | 6 +- modules/superres/src/cuda/btv_l1_gpu.cu | 4 +- 165 files changed, 539 insertions(+), 539 deletions(-) diff --git a/modules/core/include/opencv2/core/cuda/block.hpp b/modules/core/include/opencv2/core/cuda/block.hpp index d6c221709..daa7112d8 100644 --- a/modules/core/include/opencv2/core/cuda/block.hpp +++ b/modules/core/include/opencv2/core/cuda/block.hpp @@ -43,7 +43,7 @@ #ifndef __OPENCV_GPU_DEVICE_BLOCK_HPP__ #define __OPENCV_GPU_DEVICE_BLOCK_HPP__ -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { struct Block { diff --git a/modules/core/include/opencv2/core/cuda/border_interpolate.hpp b/modules/core/include/opencv2/core/cuda/border_interpolate.hpp index 0850b36af..3fcf6b2bb 100644 --- a/modules/core/include/opencv2/core/cuda/border_interpolate.hpp +++ b/modules/core/include/opencv2/core/cuda/border_interpolate.hpp @@ -47,7 +47,7 @@ #include "vec_traits.hpp" #include "vec_math.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { ////////////////////////////////////////////////////////////// // BrdConstant diff --git a/modules/core/include/opencv2/core/cuda/color.hpp b/modules/core/include/opencv2/core/cuda/color.hpp index b978d0b4a..8018aaf6c 100644 --- a/modules/core/include/opencv2/core/cuda/color.hpp +++ b/modules/core/include/opencv2/core/cuda/color.hpp @@ -45,7 +45,7 @@ #include "detail/color_detail.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { // All OPENCV_GPU_IMPLEMENT_*_TRAITS(ColorSpace1_to_ColorSpace2, ...) macros implements // template class ColorSpace1_to_ColorSpace2_traits diff --git a/modules/core/include/opencv2/core/cuda/common.hpp b/modules/core/include/opencv2/core/cuda/common.hpp index ae18750f5..780dd99b5 100644 --- a/modules/core/include/opencv2/core/cuda/common.hpp +++ b/modules/core/include/opencv2/core/cuda/common.hpp @@ -87,7 +87,7 @@ namespace cv { namespace cuda namespace cv { namespace cuda { - namespace cudev + namespace device { __host__ __device__ __forceinline__ int divUp(int total, int grain) { diff --git a/modules/core/include/opencv2/core/cuda/datamov_utils.hpp b/modules/core/include/opencv2/core/cuda/datamov_utils.hpp index c7f2e7c0f..6100e0aa6 100644 --- a/modules/core/include/opencv2/core/cuda/datamov_utils.hpp +++ b/modules/core/include/opencv2/core/cuda/datamov_utils.hpp @@ -45,7 +45,7 @@ #include "common.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { #if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 200 diff --git a/modules/core/include/opencv2/core/cuda/detail/color_detail.hpp b/modules/core/include/opencv2/core/cuda/detail/color_detail.hpp index b66ea1bf6..9b5582e59 100644 --- a/modules/core/include/opencv2/core/cuda/detail/color_detail.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/color_detail.hpp @@ -49,7 +49,7 @@ #include "../limits.hpp" #include "../functional.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { #ifndef CV_DESCALE #define CV_DESCALE(x, n) (((x) + (1 << ((n)-1))) >> (n)) @@ -146,7 +146,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2RGB_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -219,7 +219,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2RGB5x5_TRAITS(name, scn, bidx, green_bits) \ struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2RGB5x5 functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2RGB5x5 functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -300,7 +300,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB5x52RGB_TRAITS(name, dcn, bidx, green_bits) \ struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB5x52RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB5x52RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -346,7 +346,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_GRAY2RGB_TRAITS(name, dcn) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::Gray2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::Gray2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -388,7 +388,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_GRAY2RGB5x5_TRAITS(name, green_bits) \ struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::Gray2RGB5x5 functor_type; \ + typedef ::cv::cuda::device::color_detail::Gray2RGB5x5 functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -430,7 +430,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB5x52GRAY_TRAITS(name, green_bits) \ struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB5x52Gray functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB5x52Gray functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -481,7 +481,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2GRAY_TRAITS(name, scn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2Gray functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2Gray functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -532,7 +532,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2YUV_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2YUV functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2YUV functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -620,7 +620,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_YUV2RGB_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::YUV2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::YUV2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -699,7 +699,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2YCrCb_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2YCrCb functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2YCrCb functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -778,7 +778,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_YCrCb2RGB_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::YCrCb2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::YCrCb2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -854,7 +854,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2XYZ_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2XYZ functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2XYZ functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -929,7 +929,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_XYZ2RGB_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::XYZ2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::XYZ2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1067,7 +1067,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2HSV_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2HSV functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2HSV functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1075,7 +1075,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template struct name ## _full_traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2HSV functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2HSV functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1083,7 +1083,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template <> struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2HSV functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2HSV functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1091,7 +1091,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template <> struct name ## _full_traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2HSV functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2HSV functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1207,7 +1207,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_HSV2RGB_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::HSV2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::HSV2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1215,7 +1215,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template struct name ## _full_traits \ { \ - typedef ::cv::cuda::cudev::color_detail::HSV2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::HSV2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1223,7 +1223,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template <> struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::HSV2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::HSV2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1231,7 +1231,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template <> struct name ## _full_traits \ { \ - typedef ::cv::cuda::cudev::color_detail::HSV2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::HSV2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1340,7 +1340,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2HLS_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2HLS functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2HLS functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1348,7 +1348,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template struct name ## _full_traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2HLS functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2HLS functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1356,7 +1356,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template <> struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2HLS functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2HLS functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1364,7 +1364,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template <> struct name ## _full_traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2HLS functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2HLS functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1480,7 +1480,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_HLS2RGB_TRAITS(name, scn, dcn, bidx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::HLS2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::HLS2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1488,7 +1488,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template struct name ## _full_traits \ { \ - typedef ::cv::cuda::cudev::color_detail::HLS2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::HLS2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1496,7 +1496,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template <> struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::HLS2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::HLS2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1504,7 +1504,7 @@ namespace cv { namespace cuda { namespace cudev }; \ template <> struct name ## _full_traits \ { \ - typedef ::cv::cuda::cudev::color_detail::HLS2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::HLS2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1649,7 +1649,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2Lab_TRAITS(name, scn, dcn, srgb, blueIdx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2Lab functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2Lab functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1762,7 +1762,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_Lab2RGB_TRAITS(name, scn, dcn, srgb, blueIdx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::Lab2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::Lab2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1861,7 +1861,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_RGB2Luv_TRAITS(name, scn, dcn, srgb, blueIdx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::RGB2Luv functor_type; \ + typedef ::cv::cuda::device::color_detail::RGB2Luv functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ @@ -1962,7 +1962,7 @@ namespace cv { namespace cuda { namespace cudev #define OPENCV_GPU_IMPLEMENT_Luv2RGB_TRAITS(name, scn, dcn, srgb, blueIdx) \ template struct name ## _traits \ { \ - typedef ::cv::cuda::cudev::color_detail::Luv2RGB functor_type; \ + typedef ::cv::cuda::device::color_detail::Luv2RGB functor_type; \ static __host__ __device__ __forceinline__ functor_type create_functor() \ { \ return functor_type(); \ diff --git a/modules/core/include/opencv2/core/cuda/detail/reduce.hpp b/modules/core/include/opencv2/core/cuda/detail/reduce.hpp index e4bd3c9bf..7891e911c 100644 --- a/modules/core/include/opencv2/core/cuda/detail/reduce.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/reduce.hpp @@ -47,7 +47,7 @@ #include "../warp.hpp" #include "../warp_shuffle.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace reduce_detail { diff --git a/modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp b/modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp index 5fd8ad4c0..cb375f414 100644 --- a/modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp @@ -47,7 +47,7 @@ #include "../warp.hpp" #include "../warp_shuffle.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace reduce_key_val_detail { diff --git a/modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp b/modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp index ede7a78f8..706b3c734 100644 --- a/modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp @@ -47,7 +47,7 @@ #include "../vec_traits.hpp" #include "../functional.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace transform_detail { diff --git a/modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp b/modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp index 3464eb1a8..aa7a886b5 100644 --- a/modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp @@ -46,7 +46,7 @@ #include "../common.hpp" #include "../vec_traits.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace type_traits_detail { diff --git a/modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp b/modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp index 12cdc35c8..e4e805802 100644 --- a/modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp @@ -45,7 +45,7 @@ #include "../datamov_utils.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace vec_distance_detail { diff --git a/modules/core/include/opencv2/core/cuda/dynamic_smem.hpp b/modules/core/include/opencv2/core/cuda/dynamic_smem.hpp index 1d1e73c42..5d1d87ee3 100644 --- a/modules/core/include/opencv2/core/cuda/dynamic_smem.hpp +++ b/modules/core/include/opencv2/core/cuda/dynamic_smem.hpp @@ -43,7 +43,7 @@ #ifndef __OPENCV_GPU_DYNAMIC_SMEM_HPP__ #define __OPENCV_GPU_DYNAMIC_SMEM_HPP__ -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct DynamicSharedMem { diff --git a/modules/core/include/opencv2/core/cuda/emulation.hpp b/modules/core/include/opencv2/core/cuda/emulation.hpp index 0f18c2bdf..993eb0b19 100644 --- a/modules/core/include/opencv2/core/cuda/emulation.hpp +++ b/modules/core/include/opencv2/core/cuda/emulation.hpp @@ -46,7 +46,7 @@ #include "common.hpp" #include "warp_reduce.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { struct Emulation { diff --git a/modules/core/include/opencv2/core/cuda/filters.hpp b/modules/core/include/opencv2/core/cuda/filters.hpp index 1857a0239..0f9dad16d 100644 --- a/modules/core/include/opencv2/core/cuda/filters.hpp +++ b/modules/core/include/opencv2/core/cuda/filters.hpp @@ -48,7 +48,7 @@ #include "vec_math.hpp" #include "type_traits.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct PointFilter { diff --git a/modules/core/include/opencv2/core/cuda/funcattrib.hpp b/modules/core/include/opencv2/core/cuda/funcattrib.hpp index c08a9fd42..69f8e6db4 100644 --- a/modules/core/include/opencv2/core/cuda/funcattrib.hpp +++ b/modules/core/include/opencv2/core/cuda/funcattrib.hpp @@ -45,7 +45,7 @@ #include -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template void printFuncAttrib(Func& func) diff --git a/modules/core/include/opencv2/core/cuda/functional.hpp b/modules/core/include/opencv2/core/cuda/functional.hpp index c46490f09..c06b48942 100644 --- a/modules/core/include/opencv2/core/cuda/functional.hpp +++ b/modules/core/include/opencv2/core/cuda/functional.hpp @@ -49,7 +49,7 @@ #include "type_traits.hpp" #include "device_functions.h" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { // Function Objects template struct unary_function : public std::unary_function {}; diff --git a/modules/core/include/opencv2/core/cuda/limits.hpp b/modules/core/include/opencv2/core/cuda/limits.hpp index f853f7476..a70ed1ff4 100644 --- a/modules/core/include/opencv2/core/cuda/limits.hpp +++ b/modules/core/include/opencv2/core/cuda/limits.hpp @@ -47,7 +47,7 @@ #include #include "common.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct numeric_limits; diff --git a/modules/core/include/opencv2/core/cuda/reduce.hpp b/modules/core/include/opencv2/core/cuda/reduce.hpp index d663dc189..ca2373aff 100644 --- a/modules/core/include/opencv2/core/cuda/reduce.hpp +++ b/modules/core/include/opencv2/core/cuda/reduce.hpp @@ -47,7 +47,7 @@ #include "detail/reduce.hpp" #include "detail/reduce_key_val.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template __device__ __forceinline__ void reduce(volatile T* smem, T& val, unsigned int tid, const Op& op) diff --git a/modules/core/include/opencv2/core/cuda/saturate_cast.hpp b/modules/core/include/opencv2/core/cuda/saturate_cast.hpp index 5b7cd1094..26aed84c9 100644 --- a/modules/core/include/opencv2/core/cuda/saturate_cast.hpp +++ b/modules/core/include/opencv2/core/cuda/saturate_cast.hpp @@ -45,7 +45,7 @@ #include "common.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template __device__ __forceinline__ _Tp saturate_cast(uchar v) { return _Tp(v); } template __device__ __forceinline__ _Tp saturate_cast(schar v) { return _Tp(v); } diff --git a/modules/core/include/opencv2/core/cuda/scan.hpp b/modules/core/include/opencv2/core/cuda/scan.hpp index 2202974c6..69982b6d6 100644 --- a/modules/core/include/opencv2/core/cuda/scan.hpp +++ b/modules/core/include/opencv2/core/cuda/scan.hpp @@ -48,7 +48,7 @@ #include "opencv2/core/cuda/warp.hpp" #include "opencv2/core/cuda/warp_shuffle.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { enum ScanKind { EXCLUSIVE = 0, INCLUSIVE = 1 }; @@ -174,13 +174,13 @@ namespace cv { namespace cuda { namespace cudev __device__ T warpScanInclusive(T idata, volatile T* s_Data, unsigned int tid) { #if __CUDA_ARCH__ >= 300 - const unsigned int laneId = cv::cuda::cudev::Warp::laneId(); + const unsigned int laneId = cv::cuda::device::Warp::laneId(); // scan on shuffl functions #pragma unroll for (int i = 1; i <= (OPENCV_GPU_WARP_SIZE / 2); i *= 2) { - const T n = cv::cuda::cudev::shfl_up(idata, i); + const T n = cv::cuda::device::shfl_up(idata, i); if (laneId >= i) idata += n; } diff --git a/modules/core/include/opencv2/core/cuda/simd_functions.hpp b/modules/core/include/opencv2/core/cuda/simd_functions.hpp index a335704d1..f449620e9 100644 --- a/modules/core/include/opencv2/core/cuda/simd_functions.hpp +++ b/modules/core/include/opencv2/core/cuda/simd_functions.hpp @@ -123,7 +123,7 @@ vmin4(a,b) per-byte unsigned minimum: min(a, b) */ -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { // 2 diff --git a/modules/core/include/opencv2/core/cuda/transform.hpp b/modules/core/include/opencv2/core/cuda/transform.hpp index 3d4212896..cdca20d68 100644 --- a/modules/core/include/opencv2/core/cuda/transform.hpp +++ b/modules/core/include/opencv2/core/cuda/transform.hpp @@ -47,7 +47,7 @@ #include "utility.hpp" #include "detail/transform_detail.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template static inline void transform(PtrStepSz src, PtrStepSz dst, UnOp op, const Mask& mask, cudaStream_t stream) diff --git a/modules/core/include/opencv2/core/cuda/type_traits.hpp b/modules/core/include/opencv2/core/cuda/type_traits.hpp index 4e9dbb767..9bcca052e 100644 --- a/modules/core/include/opencv2/core/cuda/type_traits.hpp +++ b/modules/core/include/opencv2/core/cuda/type_traits.hpp @@ -45,7 +45,7 @@ #include "detail/type_traits_detail.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct IsSimpleParameter { diff --git a/modules/core/include/opencv2/core/cuda/utility.hpp b/modules/core/include/opencv2/core/cuda/utility.hpp index e19323043..db9dfe44d 100644 --- a/modules/core/include/opencv2/core/cuda/utility.hpp +++ b/modules/core/include/opencv2/core/cuda/utility.hpp @@ -46,7 +46,7 @@ #include "saturate_cast.hpp" #include "datamov_utils.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { #define OPENCV_GPU_LOG_WARP_SIZE (5) #define OPENCV_GPU_WARP_SIZE (1 << OPENCV_GPU_LOG_WARP_SIZE) diff --git a/modules/core/include/opencv2/core/cuda/vec_distance.hpp b/modules/core/include/opencv2/core/cuda/vec_distance.hpp index 787127e14..731616090 100644 --- a/modules/core/include/opencv2/core/cuda/vec_distance.hpp +++ b/modules/core/include/opencv2/core/cuda/vec_distance.hpp @@ -47,7 +47,7 @@ #include "functional.hpp" #include "detail/vec_distance_detail.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct L1Dist { diff --git a/modules/core/include/opencv2/core/cuda/vec_math.hpp b/modules/core/include/opencv2/core/cuda/vec_math.hpp index 87cacf04a..2a9012be7 100644 --- a/modules/core/include/opencv2/core/cuda/vec_math.hpp +++ b/modules/core/include/opencv2/core/cuda/vec_math.hpp @@ -46,7 +46,7 @@ #include "vec_traits.hpp" #include "saturate_cast.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { // saturate_cast diff --git a/modules/core/include/opencv2/core/cuda/vec_traits.hpp b/modules/core/include/opencv2/core/cuda/vec_traits.hpp index dd069b769..c8ce2c7de 100644 --- a/modules/core/include/opencv2/core/cuda/vec_traits.hpp +++ b/modules/core/include/opencv2/core/cuda/vec_traits.hpp @@ -45,7 +45,7 @@ #include "common.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct TypeVec; diff --git a/modules/core/include/opencv2/core/cuda/warp.hpp b/modules/core/include/opencv2/core/cuda/warp.hpp index 4fac49054..7ad7cc812 100644 --- a/modules/core/include/opencv2/core/cuda/warp.hpp +++ b/modules/core/include/opencv2/core/cuda/warp.hpp @@ -43,7 +43,7 @@ #ifndef __OPENCV_GPU_DEVICE_WARP_HPP__ #define __OPENCV_GPU_DEVICE_WARP_HPP__ -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { struct Warp { diff --git a/modules/core/include/opencv2/core/cuda/warp_reduce.hpp b/modules/core/include/opencv2/core/cuda/warp_reduce.hpp index 3058c47ee..d611ec69f 100644 --- a/modules/core/include/opencv2/core/cuda/warp_reduce.hpp +++ b/modules/core/include/opencv2/core/cuda/warp_reduce.hpp @@ -43,7 +43,7 @@ #ifndef OPENCV_GPU_WARP_REDUCE_HPP__ #define OPENCV_GPU_WARP_REDUCE_HPP__ -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template __device__ __forceinline__ T warp_reduce(volatile T *ptr , const unsigned int tid = threadIdx.x) diff --git a/modules/core/include/opencv2/core/cuda/warp_shuffle.hpp b/modules/core/include/opencv2/core/cuda/warp_shuffle.hpp index a54639ee6..0818a7e83 100644 --- a/modules/core/include/opencv2/core/cuda/warp_shuffle.hpp +++ b/modules/core/include/opencv2/core/cuda/warp_shuffle.hpp @@ -43,7 +43,7 @@ #ifndef __OPENCV_GPU_WARP_SHUFFLE_HPP__ #define __OPENCV_GPU_WARP_SHUFFLE_HPP__ -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template __device__ __forceinline__ T shfl(T val, int srcLane, int width = warpSize) diff --git a/modules/gpu/src/calib3d.cpp b/modules/gpu/src/calib3d.cpp index 619a2c132..eaadb9343 100644 --- a/modules/gpu/src/calib3d.cpp +++ b/modules/gpu/src/calib3d.cpp @@ -55,7 +55,7 @@ void cv::cuda::solvePnPRansac(const Mat&, const Mat&, const Mat&, const Mat&, Ma #else -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace transform_points { @@ -78,7 +78,7 @@ namespace cv { namespace cuda { namespace cudev } }}} -using namespace ::cv::cuda::cudev; +using namespace ::cv::cuda::device; namespace { diff --git a/modules/gpu/src/cascadeclassifier.cpp b/modules/gpu/src/cascadeclassifier.cpp index 84a45b763..25464b536 100644 --- a/modules/gpu/src/cascadeclassifier.cpp +++ b/modules/gpu/src/cascadeclassifier.cpp @@ -372,7 +372,7 @@ struct PyrLavel cv::Size sWindow; }; -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace lbp { @@ -473,7 +473,7 @@ public: acc += level.sFrame.width + 1; } - cudev::lbp::classifyPyramid(image.cols, image.rows, NxM.width - 1, NxM.height - 1, iniScale, scaleFactor, total, stage_mat, stage_mat.cols / sizeof(Stage), nodes_mat, + device::lbp::classifyPyramid(image.cols, image.rows, NxM.width - 1, NxM.height - 1, iniScale, scaleFactor, total, stage_mat, stage_mat.cols / sizeof(Stage), nodes_mat, leaves_mat, subsets_mat, features_mat, subsetSize, candidates, dclassified.ptr(), integral); } @@ -481,7 +481,7 @@ public: return 0; cudaSafeCall( cudaMemcpy(&classified, dclassified.ptr(), sizeof(int), cudaMemcpyDeviceToHost) ); - cudev::lbp::connectedConmonents(candidates, classified, objects, groupThreshold, grouping_eps, dclassified.ptr()); + device::lbp::connectedConmonents(candidates, classified, objects, groupThreshold, grouping_eps, dclassified.ptr()); cudaSafeCall( cudaMemcpy(&classified, dclassified.ptr(), sizeof(int), cudaMemcpyDeviceToHost) ); cudaSafeCall( cudaDeviceSynchronize() ); diff --git a/modules/gpu/src/cuda/calib3d.cu b/modules/gpu/src/cuda/calib3d.cu index d62aaf848..f30d2a493 100644 --- a/modules/gpu/src/cuda/calib3d.cu +++ b/modules/gpu/src/cuda/calib3d.cu @@ -47,7 +47,7 @@ #include "opencv2/core/cuda/functional.hpp" #include "opencv2/core/cuda/reduce.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { #define SOLVE_PNP_RANSAC_MAX_NUM_ITERS 200 @@ -79,7 +79,7 @@ namespace cv { namespace cuda { namespace cudev cudaSafeCall(cudaMemcpyToSymbol(crot1, rot + 3, sizeof(float) * 3)); cudaSafeCall(cudaMemcpyToSymbol(crot2, rot + 6, sizeof(float) * 3)); cudaSafeCall(cudaMemcpyToSymbol(ctransl, transl, sizeof(float) * 3)); - cv::cuda::cudev::transform(src, dst, TransformOp(), WithOutMask(), stream); + cv::cuda::device::transform(src, dst, TransformOp(), WithOutMask(), stream); } } // namespace transform_points @@ -120,7 +120,7 @@ namespace cv { namespace cuda { namespace cudev cudaSafeCall(cudaMemcpyToSymbol(ctransl, transl, sizeof(float) * 3)); cudaSafeCall(cudaMemcpyToSymbol(cproj0, proj, sizeof(float) * 3)); cudaSafeCall(cudaMemcpyToSymbol(cproj1, proj + 3, sizeof(float) * 3)); - cv::cuda::cudev::transform(src, dst, ProjectOp(), WithOutMask(), stream); + cv::cuda::device::transform(src, dst, ProjectOp(), WithOutMask(), stream); } } // namespace project_points diff --git a/modules/gpu/src/cuda/ccomponetns.cu b/modules/gpu/src/cuda/ccomponetns.cu index 4323919c8..681ca8fe4 100644 --- a/modules/gpu/src/cuda/ccomponetns.cu +++ b/modules/gpu/src/cuda/ccomponetns.cu @@ -50,7 +50,7 @@ #include #include -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace ccl { diff --git a/modules/gpu/src/cuda/global_motion.cu b/modules/gpu/src/cuda/global_motion.cu index c03adc02f..7eca6ff76 100644 --- a/modules/gpu/src/cuda/global_motion.cu +++ b/modules/gpu/src/cuda/global_motion.cu @@ -47,7 +47,7 @@ #include #include "opencv2/core/cuda/common.hpp" -namespace cv { namespace cuda { namespace cudev { namespace globmotion { +namespace cv { namespace cuda { namespace device { namespace globmotion { __constant__ float cml[9]; __constant__ float cmr[9]; diff --git a/modules/gpu/src/cuda/hog.cu b/modules/gpu/src/cuda/hog.cu index 0e20fe244..1a9c1e6bc 100644 --- a/modules/gpu/src/cuda/hog.cu +++ b/modules/gpu/src/cuda/hog.cu @@ -47,7 +47,7 @@ #include "opencv2/core/cuda/functional.hpp" #include "opencv2/core/cuda/warp_shuffle.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { // Other values are not supported #define CELL_WIDTH 8 diff --git a/modules/gpu/src/cuda/lbp.cu b/modules/gpu/src/cuda/lbp.cu index fada381e4..e99d28cea 100644 --- a/modules/gpu/src/cuda/lbp.cu +++ b/modules/gpu/src/cuda/lbp.cu @@ -46,7 +46,7 @@ #include "opencv2/core/cuda/vec_traits.hpp" #include "opencv2/core/cuda/saturate_cast.hpp" -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace lbp { diff --git a/modules/gpu/src/cuda/lbp.hpp b/modules/gpu/src/cuda/lbp.hpp index e6bd0b2e9..d0e543734 100644 --- a/modules/gpu/src/cuda/lbp.hpp +++ b/modules/gpu/src/cuda/lbp.hpp @@ -46,7 +46,7 @@ #include "opencv2/core/cuda/common.hpp" #include "opencv2/core/cuda/emulation.hpp" -namespace cv { namespace cuda { namespace cudev { +namespace cv { namespace cuda { namespace device { namespace lbp { diff --git a/modules/gpu/src/global_motion.cpp b/modules/gpu/src/global_motion.cpp index 2650b948a..4f847c924 100644 --- a/modules/gpu/src/global_motion.cpp +++ b/modules/gpu/src/global_motion.cpp @@ -53,7 +53,7 @@ void cv::cuda::calcWobbleSuppressionMaps( #else -namespace cv { namespace cuda { namespace cudev { namespace globmotion { +namespace cv { namespace cuda { namespace device { namespace globmotion { int compactPoints(int N, float *points0, float *points1, const uchar *mask); @@ -70,7 +70,7 @@ void cv::cuda::compactPoints(GpuMat &points0, GpuMat &points1, const GpuMat &mas CV_Assert(points0.cols == mask.cols && points1.cols == mask.cols); int npoints = points0.cols; - int remaining = cv::cuda::cudev::globmotion::compactPoints( + int remaining = cv::cuda::device::globmotion::compactPoints( npoints, (float*)points0.data, (float*)points1.data, mask.data); points0 = points0.colRange(0, remaining); @@ -88,7 +88,7 @@ void cv::cuda::calcWobbleSuppressionMaps( mapx.create(size, CV_32F); mapy.create(size, CV_32F); - cv::cuda::cudev::globmotion::calcWobbleSuppressionMaps( + cv::cuda::device::globmotion::calcWobbleSuppressionMaps( left, idx, right, size.width, size.height, ml.ptr(), mr.ptr(), mapx, mapy); } diff --git a/modules/gpu/src/graphcuts.cpp b/modules/gpu/src/graphcuts.cpp index 78532f197..eb08c3cb5 100644 --- a/modules/gpu/src/graphcuts.cpp +++ b/modules/gpu/src/graphcuts.cpp @@ -52,7 +52,7 @@ void cv::cuda::labelComponents(const GpuMat&, GpuMat&, int, Stream&) { throw_no_ #else /* !defined (HAVE_CUDA) */ -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace ccl { @@ -81,12 +81,12 @@ void cv::cuda::connectivityMask(const GpuMat& image, GpuMat& mask, const cv::Sca static const func_t suppotLookup[8][4] = { // 1, 2, 3, 4 - { cudev::ccl::computeEdges, 0, cudev::ccl::computeEdges, cudev::ccl::computeEdges },// CV_8U + { device::ccl::computeEdges, 0, device::ccl::computeEdges, device::ccl::computeEdges },// CV_8U { 0, 0, 0, 0 },// CV_16U - { cudev::ccl::computeEdges, 0, cudev::ccl::computeEdges, cudev::ccl::computeEdges },// CV_8S + { device::ccl::computeEdges, 0, device::ccl::computeEdges, device::ccl::computeEdges },// CV_8S { 0, 0, 0, 0 },// CV_16S - { cudev::ccl::computeEdges, 0, 0, 0 },// CV_32S - { cudev::ccl::computeEdges, 0, 0, 0 },// CV_32F + { device::ccl::computeEdges, 0, 0, 0 },// CV_32S + { device::ccl::computeEdges, 0, 0, 0 },// CV_32F { 0, 0, 0, 0 },// CV_64F { 0, 0, 0, 0 } // CV_USRTYPE1 }; @@ -112,7 +112,7 @@ void cv::cuda::labelComponents(const GpuMat& mask, GpuMat& components, int flags components.create(mask.size(), CV_32SC1); cudaStream_t stream = StreamAccessor::getStream(s); - cudev::ccl::labelComponents(mask, components, flags, stream); + device::ccl::labelComponents(mask, components, flags, stream); } namespace diff --git a/modules/gpu/src/hog.cpp b/modules/gpu/src/hog.cpp index 5a84137ec..f71bf2b5a 100644 --- a/modules/gpu/src/hog.cpp +++ b/modules/gpu/src/hog.cpp @@ -62,7 +62,7 @@ void cv::cuda::HOGDescriptor::computeConfidenceMultiScale(const GpuMat&, std::ve #else -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace hog { @@ -102,7 +102,7 @@ namespace cv { namespace cuda { namespace cudev } }}} -using namespace ::cv::cuda::cudev; +using namespace ::cv::cuda::device; cv::cuda::HOGDescriptor::HOGDescriptor(Size win_size_, Size block_size_, Size block_stride_, Size cell_size_, int nbins_, double win_sigma_, double threshold_L2hys_, bool gamma_correction_, int nlevels_) diff --git a/modules/gpuarithm/src/arithm.cpp b/modules/gpuarithm/src/arithm.cpp index 7206e58ec..d08e993bb 100644 --- a/modules/gpuarithm/src/arithm.cpp +++ b/modules/gpuarithm/src/arithm.cpp @@ -297,7 +297,7 @@ void cv::cuda::gemm(InputArray _src1, InputArray _src2, double alpha, InputArray #ifdef HAVE_CUFFT -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { void mulSpectrums(const PtrStep a, const PtrStep b, PtrStepSz c, cudaStream_t stream); @@ -320,7 +320,7 @@ void cv::cuda::mulSpectrums(InputArray _src1, InputArray _src2, OutputArray _dst (void) flags; typedef void (*Caller)(const PtrStep, const PtrStep, PtrStepSz, cudaStream_t stream); - static Caller callers[] = { cudev::mulSpectrums, cudev::mulSpectrums_CONJ }; + static Caller callers[] = { device::mulSpectrums, device::mulSpectrums_CONJ }; GpuMat src1 = _src1.getGpuMat(); GpuMat src2 = _src2.getGpuMat(); @@ -341,7 +341,7 @@ void cv::cuda::mulSpectrums(InputArray _src1, InputArray _src2, OutputArray _dst #ifdef HAVE_CUFFT -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { void mulAndScaleSpectrums(const PtrStep a, const PtrStep b, float scale, PtrStepSz c, cudaStream_t stream); @@ -365,7 +365,7 @@ void cv::cuda::mulAndScaleSpectrums(InputArray _src1, InputArray _src2, OutputAr (void)flags; typedef void (*Caller)(const PtrStep, const PtrStep, float scale, PtrStepSz, cudaStream_t stream); - static Caller callers[] = { cudev::mulAndScaleSpectrums, cudev::mulAndScaleSpectrums_CONJ }; + static Caller callers[] = { device::mulAndScaleSpectrums, device::mulAndScaleSpectrums_CONJ }; GpuMat src1 = _src1.getGpuMat(); GpuMat src2 = _src2.getGpuMat(); diff --git a/modules/gpuarithm/src/core.cpp b/modules/gpuarithm/src/core.cpp index e611b36df..b6189fd0e 100644 --- a/modules/gpuarithm/src/core.cpp +++ b/modules/gpuarithm/src/core.cpp @@ -66,7 +66,7 @@ void cv::cuda::copyMakeBorder(InputArray, OutputArray, int, int, int, int, int, //////////////////////////////////////////////////////////////////////// // merge/split -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace split_merge { @@ -112,7 +112,7 @@ namespace src_as_devmem[i] = src[i]; PtrStepSzb dst_as_devmem(dst); - cv::cuda::cudev::split_merge::merge(src_as_devmem, dst_as_devmem, (int)n, CV_ELEM_SIZE(depth), StreamAccessor::getStream(stream)); + cv::cuda::device::split_merge::merge(src_as_devmem, dst_as_devmem, (int)n, CV_ELEM_SIZE(depth), StreamAccessor::getStream(stream)); } } @@ -145,7 +145,7 @@ namespace dst_as_devmem[i] = dst[i]; PtrStepSzb src_as_devmem(src); - cv::cuda::cudev::split_merge::split(src_as_devmem, dst_as_devmem, num_channels, src.elemSize1(), StreamAccessor::getStream(stream)); + cv::cuda::device::split_merge::split(src_as_devmem, dst_as_devmem, num_channels, src.elemSize1(), StreamAccessor::getStream(stream)); } } @@ -503,7 +503,7 @@ Ptr cv::cuda::createLookUpTable(InputArray lut) //////////////////////////////////////////////////////////////////////// // copyMakeBorder -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { namespace imgproc { @@ -515,7 +515,7 @@ namespace { template void copyMakeBorder_caller(const PtrStepSzb& src, const PtrStepSzb& dst, int top, int left, int borderType, const Scalar& value, cudaStream_t stream) { - using namespace ::cv::cuda::cudev::imgproc; + using namespace ::cv::cuda::device::imgproc; Scalar_ val(saturate_cast(value[0]), saturate_cast(value[1]), saturate_cast(value[2]), saturate_cast(value[3])); diff --git a/modules/gpuarithm/src/cuda/absdiff_mat.cu b/modules/gpuarithm/src/cuda/absdiff_mat.cu index bdbb2c2f6..ffdcbfa38 100644 --- a/modules/gpuarithm/src/cuda/absdiff_mat.cu +++ b/modules/gpuarithm/src/cuda/absdiff_mat.cu @@ -51,7 +51,7 @@ #include "arithm_func_traits.hpp" using namespace cv::cuda; -using namespace cv::cuda::cudev; +using namespace cv::cuda::device; namespace arithm { @@ -102,7 +102,7 @@ namespace arithm }; } -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template <> struct TransformFunctorTraits< arithm::VAbsDiff4 > : arithm::ArithmFuncTraits { @@ -121,18 +121,18 @@ namespace arithm { void absDiffMat_v4(PtrStepSz src1, PtrStepSz src2, PtrStepSz dst, cudaStream_t stream) { - cudev::transform(src1, src2, dst, VAbsDiff4(), WithOutMask(), stream); + device::transform(src1, src2, dst, VAbsDiff4(), WithOutMask(), stream); } void absDiffMat_v2(PtrStepSz src1, PtrStepSz src2, PtrStepSz dst, cudaStream_t stream) { - cudev::transform(src1, src2, dst, VAbsDiff2(), WithOutMask(), stream); + device::transform(src1, src2, dst, VAbsDiff2(), WithOutMask(), stream); } template void absDiffMat(PtrStepSzb src1, PtrStepSzb src2, PtrStepSzb dst, cudaStream_t stream) { - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, AbsDiffMat(), WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, AbsDiffMat(), WithOutMask(), stream); } template void absDiffMat(PtrStepSzb src1, PtrStepSzb src2, PtrStepSzb dst, cudaStream_t stream); diff --git a/modules/gpuarithm/src/cuda/absdiff_scalar.cu b/modules/gpuarithm/src/cuda/absdiff_scalar.cu index f2b6ad097..ad30bffda 100644 --- a/modules/gpuarithm/src/cuda/absdiff_scalar.cu +++ b/modules/gpuarithm/src/cuda/absdiff_scalar.cu @@ -51,7 +51,7 @@ #include "arithm_func_traits.hpp" using namespace cv::cuda; -using namespace cv::cuda::cudev; +using namespace cv::cuda::device; namespace arithm { @@ -69,7 +69,7 @@ namespace arithm }; } -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct TransformFunctorTraits< arithm::AbsDiffScalar > : arithm::ArithmFuncTraits { @@ -83,7 +83,7 @@ namespace arithm { AbsDiffScalar op(static_cast(val)); - cudev::transform((PtrStepSz) src1, (PtrStepSz) dst, op, WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) dst, op, WithOutMask(), stream); } template void absDiffScalar(PtrStepSzb src1, double src2, PtrStepSzb dst, cudaStream_t stream); diff --git a/modules/gpuarithm/src/cuda/add_mat.cu b/modules/gpuarithm/src/cuda/add_mat.cu index d85ab9f5f..127043820 100644 --- a/modules/gpuarithm/src/cuda/add_mat.cu +++ b/modules/gpuarithm/src/cuda/add_mat.cu @@ -51,7 +51,7 @@ #include "arithm_func_traits.hpp" using namespace cv::cuda; -using namespace cv::cuda::cudev; +using namespace cv::cuda::device; namespace arithm { @@ -89,7 +89,7 @@ namespace arithm }; } -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template <> struct TransformFunctorTraits< arithm::VAdd4 > : arithm::ArithmFuncTraits { @@ -108,21 +108,21 @@ namespace arithm { void addMat_v4(PtrStepSz src1, PtrStepSz src2, PtrStepSz dst, cudaStream_t stream) { - cudev::transform(src1, src2, dst, VAdd4(), WithOutMask(), stream); + device::transform(src1, src2, dst, VAdd4(), WithOutMask(), stream); } void addMat_v2(PtrStepSz src1, PtrStepSz src2, PtrStepSz dst, cudaStream_t stream) { - cudev::transform(src1, src2, dst, VAdd2(), WithOutMask(), stream); + device::transform(src1, src2, dst, VAdd2(), WithOutMask(), stream); } template void addMat(PtrStepSzb src1, PtrStepSzb src2, PtrStepSzb dst, PtrStepb mask, cudaStream_t stream) { if (mask.data) - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, AddMat(), mask, stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, AddMat(), mask, stream); else - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, AddMat(), WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, AddMat(), WithOutMask(), stream); } template void addMat(PtrStepSzb src1, PtrStepSzb src2, PtrStepSzb dst, PtrStepb mask, cudaStream_t stream); diff --git a/modules/gpuarithm/src/cuda/add_scalar.cu b/modules/gpuarithm/src/cuda/add_scalar.cu index 1065ac3f7..680061be1 100644 --- a/modules/gpuarithm/src/cuda/add_scalar.cu +++ b/modules/gpuarithm/src/cuda/add_scalar.cu @@ -51,7 +51,7 @@ #include "arithm_func_traits.hpp" using namespace cv::cuda; -using namespace cv::cuda::cudev; +using namespace cv::cuda::device; namespace arithm { @@ -68,7 +68,7 @@ namespace arithm }; } -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct TransformFunctorTraits< arithm::AddScalar > : arithm::ArithmFuncTraits { @@ -83,9 +83,9 @@ namespace arithm AddScalar op(static_cast(val)); if (mask.data) - cudev::transform((PtrStepSz) src1, (PtrStepSz) dst, op, mask, stream); + device::transform((PtrStepSz) src1, (PtrStepSz) dst, op, mask, stream); else - cudev::transform((PtrStepSz) src1, (PtrStepSz) dst, op, WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) dst, op, WithOutMask(), stream); } template void addScalar(PtrStepSzb src1, double val, PtrStepSzb dst, PtrStepb mask, cudaStream_t stream); diff --git a/modules/gpuarithm/src/cuda/add_weighted.cu b/modules/gpuarithm/src/cuda/add_weighted.cu index ce6a13784..aa305d993 100644 --- a/modules/gpuarithm/src/cuda/add_weighted.cu +++ b/modules/gpuarithm/src/cuda/add_weighted.cu @@ -50,7 +50,7 @@ #include "arithm_func_traits.hpp" using namespace cv::cuda; -using namespace cv::cuda::cudev; +using namespace cv::cuda::device; namespace arithm { @@ -100,7 +100,7 @@ namespace arithm }; } -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct AddWeightedTraits : DefaultTransformFunctorTraits< arithm::AddWeighted > { @@ -121,7 +121,7 @@ namespace arithm { AddWeighted op(alpha, beta, gamma); - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, op, WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, op, WithOutMask(), stream); } template void addWeighted(PtrStepSzb src1, double alpha, PtrStepSzb src2, double beta, double gamma, PtrStepSzb dst, cudaStream_t stream); diff --git a/modules/gpuarithm/src/cuda/bitwise_mat.cu b/modules/gpuarithm/src/cuda/bitwise_mat.cu index e16b5d9e7..7a90cf3fc 100644 --- a/modules/gpuarithm/src/cuda/bitwise_mat.cu +++ b/modules/gpuarithm/src/cuda/bitwise_mat.cu @@ -51,9 +51,9 @@ #include "arithm_func_traits.hpp" using namespace cv::cuda; -using namespace cv::cuda::cudev; +using namespace cv::cuda::device; -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct TransformFunctorTraits< bit_not > : arithm::ArithmFuncTraits { @@ -77,33 +77,33 @@ namespace arithm template void bitMatNot(PtrStepSzb src, PtrStepSzb dst, PtrStepb mask, cudaStream_t stream) { if (mask.data) - cudev::transform((PtrStepSz) src, (PtrStepSz) dst, bit_not(), mask, stream); + device::transform((PtrStepSz) src, (PtrStepSz) dst, bit_not(), mask, stream); else - cudev::transform((PtrStepSz) src, (PtrStepSz) dst, bit_not(), WithOutMask(), stream); + device::transform((PtrStepSz) src, (PtrStepSz) dst, bit_not(), WithOutMask(), stream); } template void bitMatAnd(PtrStepSzb src1, PtrStepSzb src2, PtrStepSzb dst, PtrStepb mask, cudaStream_t stream) { if (mask.data) - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_and(), mask, stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_and(), mask, stream); else - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_and(), WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_and(), WithOutMask(), stream); } template void bitMatOr(PtrStepSzb src1, PtrStepSzb src2, PtrStepSzb dst, PtrStepb mask, cudaStream_t stream) { if (mask.data) - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_or(), mask, stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_or(), mask, stream); else - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_or(), WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_or(), WithOutMask(), stream); } template void bitMatXor(PtrStepSzb src1, PtrStepSzb src2, PtrStepSzb dst, PtrStepb mask, cudaStream_t stream) { if (mask.data) - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_xor(), mask, stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_xor(), mask, stream); else - cudev::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_xor(), WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) src2, (PtrStepSz) dst, bit_xor(), WithOutMask(), stream); } template void bitMatNot(PtrStepSzb src, PtrStepSzb dst, PtrStepb mask, cudaStream_t stream); diff --git a/modules/gpuarithm/src/cuda/bitwise_scalar.cu b/modules/gpuarithm/src/cuda/bitwise_scalar.cu index 411133d87..3de413370 100644 --- a/modules/gpuarithm/src/cuda/bitwise_scalar.cu +++ b/modules/gpuarithm/src/cuda/bitwise_scalar.cu @@ -51,9 +51,9 @@ #include "arithm_func_traits.hpp" using namespace cv::cuda; -using namespace cv::cuda::cudev; +using namespace cv::cuda::device; -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template struct TransformFunctorTraits< binder2nd< bit_and > > : arithm::ArithmFuncTraits { @@ -72,17 +72,17 @@ namespace arithm { template void bitScalarAnd(PtrStepSzb src1, uint src2, PtrStepSzb dst, cudaStream_t stream) { - cudev::transform((PtrStepSz) src1, (PtrStepSz) dst, cv::cuda::cudev::bind2nd(bit_and(), src2), WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) dst, cv::cuda::device::bind2nd(bit_and(), src2), WithOutMask(), stream); } template void bitScalarOr(PtrStepSzb src1, uint src2, PtrStepSzb dst, cudaStream_t stream) { - cudev::transform((PtrStepSz) src1, (PtrStepSz) dst, cv::cuda::cudev::bind2nd(bit_or(), src2), WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) dst, cv::cuda::device::bind2nd(bit_or(), src2), WithOutMask(), stream); } template void bitScalarXor(PtrStepSzb src1, uint src2, PtrStepSzb dst, cudaStream_t stream) { - cudev::transform((PtrStepSz) src1, (PtrStepSz) dst, cv::cuda::cudev::bind2nd(bit_xor(), src2), WithOutMask(), stream); + device::transform((PtrStepSz) src1, (PtrStepSz) dst, cv::cuda::device::bind2nd(bit_xor(), src2), WithOutMask(), stream); } template void bitScalarAnd(PtrStepSzb src1, uint src2, PtrStepSzb dst, cudaStream_t stream); diff --git a/modules/gpuarithm/src/cuda/cmp_mat.cu b/modules/gpuarithm/src/cuda/cmp_mat.cu index 281831a4e..cdbb9639b 100644 --- a/modules/gpuarithm/src/cuda/cmp_mat.cu +++ b/modules/gpuarithm/src/cuda/cmp_mat.cu @@ -51,7 +51,7 @@ #include "arithm_func_traits.hpp" using namespace cv::cuda; -using namespace cv::cuda::cudev; +using namespace cv::cuda::device; namespace arithm { @@ -107,7 +107,7 @@ namespace arithm }; } -namespace cv { namespace cuda { namespace cudev +namespace cv { namespace cuda { namespace device { template <> struct TransformFunctorTraits< arithm::VCmpEq4 > : arithm::ArithmFuncTraits { @@ -131,26 +131,26 @@ namespace arithm { void cmpMatEq_v4(PtrStepSz src1, PtrStepSz src2, PtrStepSz dst, cudaStream_t stream) { - cudev::transform(src1, src2, dst, VCmpEq4(), WithOutMask(), stream); + device::transform(src1, src2, dst, VCmpEq4(), WithOutMask(), stream); } void cmpMatNe_v4(PtrStepSz src1, PtrStepSz src2, PtrStepSz dst, cudaStream_t stream) { - cudev::transform(src1, src2, dst, VCmpNe4(), WithOutMask(), stream); + device::transform(src1, src2, dst, VCmpNe4(), WithOutMask(), stream); } void cmpMatLt_v4(PtrStepSz src1, PtrStepSz src2, PtrStepSz dst, cudaStream_t stream) { - cudev::transform(src1, src2, dst, VCmpLt4(), WithOutMask(), stream); + device::transform(src1, src2, dst, VCmpLt4(), WithOutMask(), stream); } void cmpMatLe_v4(PtrStepSz src1, PtrStepSz src2, PtrStepSz dst, cudaStream_t stream) { - cudev::transform(src1, src2, dst, VCmpLe4(), WithOutMask(), stream); + device::transform(src1, src2, dst, VCmpLe4(), WithOutMask(), stream); } template