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

renamed device -> cuda

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-03 16:04:04 +04:00
parent a57707b8d8
commit 28b1e81883
136 changed files with 762 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@
#include "NPP_staging/NPP_staging.hpp"
#include "NCVBroxOpticalFlow.hpp"
#include "opencv2/core/device/utility.hpp"
#include "opencv2/core/cuda/utility.hpp"
typedef NCVVectorAlloc<Ncv32f> FloatVector;
@@ -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::device::swap<FloatVector*>(ptrU, ptrUNew);
cv::gpu::device::swap<FloatVector*>(ptrV, ptrVNew);
cv::gpu::cuda::swap<FloatVector*>(ptrU, ptrUNew);
cv::gpu::cuda::swap<FloatVector*>(ptrV, ptrVNew);
}
scale /= scale_factor;
}

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

@@ -66,8 +66,8 @@
#include "NPP_staging/NPP_staging.hpp"
#include "NCVRuntimeTemplates.hpp"
#include "NCVHaarObjectDetection.hpp"
#include "opencv2/core/device/warp.hpp"
#include "opencv2/core/device/warp_shuffle.hpp"
#include "opencv2/core/cuda/warp.hpp"
#include "opencv2/core/cuda/warp_shuffle.hpp"
//==============================================================================
@@ -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::device::Warp::laneId();
const unsigned int laneId = cv::gpu::cuda::Warp::laneId();
// scan on shuffl functions
#pragma unroll
for (int i = 1; i <= (K_WARP_SIZE / 2); i *= 2)
{
const Ncv32u n = cv::gpu::device::shfl_up(idata, i);
const Ncv32u n = cv::gpu::cuda::shfl_up(idata, i);
if (laneId >= i)
idata += n;
}

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

@@ -45,8 +45,8 @@
#include <vector>
#include <cuda_runtime.h>
#include "NPP_staging.hpp"
#include "opencv2/core/device/warp.hpp"
#include "opencv2/core/device/warp_shuffle.hpp"
#include "opencv2/core/cuda/warp.hpp"
#include "opencv2/core/cuda/warp_shuffle.hpp"
texture<Ncv8u, 1, cudaReadModeElementType> tex8u;
@@ -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::device::Warp::laneId();
const unsigned int laneId = cv::gpu::cuda::Warp::laneId();
// scan on shuffl functions
#pragma unroll
for (int i = 1; i <= (K_WARP_SIZE / 2); i *= 2)
{
const T n = cv::gpu::device::shfl_up(idata, i);
const T n = cv::gpu::cuda::shfl_up(idata, i);
if (laneId >= i)
idata += n;
}

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

@@ -48,7 +48,7 @@
#include "NCVAlg.hpp"
#include "NCVPyramid.hpp"
#include "NCVPixelOperations.hpp"
#include "opencv2/core/device/common.hpp"
#include "opencv2/core/cuda/common.hpp"
template<typename T, Ncv32u CN> struct __average4_CN {static __host__ __device__ T _average4_CN(const T &p00, const T &p01, const T &p10, const T &p11);};
@@ -204,7 +204,7 @@ __global__ void kernelDownsampleX2(T *d_src,
}
}
namespace cv { namespace gpu { namespace device
namespace cv { namespace gpu { namespace cuda
{
namespace pyramid
{
@@ -279,7 +279,7 @@ __global__ void kernelInterpolateFrom1(T *d_srcTop,
d_dst_line[j] = outPix;
}
}
namespace cv { namespace gpu { namespace device
namespace cv { namespace gpu { namespace cuda
{
namespace pyramid
{