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

Optimized version of ReduceR functions and one ReduceC function added

Browse Source 
Attention! Optimized ReduceC function produced the bug
This commit is contained in:
Kirill Kornyakov 2011-12-22 06:22:16 +00:00
parent 1767049f30
commit 893f75444d
1 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
modules/core/src/matrix.cpp
View File

@ -1933,10 +1933,10 @@ reduceC_( const Mat& srcmat, Mat& dstmat )
a0 = op(a0, (WT)src[i+k]);
}
a0 = op(a0, a1);
dst[k] = (ST)a0;
dst[k] = (ST)a0;
}
}
}
}
}
typedef void (*ReduceFunc)( const Mat& src, Mat& dst );
@ -1977,7 +1977,11 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype)
if( op == CV_REDUCE_SUM )
{
if(sdepth == CV_8U && ddepth == CV_32S)
#ifdef HAVE_TEGRA_OPTIMIZATION
func = tegra::getTegraOptimized_reduceR8uAdd(tegra::reduceR8uAdd);
#else
func = reduceR_<uchar,int,OpAdd<int> >;
#endif
else if(sdepth == CV_8U && ddepth == CV_32F)
func = reduceR_<uchar,float,OpAdd<int> >;
else if(sdepth == CV_8U && ddepth == CV_64F)
@ -1990,8 +1994,12 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype)
func = reduceR_<short,float,OpAdd<float> >;
else if(sdepth == CV_16S && ddepth == CV_64F)
func = reduceR_<short,double,OpAdd<double> >;
else if(sdepth == CV_32F && ddepth == CV_32F)
func = reduceR_<float,float,OpAdd<float> >;
else if(sdepth == CV_32F && ddepth == CV_32F)
#ifdef HAVE_TEGRA_OPTIMIZATION
func = tegra::getTegraOptimized_reduceR32fAdd(tegra::reduceR32fAdd);
#else
func = reduceR_<float,float,OpAdd<float> >;
#endif
else if(sdepth == CV_32F && ddepth == CV_64F)
func = reduceR_<float,double,OpAdd<double> >;
else if(sdepth == CV_64F && ddepth == CV_64F)
@ -2000,26 +2008,42 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype)
else if(op == CV_REDUCE_MAX)
{
if(sdepth == CV_8U && ddepth == CV_8U)
#ifdef HAVE_TEGRA_OPTIMIZATION
func = tegra::getTegraOptimized_reduceR8uMax(tegra::reduceR8uMax);
#else
func = reduceR_<uchar, uchar, OpMax<uchar> >;
else if(sdepth == CV_16U && ddepth == CV_16U)
#endif
else if(sdepth == CV_16U && ddepth == CV_16U)
func = reduceR_<ushort, ushort, OpMax<ushort> >;
else if(sdepth == CV_16S && ddepth == CV_16S)
func = reduceR_<short, short, OpMax<short> >;
else if(sdepth == CV_32F && ddepth == CV_32F)
#ifdef HAVE_TEGRA_OPTIMIZATION
func = tegra::getTegraOptimized_reduceR32fMax(tegra::reduceR32fMax);
#else
func = reduceR_<float, float, OpMax<float> >;
else if(sdepth == CV_64F && ddepth == CV_64F)
#endif
else if(sdepth == CV_64F && ddepth == CV_64F)
func = reduceR_<double, double, OpMax<double> >;
}
else if(op == CV_REDUCE_MIN)
{
if(sdepth == CV_8U && ddepth == CV_8U)
#ifdef HAVE_TEGRA_OPTIMIZATION
func = tegra::getTegraOptimized_reduceR8uMin(tegra::reduceR8uMin);
#else
func = reduceR_<uchar, uchar, OpMin<uchar> >;
#endif
else if(sdepth == CV_16U && ddepth == CV_16U)
func = reduceR_<ushort, ushort, OpMin<ushort> >;
else if(sdepth == CV_16S && ddepth == CV_16S)
func = reduceR_<short, short, OpMin<short> >;
else if(sdepth == CV_32F && ddepth == CV_32F)
#ifdef HAVE_TEGRA_OPTIMIZATION
func = tegra::getTegraOptimized_reduceR32fMin(tegra::reduceR32fMin);
#else
func = reduceR_<float, float, OpMin<float> >;
#endif
else if(sdepth == CV_64F && ddepth == CV_64F)
func = reduceR_<double, double, OpMin<double> >;
}
@ -2029,7 +2053,11 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype)
if(op == CV_REDUCE_SUM)
{
if(sdepth == CV_8U && ddepth == CV_32S)
func = reduceC_<uchar,int,OpAdd<int> >;
#ifdef HAVE_TEGRA_OPTIMIZATION
func = tegra::getTegraOptimized_reduceC8uAdd(tegra::reduceC8uAdd);
#else
func = reduceC_<uchar,int,OpAdd<int> >;
#endif
else if(sdepth == CV_8U && ddepth == CV_32F)
func = reduceC_<uchar,float,OpAdd<int> >;
else if(sdepth == CV_8U && ddepth == CV_64F)
@ -2042,7 +2070,7 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype)
func = reduceC_<short,float,OpAdd<float> >;
else if(sdepth == CV_16S && ddepth == CV_64F)
func = reduceC_<short,double,OpAdd<double> >;
else if(sdepth == CV_32F && ddepth == CV_32F)
else if(sdepth == CV_32F && ddepth == CV_32F)
func = reduceC_<float,float,OpAdd<float> >;
else if(sdepth == CV_32F && ddepth == CV_64F)
func = reduceC_<float,double,OpAdd<double> >;
@ -2052,8 +2080,8 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype)
else if(op == CV_REDUCE_MAX)
{
if(sdepth == CV_8U && ddepth == CV_8U)
func = reduceC_<uchar, uchar, OpMax<uchar> >;
else if(sdepth == CV_16U && ddepth == CV_16U)
func = reduceC_<uchar, uchar, OpMax<uchar> >;
else if(sdepth == CV_16U && ddepth == CV_16U)
func = reduceC_<ushort, ushort, OpMax<ushort> >;
else if(sdepth == CV_16S && ddepth == CV_16S)
func = reduceC_<short, short, OpMax<short> >;
@ -2083,10 +2111,10 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype)
func( src, temp );
if( op0 == CV_REDUCE_AVG )
if( op0 == CV_REDUCE_AVG )
temp.convertTo(dst, dst.type(), 1./(dim == 0 ? src.rows : src.cols));
}
}
//////////////////////////////////////// sort ///////////////////////////////////////////