mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

IPP: update minMaxIdx, disable some AVX optimizations with mask

Browse Source
This commit is contained in:
Alexander Alekhin 2017-07-20 18:10:36 +03:00
parent d9e092325b
commit 544eb4be1f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/src/stat.cpp
View File

@ -2530,6 +2530,12 @@ static bool ipp_minMaxIdx(Mat &src, double* _minVal, double* _maxVal, int* _minI
return false; return false;
#endif #endif
// cv::minMaxIdx problem with index positions on AVX
#if IPP_VERSION_X100 < 201810
if(!mask.empty() && _maxIdx && ipp::getIppFeatures()&ippCPUID_AVX)
return false;
#endif
IppStatus status; IppStatus status;
IppDataType dataType = ippiGetDataType(src.depth()); IppDataType dataType = ippiGetDataType(src.depth());
float minVal = 0; float minVal = 0;
@ -2561,7 +2567,7 @@ static bool ipp_minMaxIdx(Mat &src, double* _minVal, double* _maxVal, int* _minI
size.width *= src.channels(); size.width *= src.channels();
status = ippMinMaxFun(src.ptr(), (int)src.step, size, dataType, pMinVal, pMaxVal, pMinIdx, pMaxIdx, (Ipp8u*)mask.ptr(), (int)mask.step); status = ippMinMaxFun(src.ptr(), (int)src.step, size, dataType, pMinVal, pMaxVal, pMinIdx, pMaxIdx, (Ipp8u*)mask.ptr(), (int)mask.step);
if(status < 0 || status == ippStsNoOperation) if(status < 0)
return false; return false;
if(_minVal) if(_minVal)
*_minVal = minVal; *_minVal = minVal;
@ -2569,7 +2575,8 @@ static bool ipp_minMaxIdx(Mat &src, double* _minVal, double* _maxVal, int* _minI
*_maxVal = maxVal; *_maxVal = maxVal;
if(_minIdx) if(_minIdx)
{ {
if(!mask.empty() && !minIdx.y && !minIdx.x) // Should be just ippStsNoOperation check, but there is a bug in the function so we need additional checks
if(status == ippStsNoOperation && !mask.empty() && !pMinIdx->x && !pMinIdx->y)
{ {
_minIdx[0] = -1; _minIdx[0] = -1;
_minIdx[1] = -1; _minIdx[1] = -1;
@ -2582,7 +2589,8 @@ static bool ipp_minMaxIdx(Mat &src, double* _minVal, double* _maxVal, int* _minI
} }
if(_maxIdx) if(_maxIdx)
{ {
if(!mask.empty() && !maxIdx.y && !maxIdx.x) // Should be just ippStsNoOperation check, but there is a bug in the function so we need additional checks
if(status == ippStsNoOperation && !mask.empty() && !pMaxIdx->x && !pMaxIdx->y)
{ {
_maxIdx[0] = -1; _maxIdx[0] = -1;
_maxIdx[1] = -1; _maxIdx[1] = -1;