Skip to content

O
opencv_contrib
Commit e4650efa authored by Anna Petrovicheva's avatar Anna Petrovicheva
Browse files
Options

Fixed dilated convolutions

parent 7a2d08aa
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
modules/dnn/src/layers/convolution_layer.cpp
View file @ e4650efa
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "convolution_layer.hpp" #include "convolution_layer.hpp"
#include "op_im2col.hpp" #include "op_im2col.hpp"
#include "op_blas.hpp" #include "op_blas.hpp"
#include <iostream>
namespace cv namespace cv
{ {
......
modules/dnn/src/layers/op_im2col.hpp
View file @ e4650efa
...@@ -108,8 +108,8 @@ public: ...@@ -108,8 +108,8 @@ public:
{ {
for (int w = 0; w < width_col; ++w) for (int w = 0; w < width_col; ++w)
{ {
int h_pad = h * (stride_h + dilation_h) - pad_h + h_offset; int h_pad = h * stride_h - pad_h + h_offset * dilation_h;
int w_pad = w * (stride_w + dilation_w) - pad_w + w_offset; int w_pad = w * stride_w - pad_w + w_offset * dilation_w;
if (h_pad >= 0 && h_pad < height && w_pad >= 0 && w_pad < width) if (h_pad >= 0 && h_pad < height && w_pad >= 0 && w_pad < width)
data_col[(c * height_col + h) * width_col + w] = data_col[(c * height_col + h) * width_col + w] =
data_im[(c_im * height + h_pad) * width + w_pad]; data_im[(c_im * height + h_pad) * width + w_pad];
...@@ -146,8 +146,8 @@ void col2im_cpu(const Dtype* data_col, ...@@ -146,8 +146,8 @@ void col2im_cpu(const Dtype* data_col,
{ {
for (int w = 0; w < width_col; ++w) for (int w = 0; w < width_col; ++w)
{ {
int h_pad = h * (stride_h + dilation_h) - pad_h + h_offset; int h_pad = h * stride_h - pad_h + h_offset * dilation_h;
int w_pad = w * (stride_w + dilation_w) - pad_w + w_offset; int w_pad = w * stride_w - pad_w + w_offset * dilation_w;
if (h_pad >= 0 && h_pad < height && w_pad >= 0 && w_pad < width) if (h_pad >= 0 && h_pad < height && w_pad >= 0 && w_pad < width)
data_im[(c_im * height + h_pad) * width + w_pad] += data_im[(c_im * height + h_pad) * width + w_pad] +=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment