Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
项目经理老王
Mace
提交
20812e12
Mace
项目概览
项目经理老王
/
Mace
与 Fork 源项目一致
Fork自
Xiaomi / Mace
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Mace
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
20812e12
编写于
3月 26, 2019
作者:
L
liutuo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
check non-const filter in convolution for onnx model
上级
91bd5c11
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
13 deletion
+17
-13
mace/python/tools/converter_tool/onnx_converter.py
mace/python/tools/converter_tool/onnx_converter.py
+14
-12
mace/python/tools/converter_tool/transformer.py
mace/python/tools/converter_tool/transformer.py
+3
-1
未找到文件。
mace/python/tools/converter_tool/onnx_converter.py
浏览文件 @
20812e12
...
...
@@ -241,14 +241,14 @@ class OnnxNode(object):
self
.
node_proto
=
node
def
print_info
(
self
):
print
"node: "
,
self
.
name
print
" type: "
,
self
.
op_type
print
" domain: "
,
self
.
domain
print
" inputs: "
,
self
.
inputs
print
" outputs: "
,
self
.
outputs
print
" attrs:"
print
(
"node: "
,
self
.
name
)
print
(
" type: "
,
self
.
op_type
)
print
(
" domain: "
,
self
.
domain
)
print
(
" inputs: "
,
self
.
inputs
)
print
(
" outputs: "
,
self
.
outputs
)
print
(
" attrs:"
)
for
arg
in
self
.
attrs
:
print
" %s: %s"
%
(
arg
,
self
.
attrs
[
arg
]
)
print
(
" %s: %s"
%
(
arg
,
self
.
attrs
[
arg
])
)
class
OnnxTensor
(
object
):
...
...
@@ -378,11 +378,11 @@ class OnnxConverter(base_converter.ConverterInterface):
opset_imp
=
onnx_model
.
opset_import
polish_available
=
True
print
"onnx model IR version: "
,
ir_version
print
(
"onnx model IR version: "
,
ir_version
)
for
imp
in
opset_imp
:
domain
=
imp
.
domain
version
=
imp
.
version
print
"constains ops domain: "
,
domain
,
"version:"
,
version
print
(
"constains ops domain: "
,
domain
,
"version:"
,
version
)
if
'kaldi2onnx'
in
domain
:
polish_available
=
False
self
.
_data_format
=
DataFormat
.
DF_NONE
...
...
@@ -397,11 +397,11 @@ class OnnxConverter(base_converter.ConverterInterface):
@
staticmethod
def
print_graph_info
(
graph
):
for
value_info
in
graph
.
value_info
:
print
"value info:"
,
value_info
print
(
"value info:"
,
value_info
)
for
value_info
in
graph
.
input
:
print
"inputs info:"
,
value_info
print
(
"inputs info:"
,
value_info
)
for
value_info
in
graph
.
output
:
print
"outputs info:"
,
value_info
print
(
"outputs info:"
,
value_info
)
def
extract_shape_info
(
self
,
graph
):
def
extract_value_info
(
shape_dict
,
value_info
):
...
...
@@ -674,6 +674,8 @@ class OnnxConverter(base_converter.ConverterInterface):
op
.
type
=
MaceOp
.
DepthwiseConv2d
.
name
else
:
op
.
type
=
MaceOp
.
Conv2D
.
name
mace_check
(
op
.
input
[
1
]
in
self
.
_consts
,
"Mace does not support non-const filter convolution."
)
dilation_arg
=
op
.
arg
.
add
()
dilation_arg
.
name
=
MaceKeyword
.
mace_dilations_str
...
...
mace/python/tools/converter_tool/transformer.py
浏览文件 @
20812e12
...
...
@@ -963,7 +963,9 @@ class Transformer(base_converter.ConverterInterface):
net
=
self
.
_model
for
op
in
net
.
op
:
if
op
.
type
==
MaceOp
.
Conv2D
.
name
:
if
op
.
type
==
MaceOp
.
Conv2D
.
name
\
and
len
(
op
.
input
)
>=
2
\
and
op
.
input
[
1
]
in
self
.
_consts
:
producer
=
self
.
_producer
[
op
.
input
[
0
]]
input_shape
=
producer
.
output_shape
[
0
].
dims
batch
,
height
,
width
,
channels
=
self
.
sort_feature_map_shape
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录