Commit 76e8794e authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

fixed warnings on old compute capabilities

parent e6b1ccdc
...@@ -260,7 +260,9 @@ namespace cv { namespace gpu { namespace device ...@@ -260,7 +260,9 @@ namespace cv { namespace gpu { namespace device
if (tid < N / 2) if (tid < N / 2)
{ {
#if __CUDA_ARCH__ >= 200
#pragma unroll #pragma unroll
#endif
for (unsigned int i = N / 2; i >= 1; i /= 2) for (unsigned int i = N / 2; i >= 1; i /= 2)
merge(smem, val, tid, i, op); merge(smem, val, tid, i, op);
} }
...@@ -289,7 +291,9 @@ namespace cv { namespace gpu { namespace device ...@@ -289,7 +291,9 @@ namespace cv { namespace gpu { namespace device
if (laneId < 16) if (laneId < 16)
{ {
#if __CUDA_ARCH__ >= 200
#pragma unroll #pragma unroll
#endif
for (int i = 16; i >= 1; i /= 2) for (int i = 16; i >= 1; i /= 2)
merge(smem, val, tid, i, op); merge(smem, val, tid, i, op);
} }
...@@ -311,7 +315,9 @@ namespace cv { namespace gpu { namespace device ...@@ -311,7 +315,9 @@ namespace cv { namespace gpu { namespace device
for (int i = M / 2; i >= 1; i /= 2) for (int i = M / 2; i >= 1; i /= 2)
mergeShfl(val, i, M, op); mergeShfl(val, i, M, op);
#else #else
#if __CUDA_ARCH__ >= 200
#pragma unroll #pragma unroll
#endif
for (int i = M / 2; i >= 1; i /= 2) for (int i = M / 2; i >= 1; i /= 2)
merge(smem, val, tid, i, op); merge(smem, val, tid, i, op);
#endif #endif
......
...@@ -388,7 +388,9 @@ namespace cv { namespace gpu { namespace device ...@@ -388,7 +388,9 @@ namespace cv { namespace gpu { namespace device
if (tid < N / 2) if (tid < N / 2)
{ {
#if __CUDA_ARCH__ >= 200
#pragma unroll #pragma unroll
#endif
for (unsigned int i = N / 2; i >= 1; i /= 2) for (unsigned int i = N / 2; i >= 1; i /= 2)
merge(skeys, key, svals, val, cmp, tid, i); merge(skeys, key, svals, val, cmp, tid, i);
} }
...@@ -421,7 +423,9 @@ namespace cv { namespace gpu { namespace device ...@@ -421,7 +423,9 @@ namespace cv { namespace gpu { namespace device
if (laneId < 16) if (laneId < 16)
{ {
#if __CUDA_ARCH__ >= 200
#pragma unroll #pragma unroll
#endif
for (int i = 16; i >= 1; i /= 2) for (int i = 16; i >= 1; i /= 2)
merge(skeys, key, svals, val, cmp, tid, i); merge(skeys, key, svals, val, cmp, tid, i);
} }
...@@ -448,7 +452,9 @@ namespace cv { namespace gpu { namespace device ...@@ -448,7 +452,9 @@ namespace cv { namespace gpu { namespace device
for (unsigned int i = M / 2; i >= 1; i /= 2) for (unsigned int i = M / 2; i >= 1; i /= 2)
mergeShfl(key, val, cml, i, M); mergeShfl(key, val, cml, i, M);
#else #else
#if __CUDA_ARCH__ >= 200
#pragma unroll #pragma unroll
#endif
for (unsigned int i = M / 2; i >= 1; i /= 2) for (unsigned int i = M / 2; i >= 1; i /= 2)
merge(skeys, key, svals, val, cmp, tid, i); merge(skeys, key, svals, val, cmp, tid, i);
#endif #endif
......
...@@ -568,7 +568,9 @@ namespace cv { namespace gpu { namespace device ...@@ -568,7 +568,9 @@ namespace cv { namespace gpu { namespace device
float bestx = 0, besty = 0, best_mod = 0; float bestx = 0, besty = 0, best_mod = 0;
#if __CUDA_ARCH__ >= 200
#pragma unroll #pragma unroll
#endif
for (int i = 0; i < 18; ++i) for (int i = 0; i < 18; ++i)
{ {
const int dir = (i * 4 + threadIdx.y) * ORI_SEARCH_INC; const int dir = (i * 4 + threadIdx.y) * ORI_SEARCH_INC;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment