Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
64721fa5
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看板
提交
64721fa5
编写于
8月 07, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
8月 07, 2020
浏览文件
操作
浏览文件
下载
差异文件
!4104 fix a bug with using dynamic memory
Merge pull request !4104 from lvchangquan/transdata
上级
b535b642
87022fce
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
6 deletion
+7
-6
mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc
...pore/ccsrc/runtime/device/ascend/ascend_device_address.cc
+6
-5
mindspore/ccsrc/runtime/device/kernel_runtime.cc
mindspore/ccsrc/runtime/device/kernel_runtime.cc
+1
-1
未找到文件。
mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc
浏览文件 @
64721fa5
...
...
@@ -335,15 +335,16 @@ void AscendDeviceAddress::LaunchTransData(kernel::KernelModPtr kernel_mod_ptr, v
AddressPtrList
kernel_inputs
=
{
input_address
};
AddressPtrList
kernel_outputs
=
{
output_address
};
AddressPtrList
kernel_workspaces
;
std
::
vector
<
DeviceAddressPtr
>
workspace_address_ptr
(
workspace_size_list
.
size
());
if
(
!
workspace_size_list
.
empty
())
{
for
(
size_t
i
=
0
;
i
<
workspace_size_list
.
size
();
++
i
)
{
auto
workspace_size
=
GetCommonAlignSize
(
workspace_size_list
[
i
]);
auto
workspace_address_ptr
=
AssignLaunchMemory
(
workspace_size
,
""
,
kTypeUnknown
);
MS_EXCEPTION_IF_NULL
(
workspace_address_ptr
);
workspace_address_ptr
[
i
]
=
AssignLaunchMemory
(
workspace_size
,
""
,
kTypeUnknown
);
MS_EXCEPTION_IF_NULL
(
workspace_address_ptr
[
i
]
);
auto
workspace_address
=
std
::
make_shared
<
kernel
::
Address
>
();
MS_EXCEPTION_IF_NULL
(
workspace_address
);
workspace_address
->
addr
=
workspace_address_ptr
->
GetMutablePtr
();
workspace_address
->
size
=
workspace_address_ptr
->
GetSize
();
workspace_address
->
addr
=
workspace_address_ptr
[
i
]
->
GetMutablePtr
();
workspace_address
->
size
=
workspace_address_ptr
[
i
]
->
GetSize
();
kernel_workspaces
.
push_back
(
workspace_address
);
}
}
...
...
@@ -357,6 +358,7 @@ void AscendDeviceAddress::LaunchTransData(kernel::KernelModPtr kernel_mod_ptr, v
if
(
!
ret
)
{
MS_LOG
(
ERROR
)
<<
"Launch kernel failed."
;
}
SyncStream
();
}
kernel
::
KernelModPtr
AscendDeviceAddress
::
CompileTransDataAndObtainKernelMod
(
const
nlohmann
::
json
&
kernel_json
)
const
{
...
...
@@ -421,7 +423,6 @@ bool AscendDeviceAddress::SyncDeviceToHostAndConvertFormatBasedOnTransData(const
auto
workspace_size_list
=
GetWorkspaceSizeList
(
kernel_json
);
// launch
LaunchTransData
(
kernel_mod_ptr
,
output_address
->
GetMutablePtr
(),
output_address
->
GetSize
(),
workspace_size_list
);
SyncStream
();
if
(
type_id_
==
type
)
{
SyncMemory
(
host_ptr
,
output_address
->
GetPtr
(),
host_size
,
RT_MEMCPY_DEVICE_TO_HOST
);
}
else
{
...
...
mindspore/ccsrc/runtime/device/kernel_runtime.cc
浏览文件 @
64721fa5
...
...
@@ -857,7 +857,7 @@ DeviceAddressPtr KernelRuntime::AssignSingleOpLaunchMemory(size_t size, const st
auto
device_address
=
CreateDeviceAddress
(
nullptr
,
size
,
format
,
type
);
MS_EXCEPTION_IF_NULL
(
device_address
);
MS_EXCEPTION_IF_NULL
(
mem_manager_
);
auto
base_ptr
=
mem_manager_
->
MallocMem
(
k
Dynam
icMem
,
size
,
device_address
);
auto
base_ptr
=
mem_manager_
->
MallocMem
(
k
Stat
icMem
,
size
,
device_address
);
MS_EXCEPTION_IF_NULL
(
base_ptr
);
return
device_address
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录