Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #700 from cuda-geek/fix_build_with_cuda

Browse Source 
fix master build with CUDA after latest 2.4 merge
pull/684/merge
Andrey Kamaev 12 years ago
parent 04eabf8d9f dd9e786a8e
commit 8c41c614eb
10 changed files with 45 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/gpu/src/hough.cpp
  2. 1
      modules/gpu/src/matrix_reductions.cpp
  3. 1
      modules/gpu/src/stereocsbp.cpp
  4. 8
      modules/gpu/test/test_bgfg.cpp
  5. 2
      modules/nonfree/perf/perf_gpu.cpp
  6. 1
      modules/nonfree/perf/perf_precomp.hpp
  7. 2
      modules/nonfree/src/precomp.hpp
  8. 2
      modules/nonfree/test/test_main.cpp
  9. 64
      modules/superres/src/btv_l1_gpu.cpp
  10. 2
      modules/superres/src/precomp.hpp

2
modules/gpu/src/hough.cpp
Unescape View File

@ -68,6 +68,8 @@ void cv::gpu::GeneralizedHough_GPU::release() {}
#else /* !defined (HAVE_CUDA) */ #else /* !defined (HAVE_CUDA) */
#include "opencv2/core/utility.hpp"
namespace cv { namespace gpu { namespace device namespace cv { namespace gpu { namespace device
{ {
namespace hough namespace hough

1
modules/gpu/src/matrix_reductions.cpp
Unescape View File

@ -71,6 +71,7 @@ int cv::gpu::countNonZero(const GpuMat&, GpuMat&) { throw_nogpu(); return 0; }
void cv::gpu::reduce(const GpuMat&, GpuMat&, int, int, int, Stream&) { throw_nogpu(); } void cv::gpu::reduce(const GpuMat&, GpuMat&, int, int, int, Stream&) { throw_nogpu(); }
#else #else
#include "opencv2/core/utility.hpp"
namespace namespace
{ {

1
modules/gpu/src/stereocsbp.cpp
Unescape View File

@ -55,6 +55,7 @@ cv::gpu::StereoConstantSpaceBP::StereoConstantSpaceBP(int, int, int, int, float,
void cv::gpu::StereoConstantSpaceBP::operator()(const GpuMat&, const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); } void cv::gpu::StereoConstantSpaceBP::operator()(const GpuMat&, const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); }
#else /* !defined (HAVE_CUDA) */ #else /* !defined (HAVE_CUDA) */
#include "opencv2/core/utility.hpp"
namespace cv { namespace gpu { namespace device namespace cv { namespace gpu { namespace device
{ {

8
modules/gpu/test/test_bgfg.cpp
Unescape View File

@ -194,7 +194,7 @@ GPU_TEST_P(MOG, Update)
cv::gpu::MOG_GPU mog; cv::gpu::MOG_GPU mog;
cv::gpu::GpuMat foreground = createMat(frame.size(), CV_8UC1, useRoi); cv::gpu::GpuMat foreground = createMat(frame.size(), CV_8UC1, useRoi);
cv::BackgroundSubtractorMOG mog_gold; cv::Ptr<cv::BackgroundSubtractorMOG> mog_gold = cv::createBackgroundSubtractorMOG();
cv::Mat foreground_gold; cv::Mat foreground_gold;
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
@ -211,7 +211,7 @@ GPU_TEST_P(MOG, Update)
mog(loadMat(frame, useRoi), foreground, (float)learningRate); mog(loadMat(frame, useRoi), foreground, (float)learningRate);
mog_gold(frame, foreground_gold, learningRate); mog_gold->apply(frame, foreground_gold, learningRate);
ASSERT_MAT_NEAR(foreground_gold, foreground, 0.0); ASSERT_MAT_NEAR(foreground_gold, foreground, 0.0);
} }
@ -270,7 +270,7 @@ GPU_TEST_P(MOG2, Update)
cv::gpu::GpuMat foreground = createMat(frame.size(), CV_8UC1, useRoi); cv::gpu::GpuMat foreground = createMat(frame.size(), CV_8UC1, useRoi);
cv::Ptr<cv::BackgroundSubtractorMOG2> mog2_gold = cv::createBackgroundSubtractorMOG2(); cv::Ptr<cv::BackgroundSubtractorMOG2> mog2_gold = cv::createBackgroundSubtractorMOG2();
mog2_gold.setDetectShadows(detectShadow); mog2_gold->setDetectShadows(detectShadow);
cv::Mat foreground_gold; cv::Mat foreground_gold;
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
@ -315,7 +315,7 @@ GPU_TEST_P(MOG2, getBackgroundImage)
cv::gpu::GpuMat foreground; cv::gpu::GpuMat foreground;
cv::Ptr<cv::BackgroundSubtractorMOG2> mog2_gold = cv::createBackgroundSubtractorMOG2(); cv::Ptr<cv::BackgroundSubtractorMOG2> mog2_gold = cv::createBackgroundSubtractorMOG2();
mog2_gold.setDetectShadows(detectShadow); mog2_gold->setDetectShadows(detectShadow);
cv::Mat foreground_gold; cv::Mat foreground_gold;
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)

2
modules/nonfree/perf/perf_gpu.cpp
Unescape View File

@ -24,7 +24,7 @@ using namespace perf;
DEF_PARAM_TEST_1(Image, string); DEF_PARAM_TEST_1(Image, string);
PERF_TEST_P(Image, GPU_SURF, PERF_TEST_P(Image, GPU_SURF,
Values<string>("gpu/perf/aloe.png")) Values<std::string>("gpu/perf/aloe.png"))
{ {
declare.time(50.0); declare.time(50.0);

1
modules/nonfree/perf/perf_precomp.hpp
Unescape View File

@ -20,6 +20,7 @@
#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA) #if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
#include "opencv2/nonfree/gpu.hpp" #include "opencv2/nonfree/gpu.hpp"
#include "opencv2/ts/gpu_perf.hpp"
#endif #endif
#ifdef GTEST_CREATE_SHARED_LIBRARY #ifdef GTEST_CREATE_SHARED_LIBRARY

2
modules/nonfree/src/precomp.hpp
Unescape View File

@ -59,7 +59,7 @@
#include "opencv2/nonfree/gpu.hpp" #include "opencv2/nonfree/gpu.hpp"
#if defined(HAVE_CUDA) #if defined(HAVE_CUDA)
#include "opencv2/gpu/stream_accessor.hpp" #include "opencv2/core/stream_accessor.hpp"
#include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/common.hpp"
static inline void throw_nogpu() { CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform"); } static inline void throw_nogpu() { CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform"); }

2
modules/nonfree/test/test_main.cpp
Unescape View File

@ -21,7 +21,7 @@ int main(int argc, char **argv)
if (cmd.get<bool>("help")) if (cmd.get<bool>("help"))
{ {
cmd.printParams(); cmd.printMessage();
return 0; return 0;
} }

64
modules/superres/src/btv_l1_gpu.cpp
Unescape View File

@ -78,8 +78,8 @@ namespace btv_l1_device
namespace namespace
{ {
void calcRelativeMotions(const vector<pair<GpuMat, GpuMat> >& forwardMotions, const vector<pair<GpuMat, GpuMat> >& backwardMotions, void calcRelativeMotions(const std::vector<std::pair<GpuMat, GpuMat> >& forwardMotions, const std::vector<std::pair<GpuMat, GpuMat> >& backwardMotions,
vector<pair<GpuMat, GpuMat> >& relForwardMotions, vector<pair<GpuMat, GpuMat> >& relBackwardMotions, std::vector<std::pair<GpuMat, GpuMat> >& relForwardMotions, std::vector<std::pair<GpuMat, GpuMat> >& relBackwardMotions,
int baseIdx, Size size) int baseIdx, Size size)
{ {
const int count = static_cast<int>(forwardMotions.size()); const int count = static_cast<int>(forwardMotions.size());
@ -115,7 +115,7 @@ namespace
} }
} }
void upscaleMotions(const vector<pair<GpuMat, GpuMat> >& lowResMotions, vector<pair<GpuMat, GpuMat> >& highResMotions, int scale) void upscaleMotions(const std::vector<std::pair<GpuMat, GpuMat> >& lowResMotions, std::vector<std::pair<GpuMat, GpuMat> >& highResMotions, int scale)
{ {
highResMotions.resize(lowResMotions.size()); highResMotions.resize(lowResMotions.size());
@ -129,8 +129,8 @@ namespace
} }
} }
void buildMotionMaps(const pair<GpuMat, GpuMat>& forwardMotion, const pair<GpuMat, GpuMat>& backwardMotion, void buildMotionMaps(const std::pair<GpuMat, GpuMat>& forwardMotion, const std::pair<GpuMat, GpuMat>& backwardMotion,
pair<GpuMat, GpuMat>& forwardMap, pair<GpuMat, GpuMat>& backwardMap) std::pair<GpuMat, GpuMat>& forwardMap, std::pair<GpuMat, GpuMat>& backwardMap)
{ {
forwardMap.first.create(forwardMotion.first.size(), CV_32FC1); forwardMap.first.create(forwardMotion.first.size(), CV_32FC1);
forwardMap.second.create(forwardMotion.first.size(), CV_32FC1); forwardMap.second.create(forwardMotion.first.size(), CV_32FC1);
@ -169,7 +169,7 @@ namespace
btv_l1_device::diffSign(src1.reshape(1), src2.reshape(1), dst.reshape(1), StreamAccessor::getStream(stream)); btv_l1_device::diffSign(src1.reshape(1), src2.reshape(1), dst.reshape(1), StreamAccessor::getStream(stream));
} }
void calcBtvWeights(int btvKernelSize, double alpha, vector<float>& btvWeights) void calcBtvWeights(int btvKernelSize, double alpha, std::vector<float>& btvWeights)
{ {
const size_t size = btvKernelSize * btvKernelSize; const size_t size = btvKernelSize * btvKernelSize;
@ -212,8 +212,8 @@ namespace
public: public:
BTVL1_GPU_Base(); BTVL1_GPU_Base();
void process(const vector<GpuMat>& src, GpuMat& dst, void process(const std::vector<GpuMat>& src, GpuMat& dst,
const vector<pair<GpuMat, GpuMat> >& forwardMotions, const vector<pair<GpuMat, GpuMat> >& backwardMotions, const std::vector<std::pair<GpuMat, GpuMat> >& forwardMotions, const std::vector<std::pair<GpuMat, GpuMat> >& backwardMotions,
int baseIdx); int baseIdx);
void collectGarbage(); void collectGarbage();
@ -230,29 +230,29 @@ namespace
Ptr<DenseOpticalFlowExt> opticalFlow_; Ptr<DenseOpticalFlowExt> opticalFlow_;
private: private:
vector<Ptr<FilterEngine_GPU> > filters_; std::vector<Ptr<FilterEngine_GPU> > filters_;
int curBlurKernelSize_; int curBlurKernelSize_;
double curBlurSigma_; double curBlurSigma_;
int curSrcType_; int curSrcType_;
vector<float> btvWeights_; std::vector<float> btvWeights_;
int curBtvKernelSize_; int curBtvKernelSize_;
double curAlpha_; double curAlpha_;
vector<pair<GpuMat, GpuMat> > lowResForwardMotions_; std::vector<std::pair<GpuMat, GpuMat> > lowResForwardMotions_;
vector<pair<GpuMat, GpuMat> > lowResBackwardMotions_; std::vector<std::pair<GpuMat, GpuMat> > lowResBackwardMotions_;
vector<pair<GpuMat, GpuMat> > highResForwardMotions_; std::vector<std::pair<GpuMat, GpuMat> > highResForwardMotions_;
vector<pair<GpuMat, GpuMat> > highResBackwardMotions_; std::vector<std::pair<GpuMat, GpuMat> > highResBackwardMotions_;
vector<pair<GpuMat, GpuMat> > forwardMaps_; std::vector<std::pair<GpuMat, GpuMat> > forwardMaps_;
vector<pair<GpuMat, GpuMat> > backwardMaps_; std::vector<std::pair<GpuMat, GpuMat> > backwardMaps_;
GpuMat highRes_; GpuMat highRes_;
vector<Stream> streams_; std::vector<Stream> streams_;
vector<GpuMat> diffTerms_; std::vector<GpuMat> diffTerms_;
vector<GpuMat> a_, b_, c_; std::vector<GpuMat> a_, b_, c_;
GpuMat regTerm_; GpuMat regTerm_;
}; };
@ -276,8 +276,8 @@ namespace
curAlpha_ = -1.0; curAlpha_ = -1.0;
} }
void BTVL1_GPU_Base::process(const vector<GpuMat>& src, GpuMat& dst, void BTVL1_GPU_Base::process(const std::vector<GpuMat>& src, GpuMat& dst,
const vector<pair<GpuMat, GpuMat> >& forwardMotions, const vector<pair<GpuMat, GpuMat> >& backwardMotions, const std::vector<std::pair<GpuMat, GpuMat> >& forwardMotions, const std::vector<std::pair<GpuMat, GpuMat> >& backwardMotions,
int baseIdx) int baseIdx)
{ {
CV_Assert( scale_ > 1 ); CV_Assert( scale_ > 1 );
@ -418,18 +418,18 @@ namespace
GpuMat curFrame_; GpuMat curFrame_;
GpuMat prevFrame_; GpuMat prevFrame_;
vector<GpuMat> frames_; std::vector<GpuMat> frames_;
vector<pair<GpuMat, GpuMat> > forwardMotions_; std::vector<std::pair<GpuMat, GpuMat> > forwardMotions_;
vector<pair<GpuMat, GpuMat> > backwardMotions_; std::vector<std::pair<GpuMat, GpuMat> > backwardMotions_;
vector<GpuMat> outputs_; std::vector<GpuMat> outputs_;
int storePos_; int storePos_;
int procPos_; int procPos_;
int outPos_; int outPos_;
vector<GpuMat> srcFrames_; std::vector<GpuMat> srcFrames_;
vector<pair<GpuMat, GpuMat> > srcForwardMotions_; std::vector<std::pair<GpuMat, GpuMat> > srcForwardMotions_;
vector<pair<GpuMat, GpuMat> > srcBackwardMotions_; std::vector<std::pair<GpuMat, GpuMat> > srcBackwardMotions_;
GpuMat finalOutput_; GpuMat finalOutput_;
}; };
@ -530,8 +530,8 @@ namespace
if (storePos_ > 0) if (storePos_ > 0)
{ {
pair<GpuMat, GpuMat>& forwardMotion = at(storePos_ - 1, forwardMotions_); std::pair<GpuMat, GpuMat>& forwardMotion = at(storePos_ - 1, forwardMotions_);
pair<GpuMat, GpuMat>& backwardMotion = at(storePos_, backwardMotions_); std::pair<GpuMat, GpuMat>& backwardMotion = at(storePos_, backwardMotions_);
opticalFlow_->calc(prevFrame_, curFrame_, forwardMotion.first, forwardMotion.second); opticalFlow_->calc(prevFrame_, curFrame_, forwardMotion.first, forwardMotion.second);
opticalFlow_->calc(curFrame_, prevFrame_, backwardMotion.first, backwardMotion.second); opticalFlow_->calc(curFrame_, prevFrame_, backwardMotion.first, backwardMotion.second);
@ -542,9 +542,9 @@ namespace
void BTVL1_GPU::processFrame(int idx) void BTVL1_GPU::processFrame(int idx)
{ {
const int startIdx = max(idx - temporalAreaRadius_, 0); const int startIdx = std::max(idx - temporalAreaRadius_, 0);
const int procIdx = idx; const int procIdx = idx;
const int endIdx = min(startIdx + 2 * temporalAreaRadius_, storePos_); const int endIdx = std::min(startIdx + 2 * temporalAreaRadius_, storePos_);
const int count = endIdx - startIdx + 1; const int count = endIdx - startIdx + 1;

2
modules/superres/src/precomp.hpp
Unescape View File

@ -62,7 +62,7 @@
#ifdef HAVE_OPENCV_GPU #ifdef HAVE_OPENCV_GPU
#include "opencv2/gpu.hpp" #include "opencv2/gpu.hpp"
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
#include "opencv2/gpu/stream_accessor.hpp" #include "opencv2/core/stream_accessor.hpp"
#endif #endif
#endif #endif

Write Preview
Loading…
Cancel
Save