Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
f43be75b
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
提交
f43be75b
编写于
4月 02, 2018
作者:
T
typhoonzero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
multi stream thread pool
上级
3fd92662
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
38 addition
and
5 deletion
+38
-5
paddle/fluid/framework/threadpool.cc
paddle/fluid/framework/threadpool.cc
+15
-0
paddle/fluid/framework/threadpool.h
paddle/fluid/framework/threadpool.h
+16
-0
paddle/fluid/operators/detail/grpc_client.cc
paddle/fluid/operators/detail/grpc_client.cc
+7
-5
未找到文件。
paddle/fluid/framework/threadpool.cc
浏览文件 @
f43be75b
...
@@ -91,5 +91,20 @@ void ThreadPool::TaskLoop() {
...
@@ -91,5 +91,20 @@ void ThreadPool::TaskLoop() {
}
}
}
}
std
::
unique_ptr
<
ThreadPool
>
MultiStreamThreadPool
::
io_threadpool_
(
nullptr
);
std
::
once_flag
MultiStreamThreadPool
::
io_init_flag_
;
MultiStreamThreadPool
*
MultiStreamThreadPool
::
GetInstanceIO
()
{
std
::
call_once
(
io_init_flag_
,
&
MultiStreamThreadPool
::
InitIO
);
return
static_cast
<
MultiStreamThreadPool
*>
(
io_threadpool_
.
get
());
}
void
MultiStreamThreadPool
::
InitIO
()
{
if
(
io_threadpool_
.
get
()
==
nullptr
)
{
// TODO(typhoonzero1986): make this configurable
io_threadpool_
.
reset
(
new
ThreadPool
(
100
));
}
}
}
// namespace framework
}
// namespace framework
}
// namespace paddle
}
// namespace paddle
paddle/fluid/framework/threadpool.h
浏览文件 @
f43be75b
...
@@ -135,6 +135,17 @@ class ThreadPool {
...
@@ -135,6 +135,17 @@ class ThreadPool {
std
::
condition_variable
completed_
;
std
::
condition_variable
completed_
;
};
};
class
MultiStreamThreadPool
:
ThreadPool
{
public:
static
MultiStreamThreadPool
*
GetInstanceIO
();
static
void
InitIO
();
private:
// NOTE: threadpool in base will be inhereted here.
static
std
::
unique_ptr
<
ThreadPool
>
io_threadpool_
;
static
std
::
once_flag
io_init_flag_
;
};
// Run a function asynchronously.
// Run a function asynchronously.
// NOTE: The function must return void. If the function need to return a value,
// NOTE: The function must return void. If the function need to return a value,
// you can use lambda to capture a value pointer.
// you can use lambda to capture a value pointer.
...
@@ -143,5 +154,10 @@ std::future<void> Async(Callback callback) {
...
@@ -143,5 +154,10 @@ std::future<void> Async(Callback callback) {
return
ThreadPool
::
GetInstance
()
->
Run
(
callback
);
return
ThreadPool
::
GetInstance
()
->
Run
(
callback
);
}
}
template
<
typename
Callback
>
std
::
future
<
void
>
AsyncIO
(
Callback
callback
)
{
return
MultiStreamThreadPool
::
GetInstanceIO
()
->
Run
(
callback
);
}
}
// namespace framework
}
// namespace framework
}
// namespace paddle
}
// namespace paddle
paddle/fluid/operators/detail/grpc_client.cc
浏览文件 @
f43be75b
...
@@ -33,7 +33,8 @@ bool RPCClient::AsyncSendVariable(const std::string& ep,
...
@@ -33,7 +33,8 @@ bool RPCClient::AsyncSendVariable(const std::string& ep,
const
framework
::
Scope
*
p_scope
=
&
scope
;
const
framework
::
Scope
*
p_scope
=
&
scope
;
const
auto
ch
=
GetChannel
(
ep_val
);
const
auto
ch
=
GetChannel
(
ep_val
);
framework
::
Async
([
var_name_val
,
p_ctx
,
ep_val
,
p_scope
,
time_out
,
ch
,
this
]
{
framework
::
AsyncIO
([
var_name_val
,
p_ctx
,
ep_val
,
p_scope
,
time_out
,
ch
,
this
]
{
auto
*
var
=
p_scope
->
FindVar
(
var_name_val
);
auto
*
var
=
p_scope
->
FindVar
(
var_name_val
);
::
grpc
::
ByteBuffer
req
;
::
grpc
::
ByteBuffer
req
;
...
@@ -88,7 +89,8 @@ bool RPCClient::AsyncGetVariable(const std::string& ep,
...
@@ -88,7 +89,8 @@ bool RPCClient::AsyncGetVariable(const std::string& ep,
const
framework
::
Scope
*
p_scope
=
&
scope
;
const
framework
::
Scope
*
p_scope
=
&
scope
;
const
auto
ch
=
GetChannel
(
ep_val
);
const
auto
ch
=
GetChannel
(
ep_val
);
framework
::
Async
([
var_name_val
,
ep_val
,
p_scope
,
p_ctx
,
time_out
,
ch
,
this
]
{
framework
::
AsyncIO
([
var_name_val
,
ep_val
,
p_scope
,
p_ctx
,
time_out
,
ch
,
this
]
{
// prepare input
// prepare input
sendrecv
::
VariableMessage
req
;
sendrecv
::
VariableMessage
req
;
req
.
set_varname
(
var_name_val
);
req
.
set_varname
(
var_name_val
);
...
@@ -131,7 +133,7 @@ bool RPCClient::AsyncPrefetchVariable(const std::string& ep,
...
@@ -131,7 +133,7 @@ bool RPCClient::AsyncPrefetchVariable(const std::string& ep,
const
framework
::
Scope
*
p_scope
=
&
scope
;
const
framework
::
Scope
*
p_scope
=
&
scope
;
const
auto
ch
=
GetChannel
(
ep_val
);
const
auto
ch
=
GetChannel
(
ep_val
);
framework
::
Async
([
in_var_name_val
,
out_var_name_val
,
ep_val
,
p_scope
,
p_ctx
,
framework
::
Async
IO
([
in_var_name_val
,
out_var_name_val
,
ep_val
,
p_scope
,
p_ctx
,
time_out
,
ch
,
this
]
{
time_out
,
ch
,
this
]
{
auto
*
var
=
p_scope
->
FindVar
(
in_var_name_val
);
auto
*
var
=
p_scope
->
FindVar
(
in_var_name_val
);
...
@@ -195,7 +197,7 @@ bool RPCClient::Wait() {
...
@@ -195,7 +197,7 @@ bool RPCClient::Wait() {
std
::
vector
<
std
::
future
<
void
>>
waits
(
req_count_
);
std
::
vector
<
std
::
future
<
void
>>
waits
(
req_count_
);
for
(
int
i
=
0
;
i
<
req_count_
;
i
++
)
{
for
(
int
i
=
0
;
i
<
req_count_
;
i
++
)
{
waits
[
i
]
=
framework
::
Async
([
i
,
&
a
,
this
]
{
a
[
i
]
=
Proceed
();
});
waits
[
i
]
=
framework
::
Async
IO
([
i
,
&
a
,
this
]
{
a
[
i
]
=
Proceed
();
});
}
}
for
(
int
i
=
0
;
i
<
req_count_
;
i
++
)
{
for
(
int
i
=
0
;
i
<
req_count_
;
i
++
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录