Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
正统之独孤求败
mindspore
提交
2ae4214f
M
mindspore
项目概览
正统之独孤求败
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
0
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2ae4214f
编写于
8月 24, 2020
作者:
K
kai00
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fushion mem check fixed
上级
33a562de
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
16 deletion
+17
-16
mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_convert_scale_pass.cc
...r/legacy_optimizer/fusion/batchnorm_convert_scale_pass.cc
+16
-15
mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_convert_scale_pass.h
...er/legacy_optimizer/fusion/batchnorm_convert_scale_pass.h
+1
-1
未找到文件。
mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_convert_scale_pass.cc
浏览文件 @
2ae4214f
...
@@ -90,23 +90,29 @@ STATUS BatchNormConvertScalePass::DoFusion(MetaGraphT *graph, const std::string
...
@@ -90,23 +90,29 @@ STATUS BatchNormConvertScalePass::DoFusion(MetaGraphT *graph, const std::string
return
RET_OK
;
return
RET_OK
;
}
}
auto
bnPath
=
matchedPath
.
at
(
bnOpName
);
auto
bnPath
=
matchedPath
.
at
(
bnOpName
);
status
=
GetTransParam
(
graph
,
bnPath
);
if
(
status
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"GetTransParam failed: "
<<
status
;
return
status
;
}
status
=
GenNewScaleTensor
(
graph
,
bnPath
);
status
=
GenNewScaleTensor
(
graph
,
bnPath
);
if
(
status
!=
RET_OK
)
{
if
(
status
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"GenNewScaleTensor failed: "
<<
status
;
MS_LOG
(
ERROR
)
<<
"GenNewScaleTensor failed: "
<<
status
;
delete
[]
transScale
;
delete
[]
transBias
;
transScale
=
nullptr
;
transBias
=
nullptr
;
return
status
;
return
status
;
}
}
status
=
ConvertBNToScale
(
graph
,
bnPath
);
status
=
ConvertBNToScale
(
graph
,
bnPath
);
if
(
status
!=
RET_OK
)
{
if
(
status
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"GenNewScaleTensor failed: "
<<
status
;
MS_LOG
(
ERROR
)
<<
"GenNewScaleTensor failed: "
<<
status
;
delete
[]
transScale
;
delete
[]
transBias
;
transScale
=
nullptr
;
transBias
=
nullptr
;
return
status
;
return
status
;
}
}
delete
[]
transScale
;
delete
[]
transBias
;
transScale
=
nullptr
;
transBias
=
nullptr
;
return
RET_OK
;
return
RET_OK
;
}
}
STATUS
BatchNormConvertScalePass
::
ConvertBNToScale
(
MetaGraphT
*
graph
,
const
std
::
shared_ptr
<
Path
>
&
bnPath
)
{
STATUS
BatchNormConvertScalePass
::
ConvertBNToScale
(
MetaGraphT
*
graph
,
const
std
::
shared_ptr
<
Path
>
&
bnPath
)
{
...
@@ -245,6 +251,10 @@ STATUS BatchNormConvertScalePass::GetTransParam(MetaGraphT *graph, const std::sh
...
@@ -245,6 +251,10 @@ STATUS BatchNormConvertScalePass::GetTransParam(MetaGraphT *graph, const std::sh
// cal transScale, tf : scale/sqrt(variance + eps); caffe : 1/sqrt(variance + eps)
// cal transScale, tf : scale/sqrt(variance + eps); caffe : 1/sqrt(variance + eps)
if
(
memcpy_s
(
transScale
,
bnChannel
*
sizeof
(
float
),
varianceData
,
bnChannel
*
sizeof
(
float
))
!=
0
)
{
if
(
memcpy_s
(
transScale
,
bnChannel
*
sizeof
(
float
),
varianceData
,
bnChannel
*
sizeof
(
float
))
!=
0
)
{
MS_LOG
(
ERROR
)
<<
"memcpy_s transScale error"
;
MS_LOG
(
ERROR
)
<<
"memcpy_s transScale error"
;
delete
[]
transScale
;
delete
[]
transBias
;
transScale
=
nullptr
;
transBias
=
nullptr
;
return
RET_ERROR
;
return
RET_ERROR
;
}
}
// 1/sqrt(variance + eps)
// 1/sqrt(variance + eps)
...
@@ -370,14 +380,5 @@ STATUS BatchNormConvertScalePass::GetBnEpsilon(MetaGraphT *graph) {
...
@@ -370,14 +380,5 @@ STATUS BatchNormConvertScalePass::GetBnEpsilon(MetaGraphT *graph) {
}
}
return
RET_OK
;
return
RET_OK
;
}
}
BatchNormConvertScalePass
::~
BatchNormConvertScalePass
()
{
if
(
this
->
transScale
!=
nullptr
)
{
delete
(
this
->
transScale
);
}
if
(
this
->
transBias
!=
nullptr
)
{
delete
(
this
->
transBias
);
}
}
}
// namespace lite
}
// namespace lite
}
// namespace mindspore
}
// namespace mindspore
mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_convert_scale_pass.h
浏览文件 @
2ae4214f
...
@@ -36,7 +36,7 @@ class BatchNormConvertScalePass : public FusionPass {
...
@@ -36,7 +36,7 @@ class BatchNormConvertScalePass : public FusionPass {
public:
public:
BatchNormConvertScalePass
()
=
default
;
BatchNormConvertScalePass
()
=
default
;
~
BatchNormConvertScalePass
()
override
;
~
BatchNormConvertScalePass
()
=
default
;
STATUS
DefinePattern
()
override
;
STATUS
DefinePattern
()
override
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录