third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13173 from dkurt:dnn_fix_vulkan_pool

Browse Source
This commit is contained in:
Alexander Alekhin 2018-11-15 12:56:10 +00:00
commit 1d10d56651
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/dnn/src/vkcom/src/op_pool.cpp
View File

@ -90,16 +90,10 @@ bool OpPool::forward(std::vector<Tensor>& ins,
std::vector<Tensor>& blobs,
std::vector<Tensor>& outs)
{
for (size_t ii = 0; ii < ins.size(); ii++)
{
Tensor& inpMat = ins[ii];
int out_index = (pool_type_ == kPoolTypeMax) ? 2 : 1;
Tensor& outMat = outs[out_index * ii];
Tensor maskMat = (pool_type_ == kPoolTypeMax) ? outs[2 * ii + 1] : Tensor();
if (!forward(inpMat, outMat, maskMat))
return false;
}
return true;
Tensor& inpMat = ins[0];
Tensor& outMat = outs[0];
Tensor maskMat = outs.size() > 1 ? outs[1] : Tensor();
return forward(inpMat, outMat, maskMat);
}
bool OpPool::forward(Tensor& in, Tensor& out, Tensor& mask)