Merge pull request #13173 from dkurt:dnn_fix_vulkan_pool

pull/13176/head
Alexander Alekhin 6 years ago
commit 1d10d56651
  1. 14
      modules/dnn/src/vkcom/src/op_pool.cpp

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

Loading…
Cancel
Save