diff --git a/modules/core/src/cuda/matrix_operations.cu b/modules/core/src/cuda/matrix_operations.cu index f475136c87..c3da05ea01 100644 --- a/modules/core/src/cuda/matrix_operations.cu +++ b/modules/core/src/cuda/matrix_operations.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/transform.hpp" #include "opencv2/gpu/device/functional.hpp" @@ -340,3 +342,5 @@ namespace cv { namespace gpu { namespace device # pragma clang diagnostic pop #endif }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp index 07d7363868..90162e762c 100644 --- a/modules/core/src/gpumat.cpp +++ b/modules/core/src/gpumat.cpp @@ -94,7 +94,7 @@ namespace bool cv::gpu::TargetArchs::builtWith(cv::gpu::FeatureSet feature_set) { -#ifdef HAVE_CUDA +#if defined HAVE_CUDA && !defined(CUDA_DISABLER) return ::compareToSet(CUDA_ARCH_FEATURES, feature_set, std::greater_equal()); #else (void)feature_set; @@ -109,7 +109,7 @@ bool cv::gpu::TargetArchs::has(int major, int minor) bool cv::gpu::TargetArchs::hasPtx(int major, int minor) { -#ifdef HAVE_CUDA +#if defined HAVE_CUDA && !defined(CUDA_DISABLER) return ::compareToSet(CUDA_ARCH_PTX, major * 10 + minor, std::equal_to()); #else (void)major; @@ -120,7 +120,7 @@ bool cv::gpu::TargetArchs::hasPtx(int major, int minor) bool cv::gpu::TargetArchs::hasBin(int major, int minor) { -#if defined (HAVE_CUDA) +#if defined (HAVE_CUDA) && !defined(CUDA_DISABLER) return ::compareToSet(CUDA_ARCH_BIN, major * 10 + minor, std::equal_to()); #else (void)major; @@ -131,7 +131,7 @@ bool cv::gpu::TargetArchs::hasBin(int major, int minor) bool cv::gpu::TargetArchs::hasEqualOrLessPtx(int major, int minor) { -#ifdef HAVE_CUDA +#if defined HAVE_CUDA && !defined(CUDA_DISABLER) return ::compareToSet(CUDA_ARCH_PTX, major * 10 + minor, std::less_equal()); #else @@ -149,7 +149,7 @@ bool cv::gpu::TargetArchs::hasEqualOrGreater(int major, int minor) bool cv::gpu::TargetArchs::hasEqualOrGreaterPtx(int major, int minor) { -#ifdef HAVE_CUDA +#if defined HAVE_CUDA && !defined(CUDA_DISABLER) return ::compareToSet(CUDA_ARCH_PTX, major * 10 + minor, std::greater_equal()); #else @@ -161,7 +161,7 @@ bool cv::gpu::TargetArchs::hasEqualOrGreaterPtx(int major, int minor) bool cv::gpu::TargetArchs::hasEqualOrGreaterBin(int major, int minor) { -#ifdef HAVE_CUDA +#if defined HAVE_CUDA && !defined(CUDA_DISABLER) return ::compareToSet(CUDA_ARCH_BIN, major * 10 + minor, std::greater_equal()); #else @@ -171,7 +171,7 @@ bool cv::gpu::TargetArchs::hasEqualOrGreaterBin(int major, int minor) #endif } -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) #define throw_nogpu CV_Error(CV_GpuNotSupported, "The library is compiled without CUDA support") @@ -728,7 +728,7 @@ namespace }; } -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) namespace { diff --git a/modules/core/src/opengl_interop.cpp b/modules/core/src/opengl_interop.cpp index 5895363cdc..a549366752 100644 --- a/modules/core/src/opengl_interop.cpp +++ b/modules/core/src/opengl_interop.cpp @@ -70,7 +70,7 @@ using namespace cv::gpu; #else #define throw_nogl CV_Error(CV_OpenGlNotSupported, "OpenGL context doesn't exist") - #ifndef HAVE_CUDA + #if !defined HAVE_CUDA || defined(CUDA_DISABLER) #define throw_nocuda CV_Error(CV_GpuNotSupported, "The library is compiled without CUDA support") #else #if defined(__GNUC__) @@ -162,7 +162,7 @@ void icvSetOpenGlFuncTab(const CvOpenGlFuncTab* tab) void cv::gpu::setGlDevice(int device) { -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) (void)device; throw_nocuda; #else @@ -538,7 +538,7 @@ cv::GlBuffer::GlBuffer(InputArray mat_, Usage _usage) : rows_(0), cols_(0), type if (kind == _InputArray::GPU_MAT) { - #ifndef HAVE_CUDA + #if !defined HAVE_CUDA || defined(CUDA_DISABLER) throw_nocuda; #else GpuMat d_mat = mat_.getGpuMat(); @@ -609,7 +609,7 @@ void cv::GlBuffer::copyFrom(InputArray mat_) } case _InputArray::GPU_MAT: { - #ifndef HAVE_CUDA + #if !defined HAVE_CUDA || defined(CUDA_DISABLER) throw_nocuda; #else GpuMat d_mat = mat_.getGpuMat(); @@ -670,7 +670,7 @@ GpuMat cv::GlBuffer::mapDevice() throw_nogl; return GpuMat(); #else - #ifndef HAVE_CUDA + #if !defined HAVE_CUDA || defined(CUDA_DISABLER) throw_nocuda; return GpuMat(); #else @@ -684,7 +684,7 @@ void cv::GlBuffer::unmapDevice() #ifndef HAVE_OPENGL throw_nogl; #else - #ifndef HAVE_CUDA + #if !defined HAVE_CUDA || defined(CUDA_DISABLER) throw_nocuda; #else impl_->unmapDevice(); @@ -976,7 +976,7 @@ cv::GlTexture::GlTexture(InputArray mat_, bool bgra) : rows_(0), cols_(0), type_ } case _InputArray::GPU_MAT: { - #ifndef HAVE_CUDA + #if !defined HAVE_CUDA || defined(CUDA_DISABLER) throw_nocuda; #else GpuMat d_mat = mat_.getGpuMat(); @@ -1056,7 +1056,7 @@ void cv::GlTexture::copyFrom(InputArray mat_, bool bgra) } case _InputArray::GPU_MAT: { - #ifndef HAVE_CUDA + #if !defined HAVE_CUDA || defined(CUDA_DISABLER) throw_nocuda; #else GpuMat d_mat = mat_.getGpuMat(); diff --git a/modules/gpu/perf/main.cpp b/modules/gpu/perf/main.cpp index 8d34041f36..8af255b78f 100644 --- a/modules/gpu/perf/main.cpp +++ b/modules/gpu/perf/main.cpp @@ -31,7 +31,7 @@ void printOsInfo() void printCudaInfo() { -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) cout << "OpenCV was built without CUDA support \n" << endl; #else int driver; @@ -99,7 +99,7 @@ int main(int argc, char** argv) int device = cmd.get("device"); bool cpu = cmd.has("cpu"); -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) cpu = true; #endif diff --git a/modules/gpu/src/arithm.cpp b/modules/gpu/src/arithm.cpp index 67f3936f99..b5d07356fc 100644 --- a/modules/gpu/src/arithm.cpp +++ b/modules/gpu/src/arithm.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::gemm(const GpuMat&, const GpuMat&, double, const GpuMat&, double, GpuMat&, int, Stream&) { throw_nogpu(); } void cv::gpu::transpose(const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/bgfg_gmg.cpp b/modules/gpu/src/bgfg_gmg.cpp index f4133f4ff5..46f3ba2890 100644 --- a/modules/gpu/src/bgfg_gmg.cpp +++ b/modules/gpu/src/bgfg_gmg.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) cv::gpu::GMG_GPU::GMG_GPU() { throw_nogpu(); } void cv::gpu::GMG_GPU::initialize(cv::Size, float, float) { throw_nogpu(); } diff --git a/modules/gpu/src/bgfg_mog.cpp b/modules/gpu/src/bgfg_mog.cpp index 67cac76526..05b4ffb9c8 100644 --- a/modules/gpu/src/bgfg_mog.cpp +++ b/modules/gpu/src/bgfg_mog.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) cv::gpu::MOG_GPU::MOG_GPU(int) { throw_nogpu(); } void cv::gpu::MOG_GPU::initialize(cv::Size, int) { throw_nogpu(); } diff --git a/modules/gpu/src/bgfg_vibe.cpp b/modules/gpu/src/bgfg_vibe.cpp index cf6d3c5340..ff7e58082e 100644 --- a/modules/gpu/src/bgfg_vibe.cpp +++ b/modules/gpu/src/bgfg_vibe.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) cv::gpu::VIBE_GPU::VIBE_GPU(unsigned long) { throw_nogpu(); } void cv::gpu::VIBE_GPU::initialize(const GpuMat&, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/bilateral_filter.cpp b/modules/gpu/src/bilateral_filter.cpp index facd1ee084..b4920a035b 100644 --- a/modules/gpu/src/bilateral_filter.cpp +++ b/modules/gpu/src/bilateral_filter.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::DisparityBilateralFilter::DisparityBilateralFilter(int, int, int) { throw_nogpu(); } cv::gpu::DisparityBilateralFilter::DisparityBilateralFilter(int, int, int, float, float, float) { throw_nogpu(); } diff --git a/modules/gpu/src/blend.cpp b/modules/gpu/src/blend.cpp index 7c2a86e7d0..4023a0842c 100644 --- a/modules/gpu/src/blend.cpp +++ b/modules/gpu/src/blend.cpp @@ -46,7 +46,7 @@ using namespace std; using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::blendLinear(const GpuMat&, const GpuMat&, const GpuMat&, const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/brute_force_matcher.cpp b/modules/gpu/src/brute_force_matcher.cpp index 5e0ef21afe..9b8a9c9b73 100644 --- a/modules/gpu/src/brute_force_matcher.cpp +++ b/modules/gpu/src/brute_force_matcher.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::BFMatcher_GPU::BFMatcher_GPU(int) { throw_nogpu(); } void cv::gpu::BFMatcher_GPU::add(const vector&) { throw_nogpu(); } diff --git a/modules/gpu/src/calib3d.cpp b/modules/gpu/src/calib3d.cpp index efbd76eb17..7e1de91e75 100644 --- a/modules/gpu/src/calib3d.cpp +++ b/modules/gpu/src/calib3d.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined(HAVE_CUDA) +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) void cv::gpu::transformPoints(const GpuMat&, const Mat&, const Mat&, GpuMat&, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/cascadeclassifier.cpp b/modules/gpu/src/cascadeclassifier.cpp index d6fb10c98b..676bca5c2f 100644 --- a/modules/gpu/src/cascadeclassifier.cpp +++ b/modules/gpu/src/cascadeclassifier.cpp @@ -48,7 +48,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::CascadeClassifier_GPU::CascadeClassifier_GPU() { throw_nogpu(); } cv::gpu::CascadeClassifier_GPU::CascadeClassifier_GPU(const string&) { throw_nogpu(); } diff --git a/modules/gpu/src/color.cpp b/modules/gpu/src/color.cpp index b8c5942d82..8115ac0c98 100644 --- a/modules/gpu/src/color.cpp +++ b/modules/gpu/src/color.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::cvtColor(const GpuMat&, GpuMat&, int, int, Stream&) { throw_nogpu(); } void cv::gpu::swapChannels(GpuMat&, const int[], Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/cuda/NV12ToARGB.cu b/modules/gpu/src/cuda/NV12ToARGB.cu index 32d5749099..a860c8514b 100644 --- a/modules/gpu/src/cuda/NV12ToARGB.cu +++ b/modules/gpu/src/cuda/NV12ToARGB.cu @@ -58,6 +58,8 @@ source and converts to output in ARGB format */ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" namespace cv { namespace gpu { namespace device { @@ -206,3 +208,5 @@ namespace cv { namespace gpu { namespace device { } } }}} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/bf_knnmatch.cu b/modules/gpu/src/cuda/bf_knnmatch.cu index b545cb5ab2..fac2f20765 100644 --- a/modules/gpu/src/cuda/bf_knnmatch.cu +++ b/modules/gpu/src/cuda/bf_knnmatch.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/vec_distance.hpp" @@ -1160,3 +1162,6 @@ namespace cv { namespace gpu { namespace device template void match2Hamming_gpu(const PtrStepSzb& query, const PtrStepSzb& trains, const PtrStepSz& masks, const PtrStepSzb& trainIdx, const PtrStepSzb& imgIdx, const PtrStepSzb& distance, int cc, cudaStream_t stream); } // namespace bf_knnmatch }}} // namespace cv { namespace gpu { namespace device { + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/bf_match.cu b/modules/gpu/src/cuda/bf_match.cu index d8489d933b..c50a076297 100644 --- a/modules/gpu/src/cuda/bf_match.cu +++ b/modules/gpu/src/cuda/bf_match.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/vec_distance.hpp" @@ -778,3 +780,6 @@ namespace cv { namespace gpu { namespace device template void matchHamming_gpu(const PtrStepSzb& query, const PtrStepSzb& trains, const PtrStepSz& masks, const PtrStepSzi& trainIdx, const PtrStepSzi& imgIdx, const PtrStepSzf& distance, int cc, cudaStream_t stream); } // namespace bf_match }}} // namespace cv { namespace gpu { namespace device { + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/bf_radius_match.cu b/modules/gpu/src/cuda/bf_radius_match.cu index 63dcd01537..1954bf9f0b 100644 --- a/modules/gpu/src/cuda/bf_radius_match.cu +++ b/modules/gpu/src/cuda/bf_radius_match.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/vec_distance.hpp" @@ -465,3 +467,6 @@ namespace cv { namespace gpu { namespace device template void matchHamming_gpu(const PtrStepSzb& query, const PtrStepSzb* trains, int n, float maxDistance, const PtrStepSzb* masks, const PtrStepSzi& trainIdx, const PtrStepSzi& imgIdx, const PtrStepSzf& distance, const PtrStepSz& nMatches, int cc, cudaStream_t stream); } // namespace bf_radius_match }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/bgfg_gmg.cu b/modules/gpu/src/cuda/bgfg_gmg.cu index 7fee2d87b3..8e2fd3b38b 100644 --- a/modules/gpu/src/cuda/bgfg_gmg.cu +++ b/modules/gpu/src/cuda/bgfg_gmg.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/vec_traits.hpp" #include "opencv2/gpu/device/limits.hpp" @@ -251,3 +253,6 @@ namespace cv { namespace gpu { namespace device { template void update_gpu(PtrStepSzb frame, PtrStepb fgmask, PtrStepSzi colors, PtrStepf weights, PtrStepi nfeatures, int frameNum, float learningRate, bool updateBackgroundModel, cudaStream_t stream); } }}} + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/bgfg_mog.cu b/modules/gpu/src/cuda/bgfg_mog.cu index dcfd502848..4f78dbd2da 100644 --- a/modules/gpu/src/cuda/bgfg_mog.cu +++ b/modules/gpu/src/cuda/bgfg_mog.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/vec_traits.hpp" #include "opencv2/gpu/device/vec_math.hpp" @@ -757,3 +759,6 @@ namespace cv { namespace gpu { namespace device } } }}} + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/bgfg_vibe.cu b/modules/gpu/src/cuda/bgfg_vibe.cu index 2b3b7074ea..72ea7f0ae7 100644 --- a/modules/gpu/src/cuda/bgfg_vibe.cu +++ b/modules/gpu/src/cuda/bgfg_vibe.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" namespace cv { namespace gpu { namespace device @@ -251,3 +253,6 @@ namespace cv { namespace gpu { namespace device } } }}} + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/bilateral_filter.cu b/modules/gpu/src/cuda/bilateral_filter.cu index 9e9135e109..15f7b19ed4 100644 --- a/modules/gpu/src/cuda/bilateral_filter.cu +++ b/modules/gpu/src/cuda/bilateral_filter.cu @@ -41,6 +41,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/vec_traits.hpp" @@ -194,3 +196,6 @@ OCV_INSTANTIATE_BILATERAL_FILTER(float) //OCV_INSTANTIATE_BILATERAL_FILTER(float2) OCV_INSTANTIATE_BILATERAL_FILTER(float3) OCV_INSTANTIATE_BILATERAL_FILTER(float4) + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/blend.cu b/modules/gpu/src/cuda/blend.cu index e716edc715..841258f5ef 100644 --- a/modules/gpu/src/cuda/blend.cu +++ b/modules/gpu/src/cuda/blend.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" namespace cv { namespace gpu { namespace device @@ -114,3 +116,6 @@ namespace cv { namespace gpu { namespace device } } // namespace blend }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/calib3d.cu b/modules/gpu/src/cuda/calib3d.cu index 5def4ad245..40c847547e 100644 --- a/modules/gpu/src/cuda/calib3d.cu +++ b/modules/gpu/src/cuda/calib3d.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/transform.hpp" #include "opencv2/gpu/device/functional.hpp" @@ -189,3 +191,6 @@ namespace cv { namespace gpu { namespace device } } // namespace solvepnp_ransac }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/canny.cu b/modules/gpu/src/cuda/canny.cu index 95028c2eaf..666777240e 100644 --- a/modules/gpu/src/cuda/canny.cu +++ b/modules/gpu/src/cuda/canny.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include #include "internal_shared.hpp" @@ -494,3 +496,6 @@ namespace cv { namespace gpu { namespace device } } // namespace canny }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/ccomponetns.cu b/modules/gpu/src/cuda/ccomponetns.cu index e92615e5f7..62e81376aa 100644 --- a/modules/gpu/src/cuda/ccomponetns.cu +++ b/modules/gpu/src/cuda/ccomponetns.cu @@ -39,6 +39,8 @@ // the use of this software, even if advised of the possibility of such damage. //M*/ +#if !defined CUDA_DISABLER + #include #include #include @@ -525,4 +527,6 @@ namespace cv { namespace gpu { namespace device cudaSafeCall( cudaDeviceSynchronize() ); } } -} } } \ No newline at end of file +} } } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/color.cu b/modules/gpu/src/cuda/color.cu index 54925abe62..7d2befea2f 100644 --- a/modules/gpu/src/cuda/color.cu +++ b/modules/gpu/src/cuda/color.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include #include @@ -378,3 +380,5 @@ namespace cv { namespace gpu { namespace device #undef OPENCV_GPU_IMPLEMENT_CVTCOLOR_ALL #undef OPENCV_GPU_IMPLEMENT_CVTCOLOR_8U32F }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/column_filter.cu b/modules/gpu/src/cuda/column_filter.cu index f283bf6931..7f5d247606 100644 --- a/modules/gpu/src/cuda/column_filter.cu +++ b/modules/gpu/src/cuda/column_filter.cu @@ -41,6 +41,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/vec_math.hpp" @@ -378,3 +380,6 @@ namespace cv { namespace gpu { namespace device template void linearColumnFilter_gpu(PtrStepSzb src, PtrStepSzb dst, const float kernel[], int ksize, int anchor, int brd_type, int cc, cudaStream_t stream); } // namespace column_filter }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/copy_make_border.cu b/modules/gpu/src/cuda/copy_make_border.cu index 71859f2b77..74120ba91c 100644 --- a/modules/gpu/src/cuda/copy_make_border.cu +++ b/modules/gpu/src/cuda/copy_make_border.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/border_interpolate.hpp" @@ -125,3 +127,5 @@ namespace cv { namespace gpu { namespace device template void copyMakeBorder_gpu(const PtrStepSzb& src, const PtrStepSzb& dst, int top, int left, int borderMode, const float* borderValue, cudaStream_t stream); } // namespace imgproc }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/debayer.cu b/modules/gpu/src/cuda/debayer.cu index 29e4b4bf5c..57322ed81f 100644 --- a/modules/gpu/src/cuda/debayer.cu +++ b/modules/gpu/src/cuda/debayer.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include #include @@ -325,3 +327,5 @@ namespace cv { namespace gpu { template void Bayer2BGR_16u_gpu<4>(PtrStepSzb src, PtrStepSzb dst, bool blue_last, bool start_with_green, cudaStream_t stream); } }} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/disp_bilateral_filter.cu b/modules/gpu/src/cuda/disp_bilateral_filter.cu index e91cf9cc3e..56b39eaa7d 100644 --- a/modules/gpu/src/cuda/disp_bilateral_filter.cu +++ b/modules/gpu/src/cuda/disp_bilateral_filter.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/limits.hpp" @@ -217,3 +219,5 @@ namespace cv { namespace gpu { namespace device template void disp_bilateral_filter(PtrStepSz disp, PtrStepSzb img, int channels, int iters, cudaStream_t stream); } // namespace bilateral_filter }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/element_operations.cu b/modules/gpu/src/cuda/element_operations.cu index 19c328c0bf..deaa94a481 100644 --- a/modules/gpu/src/cuda/element_operations.cu +++ b/modules/gpu/src/cuda/element_operations.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/functional.hpp" #include "opencv2/gpu/device/vec_math.hpp" @@ -2367,3 +2369,5 @@ namespace cv { namespace gpu { namespace device template void addWeighted_gpu(const PtrStepSzb& src1, double alpha, const PtrStepSzb& src2, double beta, double gamma, const PtrStepSzb& dst, cudaStream_t stream); template void addWeighted_gpu(const PtrStepSzb& src1, double alpha, const PtrStepSzb& src2, double beta, double gamma, const PtrStepSzb& dst, cudaStream_t stream); }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/fast.cu b/modules/gpu/src/cuda/fast.cu index 75237ee565..0661888aae 100644 --- a/modules/gpu/src/cuda/fast.cu +++ b/modules/gpu/src/cuda/fast.cu @@ -45,6 +45,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/utility.hpp" @@ -383,3 +385,6 @@ namespace cv { namespace gpu { namespace device } } // namespace fast }}} + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/fgd_bgfg.cu b/modules/gpu/src/cuda/fgd_bgfg.cu index b19fff409c..6040d021b8 100644 --- a/modules/gpu/src/cuda/fgd_bgfg.cu +++ b/modules/gpu/src/cuda/fgd_bgfg.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/vec_math.hpp" #include "opencv2/gpu/device/limits.hpp" @@ -842,3 +844,5 @@ namespace bgfg template void updateBackgroundModel_gpu(PtrStepSzb prevFrame, PtrStepSzb curFrame, PtrStepSzb Ftd, PtrStepSzb Fbd, PtrStepSzb foreground, PtrStepSzb background, int deltaC, int deltaCC, float alpha1, float alpha2, float alpha3, int N1c, int N1cc, int N2c, int N2cc, float T, cudaStream_t stream); template void updateBackgroundModel_gpu(PtrStepSzb prevFrame, PtrStepSzb curFrame, PtrStepSzb Ftd, PtrStepSzb Fbd, PtrStepSzb foreground, PtrStepSzb background, int deltaC, int deltaCC, float alpha1, float alpha2, float alpha3, int N1c, int N1cc, int N2c, int N2cc, float T, cudaStream_t stream); } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/gftt.cu b/modules/gpu/src/cuda/gftt.cu index 03e1fa2553..356d34ce29 100644 --- a/modules/gpu/src/cuda/gftt.cu +++ b/modules/gpu/src/cuda/gftt.cu @@ -45,6 +45,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include "opencv2/gpu/device/common.hpp" @@ -144,3 +146,6 @@ namespace cv { namespace gpu { namespace device } } // namespace optical_flow }}} + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/global_motion.cu b/modules/gpu/src/cuda/global_motion.cu index 8a15071085..c48274a413 100644 --- a/modules/gpu/src/cuda/global_motion.cu +++ b/modules/gpu/src/cuda/global_motion.cu @@ -41,6 +41,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "thrust/device_ptr.h" #include "thrust/remove.h" #include "thrust/functional.h" @@ -113,3 +115,6 @@ void calcWobbleSuppressionMaps( } }}}} + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/hist.cu b/modules/gpu/src/cuda/hist.cu index a337d20ceb..363050aebf 100644 --- a/modules/gpu/src/cuda/hist.cu +++ b/modules/gpu/src/cuda/hist.cu @@ -41,6 +41,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/utility.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" @@ -217,3 +219,6 @@ namespace cv { namespace gpu { namespace device } } // namespace hist }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/hog.cu b/modules/gpu/src/cuda/hog.cu index 3a3abd47a7..801e9cdfc9 100644 --- a/modules/gpu/src/cuda/hog.cu +++ b/modules/gpu/src/cuda/hog.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" namespace cv { namespace gpu { namespace device @@ -864,3 +866,6 @@ namespace cv { namespace gpu { namespace device void resize_8UC4(const PtrStepSzb& src, PtrStepSzb dst) { resize_for_hog(src, dst, resize8UC4_tex); } } // namespace hog }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/hough.cu b/modules/gpu/src/cuda/hough.cu index 712b91ab16..ac65b360a5 100644 --- a/modules/gpu/src/cuda/hough.cu +++ b/modules/gpu/src/cuda/hough.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/emulation.hpp" @@ -1505,3 +1507,6 @@ namespace cv { namespace gpu { namespace device } } }}} + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/imgproc.cu b/modules/gpu/src/cuda/imgproc.cu index 494da8db7b..9a75c52fc3 100644 --- a/modules/gpu/src/cuda/imgproc.cu +++ b/modules/gpu/src/cuda/imgproc.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/vec_traits.hpp" #include "opencv2/gpu/device/vec_math.hpp" @@ -997,3 +999,6 @@ namespace cv { namespace gpu { namespace device template void filter2D_gpu(PtrStepSzb srcWhole, int ofsX, int ofsY, PtrStepSzb dst, int kWidth, int kHeight, int anchorX, int anchorY, const float* kernel, int borderMode, const float* borderValue, cudaStream_t stream); } // namespace imgproc }}} // namespace cv { namespace gpu { namespace device { + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/integral_image.cu b/modules/gpu/src/cuda/integral_image.cu index 0405f66704..558f9085db 100644 --- a/modules/gpu/src/cuda/integral_image.cu +++ b/modules/gpu/src/cuda/integral_image.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" namespace cv { namespace gpu { namespace device @@ -383,3 +385,5 @@ namespace cv { namespace gpu { namespace device } } }}} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/lbp.cu b/modules/gpu/src/cuda/lbp.cu index d2803448dd..ce5e9ae671 100644 --- a/modules/gpu/src/cuda/lbp.cu +++ b/modules/gpu/src/cuda/lbp.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include #include @@ -295,4 +297,6 @@ namespace cv { namespace gpu { namespace device lbp_cascade<<>>(cascade, frameW, frameH, windowW, windowH, initialScale, factor, workAmount, integral.ptr(), integral.step / sizeof(int), objects, classified); } } -}}} \ No newline at end of file +}}} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/match_template.cu b/modules/gpu/src/cuda/match_template.cu index 6fd6359fc6..1b81e87d98 100644 --- a/modules/gpu/src/cuda/match_template.cu +++ b/modules/gpu/src/cuda/match_template.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/vec_math.hpp" @@ -909,3 +911,6 @@ namespace cv { namespace gpu { namespace device } } //namespace match_template }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/mathfunc.cu b/modules/gpu/src/cuda/mathfunc.cu index b6969fce39..aa502d1868 100644 --- a/modules/gpu/src/cuda/mathfunc.cu +++ b/modules/gpu/src/cuda/mathfunc.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" namespace cv { namespace gpu { namespace device @@ -211,3 +213,5 @@ namespace cv { namespace gpu { namespace device } } // namespace mathfunc }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/matrix_reductions.cu b/modules/gpu/src/cuda/matrix_reductions.cu index 26eca02ce4..b7da2151ad 100644 --- a/modules/gpu/src/cuda/matrix_reductions.cu +++ b/modules/gpu/src/cuda/matrix_reductions.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" @@ -2097,3 +2099,5 @@ namespace cv { namespace gpu { namespace device template void reduceCols_gpu(const PtrStepSzb& src, int cn, const PtrStepSzb& dst, int reduceOp, cudaStream_t stream); } // namespace mattrix_reductions }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/nlm.cu b/modules/gpu/src/cuda/nlm.cu index a175d5fec3..b65962d5fb 100644 --- a/modules/gpu/src/cuda/nlm.cu +++ b/modules/gpu/src/cuda/nlm.cu @@ -41,6 +41,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/vec_traits.hpp" @@ -168,3 +170,5 @@ namespace cv { namespace gpu { namespace device template void nlm_bruteforce_gpu(const PtrStepSzb&, PtrStepSzb, int, int, float, int, cudaStream_t); } }}} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/optical_flow.cu b/modules/gpu/src/cuda/optical_flow.cu index c0961c3354..db529c4bef 100644 --- a/modules/gpu/src/cuda/optical_flow.cu +++ b/modules/gpu/src/cuda/optical_flow.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" namespace cv { namespace gpu { namespace device @@ -214,3 +216,5 @@ namespace cv { namespace gpu { namespace device } } }}} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/optical_flow_farneback.cu b/modules/gpu/src/cuda/optical_flow_farneback.cu index f83e440c68..8231775b84 100644 --- a/modules/gpu/src/cuda/optical_flow_farneback.cu +++ b/modules/gpu/src/cuda/optical_flow_farneback.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include "internal_shared.hpp" #include "opencv2/gpu/device/common.hpp" @@ -645,3 +647,5 @@ namespace cv { namespace gpu { namespace device { namespace optflow_farneback }}}} // namespace cv { namespace gpu { namespace device { namespace optflow_farneback + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/orb.cu b/modules/gpu/src/cuda/orb.cu index 0d5ce3726e..d136472566 100644 --- a/modules/gpu/src/cuda/orb.cu +++ b/modules/gpu/src/cuda/orb.cu @@ -45,6 +45,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include "opencv2/gpu/device/common.hpp" @@ -415,4 +417,6 @@ namespace cv { namespace gpu { namespace device cudaSafeCall( cudaDeviceSynchronize() ); } } -}}} \ No newline at end of file +}}} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/pyr_down.cu b/modules/gpu/src/cuda/pyr_down.cu index ca9a598d79..db5f9d2d69 100644 --- a/modules/gpu/src/cuda/pyr_down.cu +++ b/modules/gpu/src/cuda/pyr_down.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/border_interpolate.hpp" #include "opencv2/gpu/device/vec_traits.hpp" @@ -221,3 +223,6 @@ namespace cv { namespace gpu { namespace device template void pyrDown_gpu(PtrStepSzb src, PtrStepSzb dst, cudaStream_t stream); } // namespace imgproc }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/pyr_up.cu b/modules/gpu/src/cuda/pyr_up.cu index 996663eb51..89775a002e 100644 --- a/modules/gpu/src/cuda/pyr_up.cu +++ b/modules/gpu/src/cuda/pyr_up.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/border_interpolate.hpp" #include "opencv2/gpu/device/vec_traits.hpp" @@ -190,3 +192,5 @@ namespace cv { namespace gpu { namespace device template void pyrUp_gpu(PtrStepSzb src, PtrStepSzb dst, cudaStream_t stream); } // namespace imgproc }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/pyrlk.cu b/modules/gpu/src/cuda/pyrlk.cu index ef3f424bc3..c348591c0d 100644 --- a/modules/gpu/src/cuda/pyrlk.cu +++ b/modules/gpu/src/cuda/pyrlk.cu @@ -45,6 +45,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/utility.hpp" #include "opencv2/gpu/device/functional.hpp" @@ -678,3 +680,5 @@ namespace cv { namespace gpu { namespace device } } }}} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/remap.cu b/modules/gpu/src/cuda/remap.cu index 896e48b01e..8f7ce5b68c 100644 --- a/modules/gpu/src/cuda/remap.cu +++ b/modules/gpu/src/cuda/remap.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/border_interpolate.hpp" #include "opencv2/gpu/device/vec_traits.hpp" @@ -267,3 +269,6 @@ namespace cv { namespace gpu { namespace device template void remap_gpu(PtrStepSzb src, PtrStepSzb srcWhole, int xoff, int yoff, PtrStepSzf xmap, PtrStepSzf ymap, PtrStepSzb dst, int interpolation, int borderMode, const float* borderValue, cudaStream_t stream, int cc); } // namespace imgproc }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/resize.cu b/modules/gpu/src/cuda/resize.cu index e5faeb8cc0..59424f5037 100644 --- a/modules/gpu/src/cuda/resize.cu +++ b/modules/gpu/src/cuda/resize.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/border_interpolate.hpp" #include "opencv2/gpu/device/vec_traits.hpp" @@ -295,3 +297,6 @@ namespace cv { namespace gpu { namespace device } // namespace imgproc }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/rgb_to_yv12.cu b/modules/gpu/src/cuda/rgb_to_yv12.cu index 3ef0a3e6d9..29ee7949e1 100644 --- a/modules/gpu/src/cuda/rgb_to_yv12.cu +++ b/modules/gpu/src/cuda/rgb_to_yv12.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/vec_traits.hpp" @@ -169,3 +171,5 @@ namespace cv { namespace gpu { namespace device } } }}} + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/row_filter.cu b/modules/gpu/src/cuda/row_filter.cu index 5b3d044ea1..7076f3870c 100644 --- a/modules/gpu/src/cuda/row_filter.cu +++ b/modules/gpu/src/cuda/row_filter.cu @@ -41,6 +41,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/vec_math.hpp" @@ -377,3 +379,6 @@ namespace cv { namespace gpu { namespace device template void linearRowFilter_gpu(PtrStepSzb src, PtrStepSzb dst, const float kernel[], int ksize, int anchor, int brd_type, int cc, cudaStream_t stream); } // namespace row_filter }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/split_merge.cu b/modules/gpu/src/cuda/split_merge.cu index edf19c9fbd..7613e93f00 100644 --- a/modules/gpu/src/cuda/split_merge.cu +++ b/modules/gpu/src/cuda/split_merge.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" namespace cv { namespace gpu { namespace device @@ -504,3 +506,6 @@ namespace cv { namespace gpu { namespace device } } // namespace split_merge }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/stereobm.cu b/modules/gpu/src/cuda/stereobm.cu index 3f36d0fb30..b252a5e802 100644 --- a/modules/gpu/src/cuda/stereobm.cu +++ b/modules/gpu/src/cuda/stereobm.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" namespace cv { namespace gpu { namespace device @@ -533,3 +535,6 @@ namespace cv { namespace gpu { namespace device } } // namespace stereobm }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/stereobp.cu b/modules/gpu/src/cuda/stereobp.cu index cf9a743632..62d4e9ab5f 100644 --- a/modules/gpu/src/cuda/stereobp.cu +++ b/modules/gpu/src/cuda/stereobp.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/limits.hpp" @@ -532,3 +534,5 @@ namespace cv { namespace gpu { namespace device template void output_gpu(const PtrStepSzb& u, const PtrStepSzb& d, const PtrStepSzb& l, const PtrStepSzb& r, const PtrStepSzb& data, const PtrStepSz& disp, cudaStream_t stream); } // namespace stereobp }}} // namespace cv { namespace gpu { namespace device + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/stereocsbp.cu b/modules/gpu/src/cuda/stereocsbp.cu index 6001d909bc..4c7a2da7f8 100644 --- a/modules/gpu/src/cuda/stereocsbp.cu +++ b/modules/gpu/src/cuda/stereocsbp.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/limits.hpp" @@ -886,3 +888,5 @@ namespace cv { namespace gpu { namespace device const PtrStepSz& disp, int nr_plane, cudaStream_t stream); } // namespace stereocsbp }}} // namespace cv { namespace gpu { namespace device { + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/surf.cu b/modules/gpu/src/cuda/surf.cu index 8132d7f7af..509132f574 100644 --- a/modules/gpu/src/cuda/surf.cu +++ b/modules/gpu/src/cuda/surf.cu @@ -45,6 +45,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" @@ -990,3 +992,6 @@ namespace cv { namespace gpu { namespace device } } // namespace surf }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cuda/warp.cu b/modules/gpu/src/cuda/warp.cu index e3569e7d64..a62037c0fb 100644 --- a/modules/gpu/src/cuda/warp.cu +++ b/modules/gpu/src/cuda/warp.cu @@ -40,6 +40,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include "internal_shared.hpp" #include "opencv2/gpu/device/border_interpolate.hpp" #include "opencv2/gpu/device/vec_traits.hpp" @@ -382,3 +384,6 @@ namespace cv { namespace gpu { namespace device template void warpPerspective_gpu(PtrStepSzb src, PtrStepSzb srcWhole, int xoff, int yoff, float coeffs[3 * 3], PtrStepSzb dst, int interpolation, int borderMode, const float* borderValue, cudaStream_t stream, int cc); } // namespace imgproc }}} // namespace cv { namespace gpu { namespace device + + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/cudastream.cpp b/modules/gpu/src/cudastream.cpp index 569b460eab..4b0a81a865 100644 --- a/modules/gpu/src/cudastream.cpp +++ b/modules/gpu/src/cudastream.cpp @@ -45,8 +45,26 @@ using namespace cv; using namespace cv::gpu; +#if defined HAVE_CUDA -#if !defined (HAVE_CUDA) +struct Stream::Impl +{ + static cudaStream_t getStream(const Impl* impl) { return impl ? impl->stream : 0; } + cudaStream_t stream; + int ref_counter; +}; + +#include "opencv2/gpu/stream_accessor.hpp" + +CV_EXPORTS cudaStream_t cv::gpu::StreamAccessor::getStream(const Stream& stream) +{ + return Stream::Impl::getStream(stream.impl); +}; + +#endif /* !defined (HAVE_CUDA) */ + + +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::Stream::create() { throw_nogpu(); } void cv::gpu::Stream::release() { throw_nogpu(); } @@ -69,8 +87,6 @@ cv::gpu::Stream::operator bool() const { throw_nogpu(); return false; } #else /* !defined (HAVE_CUDA) */ -#include "opencv2/gpu/stream_accessor.hpp" - namespace cv { namespace gpu { void copyWithMask(const GpuMat& src, GpuMat& dst, const GpuMat& mask, cudaStream_t stream); @@ -79,13 +95,6 @@ namespace cv { namespace gpu void setTo(GpuMat& src, Scalar s, const GpuMat& mask, cudaStream_t stream); }} -struct Stream::Impl -{ - static cudaStream_t getStream(const Impl* impl) { return impl ? impl->stream : 0; } - cudaStream_t stream; - int ref_counter; -}; - namespace { template void devcopy(const S& src, D& dst, cudaStream_t s, cudaMemcpyKind k) @@ -96,11 +105,6 @@ namespace }; } -CV_EXPORTS cudaStream_t cv::gpu::StreamAccessor::getStream(const Stream& stream) -{ - return Stream::Impl::getStream(stream.impl); -}; - void cv::gpu::Stream::create() { if (impl) diff --git a/modules/gpu/src/denoising.cpp b/modules/gpu/src/denoising.cpp index 7a85de90f1..2d56020503 100644 --- a/modules/gpu/src/denoising.cpp +++ b/modules/gpu/src/denoising.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::bilateralFilter(const GpuMat&, GpuMat&, int, float, float, int, Stream&) { throw_nogpu(); } void cv::gpu::nonLocalMeans(const GpuMat&, GpuMat&, float, int, int, int, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/element_operations.cpp b/modules/gpu/src/element_operations.cpp index eb1581f9c7..4f282b5051 100644 --- a/modules/gpu/src/element_operations.cpp +++ b/modules/gpu/src/element_operations.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::add(const GpuMat&, const GpuMat&, GpuMat&, const GpuMat&, int, Stream&) { throw_nogpu(); } void cv::gpu::add(const GpuMat&, const Scalar&, GpuMat&, const GpuMat&, int, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/fast.cpp b/modules/gpu/src/fast.cpp index 5b61e60741..f8edd23613 100644 --- a/modules/gpu/src/fast.cpp +++ b/modules/gpu/src/fast.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::FAST_GPU::FAST_GPU(int, bool, double) { throw_nogpu(); } void cv::gpu::FAST_GPU::operator ()(const GpuMat&, const GpuMat&, GpuMat&) { throw_nogpu(); } diff --git a/modules/gpu/src/fgd_bgfg.cpp b/modules/gpu/src/fgd_bgfg.cpp index f9ca5c2a88..6bd7cab291 100644 --- a/modules/gpu/src/fgd_bgfg.cpp +++ b/modules/gpu/src/fgd_bgfg.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) class cv::gpu::FGDStatModel::Impl { diff --git a/modules/gpu/src/filtering.cpp b/modules/gpu/src/filtering.cpp index d90a0d8210..82ccd85683 100644 --- a/modules/gpu/src/filtering.cpp +++ b/modules/gpu/src/filtering.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) Ptr cv::gpu::createFilter2D_GPU(const Ptr&, int, int) { throw_nogpu(); return Ptr(0); } Ptr cv::gpu::createSeparableFilter_GPU(const Ptr&, const Ptr&, int, int, int) { throw_nogpu(); return Ptr(0); } diff --git a/modules/gpu/src/gftt.cpp b/modules/gpu/src/gftt.cpp index 69b262d34b..00c1195da0 100644 --- a/modules/gpu/src/gftt.cpp +++ b/modules/gpu/src/gftt.cpp @@ -46,7 +46,7 @@ using namespace std; using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::GoodFeaturesToTrackDetector_GPU::operator ()(const GpuMat&, GpuMat&, const GpuMat&) { throw_nogpu(); } diff --git a/modules/gpu/src/global_motion.cpp b/modules/gpu/src/global_motion.cpp index b23c6420a4..7531c9327c 100644 --- a/modules/gpu/src/global_motion.cpp +++ b/modules/gpu/src/global_motion.cpp @@ -46,7 +46,7 @@ using namespace std; using namespace cv; using namespace cv::gpu; -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) void cv::gpu::compactPoints(GpuMat&, GpuMat&, const GpuMat&) { throw_nogpu(); } void cv::gpu::calcWobbleSuppressionMaps( diff --git a/modules/gpu/src/graphcuts.cpp b/modules/gpu/src/graphcuts.cpp index d41b1c6f54..ab1607059a 100644 --- a/modules/gpu/src/graphcuts.cpp +++ b/modules/gpu/src/graphcuts.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } void cv::gpu::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/hog.cpp b/modules/gpu/src/hog.cpp index aae1818548..9de31cb2db 100644 --- a/modules/gpu/src/hog.cpp +++ b/modules/gpu/src/hog.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::HOGDescriptor::HOGDescriptor(Size, Size, Size, Size, int, double, double, bool, int) { throw_nogpu(); } size_t cv::gpu::HOGDescriptor::getDescriptorSize() const { throw_nogpu(); return 0; } diff --git a/modules/gpu/src/hough.cpp b/modules/gpu/src/hough.cpp index 6d96d38e42..6e2170d114 100644 --- a/modules/gpu/src/hough.cpp +++ b/modules/gpu/src/hough.cpp @@ -46,7 +46,7 @@ using namespace std; using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::HoughLines(const GpuMat&, GpuMat&, float, float, int, bool, int) { throw_nogpu(); } void cv::gpu::HoughLines(const GpuMat&, GpuMat&, HoughLinesBuf&, float, float, int, bool, int) { throw_nogpu(); } diff --git a/modules/gpu/src/imgproc.cpp b/modules/gpu/src/imgproc.cpp index 6dd0c71bbb..14158af8dd 100644 --- a/modules/gpu/src/imgproc.cpp +++ b/modules/gpu/src/imgproc.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::meanShiftFiltering(const GpuMat&, GpuMat&, int, int, TermCriteria, Stream&) { throw_nogpu(); } void cv::gpu::meanShiftProc(const GpuMat&, GpuMat&, GpuMat&, int, int, TermCriteria, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/match_template.cpp b/modules/gpu/src/match_template.cpp index df042f1416..3b05433536 100644 --- a/modules/gpu/src/match_template.cpp +++ b/modules/gpu/src/match_template.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::matchTemplate(const GpuMat&, const GpuMat&, GpuMat&, int, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/matrix_operations.cpp b/modules/gpu/src/matrix_operations.cpp index 711ff118d0..62ee0c4ebb 100644 --- a/modules/gpu/src/matrix_operations.cpp +++ b/modules/gpu/src/matrix_operations.cpp @@ -178,7 +178,7 @@ bool cv::gpu::CudaMem::empty() const return data == 0; } -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::registerPageLocked(Mat&) { throw_nogpu(); } void cv::gpu::unregisterPageLocked(Mat&) { throw_nogpu(); } diff --git a/modules/gpu/src/matrix_reductions.cpp b/modules/gpu/src/matrix_reductions.cpp index 563d42de86..7fd268c9c1 100644 --- a/modules/gpu/src/matrix_reductions.cpp +++ b/modules/gpu/src/matrix_reductions.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::meanStdDev(const GpuMat&, Scalar&, Scalar&) { throw_nogpu(); } void cv::gpu::meanStdDev(const GpuMat&, Scalar&, Scalar&, GpuMat&) { throw_nogpu(); } diff --git a/modules/gpu/src/mssegmentation.cpp b/modules/gpu/src/mssegmentation.cpp index 1b9e481aa5..cf32c44ba2 100644 --- a/modules/gpu/src/mssegmentation.cpp +++ b/modules/gpu/src/mssegmentation.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#if !defined(HAVE_CUDA) +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) void cv::gpu::meanShiftSegmentation(const GpuMat&, Mat&, int, int, int, TermCriteria) { throw_nogpu(); } @@ -386,4 +386,4 @@ void cv::gpu::meanShiftSegmentation(const GpuMat& src, Mat& dst, int sp, int sr, } } -#endif // #if !defined (HAVE_CUDA) +#endif // #if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) diff --git a/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu b/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu index e04ec844ac..0598f24529 100644 --- a/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu +++ b/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu @@ -56,6 +56,8 @@ // //////////////////////////////////////////////////////////////////////////////// +#if !defined CUDA_DISABLER + #include #include #include @@ -1160,3 +1162,5 @@ NCVStatus NCVBroxOpticalFlow(const NCVBroxOpticalFlowDescriptor desc, return NCV_SUCCESS; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu b/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu index 4449c42127..05918ab0d8 100644 --- a/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu +++ b/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu @@ -55,6 +55,8 @@ // //////////////////////////////////////////////////////////////////////////////// +#if !defined CUDA_DISABLER + #include #include @@ -2314,3 +2316,5 @@ NCVStatus ncvHaarStoreNVBIN_host(const std::string &filename, fclose(fp); return NCV_SUCCESS; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu b/modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu index 0e6aca0889..6885e5b8dd 100644 --- a/modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu +++ b/modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu @@ -39,6 +39,7 @@ // //M*/ +#if !defined CUDA_DISABLER #include #include @@ -2576,3 +2577,5 @@ NCVStatus nppiStResize_32f_C1R(const Ncv32f *pSrc, return status; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/nvidia/core/NCV.cu b/modules/gpu/src/nvidia/core/NCV.cu index 2831877cb0..44c5d32d6f 100644 --- a/modules/gpu/src/nvidia/core/NCV.cu +++ b/modules/gpu/src/nvidia/core/NCV.cu @@ -39,6 +39,8 @@ // //M*/ +#if !defined CUDA_DISABLER + #include #include @@ -905,3 +907,5 @@ NCVStatus ncvDrawRects_32u_device(Ncv32u *d_dst, { return drawRectsWrapperDevice(d_dst, dstStride, dstWidth, dstHeight, d_rects, numRects, color, cuStream); } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/nvidia/core/NCVPyramid.cu b/modules/gpu/src/nvidia/core/NCVPyramid.cu index 84c9c129e7..cb80bcc140 100644 --- a/modules/gpu/src/nvidia/core/NCVPyramid.cu +++ b/modules/gpu/src/nvidia/core/NCVPyramid.cu @@ -39,6 +39,7 @@ // //M*/ +#if !defined CUDA_DISABLER #include #include @@ -600,3 +601,5 @@ template class NCVImagePyramid; template class NCVImagePyramid; #endif //_WIN32 + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/src/optical_flow.cpp b/modules/gpu/src/optical_flow.cpp index 1e44ed77c7..5829d08a6b 100644 --- a/modules/gpu/src/optical_flow.cpp +++ b/modules/gpu/src/optical_flow.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::BroxOpticalFlow::operator ()(const GpuMat&, const GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } void cv::gpu::interpolateFrames(const GpuMat&, const GpuMat&, const GpuMat&, const GpuMat&, const GpuMat&, const GpuMat&, float, GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/optical_flow_farneback.cpp b/modules/gpu/src/optical_flow_farneback.cpp index 4775f66c5c..4d771db34d 100644 --- a/modules/gpu/src/optical_flow_farneback.cpp +++ b/modules/gpu/src/optical_flow_farneback.cpp @@ -54,7 +54,7 @@ using namespace std; using namespace cv; using namespace cv::gpu; -#if !defined(HAVE_CUDA) +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) void cv::gpu::FarnebackOpticalFlow::operator ()(const GpuMat&, const GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/orb.cpp b/modules/gpu/src/orb.cpp index c1df4ddcea..299806c493 100644 --- a/modules/gpu/src/orb.cpp +++ b/modules/gpu/src/orb.cpp @@ -46,7 +46,7 @@ using namespace std; using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::ORB_GPU::ORB_GPU(int, float, int, int, int, int, int, int) : fastDetector_(20) { throw_nogpu(); } void cv::gpu::ORB_GPU::operator()(const GpuMat&, const GpuMat&, std::vector&) { throw_nogpu(); } diff --git a/modules/gpu/src/pyramids.cpp b/modules/gpu/src/pyramids.cpp index 1c6dc7b2dc..85fb99040c 100644 --- a/modules/gpu/src/pyramids.cpp +++ b/modules/gpu/src/pyramids.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) void cv::gpu::pyrDown(const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } void cv::gpu::pyrUp(const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/src/pyrlk.cpp b/modules/gpu/src/pyrlk.cpp index 4ad99601f0..dc874e643e 100644 --- a/modules/gpu/src/pyrlk.cpp +++ b/modules/gpu/src/pyrlk.cpp @@ -46,7 +46,7 @@ using namespace std; using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::PyrLKOpticalFlow::PyrLKOpticalFlow() { throw_nogpu(); } void cv::gpu::PyrLKOpticalFlow::sparse(const GpuMat&, const GpuMat&, const GpuMat&, GpuMat&, GpuMat&, GpuMat*) { throw_nogpu(); } diff --git a/modules/gpu/src/remap.cpp b/modules/gpu/src/remap.cpp index d2bd3cc498..8499eefa70 100644 --- a/modules/gpu/src/remap.cpp +++ b/modules/gpu/src/remap.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) void cv::gpu::remap(const GpuMat&, GpuMat&, const GpuMat&, const GpuMat&, int, int, Scalar, Stream&){ throw_nogpu(); } diff --git a/modules/gpu/src/resize.cpp b/modules/gpu/src/resize.cpp index 67cf186800..edf2fc814e 100644 --- a/modules/gpu/src/resize.cpp +++ b/modules/gpu/src/resize.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) void cv::gpu::resize(const GpuMat& src, GpuMat& dst, Size dsize, double fx, double fy, int interpolation, Stream& s) { diff --git a/modules/gpu/src/split_merge.cpp b/modules/gpu/src/split_merge.cpp index f983d9d7c4..d185f783fb 100644 --- a/modules/gpu/src/split_merge.cpp +++ b/modules/gpu/src/split_merge.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::merge(const GpuMat* /*src*/, size_t /*count*/, GpuMat& /*dst*/, Stream& /*stream*/) { throw_nogpu(); } void cv::gpu::merge(const vector& /*src*/, GpuMat& /*dst*/, Stream& /*stream*/) { throw_nogpu(); } diff --git a/modules/gpu/src/stereobm.cpp b/modules/gpu/src/stereobm.cpp index 30faf5cdde..95228728e2 100644 --- a/modules/gpu/src/stereobm.cpp +++ b/modules/gpu/src/stereobm.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::gpu; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::StereoBM_GPU::StereoBM_GPU() { throw_nogpu(); } cv::gpu::StereoBM_GPU::StereoBM_GPU(int, int, int) { throw_nogpu(); } diff --git a/modules/gpu/src/stereobp.cpp b/modules/gpu/src/stereobp.cpp index 4dbba12d3f..06bfdd6782 100644 --- a/modules/gpu/src/stereobp.cpp +++ b/modules/gpu/src/stereobp.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::StereoBeliefPropagation::estimateRecommendedParams(int, int, int&, int&, int&) { throw_nogpu(); } diff --git a/modules/gpu/src/stereocsbp.cpp b/modules/gpu/src/stereocsbp.cpp index 1eda4600ab..db15e39e6c 100644 --- a/modules/gpu/src/stereocsbp.cpp +++ b/modules/gpu/src/stereocsbp.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) void cv::gpu::StereoConstantSpaceBP::estimateRecommendedParams(int, int, int&, int&, int&, int&) { throw_nogpu(); } diff --git a/modules/gpu/src/surf.cpp b/modules/gpu/src/surf.cpp index 5df61d0c6d..99c3370ddd 100644 --- a/modules/gpu/src/surf.cpp +++ b/modules/gpu/src/surf.cpp @@ -46,7 +46,7 @@ using namespace cv; using namespace cv::gpu; using namespace std; -#if !defined (HAVE_CUDA) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) cv::gpu::SURF_GPU::SURF_GPU() { throw_nogpu(); } cv::gpu::SURF_GPU::SURF_GPU(double, int, int, bool, float, bool) { throw_nogpu(); } diff --git a/modules/gpu/src/video_reader.cpp b/modules/gpu/src/video_reader.cpp index f9d75a343c..07abebc022 100644 --- a/modules/gpu/src/video_reader.cpp +++ b/modules/gpu/src/video_reader.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#if !defined(HAVE_CUDA) || defined(__APPLE__) +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) || defined(__APPLE__) class cv::gpu::VideoReader_GPU::Impl { diff --git a/modules/gpu/src/video_writer.cpp b/modules/gpu/src/video_writer.cpp index 42d0e09f29..5410b7232c 100644 --- a/modules/gpu/src/video_writer.cpp +++ b/modules/gpu/src/video_writer.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#if !defined(HAVE_CUDA) || !defined(WIN32) +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) || !defined(WIN32) class cv::gpu::VideoWriter_GPU::Impl { diff --git a/modules/gpu/src/warp.cpp b/modules/gpu/src/warp.cpp index 9de56513cf..57bc92deab 100644 --- a/modules/gpu/src/warp.cpp +++ b/modules/gpu/src/warp.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) void cv::gpu::warpAffine(const GpuMat&, GpuMat&, const Mat&, Size, int, int, Scalar, Stream&) { throw_nogpu(); } diff --git a/modules/gpu/test/main.cpp b/modules/gpu/test/main.cpp index 2e1edf0db9..665b3abc72 100644 --- a/modules/gpu/test/main.cpp +++ b/modules/gpu/test/main.cpp @@ -74,7 +74,7 @@ void printOsInfo() void printCudaInfo() { -#ifndef HAVE_CUDA +#if !defined HAVE_CUDA || defined(CUDA_DISABLER) cout << "OpenCV was built without CUDA support \n" << endl; #else int driver; diff --git a/modules/gpu/test/nvidia/TestCompact.cpp b/modules/gpu/test/nvidia/TestCompact.cpp index 92ca73508c..ff54c47442 100644 --- a/modules/gpu/test/nvidia/TestCompact.cpp +++ b/modules/gpu/test/nvidia/TestCompact.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include "TestCompact.h" @@ -127,3 +129,5 @@ bool TestCompact::deinit() { return true; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestDrawRects.cpp b/modules/gpu/test/nvidia/TestDrawRects.cpp index b063293317..90e1bd8d56 100644 --- a/modules/gpu/test/nvidia/TestDrawRects.cpp +++ b/modules/gpu/test/nvidia/TestDrawRects.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include "TestDrawRects.h" #include "NCVHaarObjectDetection.hpp" @@ -162,3 +164,5 @@ bool TestDrawRects::deinit() template class TestDrawRects; template class TestDrawRects; + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp b/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp index fe4f5d6a3e..644ca735b8 100644 --- a/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp +++ b/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include #if defined(__GNUC__) && !defined(__APPLE__) @@ -299,3 +301,5 @@ bool TestHaarCascadeApplication::deinit() { return true; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp b/modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp index ad1c953a63..ddc84722a0 100644 --- a/modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp +++ b/modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include "TestHaarCascadeLoader.h" #include "NCVHaarObjectDetection.hpp" @@ -121,3 +123,5 @@ bool TestHaarCascadeLoader::deinit() { return true; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestHypothesesFilter.cpp b/modules/gpu/test/nvidia/TestHypothesesFilter.cpp index 48ed3a1423..702050b820 100644 --- a/modules/gpu/test/nvidia/TestHypothesesFilter.cpp +++ b/modules/gpu/test/nvidia/TestHypothesesFilter.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include "TestHypothesesFilter.h" #include "NCVHaarObjectDetection.hpp" @@ -174,3 +176,5 @@ bool TestHypothesesFilter::deinit() { return true; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestHypothesesGrow.cpp b/modules/gpu/test/nvidia/TestHypothesesGrow.cpp index 2b0c34a15d..00234c5ffd 100644 --- a/modules/gpu/test/nvidia/TestHypothesesGrow.cpp +++ b/modules/gpu/test/nvidia/TestHypothesesGrow.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include "TestHypothesesGrow.h" #include "NCVHaarObjectDetection.hpp" @@ -132,3 +134,5 @@ bool TestHypothesesGrow::deinit() { return true; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestIntegralImage.cpp b/modules/gpu/test/nvidia/TestIntegralImage.cpp index bff2aa53ae..8d498cf00c 100644 --- a/modules/gpu/test/nvidia/TestIntegralImage.cpp +++ b/modules/gpu/test/nvidia/TestIntegralImage.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include #include "TestIntegralImage.h" @@ -183,3 +185,5 @@ bool TestIntegralImage::deinit() template class TestIntegralImage; template class TestIntegralImage; + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestIntegralImageSquared.cpp b/modules/gpu/test/nvidia/TestIntegralImageSquared.cpp index 0277f5e2e3..2a1985451b 100644 --- a/modules/gpu/test/nvidia/TestIntegralImageSquared.cpp +++ b/modules/gpu/test/nvidia/TestIntegralImageSquared.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include "TestIntegralImageSquared.h" @@ -115,3 +117,5 @@ bool TestIntegralImageSquared::deinit() { return true; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestRectStdDev.cpp b/modules/gpu/test/nvidia/TestRectStdDev.cpp index 420979d881..d8857f66a6 100644 --- a/modules/gpu/test/nvidia/TestRectStdDev.cpp +++ b/modules/gpu/test/nvidia/TestRectStdDev.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include #include "TestRectStdDev.h" @@ -178,3 +180,5 @@ bool TestRectStdDev::deinit() { return true; } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestResize.cpp b/modules/gpu/test/nvidia/TestResize.cpp index eb49ddd141..7ccffacae0 100644 --- a/modules/gpu/test/nvidia/TestResize.cpp +++ b/modules/gpu/test/nvidia/TestResize.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include #include "TestResize.h" @@ -159,3 +161,5 @@ bool TestResize::deinit() template class TestResize; template class TestResize; + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/TestTranspose.cpp b/modules/gpu/test/nvidia/TestTranspose.cpp index b4c65ea66d..82ca202a94 100644 --- a/modules/gpu/test/nvidia/TestTranspose.cpp +++ b/modules/gpu/test/nvidia/TestTranspose.cpp @@ -9,6 +9,8 @@ * agreement from NVIDIA Corporation is strictly prohibited. */ +#if !defined CUDA_DISABLER + #include #include "TestTranspose.h" @@ -146,3 +148,5 @@ bool TestTranspose::deinit() template class TestTranspose; template class TestTranspose; + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/nvidia/main_nvidia.cpp b/modules/gpu/test/nvidia/main_nvidia.cpp index 15759e10fb..d249064efe 100644 --- a/modules/gpu/test/nvidia/main_nvidia.cpp +++ b/modules/gpu/test/nvidia/main_nvidia.cpp @@ -2,6 +2,8 @@ # pragma warning (disable : 4408 4201 4100) #endif +#if !defined CUDA_DISABLER + #include #include "NCV.hpp" @@ -436,3 +438,5 @@ bool nvidia_NCV_Visualization(const std::string& test_data_path, OutputLevel out return testListerVisualize.invoke(); } + +#endif /* CUDA_DISABLER */ \ No newline at end of file diff --git a/modules/gpu/test/test_nvidia.cpp b/modules/gpu/test/test_nvidia.cpp index 9c49b099b9..4e6db58e72 100644 --- a/modules/gpu/test/test_nvidia.cpp +++ b/modules/gpu/test/test_nvidia.cpp @@ -41,13 +41,15 @@ #include "test_precomp.hpp" -#ifdef HAVE_CUDA +#if defined HAVE_CUDA + OutputLevel nvidiaTestOutputLevel = OutputLevelCompact; +#endif + +#if defined HAVE_CUDA && !defined(CUDA_DISABLER) using namespace cvtest; using namespace testing; -OutputLevel nvidiaTestOutputLevel = OutputLevelCompact; - struct NVidiaTest : TestWithParam { cv::gpu::DeviceInfo devInfo;