Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
e0c33176
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
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,发现更多精彩内容 >>
提交
e0c33176
编写于
12月 14, 2017
作者:
T
tensor-tang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add MKLDNNPlace
上级
fd12776c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
1 deletion
+30
-1
paddle/platform/place.cc
paddle/platform/place.cc
+6
-0
paddle/platform/place.h
paddle/platform/place.h
+18
-1
paddle/platform/place_test.cc
paddle/platform/place_test.cc
+6
-0
未找到文件。
paddle/platform/place.cc
浏览文件 @
e0c33176
...
@@ -23,6 +23,7 @@ class PlacePrinter : public boost::static_visitor<> {
...
@@ -23,6 +23,7 @@ class PlacePrinter : public boost::static_visitor<> {
public:
public:
explicit
PlacePrinter
(
std
::
ostream
&
os
)
:
os_
(
os
)
{}
explicit
PlacePrinter
(
std
::
ostream
&
os
)
:
os_
(
os
)
{}
void
operator
()(
const
CPUPlace
&
)
{
os_
<<
"CPUPlace"
;
}
void
operator
()(
const
CPUPlace
&
)
{
os_
<<
"CPUPlace"
;
}
void
operator
()(
const
MKLDNNPlace
&
)
{
os_
<<
"MKLDNNPlace"
;
}
void
operator
()(
const
GPUPlace
&
p
)
{
os_
<<
"GPUPlace("
<<
p
.
device
<<
")"
;
}
void
operator
()(
const
GPUPlace
&
p
)
{
os_
<<
"GPUPlace("
<<
p
.
device
<<
")"
;
}
private:
private:
...
@@ -38,6 +39,7 @@ const Place &get_place() { return the_default_place; }
...
@@ -38,6 +39,7 @@ const Place &get_place() { return the_default_place; }
const
GPUPlace
default_gpu
()
{
return
GPUPlace
(
0
);
}
const
GPUPlace
default_gpu
()
{
return
GPUPlace
(
0
);
}
const
CPUPlace
default_cpu
()
{
return
CPUPlace
();
}
const
CPUPlace
default_cpu
()
{
return
CPUPlace
();
}
const
MKLDNNPlace
default_mkldnn
()
{
return
MKLDNNPlace
();
}
bool
is_gpu_place
(
const
Place
&
p
)
{
bool
is_gpu_place
(
const
Place
&
p
)
{
return
boost
::
apply_visitor
(
IsGPUPlace
(),
p
);
return
boost
::
apply_visitor
(
IsGPUPlace
(),
p
);
...
@@ -46,6 +48,10 @@ bool is_cpu_place(const Place &p) {
...
@@ -46,6 +48,10 @@ bool is_cpu_place(const Place &p) {
return
!
boost
::
apply_visitor
(
IsGPUPlace
(),
p
);
return
!
boost
::
apply_visitor
(
IsGPUPlace
(),
p
);
}
}
bool
is_mkldnn_place
(
const
Place
&
p
)
{
return
boost
::
apply_visitor
(
IsMKLDNNPlace
(),
p
);
}
bool
places_are_same_class
(
const
Place
&
p1
,
const
Place
&
p2
)
{
bool
places_are_same_class
(
const
Place
&
p1
,
const
Place
&
p2
)
{
return
p1
.
which
()
==
p2
.
which
();
return
p1
.
which
()
==
p2
.
which
();
}
}
...
...
paddle/platform/place.h
浏览文件 @
e0c33176
...
@@ -31,6 +31,14 @@ struct CPUPlace {
...
@@ -31,6 +31,14 @@ struct CPUPlace {
inline
bool
operator
!=
(
const
CPUPlace
&
)
const
{
return
false
;
}
inline
bool
operator
!=
(
const
CPUPlace
&
)
const
{
return
false
;
}
};
};
struct
MKLDNNPlace
:
public
CPUPlace
{
MKLDNNPlace
()
{}
// needed for variant equality comparison
inline
bool
operator
==
(
const
MKLDNNPlace
&
)
const
{
return
true
;
}
inline
bool
operator
!=
(
const
MKLDNNPlace
&
)
const
{
return
false
;
}
};
struct
GPUPlace
{
struct
GPUPlace
{
GPUPlace
()
:
GPUPlace
(
0
)
{}
GPUPlace
()
:
GPUPlace
(
0
)
{}
explicit
GPUPlace
(
int
d
)
:
device
(
d
)
{}
explicit
GPUPlace
(
int
d
)
:
device
(
d
)
{}
...
@@ -45,14 +53,21 @@ struct GPUPlace {
...
@@ -45,14 +53,21 @@ struct GPUPlace {
struct
IsGPUPlace
:
public
boost
::
static_visitor
<
bool
>
{
struct
IsGPUPlace
:
public
boost
::
static_visitor
<
bool
>
{
bool
operator
()(
const
CPUPlace
&
)
const
{
return
false
;
}
bool
operator
()(
const
CPUPlace
&
)
const
{
return
false
;
}
bool
operator
()(
const
MKLDNNPlace
&
)
const
{
return
false
;
}
bool
operator
()(
const
GPUPlace
&
gpu
)
const
{
return
true
;
}
bool
operator
()(
const
GPUPlace
&
gpu
)
const
{
return
true
;
}
};
};
struct
IsMKLDNNPlace
:
public
boost
::
static_visitor
<
bool
>
{
bool
operator
()(
const
MKLDNNPlace
&
)
const
{
return
true
;
}
bool
operator
()(
const
CPUPlace
&
)
const
{
return
false
;
}
bool
operator
()(
const
GPUPlace
&
)
const
{
return
false
;
}
};
// Define the max number of Place in bit length. i.e., the max number of places
// Define the max number of Place in bit length. i.e., the max number of places
// should be less equal than 2^(NUM_PLACE_TYPE_LIMIT_IN_BIT)
// should be less equal than 2^(NUM_PLACE_TYPE_LIMIT_IN_BIT)
#define NUM_PLACE_TYPE_LIMIT_IN_BIT 4
#define NUM_PLACE_TYPE_LIMIT_IN_BIT 4
typedef
boost
::
variant
<
GPUPlace
,
CPUPlace
>
Place
;
typedef
boost
::
variant
<
GPUPlace
,
CPUPlace
,
MKLDNNPlace
>
Place
;
// static check number of place types is less equal than
// static check number of place types is less equal than
// 2^(NUM_PLACE_TYPE_LIMIT_IN_BIT)
// 2^(NUM_PLACE_TYPE_LIMIT_IN_BIT)
...
@@ -65,9 +80,11 @@ const Place &get_place();
...
@@ -65,9 +80,11 @@ const Place &get_place();
const
GPUPlace
default_gpu
();
const
GPUPlace
default_gpu
();
const
CPUPlace
default_cpu
();
const
CPUPlace
default_cpu
();
const
MKLDNNPlace
default_mkldnn
();
bool
is_gpu_place
(
const
Place
&
);
bool
is_gpu_place
(
const
Place
&
);
bool
is_cpu_place
(
const
Place
&
);
bool
is_cpu_place
(
const
Place
&
);
bool
is_mkldnn_place
(
const
Place
&
);
bool
places_are_same_class
(
const
Place
&
,
const
Place
&
);
bool
places_are_same_class
(
const
Place
&
,
const
Place
&
);
std
::
ostream
&
operator
<<
(
std
::
ostream
&
,
const
Place
&
);
std
::
ostream
&
operator
<<
(
std
::
ostream
&
,
const
Place
&
);
...
...
paddle/platform/place_test.cc
浏览文件 @
e0c33176
...
@@ -21,9 +21,15 @@ TEST(Place, Default) {
...
@@ -21,9 +21,15 @@ TEST(Place, Default) {
EXPECT_TRUE
(
paddle
::
platform
::
is_gpu_place
(
paddle
::
platform
::
get_place
()));
EXPECT_TRUE
(
paddle
::
platform
::
is_gpu_place
(
paddle
::
platform
::
get_place
()));
EXPECT_TRUE
(
paddle
::
platform
::
is_gpu_place
(
paddle
::
platform
::
default_gpu
()));
EXPECT_TRUE
(
paddle
::
platform
::
is_gpu_place
(
paddle
::
platform
::
default_gpu
()));
EXPECT_TRUE
(
paddle
::
platform
::
is_cpu_place
(
paddle
::
platform
::
default_cpu
()));
EXPECT_TRUE
(
paddle
::
platform
::
is_cpu_place
(
paddle
::
platform
::
default_cpu
()));
EXPECT_TRUE
(
paddle
::
platform
::
is_mkldnn_place
(
paddle
::
platform
::
default_mkldnn
()));
paddle
::
platform
::
set_place
(
paddle
::
platform
::
CPUPlace
());
paddle
::
platform
::
set_place
(
paddle
::
platform
::
CPUPlace
());
EXPECT_TRUE
(
paddle
::
platform
::
is_cpu_place
(
paddle
::
platform
::
get_place
()));
EXPECT_TRUE
(
paddle
::
platform
::
is_cpu_place
(
paddle
::
platform
::
get_place
()));
paddle
::
platform
::
set_place
(
paddle
::
platform
::
MKLDNNPlace
());
EXPECT_FALSE
(
paddle
::
platform
::
is_cpu_place
(
paddle
::
platform
::
get_place
()));
EXPECT_TRUE
(
paddle
::
platform
::
is_mkldnn_place
(
paddle
::
platform
::
get_place
()));
}
}
TEST
(
Place
,
Print
)
{
TEST
(
Place
,
Print
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录