From dcd600cc475dc326118683733504f6b0d6290b3a Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 23 Jul 2013 15:24:10 +0400 Subject: [PATCH] renamed gpuarithm -> cudaarithm --- modules/{gpuarithm => cudaarithm}/CMakeLists.txt | 6 +++--- modules/{gpuarithm => cudaarithm}/doc/arithm.rst | 0 modules/{gpuarithm => cudaarithm}/doc/core.rst | 0 .../doc/gpuarithm.rst => cudaarithm/doc/cudaarithm.rst} | 0 .../{gpuarithm => cudaarithm}/doc/element_operations.rst | 0 modules/{gpuarithm => cudaarithm}/doc/reductions.rst | 0 .../include/opencv2/cudaarithm.hpp} | 8 ++++---- modules/{gpuarithm => cudaarithm}/perf/perf_arithm.cpp | 0 modules/{gpuarithm => cudaarithm}/perf/perf_core.cpp | 0 .../perf/perf_element_operations.cpp | 0 modules/{gpuarithm => cudaarithm}/perf/perf_main.cpp | 2 +- modules/{gpuarithm => cudaarithm}/perf/perf_precomp.cpp | 0 modules/{gpuarithm => cudaarithm}/perf/perf_precomp.hpp | 2 +- .../{gpuarithm => cudaarithm}/perf/perf_reductions.cpp | 0 modules/{gpuarithm => cudaarithm}/src/arithm.cpp | 0 modules/{gpuarithm => cudaarithm}/src/core.cpp | 0 modules/{gpuarithm => cudaarithm}/src/cuda/absdiff_mat.cu | 0 .../{gpuarithm => cudaarithm}/src/cuda/absdiff_scalar.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/add_mat.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/add_scalar.cu | 0 .../{gpuarithm => cudaarithm}/src/cuda/add_weighted.cu | 0 .../src/cuda/arithm_func_traits.hpp | 0 modules/{gpuarithm => cudaarithm}/src/cuda/bitwise_mat.cu | 0 .../{gpuarithm => cudaarithm}/src/cuda/bitwise_scalar.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/cmp_mat.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/cmp_scalar.cu | 0 .../src/cuda/copy_make_border.cu | 0 .../{gpuarithm => cudaarithm}/src/cuda/countnonzero.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/div_mat.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/div_scalar.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/integral.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/math.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/minmax.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/minmax_mat.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/minmaxloc.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/mul_mat.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/mul_scalar.cu | 0 .../{gpuarithm => cudaarithm}/src/cuda/mul_spectrums.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/polar_cart.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/reduce.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/split_merge.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/sub_mat.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/sub_scalar.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/sum.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/threshold.cu | 0 modules/{gpuarithm => cudaarithm}/src/cuda/transpose.cu | 0 .../{gpuarithm => cudaarithm}/src/cuda/unroll_detail.hpp | 0 .../{gpuarithm => cudaarithm}/src/element_operations.cpp | 0 modules/{gpuarithm => cudaarithm}/src/precomp.cpp | 0 modules/{gpuarithm => cudaarithm}/src/precomp.hpp | 2 +- modules/{gpuarithm => cudaarithm}/src/reductions.cpp | 0 modules/{gpuarithm => cudaarithm}/test/test_arithm.cpp | 0 modules/{gpuarithm => cudaarithm}/test/test_core.cpp | 0 .../test/test_element_operations.cpp | 0 modules/{gpuarithm => cudaarithm}/test/test_main.cpp | 0 modules/{gpuarithm => cudaarithm}/test/test_precomp.cpp | 0 modules/{gpuarithm => cudaarithm}/test/test_precomp.hpp | 2 +- .../{gpuarithm => cudaarithm}/test/test_reductions.cpp | 0 modules/gpu/CMakeLists.txt | 2 +- modules/gpu/src/precomp.hpp | 2 +- modules/gpubgsegm/CMakeLists.txt | 2 +- modules/gpubgsegm/src/fgd.cpp | 2 +- modules/gpubgsegm/src/gmg.cpp | 6 +++--- modules/gpubgsegm/src/precomp.hpp | 4 ++-- modules/gpufeatures2d/src/precomp.hpp | 2 +- modules/gpufilters/CMakeLists.txt | 2 +- modules/gpufilters/src/precomp.hpp | 2 +- modules/gpuimgproc/CMakeLists.txt | 2 +- modules/gpuimgproc/src/cuda/generalized_hough.cu | 4 ++-- modules/gpuimgproc/src/generalized_hough.cpp | 2 +- modules/gpuimgproc/src/gftt.cpp | 2 +- modules/gpuimgproc/src/histogram.cpp | 2 +- modules/gpuimgproc/src/match_template.cpp | 2 +- modules/gpuimgproc/src/precomp.hpp | 4 ++-- modules/gpuoptflow/CMakeLists.txt | 2 +- modules/gpuoptflow/src/precomp.hpp | 2 +- modules/nonfree/CMakeLists.txt | 2 +- modules/nonfree/perf/perf_gpu.cpp | 4 ++-- modules/nonfree/src/cuda/surf.cu | 4 ++-- modules/nonfree/src/precomp.hpp | 4 ++-- modules/nonfree/src/surf_gpu.cpp | 2 +- modules/nonfree/test/test_gpu.cpp | 4 ++-- modules/photo/CMakeLists.txt | 2 +- modules/photo/perf/perf_gpu.cpp | 2 +- modules/photo/src/denoising_gpu.cpp | 6 +++--- modules/photo/test/test_denoising_gpu.cpp | 2 +- modules/stitching/CMakeLists.txt | 2 +- modules/stitching/src/blenders.cpp | 6 +++--- modules/stitching/src/precomp.hpp | 4 ++-- modules/superres/CMakeLists.txt | 2 +- modules/superres/src/btv_l1_gpu.cpp | 2 +- modules/superres/src/cuda/btv_l1_gpu.cu | 2 +- modules/superres/src/precomp.hpp | 4 ++-- modules/superres/test/test_superres.cpp | 2 +- samples/cpp/CMakeLists.txt | 8 ++++---- .../gpu/gpu-basics-similarity/gpu-basics-similarity.cpp | 2 +- samples/gpu/CMakeLists.txt | 2 +- samples/gpu/brox_optical_flow.cpp | 2 +- samples/gpu/driver_api_multi.cpp | 2 +- samples/gpu/multi.cpp | 2 +- samples/gpu/performance/tests.cpp | 2 +- 101 files changed, 72 insertions(+), 72 deletions(-) rename modules/{gpuarithm => cudaarithm}/CMakeLists.txt (76%) rename modules/{gpuarithm => cudaarithm}/doc/arithm.rst (100%) rename modules/{gpuarithm => cudaarithm}/doc/core.rst (100%) rename modules/{gpuarithm/doc/gpuarithm.rst => cudaarithm/doc/cudaarithm.rst} (100%) rename modules/{gpuarithm => cudaarithm}/doc/element_operations.rst (100%) rename modules/{gpuarithm => cudaarithm}/doc/reductions.rst (100%) rename modules/{gpuarithm/include/opencv2/gpuarithm.hpp => cudaarithm/include/opencv2/cudaarithm.hpp} (99%) rename modules/{gpuarithm => cudaarithm}/perf/perf_arithm.cpp (100%) rename modules/{gpuarithm => cudaarithm}/perf/perf_core.cpp (100%) rename modules/{gpuarithm => cudaarithm}/perf/perf_element_operations.cpp (100%) rename modules/{gpuarithm => cudaarithm}/perf/perf_main.cpp (98%) rename modules/{gpuarithm => cudaarithm}/perf/perf_precomp.cpp (100%) rename modules/{gpuarithm => cudaarithm}/perf/perf_precomp.hpp (98%) rename modules/{gpuarithm => cudaarithm}/perf/perf_reductions.cpp (100%) rename modules/{gpuarithm => cudaarithm}/src/arithm.cpp (100%) rename modules/{gpuarithm => cudaarithm}/src/core.cpp (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/absdiff_mat.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/absdiff_scalar.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/add_mat.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/add_scalar.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/add_weighted.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/arithm_func_traits.hpp (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/bitwise_mat.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/bitwise_scalar.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/cmp_mat.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/cmp_scalar.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/copy_make_border.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/countnonzero.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/div_mat.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/div_scalar.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/integral.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/math.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/minmax.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/minmax_mat.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/minmaxloc.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/mul_mat.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/mul_scalar.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/mul_spectrums.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/polar_cart.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/reduce.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/split_merge.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/sub_mat.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/sub_scalar.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/sum.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/threshold.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/transpose.cu (100%) rename modules/{gpuarithm => cudaarithm}/src/cuda/unroll_detail.hpp (100%) rename modules/{gpuarithm => cudaarithm}/src/element_operations.cpp (100%) rename modules/{gpuarithm => cudaarithm}/src/precomp.cpp (100%) rename modules/{gpuarithm => cudaarithm}/src/precomp.hpp (98%) rename modules/{gpuarithm => cudaarithm}/src/reductions.cpp (100%) rename modules/{gpuarithm => cudaarithm}/test/test_arithm.cpp (100%) rename modules/{gpuarithm => cudaarithm}/test/test_core.cpp (100%) rename modules/{gpuarithm => cudaarithm}/test/test_element_operations.cpp (100%) rename modules/{gpuarithm => cudaarithm}/test/test_main.cpp (100%) rename modules/{gpuarithm => cudaarithm}/test/test_precomp.cpp (100%) rename modules/{gpuarithm => cudaarithm}/test/test_precomp.hpp (98%) rename modules/{gpuarithm => cudaarithm}/test/test_reductions.cpp (100%) diff --git a/modules/gpuarithm/CMakeLists.txt b/modules/cudaarithm/CMakeLists.txt similarity index 76% rename from modules/gpuarithm/CMakeLists.txt rename to modules/cudaarithm/CMakeLists.txt index 091e3ecd47..67a7ff922f 100644 --- a/modules/gpuarithm/CMakeLists.txt +++ b/modules/cudaarithm/CMakeLists.txt @@ -1,12 +1,12 @@ if(ANDROID OR IOS) - ocv_module_disable(gpuarithm) + ocv_module_disable(cudaarithm) endif() -set(the_description "GPU-accelerated Operations on Matrices") +set(the_description "CUDA-accelerated Operations on Matrices") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) -ocv_add_module(gpuarithm opencv_core OPTIONAL opencv_cudalegacy) +ocv_add_module(cudaarithm opencv_core OPTIONAL opencv_cudalegacy) ocv_module_include_directories() ocv_glob_module_sources() diff --git a/modules/gpuarithm/doc/arithm.rst b/modules/cudaarithm/doc/arithm.rst similarity index 100% rename from modules/gpuarithm/doc/arithm.rst rename to modules/cudaarithm/doc/arithm.rst diff --git a/modules/gpuarithm/doc/core.rst b/modules/cudaarithm/doc/core.rst similarity index 100% rename from modules/gpuarithm/doc/core.rst rename to modules/cudaarithm/doc/core.rst diff --git a/modules/gpuarithm/doc/gpuarithm.rst b/modules/cudaarithm/doc/cudaarithm.rst similarity index 100% rename from modules/gpuarithm/doc/gpuarithm.rst rename to modules/cudaarithm/doc/cudaarithm.rst diff --git a/modules/gpuarithm/doc/element_operations.rst b/modules/cudaarithm/doc/element_operations.rst similarity index 100% rename from modules/gpuarithm/doc/element_operations.rst rename to modules/cudaarithm/doc/element_operations.rst diff --git a/modules/gpuarithm/doc/reductions.rst b/modules/cudaarithm/doc/reductions.rst similarity index 100% rename from modules/gpuarithm/doc/reductions.rst rename to modules/cudaarithm/doc/reductions.rst diff --git a/modules/gpuarithm/include/opencv2/gpuarithm.hpp b/modules/cudaarithm/include/opencv2/cudaarithm.hpp similarity index 99% rename from modules/gpuarithm/include/opencv2/gpuarithm.hpp rename to modules/cudaarithm/include/opencv2/cudaarithm.hpp index b45ce9e82e..4af48b028f 100644 --- a/modules/gpuarithm/include/opencv2/gpuarithm.hpp +++ b/modules/cudaarithm/include/opencv2/cudaarithm.hpp @@ -40,11 +40,11 @@ // //M*/ -#ifndef __OPENCV_GPUARITHM_HPP__ -#define __OPENCV_GPUARITHM_HPP__ +#ifndef __OPENCV_CUDAARITHM_HPP__ +#define __OPENCV_CUDAARITHM_HPP__ #ifndef __cplusplus -# error gpuarithm.hpp header must be compiled as C++ +# error cudaarithm.hpp header must be compiled as C++ #endif #include "opencv2/core/cuda.hpp" @@ -371,4 +371,4 @@ CV_EXPORTS Ptr createConvolution(Size user_block_size = Size()); }} // namespace cv { namespace cuda { -#endif /* __OPENCV_GPUARITHM_HPP__ */ +#endif /* __OPENCV_CUDAARITHM_HPP__ */ diff --git a/modules/gpuarithm/perf/perf_arithm.cpp b/modules/cudaarithm/perf/perf_arithm.cpp similarity index 100% rename from modules/gpuarithm/perf/perf_arithm.cpp rename to modules/cudaarithm/perf/perf_arithm.cpp diff --git a/modules/gpuarithm/perf/perf_core.cpp b/modules/cudaarithm/perf/perf_core.cpp similarity index 100% rename from modules/gpuarithm/perf/perf_core.cpp rename to modules/cudaarithm/perf/perf_core.cpp diff --git a/modules/gpuarithm/perf/perf_element_operations.cpp b/modules/cudaarithm/perf/perf_element_operations.cpp similarity index 100% rename from modules/gpuarithm/perf/perf_element_operations.cpp rename to modules/cudaarithm/perf/perf_element_operations.cpp diff --git a/modules/gpuarithm/perf/perf_main.cpp b/modules/cudaarithm/perf/perf_main.cpp similarity index 98% rename from modules/gpuarithm/perf/perf_main.cpp rename to modules/cudaarithm/perf/perf_main.cpp index 552cf5c162..118d7596ac 100644 --- a/modules/gpuarithm/perf/perf_main.cpp +++ b/modules/cudaarithm/perf/perf_main.cpp @@ -44,4 +44,4 @@ using namespace perf; -CV_PERF_TEST_CUDA_MAIN(gpuarithm) +CV_PERF_TEST_CUDA_MAIN(cudaarithm) diff --git a/modules/gpuarithm/perf/perf_precomp.cpp b/modules/cudaarithm/perf/perf_precomp.cpp similarity index 100% rename from modules/gpuarithm/perf/perf_precomp.cpp rename to modules/cudaarithm/perf/perf_precomp.cpp diff --git a/modules/gpuarithm/perf/perf_precomp.hpp b/modules/cudaarithm/perf/perf_precomp.hpp similarity index 98% rename from modules/gpuarithm/perf/perf_precomp.hpp rename to modules/cudaarithm/perf/perf_precomp.hpp index 0b50ab0f9a..fbd70698ca 100644 --- a/modules/gpuarithm/perf/perf_precomp.hpp +++ b/modules/cudaarithm/perf/perf_precomp.hpp @@ -54,7 +54,7 @@ #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_perf.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #include "opencv2/core.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/gpuarithm/perf/perf_reductions.cpp b/modules/cudaarithm/perf/perf_reductions.cpp similarity index 100% rename from modules/gpuarithm/perf/perf_reductions.cpp rename to modules/cudaarithm/perf/perf_reductions.cpp diff --git a/modules/gpuarithm/src/arithm.cpp b/modules/cudaarithm/src/arithm.cpp similarity index 100% rename from modules/gpuarithm/src/arithm.cpp rename to modules/cudaarithm/src/arithm.cpp diff --git a/modules/gpuarithm/src/core.cpp b/modules/cudaarithm/src/core.cpp similarity index 100% rename from modules/gpuarithm/src/core.cpp rename to modules/cudaarithm/src/core.cpp diff --git a/modules/gpuarithm/src/cuda/absdiff_mat.cu b/modules/cudaarithm/src/cuda/absdiff_mat.cu similarity index 100% rename from modules/gpuarithm/src/cuda/absdiff_mat.cu rename to modules/cudaarithm/src/cuda/absdiff_mat.cu diff --git a/modules/gpuarithm/src/cuda/absdiff_scalar.cu b/modules/cudaarithm/src/cuda/absdiff_scalar.cu similarity index 100% rename from modules/gpuarithm/src/cuda/absdiff_scalar.cu rename to modules/cudaarithm/src/cuda/absdiff_scalar.cu diff --git a/modules/gpuarithm/src/cuda/add_mat.cu b/modules/cudaarithm/src/cuda/add_mat.cu similarity index 100% rename from modules/gpuarithm/src/cuda/add_mat.cu rename to modules/cudaarithm/src/cuda/add_mat.cu diff --git a/modules/gpuarithm/src/cuda/add_scalar.cu b/modules/cudaarithm/src/cuda/add_scalar.cu similarity index 100% rename from modules/gpuarithm/src/cuda/add_scalar.cu rename to modules/cudaarithm/src/cuda/add_scalar.cu diff --git a/modules/gpuarithm/src/cuda/add_weighted.cu b/modules/cudaarithm/src/cuda/add_weighted.cu similarity index 100% rename from modules/gpuarithm/src/cuda/add_weighted.cu rename to modules/cudaarithm/src/cuda/add_weighted.cu diff --git a/modules/gpuarithm/src/cuda/arithm_func_traits.hpp b/modules/cudaarithm/src/cuda/arithm_func_traits.hpp similarity index 100% rename from modules/gpuarithm/src/cuda/arithm_func_traits.hpp rename to modules/cudaarithm/src/cuda/arithm_func_traits.hpp diff --git a/modules/gpuarithm/src/cuda/bitwise_mat.cu b/modules/cudaarithm/src/cuda/bitwise_mat.cu similarity index 100% rename from modules/gpuarithm/src/cuda/bitwise_mat.cu rename to modules/cudaarithm/src/cuda/bitwise_mat.cu diff --git a/modules/gpuarithm/src/cuda/bitwise_scalar.cu b/modules/cudaarithm/src/cuda/bitwise_scalar.cu similarity index 100% rename from modules/gpuarithm/src/cuda/bitwise_scalar.cu rename to modules/cudaarithm/src/cuda/bitwise_scalar.cu diff --git a/modules/gpuarithm/src/cuda/cmp_mat.cu b/modules/cudaarithm/src/cuda/cmp_mat.cu similarity index 100% rename from modules/gpuarithm/src/cuda/cmp_mat.cu rename to modules/cudaarithm/src/cuda/cmp_mat.cu diff --git a/modules/gpuarithm/src/cuda/cmp_scalar.cu b/modules/cudaarithm/src/cuda/cmp_scalar.cu similarity index 100% rename from modules/gpuarithm/src/cuda/cmp_scalar.cu rename to modules/cudaarithm/src/cuda/cmp_scalar.cu diff --git a/modules/gpuarithm/src/cuda/copy_make_border.cu b/modules/cudaarithm/src/cuda/copy_make_border.cu similarity index 100% rename from modules/gpuarithm/src/cuda/copy_make_border.cu rename to modules/cudaarithm/src/cuda/copy_make_border.cu diff --git a/modules/gpuarithm/src/cuda/countnonzero.cu b/modules/cudaarithm/src/cuda/countnonzero.cu similarity index 100% rename from modules/gpuarithm/src/cuda/countnonzero.cu rename to modules/cudaarithm/src/cuda/countnonzero.cu diff --git a/modules/gpuarithm/src/cuda/div_mat.cu b/modules/cudaarithm/src/cuda/div_mat.cu similarity index 100% rename from modules/gpuarithm/src/cuda/div_mat.cu rename to modules/cudaarithm/src/cuda/div_mat.cu diff --git a/modules/gpuarithm/src/cuda/div_scalar.cu b/modules/cudaarithm/src/cuda/div_scalar.cu similarity index 100% rename from modules/gpuarithm/src/cuda/div_scalar.cu rename to modules/cudaarithm/src/cuda/div_scalar.cu diff --git a/modules/gpuarithm/src/cuda/integral.cu b/modules/cudaarithm/src/cuda/integral.cu similarity index 100% rename from modules/gpuarithm/src/cuda/integral.cu rename to modules/cudaarithm/src/cuda/integral.cu diff --git a/modules/gpuarithm/src/cuda/math.cu b/modules/cudaarithm/src/cuda/math.cu similarity index 100% rename from modules/gpuarithm/src/cuda/math.cu rename to modules/cudaarithm/src/cuda/math.cu diff --git a/modules/gpuarithm/src/cuda/minmax.cu b/modules/cudaarithm/src/cuda/minmax.cu similarity index 100% rename from modules/gpuarithm/src/cuda/minmax.cu rename to modules/cudaarithm/src/cuda/minmax.cu diff --git a/modules/gpuarithm/src/cuda/minmax_mat.cu b/modules/cudaarithm/src/cuda/minmax_mat.cu similarity index 100% rename from modules/gpuarithm/src/cuda/minmax_mat.cu rename to modules/cudaarithm/src/cuda/minmax_mat.cu diff --git a/modules/gpuarithm/src/cuda/minmaxloc.cu b/modules/cudaarithm/src/cuda/minmaxloc.cu similarity index 100% rename from modules/gpuarithm/src/cuda/minmaxloc.cu rename to modules/cudaarithm/src/cuda/minmaxloc.cu diff --git a/modules/gpuarithm/src/cuda/mul_mat.cu b/modules/cudaarithm/src/cuda/mul_mat.cu similarity index 100% rename from modules/gpuarithm/src/cuda/mul_mat.cu rename to modules/cudaarithm/src/cuda/mul_mat.cu diff --git a/modules/gpuarithm/src/cuda/mul_scalar.cu b/modules/cudaarithm/src/cuda/mul_scalar.cu similarity index 100% rename from modules/gpuarithm/src/cuda/mul_scalar.cu rename to modules/cudaarithm/src/cuda/mul_scalar.cu diff --git a/modules/gpuarithm/src/cuda/mul_spectrums.cu b/modules/cudaarithm/src/cuda/mul_spectrums.cu similarity index 100% rename from modules/gpuarithm/src/cuda/mul_spectrums.cu rename to modules/cudaarithm/src/cuda/mul_spectrums.cu diff --git a/modules/gpuarithm/src/cuda/polar_cart.cu b/modules/cudaarithm/src/cuda/polar_cart.cu similarity index 100% rename from modules/gpuarithm/src/cuda/polar_cart.cu rename to modules/cudaarithm/src/cuda/polar_cart.cu diff --git a/modules/gpuarithm/src/cuda/reduce.cu b/modules/cudaarithm/src/cuda/reduce.cu similarity index 100% rename from modules/gpuarithm/src/cuda/reduce.cu rename to modules/cudaarithm/src/cuda/reduce.cu diff --git a/modules/gpuarithm/src/cuda/split_merge.cu b/modules/cudaarithm/src/cuda/split_merge.cu similarity index 100% rename from modules/gpuarithm/src/cuda/split_merge.cu rename to modules/cudaarithm/src/cuda/split_merge.cu diff --git a/modules/gpuarithm/src/cuda/sub_mat.cu b/modules/cudaarithm/src/cuda/sub_mat.cu similarity index 100% rename from modules/gpuarithm/src/cuda/sub_mat.cu rename to modules/cudaarithm/src/cuda/sub_mat.cu diff --git a/modules/gpuarithm/src/cuda/sub_scalar.cu b/modules/cudaarithm/src/cuda/sub_scalar.cu similarity index 100% rename from modules/gpuarithm/src/cuda/sub_scalar.cu rename to modules/cudaarithm/src/cuda/sub_scalar.cu diff --git a/modules/gpuarithm/src/cuda/sum.cu b/modules/cudaarithm/src/cuda/sum.cu similarity index 100% rename from modules/gpuarithm/src/cuda/sum.cu rename to modules/cudaarithm/src/cuda/sum.cu diff --git a/modules/gpuarithm/src/cuda/threshold.cu b/modules/cudaarithm/src/cuda/threshold.cu similarity index 100% rename from modules/gpuarithm/src/cuda/threshold.cu rename to modules/cudaarithm/src/cuda/threshold.cu diff --git a/modules/gpuarithm/src/cuda/transpose.cu b/modules/cudaarithm/src/cuda/transpose.cu similarity index 100% rename from modules/gpuarithm/src/cuda/transpose.cu rename to modules/cudaarithm/src/cuda/transpose.cu diff --git a/modules/gpuarithm/src/cuda/unroll_detail.hpp b/modules/cudaarithm/src/cuda/unroll_detail.hpp similarity index 100% rename from modules/gpuarithm/src/cuda/unroll_detail.hpp rename to modules/cudaarithm/src/cuda/unroll_detail.hpp diff --git a/modules/gpuarithm/src/element_operations.cpp b/modules/cudaarithm/src/element_operations.cpp similarity index 100% rename from modules/gpuarithm/src/element_operations.cpp rename to modules/cudaarithm/src/element_operations.cpp diff --git a/modules/gpuarithm/src/precomp.cpp b/modules/cudaarithm/src/precomp.cpp similarity index 100% rename from modules/gpuarithm/src/precomp.cpp rename to modules/cudaarithm/src/precomp.cpp diff --git a/modules/gpuarithm/src/precomp.hpp b/modules/cudaarithm/src/precomp.hpp similarity index 98% rename from modules/gpuarithm/src/precomp.hpp rename to modules/cudaarithm/src/precomp.hpp index 04a3458f17..38fce941ee 100644 --- a/modules/gpuarithm/src/precomp.hpp +++ b/modules/cudaarithm/src/precomp.hpp @@ -47,7 +47,7 @@ #include "cvconfig.h" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #include "opencv2/core/utility.hpp" #include "opencv2/core/private.cuda.hpp" diff --git a/modules/gpuarithm/src/reductions.cpp b/modules/cudaarithm/src/reductions.cpp similarity index 100% rename from modules/gpuarithm/src/reductions.cpp rename to modules/cudaarithm/src/reductions.cpp diff --git a/modules/gpuarithm/test/test_arithm.cpp b/modules/cudaarithm/test/test_arithm.cpp similarity index 100% rename from modules/gpuarithm/test/test_arithm.cpp rename to modules/cudaarithm/test/test_arithm.cpp diff --git a/modules/gpuarithm/test/test_core.cpp b/modules/cudaarithm/test/test_core.cpp similarity index 100% rename from modules/gpuarithm/test/test_core.cpp rename to modules/cudaarithm/test/test_core.cpp diff --git a/modules/gpuarithm/test/test_element_operations.cpp b/modules/cudaarithm/test/test_element_operations.cpp similarity index 100% rename from modules/gpuarithm/test/test_element_operations.cpp rename to modules/cudaarithm/test/test_element_operations.cpp diff --git a/modules/gpuarithm/test/test_main.cpp b/modules/cudaarithm/test/test_main.cpp similarity index 100% rename from modules/gpuarithm/test/test_main.cpp rename to modules/cudaarithm/test/test_main.cpp diff --git a/modules/gpuarithm/test/test_precomp.cpp b/modules/cudaarithm/test/test_precomp.cpp similarity index 100% rename from modules/gpuarithm/test/test_precomp.cpp rename to modules/cudaarithm/test/test_precomp.cpp diff --git a/modules/gpuarithm/test/test_precomp.hpp b/modules/cudaarithm/test/test_precomp.hpp similarity index 98% rename from modules/gpuarithm/test/test_precomp.hpp rename to modules/cudaarithm/test/test_precomp.hpp index faa0f5adbd..6bfdd38916 100644 --- a/modules/gpuarithm/test/test_precomp.hpp +++ b/modules/cudaarithm/test/test_precomp.hpp @@ -56,7 +56,7 @@ #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_test.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #include "opencv2/core.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/gpuarithm/test/test_reductions.cpp b/modules/cudaarithm/test/test_reductions.cpp similarity index 100% rename from modules/gpuarithm/test/test_reductions.cpp rename to modules/cudaarithm/test/test_reductions.cpp diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt index 351608b697..1759460400 100644 --- a/modules/gpu/CMakeLists.txt +++ b/modules/gpu/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Computer Vision") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter) -ocv_define_module(gpu opencv_calib3d opencv_objdetect opencv_gpuarithm opencv_gpuwarping OPTIONAL opencv_cudalegacy) +ocv_define_module(gpu opencv_calib3d opencv_objdetect opencv_cudaarithm opencv_gpuwarping OPTIONAL opencv_cudalegacy) diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp index d7101caa16..4407b07ea6 100644 --- a/modules/gpu/src/precomp.hpp +++ b/modules/gpu/src/precomp.hpp @@ -44,7 +44,7 @@ #define __OPENCV_PRECOMP_H__ #include "opencv2/gpu.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #include "opencv2/gpuwarping.hpp" #include "opencv2/calib3d.hpp" #include "opencv2/objdetect.hpp" diff --git a/modules/gpubgsegm/CMakeLists.txt b/modules/gpubgsegm/CMakeLists.txt index f87f3cb88c..47f3fa8375 100644 --- a/modules/gpubgsegm/CMakeLists.txt +++ b/modules/gpubgsegm/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Background Segmentation") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) -ocv_define_module(gpubgsegm opencv_video OPTIONAL opencv_legacy opencv_imgproc opencv_gpuarithm opencv_gpufilters opencv_gpuimgproc) +ocv_define_module(gpubgsegm opencv_video OPTIONAL opencv_legacy opencv_imgproc opencv_cudaarithm opencv_gpufilters opencv_gpuimgproc) diff --git a/modules/gpubgsegm/src/fgd.cpp b/modules/gpubgsegm/src/fgd.cpp index fd0128c8f3..74659a10da 100644 --- a/modules/gpubgsegm/src/fgd.cpp +++ b/modules/gpubgsegm/src/fgd.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::cuda; -#if !defined(HAVE_CUDA) || defined(CUDA_DISABLER) || !defined(HAVE_OPENCV_IMGPROC) || !defined(HAVE_OPENCV_GPUARITHM) || !defined(HAVE_OPENCV_GPUIMGPROC) +#if !defined(HAVE_CUDA) || defined(CUDA_DISABLER) || !defined(HAVE_OPENCV_IMGPROC) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_GPUIMGPROC) cv::cuda::FGDParams::FGDParams() { throw_no_cuda(); } diff --git a/modules/gpubgsegm/src/gmg.cpp b/modules/gpubgsegm/src/gmg.cpp index 8f90cba1cc..b7eabe93a7 100644 --- a/modules/gpubgsegm/src/gmg.cpp +++ b/modules/gpubgsegm/src/gmg.cpp @@ -141,7 +141,7 @@ namespace GpuMat colors_; GpuMat weights_; -#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_GPUARITHM) +#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) Ptr boxFilter_; GpuMat buf_; #endif @@ -214,7 +214,7 @@ namespace funcs[frame.depth()][frame.channels() - 1](frame, fgmask, colors_, weights_, nfeatures_, frameNum_, learningRate_, updateBackgroundModel_, StreamAccessor::getStream(stream)); -#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_GPUARITHM) +#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) // medianBlur if (smoothingRadius_ > 0) { @@ -259,7 +259,7 @@ namespace nfeatures_.setTo(Scalar::all(0)); -#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_GPUARITHM) +#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) if (smoothingRadius_ > 0) boxFilter_ = cuda::createBoxFilter(CV_8UC1, -1, Size(smoothingRadius_, smoothingRadius_)); #endif diff --git a/modules/gpubgsegm/src/precomp.hpp b/modules/gpubgsegm/src/precomp.hpp index d65ba9f297..42ceddf4cb 100644 --- a/modules/gpubgsegm/src/precomp.hpp +++ b/modules/gpubgsegm/src/precomp.hpp @@ -51,8 +51,8 @@ #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUARITHM -# include "opencv2/gpuarithm.hpp" +#ifdef HAVE_OPENCV_CUDAARITHM +# include "opencv2/cudaarithm.hpp" #endif #ifdef HAVE_OPENCV_GPUFILTERS diff --git a/modules/gpufeatures2d/src/precomp.hpp b/modules/gpufeatures2d/src/precomp.hpp index a11387c037..90ffc3f272 100644 --- a/modules/gpufeatures2d/src/precomp.hpp +++ b/modules/gpufeatures2d/src/precomp.hpp @@ -48,7 +48,7 @@ #include #include "opencv2/gpufeatures2d.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #include "opencv2/gpuwarping.hpp" #include "opencv2/features2d.hpp" diff --git a/modules/gpufilters/CMakeLists.txt b/modules/gpufilters/CMakeLists.txt index 640de8c115..eb1220d24d 100644 --- a/modules/gpufilters/CMakeLists.txt +++ b/modules/gpufilters/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Image Filtering") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) -ocv_define_module(gpufilters opencv_imgproc opencv_gpuarithm) +ocv_define_module(gpufilters opencv_imgproc opencv_cudaarithm) diff --git a/modules/gpufilters/src/precomp.hpp b/modules/gpufilters/src/precomp.hpp index 5853481cf3..72727e7060 100644 --- a/modules/gpufilters/src/precomp.hpp +++ b/modules/gpufilters/src/precomp.hpp @@ -46,7 +46,7 @@ #include #include "opencv2/gpufilters.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #include "opencv2/imgproc.hpp" #include "opencv2/core/private.cuda.hpp" diff --git a/modules/gpuimgproc/CMakeLists.txt b/modules/gpuimgproc/CMakeLists.txt index dfecf1d219..02cdc34a57 100644 --- a/modules/gpuimgproc/CMakeLists.txt +++ b/modules/gpuimgproc/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Image Processing") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter) -ocv_define_module(gpuimgproc opencv_imgproc OPTIONAL opencv_gpuarithm opencv_gpufilters) +ocv_define_module(gpuimgproc opencv_imgproc OPTIONAL opencv_cudaarithm opencv_gpufilters) diff --git a/modules/gpuimgproc/src/cuda/generalized_hough.cu b/modules/gpuimgproc/src/cuda/generalized_hough.cu index 09e235437f..232c625f9f 100644 --- a/modules/gpuimgproc/src/cuda/generalized_hough.cu +++ b/modules/gpuimgproc/src/cuda/generalized_hough.cu @@ -52,7 +52,7 @@ #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUARITHM +#ifdef HAVE_OPENCV_CUDAARITHM namespace cv { namespace cuda { namespace device { @@ -819,6 +819,6 @@ namespace cv { namespace cuda { namespace device } }}} -#endif // HAVE_OPENCV_GPUARITHM +#endif // HAVE_OPENCV_CUDAARITHM #endif /* CUDA_DISABLER */ diff --git a/modules/gpuimgproc/src/generalized_hough.cpp b/modules/gpuimgproc/src/generalized_hough.cpp index 547e36b0a7..5f94aeeb52 100644 --- a/modules/gpuimgproc/src/generalized_hough.cpp +++ b/modules/gpuimgproc/src/generalized_hough.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::cuda; -#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || !defined(HAVE_OPENCV_GPUARITHM) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || !defined(HAVE_OPENCV_CUDAARITHM) Ptr cv::cuda::createGeneralizedHoughBallard() { throw_no_cuda(); return Ptr(); } diff --git a/modules/gpuimgproc/src/gftt.cpp b/modules/gpuimgproc/src/gftt.cpp index ce6239c42e..094e67a674 100644 --- a/modules/gpuimgproc/src/gftt.cpp +++ b/modules/gpuimgproc/src/gftt.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::cuda; -#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || !defined(HAVE_OPENCV_GPUARITHM) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || !defined(HAVE_OPENCV_CUDAARITHM) Ptr cv::cuda::createGoodFeaturesToTrackDetector(int, int, double, double, int, bool, double) { throw_no_cuda(); return Ptr(); } diff --git a/modules/gpuimgproc/src/histogram.cpp b/modules/gpuimgproc/src/histogram.cpp index 92df20baf1..cb22e3ba27 100644 --- a/modules/gpuimgproc/src/histogram.cpp +++ b/modules/gpuimgproc/src/histogram.cpp @@ -202,7 +202,7 @@ namespace } else { -#ifndef HAVE_OPENCV_GPUARITHM +#ifndef HAVE_OPENCV_CUDAARITHM throw_no_cuda(); #else cv::cuda::copyMakeBorder(src, srcExt_, 0, tilesY_ - (src.rows % tilesY_), 0, tilesX_ - (src.cols % tilesX_), cv::BORDER_REFLECT_101, cv::Scalar(), s); diff --git a/modules/gpuimgproc/src/match_template.cpp b/modules/gpuimgproc/src/match_template.cpp index 775cf9906b..d4406c8b13 100644 --- a/modules/gpuimgproc/src/match_template.cpp +++ b/modules/gpuimgproc/src/match_template.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::cuda; -#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_GPUARITHM) || defined (CUDA_DISABLER) +#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_CUDAARITHM) || defined (CUDA_DISABLER) Ptr cv::cuda::createTemplateMatching(int, int, Size) { throw_no_cuda(); return Ptr(); } diff --git a/modules/gpuimgproc/src/precomp.hpp b/modules/gpuimgproc/src/precomp.hpp index 1fd1c84e8e..c1fea0084e 100644 --- a/modules/gpuimgproc/src/precomp.hpp +++ b/modules/gpuimgproc/src/precomp.hpp @@ -51,8 +51,8 @@ #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUARITHM -# include "opencv2/gpuarithm.hpp" +#ifdef HAVE_OPENCV_CUDAARITHM +# include "opencv2/cudaarithm.hpp" #endif #ifdef HAVE_OPENCV_GPUFILTERS diff --git a/modules/gpuoptflow/CMakeLists.txt b/modules/gpuoptflow/CMakeLists.txt index e230c06bab..30a7e4aee3 100644 --- a/modules/gpuoptflow/CMakeLists.txt +++ b/modules/gpuoptflow/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Optical Flow") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) -ocv_define_module(gpuoptflow opencv_video opencv_legacy opencv_gpuarithm opencv_gpuwarping opencv_gpuimgproc OPTIONAL opencv_cudalegacy) +ocv_define_module(gpuoptflow opencv_video opencv_legacy opencv_cudaarithm opencv_gpuwarping opencv_gpuimgproc OPTIONAL opencv_cudalegacy) diff --git a/modules/gpuoptflow/src/precomp.hpp b/modules/gpuoptflow/src/precomp.hpp index 822a980bee..3e9d88a5b7 100644 --- a/modules/gpuoptflow/src/precomp.hpp +++ b/modules/gpuoptflow/src/precomp.hpp @@ -46,7 +46,7 @@ #include #include "opencv2/gpuoptflow.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #include "opencv2/gpuwarping.hpp" #include "opencv2/gpuimgproc.hpp" #include "opencv2/video.hpp" diff --git a/modules/nonfree/CMakeLists.txt b/modules/nonfree/CMakeLists.txt index fa73931aab..eec28e975b 100644 --- a/modules/nonfree/CMakeLists.txt +++ b/modules/nonfree/CMakeLists.txt @@ -4,4 +4,4 @@ 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_cudaarithm opencv_ocl) diff --git a/modules/nonfree/perf/perf_gpu.cpp b/modules/nonfree/perf/perf_gpu.cpp index c2a8ea130d..348c80e523 100644 --- a/modules/nonfree/perf/perf_gpu.cpp +++ b/modules/nonfree/perf/perf_gpu.cpp @@ -53,7 +53,7 @@ using namespace perf; ////////////////////////////////////////////////////////////////////// // SURF -#ifdef HAVE_OPENCV_GPUARITHM +#ifdef HAVE_OPENCV_CUDAARITHM DEF_PARAM_TEST_1(Image, string); @@ -98,6 +98,6 @@ PERF_TEST_P(Image, GPU_SURF, } } -#endif // HAVE_OPENCV_GPUARITHM +#endif // HAVE_OPENCV_CUDAARITHM #endif // HAVE_CUDA diff --git a/modules/nonfree/src/cuda/surf.cu b/modules/nonfree/src/cuda/surf.cu index c7aa09b446..9a141ab7c9 100644 --- a/modules/nonfree/src/cuda/surf.cu +++ b/modules/nonfree/src/cuda/surf.cu @@ -42,7 +42,7 @@ #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUARITHM +#ifdef HAVE_OPENCV_CUDAARITHM #include "opencv2/core/cuda/common.hpp" #include "opencv2/core/cuda/limits.hpp" @@ -957,4 +957,4 @@ namespace cv { namespace cuda { namespace device } // namespace surf }}} // namespace cv { namespace cuda { namespace cudev -#endif // HAVE_OPENCV_GPUARITHM +#endif // HAVE_OPENCV_CUDAARITHM diff --git a/modules/nonfree/src/precomp.hpp b/modules/nonfree/src/precomp.hpp index 3fb85a7305..fc21fb6864 100644 --- a/modules/nonfree/src/precomp.hpp +++ b/modules/nonfree/src/precomp.hpp @@ -54,8 +54,8 @@ #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUARITHM -# include "opencv2/gpuarithm.hpp" +#ifdef HAVE_OPENCV_CUDAARITHM +# include "opencv2/cudaarithm.hpp" #endif #ifdef HAVE_OPENCV_OCL diff --git a/modules/nonfree/src/surf_gpu.cpp b/modules/nonfree/src/surf_gpu.cpp index a3e8769eca..0abd7be828 100644 --- a/modules/nonfree/src/surf_gpu.cpp +++ b/modules/nonfree/src/surf_gpu.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::cuda; -#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_GPUARITHM) +#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_CUDAARITHM) cv::cuda::SURF_GPU::SURF_GPU() { throw_no_cuda(); } cv::cuda::SURF_GPU::SURF_GPU(double, int, int, bool, float, bool) { throw_no_cuda(); } diff --git a/modules/nonfree/test/test_gpu.cpp b/modules/nonfree/test/test_gpu.cpp index 7094a49d16..3380931cfc 100644 --- a/modules/nonfree/test/test_gpu.cpp +++ b/modules/nonfree/test/test_gpu.cpp @@ -49,7 +49,7 @@ using namespace cvtest; ///////////////////////////////////////////////////////////////////////////////////////////////// // SURF -#ifdef HAVE_OPENCV_GPUARITHM +#ifdef HAVE_OPENCV_CUDAARITHM namespace { @@ -193,6 +193,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 +#endif // HAVE_OPENCV_CUDAARITHM #endif // HAVE_CUDA diff --git a/modules/photo/CMakeLists.txt b/modules/photo/CMakeLists.txt index 5b47d3a1d9..ad04f0a69b 100644 --- a/modules/photo/CMakeLists.txt +++ b/modules/photo/CMakeLists.txt @@ -4,4 +4,4 @@ if(HAVE_CUDA) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations) endif() -ocv_define_module(photo opencv_imgproc OPTIONAL opencv_gpuarithm opencv_gpuimgproc) +ocv_define_module(photo opencv_imgproc OPTIONAL opencv_cudaarithm opencv_gpuimgproc) diff --git a/modules/photo/perf/perf_gpu.cpp b/modules/photo/perf/perf_gpu.cpp index 7e9b7c09c7..9ad29c468c 100644 --- a/modules/photo/perf/perf_gpu.cpp +++ b/modules/photo/perf/perf_gpu.cpp @@ -47,7 +47,7 @@ #include "opencv2/opencv_modules.hpp" -#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUIMGPROC) +#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUIMGPROC) using namespace std; using namespace testing; diff --git a/modules/photo/src/denoising_gpu.cpp b/modules/photo/src/denoising_gpu.cpp index b12e967be9..13167d1113 100644 --- a/modules/photo/src/denoising_gpu.cpp +++ b/modules/photo/src/denoising_gpu.cpp @@ -47,8 +47,8 @@ #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUARITHM -# include "opencv2/gpuarithm.hpp" +#ifdef HAVE_OPENCV_CUDAARITHM +# include "opencv2/cudaarithm.hpp" #endif #ifdef HAVE_OPENCV_GPUIMGPROC @@ -58,7 +58,7 @@ using namespace cv; using namespace cv::cuda; -#if !defined (HAVE_CUDA) || !defined(HAVE_OPENCV_GPUARITHM) || !defined(HAVE_OPENCV_GPUIMGPROC) +#if !defined (HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_GPUIMGPROC) void cv::cuda::nonLocalMeans(const GpuMat&, GpuMat&, float, int, int, int, Stream&) { throw_no_cuda(); } void cv::cuda::FastNonLocalMeansDenoising::simpleMethod(const GpuMat&, GpuMat&, float, int, int, Stream&) { throw_no_cuda(); } diff --git a/modules/photo/test/test_denoising_gpu.cpp b/modules/photo/test/test_denoising_gpu.cpp index fe2d041810..b9363cdced 100644 --- a/modules/photo/test/test_denoising_gpu.cpp +++ b/modules/photo/test/test_denoising_gpu.cpp @@ -48,7 +48,7 @@ #include "opencv2/opencv_modules.hpp" #include "cvconfig.h" -#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUIMGPROC) +#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUIMGPROC) using namespace cvtest; diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt index 389285a569..768abe9b1d 100644 --- a/modules/stitching/CMakeLists.txt +++ b/modules/stitching/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Images stitching") ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect - OPTIONAL opencv_gpu opencv_gpuarithm opencv_gpufilters opencv_gpufeatures2d opencv_nonfree) + OPTIONAL opencv_gpu opencv_cudaarithm opencv_gpufilters opencv_gpufeatures2d opencv_nonfree) diff --git a/modules/stitching/src/blenders.cpp b/modules/stitching/src/blenders.cpp index 6ac37d1f9d..ffff71460b 100644 --- a/modules/stitching/src/blenders.cpp +++ b/modules/stitching/src/blenders.cpp @@ -188,7 +188,7 @@ MultiBandBlender::MultiBandBlender(int try_gpu, int num_bands, int weight_type) { setNumBands(num_bands); -#if defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUWARPING) +#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) can_use_gpu_ = try_gpu && cuda::getCudaEnabledDeviceCount(); #else (void) try_gpu; @@ -491,7 +491,7 @@ void createLaplacePyr(const Mat &img, int num_levels, std::vector &pyr) void createLaplacePyrGpu(const Mat &img, int num_levels, std::vector &pyr) { -#if defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUWARPING) +#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) pyr.resize(num_levels + 1); std::vector gpu_pyr(num_levels + 1); @@ -531,7 +531,7 @@ void restoreImageFromLaplacePyr(std::vector &pyr) void restoreImageFromLaplacePyrGpu(std::vector &pyr) { -#if defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUWARPING) +#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) if (pyr.empty()) return; diff --git a/modules/stitching/src/precomp.hpp b/modules/stitching/src/precomp.hpp index ddd216a276..c2dbd11dfd 100644 --- a/modules/stitching/src/precomp.hpp +++ b/modules/stitching/src/precomp.hpp @@ -68,8 +68,8 @@ #include "opencv2/features2d.hpp" #include "opencv2/calib3d.hpp" -#ifdef HAVE_OPENCV_GPUARITHM -# include "opencv2/gpuarithm.hpp" +#ifdef HAVE_OPENCV_CUDAARITHM +# include "opencv2/cudaarithm.hpp" #endif #ifdef HAVE_OPENCV_GPUWARPING diff --git a/modules/superres/CMakeLists.txt b/modules/superres/CMakeLists.txt index a7d406d458..a1c0dde00b 100644 --- a/modules/superres/CMakeLists.txt +++ b/modules/superres/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "Super Resolution") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef) ocv_define_module(superres opencv_imgproc opencv_video OPTIONAL opencv_highgui opencv_ocl - opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec) + opencv_cudaarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec) diff --git a/modules/superres/src/btv_l1_gpu.cpp b/modules/superres/src/btv_l1_gpu.cpp index 677a42a44f..e968e9d790 100644 --- a/modules/superres/src/btv_l1_gpu.cpp +++ b/modules/superres/src/btv_l1_gpu.cpp @@ -50,7 +50,7 @@ using namespace cv::cuda; using namespace cv::superres; using namespace cv::superres::detail; -#if !defined(HAVE_CUDA) || !defined(HAVE_OPENCV_GPUARITHM) || !defined(HAVE_OPENCV_GPUWARPING) || !defined(HAVE_OPENCV_GPUFILTERS) +#if !defined(HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_GPUWARPING) || !defined(HAVE_OPENCV_GPUFILTERS) Ptr cv::superres::createSuperResolution_BTVL1_GPU() { diff --git a/modules/superres/src/cuda/btv_l1_gpu.cu b/modules/superres/src/cuda/btv_l1_gpu.cu index 1f80ce5fdb..d370a68c87 100644 --- a/modules/superres/src/cuda/btv_l1_gpu.cu +++ b/modules/superres/src/cuda/btv_l1_gpu.cu @@ -42,7 +42,7 @@ #include "opencv2/opencv_modules.hpp" -#if defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUWARPING) && defined(HAVE_OPENCV_GPUFILTERS) +#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) && defined(HAVE_OPENCV_GPUFILTERS) #include "opencv2/core/cuda/common.hpp" #include "opencv2/core/cuda/transform.hpp" diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp index 7e8d581171..89a1e132cb 100644 --- a/modules/superres/src/precomp.hpp +++ b/modules/superres/src/precomp.hpp @@ -57,8 +57,8 @@ #include "opencv2/core/private.cuda.hpp" -#ifdef HAVE_OPENCV_GPUARITHM -# include "opencv2/gpuarithm.hpp" +#ifdef HAVE_OPENCV_CUDAARITHM +# include "opencv2/cudaarithm.hpp" #endif #ifdef HAVE_OPENCV_GPUWARPING diff --git a/modules/superres/test/test_superres.cpp b/modules/superres/test/test_superres.cpp index 2cede096db..541ec5524f 100644 --- a/modules/superres/test/test_superres.cpp +++ b/modules/superres/test/test_superres.cpp @@ -268,7 +268,7 @@ TEST_F(SuperResolution, BTVL1) RunTest(cv::superres::createSuperResolution_BTVL1()); } -#if defined(HAVE_CUDA) && defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUWARPING) && defined(HAVE_OPENCV_GPUFILTERS) +#if defined(HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) && defined(HAVE_OPENCV_GPUFILTERS) TEST_F(SuperResolution, BTVL1_GPU) { diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index 4115bf9fce..20f30e0d72 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -22,8 +22,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) if(HAVE_opencv_gpuimgproc) ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuimgproc/include") endif() - if(HAVE_opencv_gpuarithm) - ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuarithm/include") + if(HAVE_opencv_cudaarithm) + ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudaarithm/include") endif() if(HAVE_opencv_gpufilters) ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpufilters/include") @@ -53,7 +53,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) if("${srcs}" MATCHES "gpu/") - target_link_libraries(${the_target} opencv_gpuarithm opencv_gpufilters) + target_link_libraries(${the_target} opencv_cudaarithm opencv_gpufilters) endif() set_target_properties(${the_target} PROPERTIES @@ -79,7 +79,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ocv_list_filterout(cpp_samples Qt_sample) endif() - if(NOT HAVE_opencv_gpuarithm OR NOT HAVE_opencv_gpufilters) + if(NOT HAVE_opencv_cudaarithm OR NOT HAVE_opencv_gpufilters) ocv_list_filterout(cpp_samples "/gpu/") endif() diff --git a/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp b/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp index 00223b0dbd..29f5a7e7ca 100644 --- a/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp +++ b/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp @@ -7,7 +7,7 @@ #include // Read images // GPU structures and methods -#include +#include #include using namespace std; diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt index d6e24c6dd7..9d47cfe0d1 100644 --- a/samples/gpu/CMakeLists.txt +++ b/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_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc + opencv_cudaarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm opencv_gpustereo opencv_cudalegacy) diff --git a/samples/gpu/brox_optical_flow.cpp b/samples/gpu/brox_optical_flow.cpp index 7bcc509380..4a82cef822 100644 --- a/samples/gpu/brox_optical_flow.cpp +++ b/samples/gpu/brox_optical_flow.cpp @@ -8,7 +8,7 @@ #include "opencv2/highgui.hpp" #include "opencv2/imgproc.hpp" #include "opencv2/gpuoptflow.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" using namespace std; using namespace cv; diff --git a/samples/gpu/driver_api_multi.cpp b/samples/gpu/driver_api_multi.cpp index 6508dadddd..cd8400aac8 100644 --- a/samples/gpu/driver_api_multi.cpp +++ b/samples/gpu/driver_api_multi.cpp @@ -9,7 +9,7 @@ #include #include "cvconfig.h" #include "opencv2/core/core.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #ifdef HAVE_TBB # include "tbb/tbb_stddef.h" diff --git a/samples/gpu/multi.cpp b/samples/gpu/multi.cpp index c6744c5cb9..b8dfd6b649 100644 --- a/samples/gpu/multi.cpp +++ b/samples/gpu/multi.cpp @@ -9,7 +9,7 @@ #include #include "cvconfig.h" #include "opencv2/core/core.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #ifdef HAVE_TBB # include "tbb/tbb_stddef.h" diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index 7747128333..12f098390a 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -5,7 +5,7 @@ #include "opencv2/video.hpp" #include "opencv2/gpu.hpp" #include "opencv2/gpuimgproc.hpp" -#include "opencv2/gpuarithm.hpp" +#include "opencv2/cudaarithm.hpp" #include "opencv2/gpuwarping.hpp" #include "opencv2/gpufeatures2d.hpp" #include "opencv2/gpufilters.hpp"