Skip to content

Commit 579781e

Browse files
committed
Merge pull request opencv#10822 from alalek:ocl_fix_imgproc_amd
2 parents 66f3c1a + fad3a6b commit 579781e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

modules/imgproc/src/deriv.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,7 @@ static bool ocl_Laplacian5(InputArray _src, OutputArray _dst,
558558
) &&
559559
(tileSizeX * tileSizeYmin <= wgs) &&
560560
(LAPLACIAN_LOCAL_MEM(tileSizeX, tileSizeYmin, kernelX.cols, loc_mem_cn * 4) <= lmsz)
561+
&& OCL_PERFORMANCE_CHECK(!dev.isAMD()) // TODO FIXIT 2018: Problem with AMDGPU on Linux (2482.3)
561562
)
562563
{
563564
Size size = _src.size(), wholeSize;

modules/imgproc/src/filter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4391,7 +4391,7 @@ bool ocl_sepFilter2D( InputArray _src, OutputArray _dst, int ddepth,
43914391
imgSize.height > optimizedSepFilterLocalHeight + anchor.y &&
43924392
(!(borderType & BORDER_ISOLATED) || _src.offset() == 0) &&
43934393
anchor == Point(kernelX.cols >> 1, kernelY.cols >> 1) &&
4394-
(d.isIntel() || (d.isAMD() && !d.hostUnifiedMemory())),
4394+
OCL_PERFORMANCE_CHECK(d.isIntel()), // TODO FIXIT
43954395
ocl_sepFilter2D_SinglePass(_src, _dst, kernelX, kernelY, delta,
43964396
borderType & ~BORDER_ISOLATED, ddepth, bdepth, int_arithm), true)
43974397

0 commit comments

Comments
 (0)