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

renamed gpu::cudev namespace -> cuda::device

Browse Source 
cudev is used for new device layer
This commit is contained in:
Vladislav Vinogradov
2013-07-23 11:33:51 +04:00
parent e895b7455e
commit 8282f6ebc1
165 changed files with 539 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/src/calib3d.cpp
View File

@@ -55,7 +55,7 @@ void cv::cuda::solvePnPRansac(const Mat&, const Mat&, const Mat&, const Mat&, Ma
#else
namespace cv { namespace cuda { namespace cudev
namespace cv { namespace cuda { namespace device
{
namespace transform_points
{
@@ -78,7 +78,7 @@ namespace cv { namespace cuda { namespace cudev
}
}}}
using namespace ::cv::cuda::cudev;
using namespace ::cv::cuda::device;
namespace
{

6
modules/gpu/src/cascadeclassifier.cpp
View File

@@ -372,7 +372,7 @@ struct PyrLavel
cv::Size sWindow;
};
namespace cv { namespace cuda { namespace cudev
namespace cv { namespace cuda { namespace device
{
namespace lbp
{
@@ -473,7 +473,7 @@ public:
acc += level.sFrame.width + 1;
}
cudev::lbp::classifyPyramid(image.cols, image.rows, NxM.width - 1, NxM.height - 1, iniScale, scaleFactor, total, stage_mat, stage_mat.cols / sizeof(Stage), nodes_mat,
device::lbp::classifyPyramid(image.cols, image.rows, NxM.width - 1, NxM.height - 1, iniScale, scaleFactor, total, stage_mat, stage_mat.cols / sizeof(Stage), nodes_mat,
leaves_mat, subsets_mat, features_mat, subsetSize, candidates, dclassified.ptr<unsigned int>(), integral);
}
@@ -481,7 +481,7 @@ public:
return 0;
cudaSafeCall( cudaMemcpy(&classified, dclassified.ptr(), sizeof(int), cudaMemcpyDeviceToHost) );
cudev::lbp::connectedConmonents(candidates, classified, objects, groupThreshold, grouping_eps, dclassified.ptr<unsigned int>());
device::lbp::connectedConmonents(candidates, classified, objects, groupThreshold, grouping_eps, dclassified.ptr<unsigned int>());
cudaSafeCall( cudaMemcpy(&classified, dclassified.ptr(), sizeof(int), cudaMemcpyDeviceToHost) );
cudaSafeCall( cudaDeviceSynchronize() );

6
modules/gpu/src/cuda/calib3d.cu
View File

@@ -47,7 +47,7 @@
#include "opencv2/core/cuda/functional.hpp"
#include "opencv2/core/cuda/reduce.hpp"
namespace cv { namespace cuda { namespace cudev
namespace cv { namespace cuda { namespace device
{
#define SOLVE_PNP_RANSAC_MAX_NUM_ITERS 200
@@ -79,7 +79,7 @@ namespace cv { namespace cuda { namespace cudev
cudaSafeCall(cudaMemcpyToSymbol(crot1, rot + 3, sizeof(float) * 3));
cudaSafeCall(cudaMemcpyToSymbol(crot2, rot + 6, sizeof(float) * 3));
cudaSafeCall(cudaMemcpyToSymbol(ctransl, transl, sizeof(float) * 3));
cv::cuda::cudev::transform(src, dst, TransformOp(), WithOutMask(), stream);
cv::cuda::device::transform(src, dst, TransformOp(), WithOutMask(), stream);
}
} // namespace transform_points
@@ -120,7 +120,7 @@ namespace cv { namespace cuda { namespace cudev
cudaSafeCall(cudaMemcpyToSymbol(ctransl, transl, sizeof(float) * 3));
cudaSafeCall(cudaMemcpyToSymbol(cproj0, proj, sizeof(float) * 3));
cudaSafeCall(cudaMemcpyToSymbol(cproj1, proj + 3, sizeof(float) * 3));
cv::cuda::cudev::transform(src, dst, ProjectOp(), WithOutMask(), stream);
cv::cuda::device::transform(src, dst, ProjectOp(), WithOutMask(), stream);
}
} // namespace project_points

2
modules/gpu/src/cuda/ccomponetns.cu
View File

@@ -50,7 +50,7 @@
#include <iostream>
#include <stdio.h>
namespace cv { namespace cuda { namespace cudev
namespace cv { namespace cuda { namespace device
{
namespace ccl
{

2
modules/gpu/src/cuda/global_motion.cu
View File

@@ -47,7 +47,7 @@
#include <thrust/functional.h>
#include "opencv2/core/cuda/common.hpp"
namespace cv { namespace cuda { namespace cudev { namespace globmotion {
namespace cv { namespace cuda { namespace device { namespace globmotion {
__constant__ float cml[9];
__constant__ float cmr[9];

2
modules/gpu/src/cuda/hog.cu
View File

@@ -47,7 +47,7 @@
#include "opencv2/core/cuda/functional.hpp"
#include "opencv2/core/cuda/warp_shuffle.hpp"
namespace cv { namespace cuda { namespace cudev
namespace cv { namespace cuda { namespace device
{
// Other values are not supported
#define CELL_WIDTH 8

2
modules/gpu/src/cuda/lbp.cu
View File

@@ -46,7 +46,7 @@
#include "opencv2/core/cuda/vec_traits.hpp"
#include "opencv2/core/cuda/saturate_cast.hpp"
namespace cv { namespace cuda { namespace cudev
namespace cv { namespace cuda { namespace device
{
namespace lbp
{

2
modules/gpu/src/cuda/lbp.hpp
View File

@@ -46,7 +46,7 @@
#include "opencv2/core/cuda/common.hpp"
#include "opencv2/core/cuda/emulation.hpp"
namespace cv { namespace cuda { namespace cudev {
namespace cv { namespace cuda { namespace device {
namespace lbp {

6
modules/gpu/src/global_motion.cpp
View File

@@ -53,7 +53,7 @@ void cv::cuda::calcWobbleSuppressionMaps(
#else
namespace cv { namespace cuda { namespace cudev { namespace globmotion {
namespace cv { namespace cuda { namespace device { namespace globmotion {
int compactPoints(int N, float *points0, float *points1, const uchar *mask);
@@ -70,7 +70,7 @@ void cv::cuda::compactPoints(GpuMat &points0, GpuMat &points1, const GpuMat &mas
CV_Assert(points0.cols == mask.cols && points1.cols == mask.cols);
int npoints = points0.cols;
int remaining = cv::cuda::cudev::globmotion::compactPoints(
int remaining = cv::cuda::device::globmotion::compactPoints(
npoints, (float*)points0.data, (float*)points1.data, mask.data);
points0 = points0.colRange(0, remaining);
@@ -88,7 +88,7 @@ void cv::cuda::calcWobbleSuppressionMaps(
mapx.create(size, CV_32F);
mapy.create(size, CV_32F);
cv::cuda::cudev::globmotion::calcWobbleSuppressionMaps(
cv::cuda::device::globmotion::calcWobbleSuppressionMaps(
left, idx, right, size.width, size.height,
ml.ptr<float>(), mr.ptr<float>(), mapx, mapy);
}

12
modules/gpu/src/graphcuts.cpp
View File

@@ -52,7 +52,7 @@ void cv::cuda::labelComponents(const GpuMat&, GpuMat&, int, Stream&) { throw_no_
#else /* !defined (HAVE_CUDA) */
namespace cv { namespace cuda { namespace cudev
namespace cv { namespace cuda { namespace device
{
namespace ccl
{
@@ -81,12 +81,12 @@ void cv::cuda::connectivityMask(const GpuMat& image, GpuMat& mask, const cv::Sca
static const func_t suppotLookup[8][4] =
{ // 1, 2, 3, 4
{ cudev::ccl::computeEdges<uchar>, 0, cudev::ccl::computeEdges<uchar3>, cudev::ccl::computeEdges<uchar4> },// CV_8U
{ device::ccl::computeEdges<uchar>, 0, device::ccl::computeEdges<uchar3>, device::ccl::computeEdges<uchar4> },// CV_8U
{ 0, 0, 0, 0 },// CV_16U
{ cudev::ccl::computeEdges<ushort>, 0, cudev::ccl::computeEdges<ushort3>, cudev::ccl::computeEdges<ushort4> },// CV_8S
{ device::ccl::computeEdges<ushort>, 0, device::ccl::computeEdges<ushort3>, device::ccl::computeEdges<ushort4> },// CV_8S
{ 0, 0, 0, 0 },// CV_16S
{ cudev::ccl::computeEdges<int>, 0, 0, 0 },// CV_32S
{ cudev::ccl::computeEdges<float>, 0, 0, 0 },// CV_32F
{ device::ccl::computeEdges<int>, 0, 0, 0 },// CV_32S
{ device::ccl::computeEdges<float>, 0, 0, 0 },// CV_32F
{ 0, 0, 0, 0 },// CV_64F
{ 0, 0, 0, 0 } // CV_USRTYPE1
};
@@ -112,7 +112,7 @@ void cv::cuda::labelComponents(const GpuMat& mask, GpuMat& components, int flags
components.create(mask.size(), CV_32SC1);
cudaStream_t stream = StreamAccessor::getStream(s);
cudev::ccl::labelComponents(mask, components, flags, stream);
device::ccl::labelComponents(mask, components, flags, stream);
}
namespace

4
modules/gpu/src/hog.cpp
View File

@@ -62,7 +62,7 @@ void cv::cuda::HOGDescriptor::computeConfidenceMultiScale(const GpuMat&, std::ve
#else
namespace cv { namespace cuda { namespace cudev
namespace cv { namespace cuda { namespace device
{
namespace hog
{
@@ -102,7 +102,7 @@ namespace cv { namespace cuda { namespace cudev
}
}}}
using namespace ::cv::cuda::cudev;
using namespace ::cv::cuda::device;
cv::cuda::HOGDescriptor::HOGDescriptor(Size win_size_, Size block_size_, Size block_stride_, Size cell_size_,
int nbins_, double win_sigma_, double threshold_L2hys_, bool gamma_correction_, int nlevels_)