Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
2514d70e
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2514d70e
编写于
4月 02, 2018
作者:
C
chengduoZH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
follow comments
上级
ffa63974
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
10 deletion
+18
-10
paddle/fluid/memory/detail/system_allocator.cc
paddle/fluid/memory/detail/system_allocator.cc
+9
-1
paddle/fluid/memory/memory.cc
paddle/fluid/memory/memory.cc
+4
-5
paddle/fluid/platform/cpu_info.cc
paddle/fluid/platform/cpu_info.cc
+5
-4
未找到文件。
paddle/fluid/memory/detail/system_allocator.cc
浏览文件 @
2514d70e
...
@@ -131,7 +131,12 @@ void* CUDAPinnedAllocator::Alloc(size_t& index, size_t size) {
...
@@ -131,7 +131,12 @@ void* CUDAPinnedAllocator::Alloc(size_t& index, size_t size) {
size_t
usable
=
size_t
usable
=
paddle
::
platform
::
CUDAPinnedMaxAllocSize
()
-
cuda_pinnd_alloc_size_
;
paddle
::
platform
::
CUDAPinnedMaxAllocSize
()
-
cuda_pinnd_alloc_size_
;
if
(
size
>
usable
)
return
nullptr
;
if
(
size
>
usable
)
{
LOG
(
WARNING
)
<<
"Cannot malloc "
<<
size
/
1024.0
/
1024.0
<<
" MB pinned memory."
<<
", available "
<<
usable
/
1024.0
/
1024.0
<<
" MB"
;
return
nullptr
;
}
void
*
p
;
void
*
p
;
// PINNED memory is visible to all CUDA contexts.
// PINNED memory is visible to all CUDA contexts.
...
@@ -141,6 +146,9 @@ void* CUDAPinnedAllocator::Alloc(size_t& index, size_t size) {
...
@@ -141,6 +146,9 @@ void* CUDAPinnedAllocator::Alloc(size_t& index, size_t size) {
index
=
1
;
// PINNED memory
index
=
1
;
// PINNED memory
cuda_pinnd_alloc_size_
+=
size
;
cuda_pinnd_alloc_size_
+=
size
;
return
p
;
return
p
;
}
else
{
LOG
(
WARNING
)
<<
"cudaMallocHost failed."
;
return
nullptr
;
}
}
return
nullptr
;
return
nullptr
;
...
...
paddle/fluid/memory/memory.cc
浏览文件 @
2514d70e
...
@@ -133,11 +133,10 @@ void* Alloc<platform::CUDAPinnedPlace>(platform::CUDAPinnedPlace place,
...
@@ -133,11 +133,10 @@ void* Alloc<platform::CUDAPinnedPlace>(platform::CUDAPinnedPlace place,
auto
*
buddy_allocator
=
GetCUDAPinnedBuddyAllocator
();
auto
*
buddy_allocator
=
GetCUDAPinnedBuddyAllocator
();
void
*
ptr
=
buddy_allocator
->
Alloc
(
size
);
void
*
ptr
=
buddy_allocator
->
Alloc
(
size
);
// if (ptr == nullptr) {
if
(
ptr
==
nullptr
)
{
// LOG(WARNING) << "Cannot allocate " << size << " bytes in CUDAPinnedPlace
LOG
(
WARNING
)
<<
"cudaMallocHost Cannot allocate "
<<
size
// "
<<
" bytes in CUDAPinnedPlace"
;
// << ", available " << avail << " bytes"
}
// }
return
ptr
;
return
ptr
;
}
}
...
...
paddle/fluid/platform/cpu_info.cc
浏览文件 @
2514d70e
...
@@ -27,9 +27,10 @@ DEFINE_double(fraction_of_cpu_memory_to_use, 1,
...
@@ -27,9 +27,10 @@ DEFINE_double(fraction_of_cpu_memory_to_use, 1,
"Default use 100% of CPU memory for PaddlePaddle,"
"Default use 100% of CPU memory for PaddlePaddle,"
"reserve the rest for page tables, etc"
);
"reserve the rest for page tables, etc"
);
DEFINE_double
(
fraction_of_cuda_pinned_memory_to_use
,
0.5
,
DEFINE_double
(
"Default use 100% of CPU memory for PaddlePaddle,"
fraction_of_cuda_pinned_memory_to_use
,
0.5
,
"reserve the rest for page tables, etc"
);
"Default use 50% of CPU memory as the pinned_memory for PaddlePaddle,"
"reserve the rest for page tables, etc"
);
namespace
paddle
{
namespace
paddle
{
namespace
platform
{
namespace
platform
{
...
@@ -78,7 +79,7 @@ size_t CUDAPinnedMinChunkSize() {
...
@@ -78,7 +79,7 @@ size_t CUDAPinnedMinChunkSize() {
}
}
size_t
CUDAPinnedMaxChunkSize
()
{
size_t
CUDAPinnedMaxChunkSize
()
{
// Allow to allocate the maximum chunk size is roughly
0.39%
of CUDA_PINNED
// Allow to allocate the maximum chunk size is roughly
1/256
of CUDA_PINNED
// memory.
// memory.
return
CUDAPinnedMaxAllocSize
()
/
256
;
return
CUDAPinnedMaxAllocSize
()
/
256
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录