Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
2f9fa9b7
P
Paddle
项目概览
wzpei9
/
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,发现更多精彩内容 >>
未验证
提交
2f9fa9b7
编写于
4月 27, 2018
作者:
W
whs
提交者:
GitHub
4月 27, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10167 from wanghaoshuang/fluid_init
Add init interface for customize devices.
上级
4a5bfa89
848fb002
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
54 addition
and
17 deletion
+54
-17
paddle/fluid/framework/init.cc
paddle/fluid/framework/init.cc
+36
-13
paddle/fluid/framework/init.h
paddle/fluid/framework/init.h
+2
-0
paddle/fluid/inference/io.cc
paddle/fluid/inference/io.cc
+15
-3
paddle/fluid/inference/io.h
paddle/fluid/inference/io.h
+1
-1
未找到文件。
paddle/fluid/framework/init.cc
浏览文件 @
2f9fa9b7
...
...
@@ -15,7 +15,6 @@ limitations under the License. */
#include <algorithm>
#include <stdexcept>
#include <string>
#include <vector>
#include "paddle/fluid/framework/init.h"
#include "paddle/fluid/framework/operator.h"
...
...
@@ -31,6 +30,7 @@ std::once_flag p2p_init_flag;
void
InitGflags
(
std
::
vector
<
std
::
string
>
argv
)
{
std
::
call_once
(
gflags_init_flag
,
[
&
]()
{
argv
.
insert
(
argv
.
begin
(),
"dummy"
);
int
argc
=
argv
.
size
();
char
**
arr
=
new
char
*
[
argv
.
size
()];
std
::
string
line
;
...
...
@@ -44,20 +44,23 @@ void InitGflags(std::vector<std::string> argv) {
});
}
void
InitP2P
(
int
count
)
{
void
InitP2P
(
std
::
vector
<
int
>
devices
)
{
#ifdef PADDLE_WITH_CUDA
std
::
call_once
(
p2p_init_flag
,
[
&
]()
{
int
count
=
devices
.
size
();
for
(
int
i
=
0
;
i
<
count
;
++
i
)
{
for
(
int
j
=
0
;
j
<
count
;
++
j
)
{
if
(
i
==
j
)
continue
;
if
(
devices
[
i
]
==
devices
[
j
]
)
continue
;
int
can_acess
=
-
1
;
PADDLE_ENFORCE
(
cudaDeviceCanAccessPeer
(
&
can_acess
,
i
,
j
),
"Failed to test P2P access."
);
PADDLE_ENFORCE
(
cudaDeviceCanAccessPeer
(
&
can_acess
,
devices
[
i
],
devices
[
j
]),
"Failed to test P2P access."
);
if
(
can_acess
!=
1
)
{
LOG
(
WARNING
)
<<
"Cannot enable P2P access from "
<<
i
<<
" to "
<<
j
;
LOG
(
WARNING
)
<<
"Cannot enable P2P access from "
<<
devices
[
i
]
<<
" to "
<<
devices
[
j
];
}
else
{
cudaSetDevice
(
i
);
cudaDeviceEnablePeerAccess
(
j
,
0
);
cudaSetDevice
(
devices
[
i
]
);
cudaDeviceEnablePeerAccess
(
devices
[
j
]
,
0
);
}
}
}
...
...
@@ -67,11 +70,26 @@ void InitP2P(int count) {
void
InitDevices
(
bool
init_p2p
)
{
/*Init all available devices by default */
std
::
vector
<
int
>
devices
;
#ifdef PADDLE_WITH_CUDA
try
{
int
count
=
platform
::
GetCUDADeviceCount
();
for
(
int
i
=
0
;
i
<
count
;
++
i
)
{
devices
.
push_back
(
i
);
}
}
catch
(
const
std
::
exception
&
exp
)
{
LOG
(
WARNING
)
<<
"Compiled with WITH_GPU, but no GPU found in runtime."
;
}
#else
LOG
(
WARNING
)
<<
"'CUDA' is not supported, Please re-compile with WITH_GPU option"
;
#endif
InitDevices
(
init_p2p
,
devices
);
}
void
InitDevices
(
bool
init_p2p
,
const
std
::
vector
<
int
>
devices
)
{
std
::
vector
<
platform
::
Place
>
places
;
places
.
emplace_back
(
platform
::
CPUPlace
());
int
count
=
0
;
#ifdef PADDLE_WITH_CUDA
try
{
count
=
platform
::
GetCUDADeviceCount
();
...
...
@@ -83,12 +101,17 @@ void InitDevices(bool init_p2p) {
<<
"'CUDA' is not supported, Please re-compile with WITH_GPU option"
;
#endif
for
(
int
i
=
0
;
i
<
count
;
++
i
)
{
places
.
emplace_back
(
platform
::
CUDAPlace
(
i
));
for
(
size_t
i
=
0
;
i
<
devices
.
size
();
++
i
)
{
if
(
devices
[
i
]
>=
count
||
devices
[
i
]
<
0
)
{
LOG
(
WARNING
)
<<
"Invalid devices id."
;
continue
;
}
places
.
emplace_back
(
platform
::
CUDAPlace
(
devices
[
i
]));
}
if
(
init_p2p
)
{
InitP2P
(
count
);
InitP2P
(
devices
);
}
places
.
emplace_back
(
platform
::
CPUPlace
());
platform
::
DeviceContextPool
::
Init
(
places
);
}
...
...
paddle/fluid/framework/init.h
浏览文件 @
2f9fa9b7
...
...
@@ -28,5 +28,7 @@ void InitGLOG(const std::string &prog_name);
void
InitDevices
(
bool
init_p2p
);
void
InitDevices
(
bool
init_p2p
,
const
std
::
vector
<
int
>
devices
);
}
// namespace framework
}
// namespace paddle
paddle/fluid/inference/io.cc
浏览文件 @
2f9fa9b7
...
...
@@ -16,17 +16,29 @@ limitations under the License. */
#include <algorithm>
#include <fstream>
#include <vector>
#include "paddle/fluid/framework/block_desc.h"
#include "paddle/fluid/framework/feed_fetch_type.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/pybind/pybind.h"
DEFINE_string
(
devices
,
""
,
"The devices to be used which is joined by comma."
);
DEFINE_bool
(
init_p2p
,
false
,
"Whether to init p2p."
);
namespace
paddle
{
namespace
inference
{
// Temporarily add this function for exposing framework::InitDevices() when
// linking the inference shared library.
void
Init
(
bool
init_p2p
)
{
framework
::
InitDevices
(
init_p2p
);
}
void
Init
(
const
std
::
vector
<
std
::
string
>
argv
)
{
framework
::
InitGflags
(
argv
);
// init devices
std
::
vector
<
int
>
devices
;
std
::
string
token
;
std
::
istringstream
tokenStream
(
FLAGS_devices
);
while
(
std
::
getline
(
tokenStream
,
token
,
','
))
{
devices
.
push_back
(
std
::
stoi
(
token
));
}
framework
::
InitDevices
(
FLAGS_init_p2p
,
devices
);
}
void
ReadBinaryFile
(
const
std
::
string
&
filename
,
std
::
string
*
contents
)
{
std
::
ifstream
fin
(
filename
,
std
::
ios
::
in
|
std
::
ios
::
binary
);
...
...
paddle/fluid/inference/io.h
浏览文件 @
2f9fa9b7
...
...
@@ -25,7 +25,7 @@ limitations under the License. */
namespace
paddle
{
namespace
inference
{
void
Init
(
bool
init_p2p
);
void
Init
(
const
std
::
vector
<
std
::
string
>
argv
);
void
LoadPersistables
(
framework
::
Executor
*
executor
,
framework
::
Scope
*
scope
,
const
framework
::
ProgramDesc
&
main_program
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录