fixed build for old compute capabilities

13 years ago · 7ff04a65f1
parent fa5113f303
commit 7ff04a65f1
2 changed files with 3 additions and 3 deletions
--- 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)
--- 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;