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

renamed cuda namespace to cudev

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-04 15:36:22 +04:00
parent 1bb141c465
commit 910ef57109
130 changed files with 592 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
View File

@@ -1141,8 +1141,8 @@ NCVStatus NCVBroxOpticalFlow(const NCVBroxOpticalFlowDescriptor desc,
ScaleVector(ptrVNew->ptr(), ptrVNew->ptr(), 1.0f/scale_factor, ns * nh, stream);
ncvAssertCUDALastErrorReturn((int)NCV_CUDA_ERROR);
cv::gpu::cuda::swap<FloatVector*>(ptrU, ptrUNew);
cv::gpu::cuda::swap<FloatVector*>(ptrV, ptrVNew);
cv::gpu::cudev::swap<FloatVector*>(ptrU, ptrUNew);
cv::gpu::cudev::swap<FloatVector*>(ptrV, ptrVNew);
}
scale /= scale_factor;
}

4
modules/gpu/src/nvidia/NCVHaarObjectDetection.cu
View File

@@ -85,13 +85,13 @@ NCV_CT_ASSERT(K_WARP_SIZE == 32); //this is required for the manual unroll of th
__device__ Ncv32u warpScanInclusive(Ncv32u idata, volatile Ncv32u *s_Data)
{
#if __CUDA_ARCH__ >= 300
const unsigned int laneId = cv::gpu::cuda::Warp::laneId();
const unsigned int laneId = cv::gpu::cudev::Warp::laneId();
// scan on shuffl functions
#pragma unroll
for (int i = 1; i <= (K_WARP_SIZE / 2); i *= 2)
{
const Ncv32u n = cv::gpu::cuda::shfl_up(idata, i);
const Ncv32u n = cv::gpu::cudev::shfl_up(idata, i);
if (laneId >= i)
idata += n;
}

4
modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu
View File

@@ -95,13 +95,13 @@ template <class T>
inline __device__ T warpScanInclusive(T idata, volatile T *s_Data)
{
#if __CUDA_ARCH__ >= 300
const unsigned int laneId = cv::gpu::cuda::Warp::laneId();
const unsigned int laneId = cv::gpu::cudev::Warp::laneId();
// scan on shuffl functions
#pragma unroll
for (int i = 1; i <= (K_WARP_SIZE / 2); i *= 2)
{
const T n = cv::gpu::cuda::shfl_up(idata, i);
const T n = cv::gpu::cudev::shfl_up(idata, i);
if (laneId >= i)
idata += n;
}

4
modules/gpu/src/nvidia/core/NCVPyramid.cu
View File

@@ -204,7 +204,7 @@ __global__ void kernelDownsampleX2(T *d_src,
}
}
namespace cv { namespace gpu { namespace cuda
namespace cv { namespace gpu { namespace cudev
{
namespace pyramid
{
@@ -279,7 +279,7 @@ __global__ void kernelInterpolateFrom1(T *d_srcTop,
d_dst_line[j] = outPix;
}
}
namespace cv { namespace gpu { namespace cuda
namespace cv { namespace gpu { namespace cudev
{
namespace pyramid
{