From 7ff04a65f14a64a1d8c4f4faf02f6bb49f4013ab Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Fri, 10 Aug 2012 10:03:35 +0400 Subject: [PATCH] fixed build for old compute capabilities --- modules/gpu/src/cuda/ccomponetns.cu | 2 +- modules/gpu/src/opencv2/gpu/device/emulation.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gpu/src/cuda/ccomponetns.cu b/modules/gpu/src/cuda/ccomponetns.cu index 1f9dc11..c11031b 100644 --- a/modules/gpu/src/cuda/ccomponetns.cu +++ b/modules/gpu/src/cuda/ccomponetns.cu @@ -474,7 +474,7 @@ namespace cv { namespace gpu { namespace device } } } - } while (__syncthreads_or(changed)); + } while (Emulation::sycthOr(changed)); } __global__ void flatten(const DevMem2D edges, DevMem2Di comps) diff --git a/modules/gpu/src/opencv2/gpu/device/emulation.hpp b/modules/gpu/src/opencv2/gpu/device/emulation.hpp index 0999495..e116c50 100644 --- a/modules/gpu/src/opencv2/gpu/device/emulation.hpp +++ b/modules/gpu/src/opencv2/gpu/device/emulation.hpp @@ -53,7 +53,7 @@ namespace cv { namespace gpu { namespace device static __device__ __forceinline__ int sycthOr(int pred) { -#if defined (__CUDA_ARCH__) && (__CUDA_ARCH__ < 120) +#if defined (__CUDA_ARCH__) && (__CUDA_ARCH__ < 200) // just campilation stab return false; #else @@ -119,7 +119,7 @@ namespace cv { namespace gpu { namespace device static __device__ __forceinline__ T atomicMin(T* address, T val) { #if defined (__CUDA_ARCH__) && (__CUDA_ARCH__ < 120) - T count = min(*address, val); + T count = ::min(*address, val); do { *address = count; -- 2.7.4