Skip to content

Commit

Permalink
Merge pull request #3831 from cudawarped:fix_cuda_even_levels_stream
Browse files Browse the repository at this point in the history
`cudaimgproc`: remove incorrectly added `NppStreamHandler` from `cv::cuda:evenLevels`
  • Loading branch information
asmorkalov authored Nov 26, 2024
2 parents 475f6fa + 3f26817 commit ec9d892
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions modules/cudaimgproc/src/histogram.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -553,24 +553,6 @@ namespace
};
}

class OldNppStreamHandlerForEvenLevels
{
public:
explicit OldNppStreamHandlerForEvenLevels(Stream& newStream)
{
oldStream = nppGetStream();
nppSafeSetStream(oldStream, StreamAccessor::getStream(newStream));
}

~OldNppStreamHandlerForEvenLevels()
{
nppSafeSetStream(nppGetStream(), oldStream);
}

private:
cudaStream_t oldStream;
};

void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int upperLevel, Stream& stream)
{
const int kind = _levels.kind();
Expand All @@ -583,9 +565,6 @@ void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int
else
host_levels = _levels.getMat();

// Update to use NppStreamHandler when nppiEvenLevelsHost_32s_Ctx is included in nppist.lib and libnppist.so
OldNppStreamHandlerForEvenLevels h(stream);

nppSafeCall( nppiEvenLevelsHost_32s(host_levels.ptr<Npp32s>(), nLevels, lowerLevel, upperLevel) );

if (kind == _InputArray::CUDA_GPU_MAT)
Expand Down

0 comments on commit ec9d892

Please sign in to comment.