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

fixed gpu::meanStdDev and gpu::norm under CUDA 4.0

Browse Source 
fixed compilation under Win64
This commit is contained in:
Vladislav Vinogradov 2011-05-10 12:39:12 +00:00
parent 7ec77593db
commit 1c9f4e7ca2
2 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gpu/src/matrix_operations.cpp
View File

@ -596,11 +596,11 @@ bool cv::gpu::CudaMem::canMapHostMemory()
namespace namespace
{ {
int alignUp(int what, int alignment) size_t alignUpStep(size_t what, size_t alignment)
{ {
int alignMask = alignment-1; size_t alignMask = alignment-1;
int inverseAlignMask = ~alignMask; size_t inverseAlignMask = ~alignMask;
int res = (what + alignMask) & inverseAlignMask; size_t res = (what + alignMask) & inverseAlignMask;
return res; return res;
} }
} }
@ -626,7 +626,7 @@ void cv::gpu::CudaMem::create(int _rows, int _cols, int _type, int _alloc_type)
{ {
cudaDeviceProp prop; cudaDeviceProp prop;
cudaSafeCall( cudaGetDeviceProperties(&prop, getDevice()) ); cudaSafeCall( cudaGetDeviceProperties(&prop, getDevice()) );
step = alignUp(step, prop.textureAlignment); step = alignUpStep(step, prop.textureAlignment);
} }
int64 _nettosize = (int64)step*rows; int64 _nettosize = (int64)step*rows;
size_t nettosize = (size_t)_nettosize; size_t nettosize = (size_t)_nettosize;

39
modules/gpu/src/matrix_reductions.cpp
View File

@ -78,9 +78,28 @@ void cv::gpu::meanStdDev(const GpuMat& src, Scalar& mean, Scalar& stddev)
sz.width = src.cols; sz.width = src.cols;
sz.height = src.rows; sz.height = src.rows;
#if NPP_VERSION_MAJOR >= 4
GpuMat d_buf(1, 2, CV_64F);
nppSafeCall( nppiMean_StdDev_8u_C1R(src.ptr<Npp8u>(), src.step, sz, d_buf.ptr<double>(), d_buf.ptr<double>() + 1) );
cudaSafeCall( cudaThreadSynchronize() );
double buf[2];
Mat _buf(1, 2, CV_64F, buf);
d_buf.download(_buf);
mean[0] = buf[0];
stddev[0] = buf[1];
#else
nppSafeCall( nppiMean_StdDev_8u_C1R(src.ptr<Npp8u>(), src.step, sz, mean.val, stddev.val) ); nppSafeCall( nppiMean_StdDev_8u_C1R(src.ptr<Npp8u>(), src.step, sz, mean.val, stddev.val) );
cudaSafeCall( cudaThreadSynchronize() ); cudaSafeCall( cudaThreadSynchronize() );
#endif
} }
@ -131,14 +150,32 @@ double cv::gpu::norm(const GpuMat& src1, const GpuMat& src2, int normType)
sz.height = src1.rows; sz.height = src1.rows;
int funcIdx = normType >> 1; int funcIdx = normType >> 1;
double retVal;
#if NPP_VERSION_MAJOR >= 4
GpuMat d_buf(1, 1, CV_64F);
nppSafeCall( npp_norm_diff_func[funcIdx](src1.ptr<Npp8u>(), src1.step,
src2.ptr<Npp8u>(), src2.step,
sz, d_buf.ptr<double>()) );
cudaSafeCall( cudaThreadSynchronize() );
double retVal;
Mat _buf(1, 1, CV_64F, &retVal);
d_buf.download(_buf);
#else
double retVal;
nppSafeCall( npp_norm_diff_func[funcIdx](src1.ptr<Npp8u>(), src1.step, nppSafeCall( npp_norm_diff_func[funcIdx](src1.ptr<Npp8u>(), src1.step,
src2.ptr<Npp8u>(), src2.step, src2.ptr<Npp8u>(), src2.step,
sz, &retVal) ); sz, &retVal) );
cudaSafeCall( cudaThreadSynchronize() ); cudaSafeCall( cudaThreadSynchronize() );
#endif
return retVal; return retVal;
} }