generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed build for old compute capabilities

Browse Source
This commit is contained in:
Vladislav Vinogradov 2012-08-10 10:03:35 +04:00
parent fa5113f303
commit 7ff04a65f1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/cuda/ccomponetns.cu
View File

@ -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) __global__ void flatten(const DevMem2D edges, DevMem2Di comps)

4
modules/gpu/src/opencv2/gpu/device/emulation.hpp
View File

@ -53,7 +53,7 @@ namespace cv { namespace gpu { namespace device
static __device__ __forceinline__ int sycthOr(int pred) static __device__ __forceinline__ int sycthOr(int pred)
{ {
#if defined (__CUDA_ARCH__) && (__CUDA_ARCH__ < 120) #if defined (__CUDA_ARCH__) && (__CUDA_ARCH__ < 200)
// just campilation stab // just campilation stab
return false; return false;
#else #else
@ -119,7 +119,7 @@ namespace cv { namespace gpu { namespace device
static __device__ __forceinline__ T atomicMin(T* address, T val) static __device__ __forceinline__ T atomicMin(T* address, T val)
{ {
#if defined (__CUDA_ARCH__) && (__CUDA_ARCH__ < 120) #if defined (__CUDA_ARCH__) && (__CUDA_ARCH__ < 120)
T count = min(*address, val); T count = ::min(*address, val);
do do
{ {
*address = count; *address = count;