Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
f738e490
O
Opencv
项目概览
Greenplum
/
Opencv
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
f738e490
编写于
3月 26, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13989 from kohei-us:onnx-conv-transpose-output-shape
上级
55366cae
21242051
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
0 deletion
+32
-0
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
+31
-0
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
+1
-0
未找到文件。
modules/dnn/src/onnx/onnx_importer.cpp
浏览文件 @
f738e490
...
...
@@ -591,6 +591,37 @@ void ONNXImporter::populateNet(Net dstNet)
}
layerParams
.
set
(
"num_output"
,
layerParams
.
blobs
[
0
].
size
[
1
]
*
layerParams
.
get
<
int
>
(
"group"
,
1
));
layerParams
.
set
(
"bias_term"
,
node_proto
.
input_size
()
==
3
);
if
(
layerParams
.
has
(
"output_shape"
))
{
const
DictValue
&
outShape
=
layerParams
.
get
(
"output_shape"
);
if
(
outShape
.
size
()
!=
4
)
CV_Error
(
Error
::
StsNotImplemented
,
"Output shape must have 4 elements."
);
const
int
strideY
=
layerParams
.
get
<
int
>
(
"stride_h"
,
1
);
const
int
strideX
=
layerParams
.
get
<
int
>
(
"stride_w"
,
1
);
const
int
outH
=
outShape
.
getIntValue
(
2
);
const
int
outW
=
outShape
.
getIntValue
(
3
);
if
(
layerParams
.
get
<
String
>
(
"pad_mode"
)
==
"SAME"
)
{
layerParams
.
set
(
"adj_w"
,
(
outW
-
1
)
%
strideX
);
layerParams
.
set
(
"adj_h"
,
(
outH
-
1
)
%
strideY
);
}
else
if
(
layerParams
.
get
<
String
>
(
"pad_mode"
)
==
"VALID"
)
{
if
(
!
layerParams
.
has
(
"kernel_h"
)
||
!
layerParams
.
has
(
"kernel_w"
))
CV_Error
(
Error
::
StsNotImplemented
,
"Required attributes 'kernel_h' and 'kernel_w' are not present."
);
int
kernelH
=
layerParams
.
get
<
int
>
(
"kernel_h"
);
int
kernelW
=
layerParams
.
get
<
int
>
(
"kernel_w"
);
layerParams
.
set
(
"adj_w"
,
(
outW
-
kernelW
)
%
strideX
);
layerParams
.
set
(
"adj_h"
,
(
outH
-
kernelH
)
%
strideY
);
}
}
}
else
if
(
layer_type
==
"Transpose"
)
{
...
...
modules/dnn/test/test_onnx_importer.cpp
浏览文件 @
f738e490
...
...
@@ -73,6 +73,7 @@ TEST_P(Test_ONNX_layers, Deconvolution)
testONNXModels
(
"deconvolution"
);
testONNXModels
(
"two_deconvolution"
);
testONNXModels
(
"deconvolution_group"
);
testONNXModels
(
"deconvolution_output_shape"
);
}
TEST_P
(
Test_ONNX_layers
,
Dropout
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录