Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
94c7d99d
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
94c7d99d
编写于
5月 06, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14489 from dkurt:fix_14464
上级
7bb8d89e
471b83cc
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
17 deletion
+16
-17
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/convolution_layer.cpp
+2
-2
modules/dnn/src/layers/layers_common.cpp
modules/dnn/src/layers/layers_common.cpp
+11
-11
modules/dnn/src/layers/layers_common.hpp
modules/dnn/src/layers/layers_common.hpp
+2
-3
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
+1
-1
未找到文件。
modules/dnn/src/layers/convolution_layer.cpp
浏览文件 @
94c7d99d
...
...
@@ -125,7 +125,7 @@ public:
inpShape
.
push_back
(
inputs
[
0
].
size
[
i
]);
outShape
.
push_back
(
outputs
[
0
].
size
[
i
]);
}
getConvPoolPaddings
(
inpShape
,
outShape
,
kernel_size
,
strides
,
padMode
,
dilations
,
pads_begin
,
pads_end
);
getConvPoolPaddings
(
inpShape
,
kernel_size
,
strides
,
padMode
,
pads_begin
,
pads_end
);
if
(
pads_begin
.
size
()
==
2
)
{
for
(
int
i
=
0
;
i
<
pads_begin
.
size
();
i
++
)
{
if
(
pads_begin
[
i
]
!=
pads_end
[
i
])
...
...
@@ -1257,7 +1257,7 @@ public:
inpShape
.
push_back
(
inputs
[
0
].
size
[
i
]);
outShape
.
push_back
(
outputs
[
0
].
size
[
i
]);
}
getConvPoolPaddings
(
outShape
,
inpShape
,
kernel_size
,
strides
,
padMode
,
dilations
,
pads_begin
,
pads_end
);
getConvPoolPaddings
(
outShape
,
kernel_size
,
strides
,
padMode
,
pads_begin
,
pads_end
);
if
(
pads_begin
.
size
()
==
2
)
{
for
(
int
i
=
0
;
i
<
pads_begin
.
size
();
i
++
)
{
if
(
pads_begin
[
i
]
!=
pads_end
[
i
])
...
...
modules/dnn/src/layers/layers_common.cpp
浏览文件 @
94c7d99d
...
...
@@ -214,25 +214,25 @@ void getConvPoolOutParams(const std::vector<int>& inp, const std::vector<size_t>
}
}
void
getConvPoolPaddings
(
const
std
::
vector
<
int
>&
inp
,
const
std
::
vector
<
int
>&
out
,
const
std
::
vector
<
size_t
>&
kernel
,
const
std
::
vector
<
size_t
>&
strides
,
const
String
&
padMode
,
const
std
::
vector
<
size_t
>&
dilation
,
void
getConvPoolPaddings
(
const
std
::
vector
<
int
>&
inp
,
const
std
::
vector
<
size_t
>&
kernel
,
const
std
::
vector
<
size_t
>&
strides
,
const
String
&
padMode
,
std
::
vector
<
size_t
>&
pads_begin
,
std
::
vector
<
size_t
>&
pads_end
)
{
if
(
padMode
==
"VALID"
)
if
(
padMode
==
"
SAME"
||
padMode
==
"
VALID"
)
{
pads_begin
.
assign
(
kernel
.
size
(),
0
);
pads_end
.
assign
(
kernel
.
size
(),
0
);
}
else
if
(
padMode
==
"SAME"
)
if
(
padMode
==
"SAME"
)
{
CV_Assert_N
(
kernel
.
size
()
==
dilation
.
size
(),
kernel
.
size
()
==
strides
.
size
(),
kernel
.
size
()
==
inp
.
size
(),
kernel
.
size
()
==
out
.
size
());
pads_begin
.
resize
(
kernel
.
size
());
pads_end
.
resize
(
kernel
.
size
());
CV_Assert_N
(
kernel
.
size
()
==
strides
.
size
(),
kernel
.
size
()
==
inp
.
size
());
for
(
int
i
=
0
;
i
<
pads_begin
.
size
();
i
++
)
{
int
pad
=
((
out
[
i
]
-
1
)
*
strides
[
i
]
+
dilation
[
i
]
*
(
kernel
[
i
]
-
1
)
+
1
-
inp
[
i
])
/
2
;
pads_begin
[
i
]
=
pads_end
[
i
]
=
std
::
max
(
0
,
pad
);
// There are test cases with stride > kernel.
if
(
strides
[
i
]
<=
kernel
[
i
])
{
int
pad
=
(
kernel
[
i
]
-
1
-
(
inp
[
i
]
-
1
+
strides
[
i
])
%
strides
[
i
])
/
2
;
pads_begin
[
i
]
=
pads_end
[
i
]
=
pad
;
}
}
}
}
...
...
modules/dnn/src/layers/layers_common.hpp
浏览文件 @
94c7d99d
...
...
@@ -69,9 +69,8 @@ void getConvPoolOutParams(const std::vector<int>& inp, const std::vector<size_t>
const
std
::
vector
<
size_t
>&
stride
,
const
String
&
padMode
,
const
std
::
vector
<
size_t
>&
dilation
,
std
::
vector
<
int
>&
out
);
void
getConvPoolPaddings
(
const
std
::
vector
<
int
>&
inp
,
const
std
::
vector
<
int
>&
out
,
const
std
::
vector
<
size_t
>&
kernel
,
const
std
::
vector
<
size_t
>&
strides
,
const
String
&
padMode
,
const
std
::
vector
<
size_t
>&
dilation
,
void
getConvPoolPaddings
(
const
std
::
vector
<
int
>&
inp
,
const
std
::
vector
<
size_t
>&
kernel
,
const
std
::
vector
<
size_t
>&
strides
,
const
String
&
padMode
,
std
::
vector
<
size_t
>&
pads_begin
,
std
::
vector
<
size_t
>&
pads_end
);
}
}
...
...
modules/dnn/src/layers/pooling_layer.cpp
浏览文件 @
94c7d99d
...
...
@@ -143,7 +143,7 @@ public:
kernel_size
=
std
::
vector
<
size_t
>
(
inp
.
begin
(),
inp
.
end
());
}
getConvPoolPaddings
(
inp
,
out
,
kernel_size
,
strides
,
padMode
,
std
::
vector
<
size_t
>
(
kernel_size
.
size
(),
1
)
,
pads_begin
,
pads_end
);
getConvPoolPaddings
(
inp
,
kernel_size
,
strides
,
padMode
,
pads_begin
,
pads_end
);
if
(
pads_begin
.
size
()
==
2
)
{
pad_t
=
pads_begin
[
0
];
pad_l
=
pads_begin
[
1
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录