Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
12a150bb
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看板
提交
12a150bb
编写于
7月 29, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
7月 29, 2020
浏览文件
操作
浏览文件
下载
差异文件
!3630 not reuse refnode input's memory
Merge pull request !3630 from laiyongqiang/refnode_input_fix
上级
c57ad152
d99786e9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
3 deletion
+17
-3
mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc
mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc
+5
-2
mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc
...pore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc
+12
-1
未找到文件。
mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc
浏览文件 @
12a150bb
...
...
@@ -64,11 +64,14 @@ bool MemReuseUtil::InitDynamicOutputKernelRef() {
kernel_ref
->
type_
=
kRefNodeOutput
;
auto
origin_pair
=
graph_
->
GetRefCorrespondOutput
(
out_pair
);
MS_EXCEPTION_IF_NULL
(
origin_pair
.
first
);
MS_LOG
(
INFO
)
<<
"REF origin op is "
<<
origin_pair
.
first
->
fullname_with_scope
()
<<
", output index is "
<<
origin_pair
.
second
<<
", cur op is "
<<
kernel_cnode
->
fullname_with_scope
()
<<
", out index is "
<<
output_index
;
if
(
origin_pair
.
first
->
isa
<
CNode
>
())
{
auto
cnode
=
origin_pair
.
first
->
cast
<
CNodePtr
>
();
auto
ref_ptr
=
Get
KernelInput
Ref
(
cnode
,
origin_pair
.
second
);
auto
ref_ptr
=
GetRef
(
cnode
,
origin_pair
.
second
);
if
(
ref_ptr
!=
nullptr
)
{
kernel_ref
->
type_
=
kRefNodeInput
;
ref_ptr
->
type_
=
kRefNodeInput
;
}
}
}
else
{
...
...
mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc
浏览文件 @
12a150bb
...
...
@@ -96,6 +96,12 @@ uint8_t *AscendMemoryManager::MallocStaticMem(size_t size, bool communication_me
}
else
{
align_size
=
GetCommonAlignSize
(
size
);
}
auto
device_mem_pool_offset
=
AscendMemoryPool
::
GetInstance
().
device_mem_pool_offset
();
MS_LOG
(
INFO
)
<<
"Malloc Memory: Static, total["
<<
device_mem_size_
<<
"] (dynamic["
<<
total_dynamic_size_
<<
"] memory pool["
<<
device_mem_pool_offset
<<
"])"
<<
" malloc ["
<<
align_size
<<
"] communication_mem: "
<<
communication_mem
;
if
(
communication_mem
)
{
// create protect area [kMemAlignSize -- data -- kMemAlignSize]
uint8_t
*
alloc_address
=
reinterpret_cast
<
uint8_t
*>
(
AscendMemoryPool
::
GetInstance
().
AllocTensorMem
(
align_size
));
...
...
@@ -112,12 +118,17 @@ uint8_t *AscendMemoryManager::MallocDynamicMem(size_t size, bool communication_m
}
else
{
align_size
=
GetCommonAlignSize
(
size
);
}
auto
device_mem_pool_offset
=
AscendMemoryPool
::
GetInstance
().
device_mem_pool_offset
();
MS_LOG
(
INFO
)
<<
"Malloc Memory: Dynamic, total["
<<
device_mem_size_
<<
"] (dynamic["
<<
total_dynamic_size_
<<
"] memory pool["
<<
device_mem_pool_offset
<<
"])"
<<
" malloc ["
<<
align_size
<<
"] communication_mem: "
<<
communication_mem
;
if
(
dynamic_mem_offset_
<
align_size
)
{
MS_LOG
(
EXCEPTION
)
<<
"Out of memory!!! total["
<<
device_mem_size_
<<
"] (dynamic["
<<
total_dynamic_size_
<<
"]) malloc ["
<<
align_size
<<
"] failed!"
;
}
auto
new_offset
=
dynamic_mem_offset_
-
align_size
;
auto
device_mem_pool_offset
=
AscendMemoryPool
::
GetInstance
().
device_mem_pool_offset
();
if
(
new_offset
<=
device_mem_pool_offset
)
{
MS_LOG
(
EXCEPTION
)
<<
"Out of memory!!! total["
<<
device_mem_size_
<<
"] (dynamic["
<<
total_dynamic_size_
<<
"] memory pool["
<<
device_mem_pool_offset
<<
"])"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录