Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
3a16925f
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
3a16925f
编写于
4年前
作者:
M
mindspore-ci-bot
提交者:
Gitee
4年前
浏览文件
操作
浏览文件
下载
差异文件
!5065 fix depthwise conv tflite parser bug
Merge pull request !5065 from lyvette/parser
上级
5df2f5ac
c87b43b5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
43 addition
and
38 deletion
+43
-38
mindspore/lite/tools/converter/parser/tflite/tflite_model_parser.cc
...lite/tools/converter/parser/tflite/tflite_model_parser.cc
+43
-38
未找到文件。
mindspore/lite/tools/converter/parser/tflite/tflite_model_parser.cc
浏览文件 @
3a16925f
...
...
@@ -249,47 +249,52 @@ STATUS TfliteModelParser::ConvertGroupDepthwiseOp(schema::MetaGraphT* sub_graph)
return
RET_NULL_PTR
;
}
auto
data_shape
=
data_tensor
->
dims
;
conv_attr
->
channelIn
=
data_shape
[
3
];
conv_attr
->
channelOut
=
conv_attr
->
channelIn
*
attr
->
channelMultiplier
;
// update attr
conv_attr
->
group
=
0
;
conv_attr
->
format
=
attr
->
format
;
conv_attr
->
kernelH
=
attr
->
kernelH
;
conv_attr
->
kernelW
=
attr
->
kernelW
;
conv_attr
->
strideH
=
attr
->
strideH
;
conv_attr
->
strideW
=
attr
->
strideW
;
conv_attr
->
padMode
=
attr
->
padMode
;
conv_attr
->
padUp
=
attr
->
padUp
;
conv_attr
->
padDown
=
attr
->
padDown
;
conv_attr
->
padLeft
=
attr
->
padLeft
;
conv_attr
->
padRight
=
attr
->
padRight
;
conv_attr
->
dilateH
=
attr
->
dilateH
;
conv_attr
->
dilateW
=
attr
->
dilateW
;
conv_attr
->
hasBias
=
attr
->
hasBias
;
conv_attr
->
activationType
=
attr
->
activationType
;
op
->
primitive
->
value
.
type
=
schema
::
PrimitiveType_Conv2D
;
op
->
primitive
->
value
.
value
=
conv_attr
.
release
();
// update weight
auto
weight_id
=
op
->
inputIndex
[
1
];
auto
&
weight_tensor
=
sub_graph
->
allTensors
.
at
(
weight_id
);
if
(
weight_tensor
->
dataType
==
TypeId
::
kNumberTypeUInt8
)
{
auto
status
=
TransFilterFormat
<
uint8_t
>
(
weight_tensor
.
get
(),
kKHWC2CHWK
);
if
(
status
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Trans depthwiseConv Filter Format failed."
;
return
RET_ERROR
;
}
}
if
(
weight_tensor
->
dataType
==
kNumberTypeFloat32
||
weight_tensor
->
dataType
==
kNumberTypeFloat
)
{
auto
status
=
TransFilterFormat
<
float
>
(
weight_tensor
.
get
(),
kKHWC2CHWK
);
if
(
status
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Trans filter format failed."
;
if
(
data_shape
[
3
]
==
1
)
{
conv_attr
->
channelIn
=
data_shape
[
3
];
conv_attr
->
channelOut
=
conv_attr
->
channelIn
*
attr
->
channelMultiplier
;
// update attr
conv_attr
->
group
=
1
;
conv_attr
->
format
=
attr
->
format
;
conv_attr
->
kernelH
=
attr
->
kernelH
;
conv_attr
->
kernelW
=
attr
->
kernelW
;
conv_attr
->
strideH
=
attr
->
strideH
;
conv_attr
->
strideW
=
attr
->
strideW
;
conv_attr
->
padMode
=
attr
->
padMode
;
conv_attr
->
padUp
=
attr
->
padUp
;
conv_attr
->
padDown
=
attr
->
padDown
;
conv_attr
->
padLeft
=
attr
->
padLeft
;
conv_attr
->
padRight
=
attr
->
padRight
;
conv_attr
->
dilateH
=
attr
->
dilateH
;
conv_attr
->
dilateW
=
attr
->
dilateW
;
conv_attr
->
hasBias
=
attr
->
hasBias
;
conv_attr
->
activationType
=
attr
->
activationType
;
op
->
primitive
->
value
.
type
=
schema
::
PrimitiveType_Conv2D
;
op
->
primitive
->
value
.
value
=
conv_attr
.
release
();
// update weight
auto
weight_id
=
op
->
inputIndex
[
1
];
auto
&
weight_tensor
=
sub_graph
->
allTensors
.
at
(
weight_id
);
if
(
weight_tensor
->
dataType
==
TypeId
::
kNumberTypeUInt8
)
{
auto
status
=
TransFilterFormat
<
uint8_t
>
(
weight_tensor
.
get
(),
kKHWC2CHWK
);
if
(
status
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Trans depthwiseConv Filter Format failed."
;
return
RET_ERROR
;
}
}
else
if
(
weight_tensor
->
dataType
==
kNumberTypeFloat32
||
weight_tensor
->
dataType
==
kNumberTypeFloat
)
{
auto
status
=
TransFilterFormat
<
float
>
(
weight_tensor
.
get
(),
kKHWC2CHWK
);
if
(
status
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Trans filter format failed."
;
return
RET_ERROR
;
}
}
else
{
MS_LOG
(
ERROR
)
<<
"The dataType of weight tensor is unsupported."
;
return
RET_ERROR
;
}
weight_tensor
->
format
=
schema
::
Format_CHWK
;
}
weight_tensor
->
format
=
schema
::
Format_CHWK
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部