Skip to content

O
opencv
Commit 7ab9c4cc authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

fixed compilation on 1.1 CC

parent 06776b61
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
modules/gpu/src/cuda/icf-sc.cu
View file @ 7ab9c4cc
...@@ -114,7 +114,9 @@ namespace icf { ...@@ -114,7 +114,9 @@ namespace icf {
excluded = excluded || (suppessed == i); excluded = excluded || (suppessed == i);
} }
#if __CUDA_ARCH__ >= 120
if (__all(excluded)) break; if (__all(excluded)) break;
#endif
} }
} }
} }
...@@ -312,7 +314,9 @@ __device void CascadeInvoker<Policy>::detect(Detection* objects, const uint ndet ...@@ -312,7 +314,9 @@ __device void CascadeInvoker<Policy>::detect(Detection* objects, const uint ndet
PrefixSum<Policy>::apply(impact); PrefixSum<Policy>::apply(impact);
confidence += impact; confidence += impact;
#if __CUDA_ARCH__ >= 120
if(__any((confidence <= stages[(st + threadIdx.x)]))) st += 2048; if(__any((confidence <= stages[(st + threadIdx.x)]))) st += 2048;
#endif
} }
if(!threadIdx.x && st == stEnd && ((confidence - FLT_EPSILON) >= 0)) if(!threadIdx.x && st == stEnd && ((confidence - FLT_EPSILON) >= 0))
...@@ -367,4 +371,4 @@ template void CascadeInvoker<GK107PolicyX4>::operator()(const PtrStepSzb& roi, c ...@@ -367,4 +371,4 @@ template void CascadeInvoker<GK107PolicyX4>::operator()(const PtrStepSzb& roi, c
PtrStepSz<uchar4> objects, const int downscales, const cudaStream_t& stream) const; PtrStepSz<uchar4> objects, const int downscales, const cudaStream_t& stream) const;
} }
}}} }}}
\ No newline at end of file
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