added black list for gpu tests

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

View File

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

View File

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

View File

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

View File

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

View File

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