mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26062 from asmorkalov:as/pow_ocl_duplicate

Browse Source 
Removed duplicated code in Pow implementation that triggers wrong assert on Intel iGPU
This commit is contained in:
Alexander Smorkalov 2024-08-27 17:04:57 +03:00 committed by GitHub
commit ea8c9dc2de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/core/src/mathfuncs.cpp
View File

@ -1203,16 +1203,6 @@ static bool ocl_pow(InputArray _src, double power, OutputArray _dst,
_dst.createSameSize(_src, type); _dst.createSameSize(_src, type);
if (is_ipower) if (is_ipower)
{ {
if (ipower == 0)
{
_dst.setTo(Scalar::all(1));
return true;
}
if (ipower == 1)
{
_src.copyTo(_dst);
return true;
}
if( ipower < 0 ) if( ipower < 0 )
{ {
if( depth == CV_32F || depth == CV_64F ) if( depth == CV_32F || depth == CV_64F )
@ -1271,11 +1261,7 @@ void pow( InputArray _src, double power, OutputArray _dst )
bool useOpenCL = _dst.isUMat() && _src.dims() <= 2; bool useOpenCL = _dst.isUMat() && _src.dims() <= 2;
#endif #endif
if( is_ipower if (is_ipower)
#ifdef HAVE_OPENCL
&& !(useOpenCL && ocl::Device::getDefault().isIntel() && depth != CV_64F)
#endif
)
{ {
switch( ipower ) switch( ipower )
{ {
@ -1291,8 +1277,6 @@ void pow( InputArray _src, double power, OutputArray _dst )
return; return;
} }
} }
else
CV_Assert( depth == CV_32F || depth == CV_64F );
CV_OCL_RUN(useOpenCL, ocl_pow(_src, power, _dst, is_ipower, ipower)) CV_OCL_RUN(useOpenCL, ocl_pow(_src, power, _dst, is_ipower, ipower))