potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

G-API: fix Fluid reshape with unused nodes (Merge pull request #15115)

Browse Source 
* G-API: fix fluid reshape with unused nodes

* Update test names

* Add FIXME for future improvement
This commit is contained in:
Andrey Golubev
2019-07-30 23:48:46 +03:00
committed by Maksim Shabunin
parent 778f42ad34
commit 304e3ac12f
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/src/backends/fluid/gfluidbackend.cpp
+10 -1
View File
@@ -1145,7 +1145,16 @@ void cv::gimpl::GFluidExecutable::makeReshape(const std::vector<gapi::own::Rect>
// Introduce Storage::INTERNAL_GRAPH and Storage::INTERNAL_ISLAND?
if (fd.internal == true)
{
m_buffers[id].priv().allocate(fd.border, fd.border_size, fd.max_consumption, fd.skew);
// FIXME: do max_consumption calculation properly (e.g. in initLineConsumption)
int max_consumption = 0;
if (nh->outNodes().empty()) {
// nh is always a DATA node, so it is safe to get inNodes().front() since there's
// always a single writer (OP node)
max_consumption = fg.metadata(nh->inNodes().front()).get<FluidUnit>().k.m_lpi;
} else {
max_consumption = fd.max_consumption;
}
m_buffers[id].priv().allocate(fd.border, fd.border_size, max_consumption, fd.skew);
std::stringstream stream;
m_buffers[id].debug(stream);
GAPI_LOG_INFO(NULL, stream.str());