From 7ab9c4ccee4a068dbd6c1fe7489152bd5ae7e17b Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 4 Dec 2012 10:36:46 +0400 Subject: [PATCH] fixed compilation on 1.1 CC --- modules/gpu/src/cuda/icf-sc.cu | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/gpu/src/cuda/icf-sc.cu b/modules/gpu/src/cuda/icf-sc.cu index 5fca87b..9f1661c 100644 --- a/modules/gpu/src/cuda/icf-sc.cu +++ b/modules/gpu/src/cuda/icf-sc.cu @@ -114,7 +114,9 @@ namespace icf { excluded = excluded || (suppessed == i); } + #if __CUDA_ARCH__ >= 120 if (__all(excluded)) break; + #endif } } } @@ -312,7 +314,9 @@ __device void CascadeInvoker::detect(Detection* objects, const uint ndet PrefixSum::apply(impact); confidence += impact; + #if __CUDA_ARCH__ >= 120 if(__any((confidence <= stages[(st + threadIdx.x)]))) st += 2048; + #endif } if(!threadIdx.x && st == stEnd && ((confidence - FLT_EPSILON) >= 0)) @@ -367,4 +371,4 @@ template void CascadeInvoker::operator()(const PtrStepSzb& roi, c PtrStepSz objects, const int downscales, const cudaStream_t& stream) const; } -}}} \ No newline at end of file +}}} -- 2.7.4