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

added black list for gpu tests

Browse Source
This commit is contained in:
Anatoly Baksheev 2010-09-27 06:57:25 +00:00
parent 50df762c4e
commit 1b8c00000c
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,7 @@ Scalar cv::gpu::sum(const GpuMat& src)
{ {
CV_Assert(src.type() == CV_8UC1 || src.type() == CV_8UC4); CV_Assert(src.type() == CV_8UC1 || src.type() == CV_8UC4);
Scalar res;
NppiSize sz; NppiSize sz;
@ -322,16 +322,22 @@ Scalar cv::gpu::sum(const GpuMat& src)
{ {
nppiReductionGetBufferHostSize_8u_C1R(sz, &bufsz); nppiReductionGetBufferHostSize_8u_C1R(sz, &bufsz);
GpuMat buf(1, bufsz, CV_32S); GpuMat buf(1, bufsz, CV_32S);
Scalar res;
nppSafeCall( nppiSum_8u_C1R(src.ptr<Npp8u>(), src.step, sz, buf.ptr<Npp32s>(), res.val) ); nppSafeCall( nppiSum_8u_C1R(src.ptr<Npp8u>(), src.step, sz, buf.ptr<Npp32s>(), res.val) );
return res;
} }
else else
{ {
nppiReductionGetBufferHostSize_8u_C4R(sz, &bufsz); nppiReductionGetBufferHostSize_8u_C4R(sz, &bufsz);
GpuMat buf(1, bufsz, CV_32S); GpuMat buf(1, bufsz, CV_32S);
Scalar res;
nppSafeCall( nppiSum_8u_C4R(src.ptr<Npp8u>(), src.step, sz, buf.ptr<Npp32s>(), res.val) ); nppSafeCall( nppiSum_8u_C4R(src.ptr<Npp8u>(), src.step, sz, buf.ptr<Npp32s>(), res.val) );
return res;
} }
return res;
} }
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

2
modules/gpu/src/error.cpp
View File

@ -124,7 +124,7 @@ namespace cv
const string& msg = (idx != error_num) ? npp_errors[idx].str : string("Unknown error code"); const string& msg = (idx != error_num) ? npp_errors[idx].str : string("Unknown error code");
std::stringstream interpreter; std::stringstream interpreter;
interpreter << "<" << err << "> " << msg; interpreter << msg <<" [Code = " << err << "]";
return interpreter.str(); return interpreter.str();
} }

2
modules/gpu/src/filtering_npp.cpp
View File

@ -69,7 +69,7 @@ namespace
NppiSize sz; NppiSize sz;
sz.width = src.cols; sz.width = src.cols;
sz.height = dst.rows; sz.height = src.rows;
NppiSize mask_sz; NppiSize mask_sz;
mask_sz.width = kernel.cols; mask_sz.width = kernel.cols;

2
tests/gpu/src/arithm.cpp
View File

@ -590,6 +590,6 @@ CV_GpuNppImageCompareTest CV_GpuNppImageCompare_test;
CV_GpuNppImageMeanStdDevTest CV_GpuNppImageMeanStdDev_test; CV_GpuNppImageMeanStdDevTest CV_GpuNppImageMeanStdDev_test;
CV_GpuNppImageNormTest CV_GpuNppImageNorm_test; CV_GpuNppImageNormTest CV_GpuNppImageNorm_test;
CV_GpuNppImageFlipTest CV_GpuNppImageFlip_test; CV_GpuNppImageFlipTest CV_GpuNppImageFlip_test;
//CV_GpuNppImageSumTest CV_GpuNppImageSum_test; CV_GpuNppImageSumTest CV_GpuNppImageSum_test;
CV_GpuNppImageMinNaxTest CV_GpuNppImageMinNax_test; CV_GpuNppImageMinNaxTest CV_GpuNppImageMinNax_test;
CV_GpuNppImageLUTTest CV_GpuNppImageLUT_test; CV_GpuNppImageLUTTest CV_GpuNppImageLUT_test;

8
tests/gpu/src/gputest_main.cpp
View File

@ -43,9 +43,15 @@
CvTS test_system; CvTS test_system;
const char* blacklist[] =
{
"GPU-NppImageSum",
0
};
int main( int argc, char** argv ) int main( int argc, char** argv )
{ {
return test_system.run( argc, argv ); return test_system.run( argc, argv, blacklist );
} }
/* End of file. */ /* End of file. */