Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
72d06080
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 9 个月
通知
992
Star
71100
Fork
55581
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
72d06080
编写于
11月 17, 2020
作者:
L
Liubov Batanina
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ONNX] Added Reduce ops for batch and channel
上级
025a9647
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
5 deletion
+32
-5
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
+29
-4
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
+3
-1
未找到文件。
modules/dnn/src/onnx/onnx_importer.cpp
浏览文件 @
72d06080
...
...
@@ -551,11 +551,36 @@ void ONNXImporter::handleNode(const opencv_onnx::NodeProto& node_proto_)
CV_Assert
(
axes
.
size
()
<=
inpShape
.
size
()
-
2
);
std
::
vector
<
int
>
kernel_size
(
inpShape
.
size
()
-
2
,
1
);
for
(
int
i
=
0
;
i
<
axes
.
size
();
i
++
)
{
int
axis
=
clamp
(
axes
.
get
<
int
>
(
i
),
inpShape
.
size
());
CV_Assert_N
(
axis
>=
2
+
i
,
axis
<
inpShape
.
size
());
kernel_size
[
axis
-
2
]
=
inpShape
[
axis
];
if
(
axes
.
size
()
==
1
&&
(
clamp
(
axes
.
get
<
int
>
(
0
),
inpShape
.
size
())
<=
1
))
{
int
axis
=
clamp
(
axes
.
get
<
int
>
(
0
),
inpShape
.
size
());
MatShape
newShape
=
inpShape
;
newShape
[
axis
+
1
]
=
total
(
newShape
,
axis
+
1
);
newShape
.
resize
(
axis
+
2
);
newShape
.
insert
(
newShape
.
begin
(),
2
-
axis
,
1
);
LayerParams
reshapeLp
;
reshapeLp
.
type
=
"Reshape"
;
reshapeLp
.
name
=
layerParams
.
name
+
"/reshape"
;
CV_Assert
(
layer_id
.
find
(
reshapeLp
.
name
)
==
layer_id
.
end
());
reshapeLp
.
set
(
"dim"
,
DictValue
::
arrayInt
(
&
newShape
[
0
],
newShape
.
size
()));
node_proto
.
set_output
(
0
,
reshapeLp
.
name
);
addLayer
(
reshapeLp
,
node_proto
);
kernel_size
.
resize
(
2
);
kernel_size
[
0
]
=
inpShape
[
axis
];
node_proto
.
set_input
(
0
,
node_proto
.
output
(
0
));
}
else
{
for
(
int
i
=
0
;
i
<
axes
.
size
();
i
++
)
{
int
axis
=
clamp
(
axes
.
get
<
int
>
(
i
),
inpShape
.
size
());
CV_Assert_N
(
axis
>=
2
+
i
,
axis
<
inpShape
.
size
());
kernel_size
[
axis
-
2
]
=
inpShape
[
axis
];
}
}
LayerParams
poolLp
=
layerParams
;
poolLp
.
name
=
layerParams
.
name
+
"/avg"
;
CV_Assert
(
layer_id
.
find
(
poolLp
.
name
)
==
layer_id
.
end
());
...
...
modules/dnn/test/test_onnx_importer.cpp
浏览文件 @
72d06080
...
...
@@ -267,9 +267,11 @@ TEST_P(Test_ONNX_layers, ReduceSum)
testONNXModels
(
"reduce_sum"
);
}
TEST_P
(
Test_ONNX_layers
,
ReduceMax
Global
)
TEST_P
(
Test_ONNX_layers
,
ReduceMax
)
{
testONNXModels
(
"reduce_max"
);
testONNXModels
(
"reduce_max_axis_0"
);
testONNXModels
(
"reduce_max_axis_1"
);
}
TEST_P
(
Test_ONNX_layers
,
Scale
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录