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

temporarily disabled reduceKeyVal implementation for kepler

Browse Source 
used fermi implementation
This commit is contained in:
Vladislav Vinogradov 2012-12-05 10:36:54 +04:00
parent e311613fc8
commit aabc33c772
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/include/opencv2/gpu/device/detail/reduce_key_val.hpp
View File

@ -399,7 +399,7 @@ namespace cv { namespace gpu { namespace device
template <class KP, class KR, class VP, class VR, class Cmp> template <class KP, class KR, class VP, class VR, class Cmp>
static __device__ void reduce(KP skeys, KR key, VP svals, VR val, unsigned int tid, Cmp cmp) static __device__ void reduce(KP skeys, KR key, VP svals, VR val, unsigned int tid, Cmp cmp)
{ {
#if __CUDA_ARCH__ >= 300 #if 0 // __CUDA_ARCH__ >= 300
(void) skeys; (void) skeys;
(void) svals; (void) svals;
(void) tid; (void) tid;
@ -424,7 +424,7 @@ namespace cv { namespace gpu { namespace device
{ {
const unsigned int laneId = Warp::laneId(); const unsigned int laneId = Warp::laneId();
#if __CUDA_ARCH__ >= 300 #if 0 // __CUDA_ARCH__ >= 300
Unroll<16, KP, KR, VP, VR, Cmp>::loopShfl(key, val, cmp, warpSize); Unroll<16, KP, KR, VP, VR, Cmp>::loopShfl(key, val, cmp, warpSize);
if (laneId == 0) if (laneId == 0)
@ -454,7 +454,7 @@ namespace cv { namespace gpu { namespace device
if (tid < 32) if (tid < 32)
{ {
#if __CUDA_ARCH__ >= 300 #if 0 // __CUDA_ARCH__ >= 300
loadFromSmem(svals, val, tid); loadFromSmem(svals, val, tid);
Unroll<M / 2, KP, KR, VP, VR, Cmp>::loopShfl(key, val, cmp, M); Unroll<M / 2, KP, KR, VP, VR, Cmp>::loopShfl(key, val, cmp, M);