Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
兽拳
Paddle
提交
b4f54d33
P
Paddle
项目概览
兽拳
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b4f54d33
编写于
10月 01, 2018
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add conditional_allocator
上级
3175317f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
113 addition
and
0 deletion
+113
-0
paddle/fluid/memory/allocation/CMakeLists.txt
paddle/fluid/memory/allocation/CMakeLists.txt
+2
-0
paddle/fluid/memory/allocation/allocator_facade.cc
paddle/fluid/memory/allocation/allocator_facade.cc
+13
-0
paddle/fluid/memory/allocation/conditional_allocator.cc
paddle/fluid/memory/allocation/conditional_allocator.cc
+43
-0
paddle/fluid/memory/allocation/conditional_allocator.h
paddle/fluid/memory/allocation/conditional_allocator.h
+55
-0
未找到文件。
paddle/fluid/memory/allocation/CMakeLists.txt
浏览文件 @
b4f54d33
...
...
@@ -35,6 +35,7 @@ endif()
cc_library
(
aligned_allocator SRCS aligned_allocator.cc DEPS allocator
)
cc_library
(
auto_increment_allocator SRCS auto_increment_allocator.cc DEPS allocator
)
cc_library
(
zero_size_allocator SRCS zero_size_allocator.cc DEPS allocator
)
cc_library
(
conditional_allocator SRCS conditional_allocator.cc DEPS allocator
)
cc_library
(
allocator_facade SRCS allocator_facade.cc DEPS
${
AllocatorFacadeDeps
}
cpu_allocator
...
...
@@ -44,6 +45,7 @@ cc_library(allocator_facade SRCS allocator_facade.cc DEPS
aligned_allocator
auto_increment_allocator
zero_size_allocator
conditional_allocator
cuda_device_guard
)
nv_test
(
allocation_and_eigen_test SRCS allocation_and_eigen_test.cu DEPS allocator_facade
)
paddle/fluid/memory/allocation/allocator_facade.cc
浏览文件 @
b4f54d33
...
...
@@ -19,6 +19,7 @@
#include "paddle/fluid/memory/allocation/allocator_facade.h"
#include "paddle/fluid/memory/allocation/auto_increment_allocator.h"
#include "paddle/fluid/memory/allocation/best_fit_allocator.h"
#include "paddle/fluid/memory/allocation/conditional_allocator.h"
#include "paddle/fluid/memory/allocation/cpu_allocator.h"
#include "paddle/fluid/memory/allocation/locked_allocator.h"
#include "paddle/fluid/memory/allocation/naive_managed_allocator.h"
...
...
@@ -77,6 +78,18 @@ class CUDAManagedAllocator : public ManagedAllocator {
new
CUDAAllocator
(
platform
::
CUDAPlace
(
dev_id
))));
default_allocator_
=
std
::
make_shared
<
AutoIncrementAllocator
>
(
[
this
]
{
return
std
::
move
(
BestFitAllocatorCreator
());
});
auto
*
cond_allocator
=
new
ConditionalAllocator
();
cond_allocator
->
AddAllocator
(
[
this
](
size_t
size
,
Attr
attr
)
{
return
size
<
max_chunk_size_
;
},
default_allocator_
)
.
AddAllocator
(
[](
size_t
size
,
Attr
attr
)
{
return
true
;
// default case
},
raw_allocator_
);
default_allocator_
.
reset
(
cond_allocator
);
}
~
CUDAManagedAllocator
()
{
...
...
paddle/fluid/memory/allocation/conditional_allocator.cc
0 → 100644
浏览文件 @
b4f54d33
// Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "paddle/fluid/memory/allocation/conditional_allocator.h"
namespace
paddle
{
namespace
memory
{
namespace
allocation
{
ConditionalAllocator
&
ConditionalAllocator
::
AddAllocator
(
std
::
function
<
bool
(
size_t
,
Allocator
::
Attr
)
>
func
,
std
::
shared_ptr
<
ManagedAllocator
>
allocator
)
{
underlying_allocators_
.
emplace_back
(
std
::
move
(
func
),
std
::
move
(
allocator
));
return
*
this
;
}
std
::
unique_ptr
<
Allocation
>
ConditionalAllocator
::
Allocate
(
size_t
size
,
Allocator
::
Attr
attr
)
{
return
SelectAndInvoke
(
size
,
attr
,
[
&
](
ManagedAllocator
&
allocator
)
{
return
allocator
.
Allocate
(
size
,
attr
);
});
}
std
::
shared_ptr
<
Allocation
>
ConditionalAllocator
::
AllocateShared
(
size_t
size
,
Allocator
::
Attr
attr
)
{
return
SelectAndInvoke
(
size
,
attr
,
[
&
](
ManagedAllocator
&
allocator
)
{
return
allocator
.
AllocateShared
(
size
,
attr
);
});
}
bool
ConditionalAllocator
::
IsAllocThreadSafe
()
const
{
return
true
;
}
}
// namespace allocation
}
// namespace memory
}
// namespace paddle
paddle/fluid/memory/allocation/conditional_allocator.h
0 → 100644
浏览文件 @
b4f54d33
// Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <functional>
#include <utility>
#include <vector>
#include "paddle/fluid/memory/allocation/allocator.h"
namespace
paddle
{
namespace
memory
{
namespace
allocation
{
class
ConditionalAllocator
:
public
ManagedAllocator
{
public:
ConditionalAllocator
()
=
default
;
ConditionalAllocator
&
AddAllocator
(
std
::
function
<
bool
(
size_t
,
Attr
)
>
func
,
std
::
shared_ptr
<
ManagedAllocator
>
allocator
);
std
::
unique_ptr
<
Allocation
>
Allocate
(
size_t
size
,
Attr
attr
)
override
;
std
::
shared_ptr
<
Allocation
>
AllocateShared
(
size_t
size
,
Attr
attr
)
override
;
bool
IsAllocThreadSafe
()
const
override
;
private:
template
<
typename
Callback
>
inline
typename
std
::
result_of
<
Callback
(
ManagedAllocator
&
)
>::
type
SelectAndInvoke
(
size_t
size
,
Attr
attr
,
Callback
callback
)
{
for
(
auto
&
pair
:
underlying_allocators_
)
{
if
(
pair
.
first
(
size
,
attr
))
{
return
callback
(
*
pair
.
second
);
}
}
PADDLE_THROW
(
"No suitable allocator"
);
}
std
::
vector
<
std
::
pair
<
std
::
function
<
bool
(
size_t
,
Attr
)
>
,
std
::
shared_ptr
<
ManagedAllocator
>>>
underlying_allocators_
;
};
}
// namespace allocation
}
// namespace memory
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录