Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
f0f50b75
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
f0f50b75
编写于
5月 20, 2019
作者:
D
dianlujitao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix LogSoftmax for ONNX
Fix wrong indentation as well while at it
上级
447116a9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
25 deletion
+36
-25
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
+30
-25
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
+6
-0
未找到文件。
modules/dnn/src/onnx/onnx_importer.cpp
浏览文件 @
f0f50b75
...
@@ -786,37 +786,42 @@ void ONNXImporter::populateNet(Net dstNet)
...
@@ -786,37 +786,42 @@ void ONNXImporter::populateNet(Net dstNet)
}
}
replaceLayerParam
(
layerParams
,
"mode"
,
"interpolation"
);
replaceLayerParam
(
layerParams
,
"mode"
,
"interpolation"
);
}
}
else
if
(
layer_type
==
"LogSoftmax"
)
{
layerParams
.
type
=
"Softmax"
;
layerParams
.
set
(
"log_softmax"
,
true
);
}
else
else
{
{
for
(
int
j
=
0
;
j
<
node_proto
.
input_size
();
j
++
)
{
for
(
int
j
=
0
;
j
<
node_proto
.
input_size
();
j
++
)
{
if
(
layer_id
.
find
(
node_proto
.
input
(
j
))
==
layer_id
.
end
())
if
(
layer_id
.
find
(
node_proto
.
input
(
j
))
==
layer_id
.
end
())
layerParams
.
blobs
.
push_back
(
getBlob
(
node_proto
,
constBlobs
,
j
));
layerParams
.
blobs
.
push_back
(
getBlob
(
node_proto
,
constBlobs
,
j
));
}
}
}
}
int
id
=
dstNet
.
addLayer
(
layerParams
.
name
,
layerParams
.
type
,
layerParams
);
int
id
=
dstNet
.
addLayer
(
layerParams
.
name
,
layerParams
.
type
,
layerParams
);
layer_id
.
insert
(
std
::
make_pair
(
layerParams
.
name
,
LayerInfo
(
id
,
0
)));
layer_id
.
insert
(
std
::
make_pair
(
layerParams
.
name
,
LayerInfo
(
id
,
0
)));
std
::
vector
<
MatShape
>
layerInpShapes
,
layerOutShapes
,
layerInternalShapes
;
std
::
vector
<
MatShape
>
layerInpShapes
,
layerOutShapes
,
layerInternalShapes
;
for
(
int
j
=
0
;
j
<
node_proto
.
input_size
();
j
++
)
{
for
(
int
j
=
0
;
j
<
node_proto
.
input_size
();
j
++
)
{
layerId
=
layer_id
.
find
(
node_proto
.
input
(
j
));
layerId
=
layer_id
.
find
(
node_proto
.
input
(
j
));
if
(
layerId
!=
layer_id
.
end
())
{
if
(
layerId
!=
layer_id
.
end
())
{
dstNet
.
connect
(
layerId
->
second
.
layerId
,
layerId
->
second
.
outputId
,
id
,
j
);
dstNet
.
connect
(
layerId
->
second
.
layerId
,
layerId
->
second
.
outputId
,
id
,
j
);
// Collect input shapes.
// Collect input shapes.
shapeIt
=
outShapes
.
find
(
node_proto
.
input
(
j
));
shapeIt
=
outShapes
.
find
(
node_proto
.
input
(
j
));
CV_Assert
(
shapeIt
!=
outShapes
.
end
());
CV_Assert
(
shapeIt
!=
outShapes
.
end
());
layerInpShapes
.
push_back
(
shapeIt
->
second
);
layerInpShapes
.
push_back
(
shapeIt
->
second
);
}
}
}
}
// Compute shape of output blob for this layer.
// Compute shape of output blob for this layer.
Ptr
<
Layer
>
layer
=
dstNet
.
getLayer
(
id
);
Ptr
<
Layer
>
layer
=
dstNet
.
getLayer
(
id
);
layer
->
getMemoryShapes
(
layerInpShapes
,
0
,
layerOutShapes
,
layerInternalShapes
);
layer
->
getMemoryShapes
(
layerInpShapes
,
0
,
layerOutShapes
,
layerInternalShapes
);
CV_Assert
(
!
layerOutShapes
.
empty
());
CV_Assert
(
!
layerOutShapes
.
empty
());
outShapes
[
layerParams
.
name
]
=
layerOutShapes
[
0
];
outShapes
[
layerParams
.
name
]
=
layerOutShapes
[
0
];
}
}
}
}
Net
readNetFromONNX
(
const
String
&
onnxFile
)
Net
readNetFromONNX
(
const
String
&
onnxFile
)
{
{
...
...
modules/dnn/test/test_onnx_importer.cpp
浏览文件 @
f0f50b75
...
@@ -245,6 +245,12 @@ TEST_P(Test_ONNX_layers, Reshape)
...
@@ -245,6 +245,12 @@ TEST_P(Test_ONNX_layers, Reshape)
testONNXModels
(
"unsqueeze"
);
testONNXModels
(
"unsqueeze"
);
}
}
TEST_P
(
Test_ONNX_layers
,
Softmax
)
{
testONNXModels
(
"softmax"
);
testONNXModels
(
"log_softmax"
);
}
INSTANTIATE_TEST_CASE_P
(
/*nothing*/
,
Test_ONNX_layers
,
dnnBackendsAndTargets
());
INSTANTIATE_TEST_CASE_P
(
/*nothing*/
,
Test_ONNX_layers
,
dnnBackendsAndTargets
());
class
Test_ONNX_nets
:
public
Test_ONNX_layers
{};
class
Test_ONNX_nets
:
public
Test_ONNX_layers
{};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录