Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
30f9dc92
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看板
提交
30f9dc92
编写于
4月 27, 2018
作者:
F
fengjiayi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix errors
上级
330fa95c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
13 deletion
+13
-13
paddle/fluid/operators/math/concat_test.cc
paddle/fluid/operators/math/concat_test.cc
+12
-12
paddle/fluid/operators/reader/create_double_buffer_reader_op.cc
.../fluid/operators/reader/create_double_buffer_reader_op.cc
+1
-1
未找到文件。
paddle/fluid/operators/math/concat_test.cc
浏览文件 @
30f9dc92
...
@@ -72,8 +72,8 @@ void testConcat() {
...
@@ -72,8 +72,8 @@ void testConcat() {
}
}
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
TensorCopy
(
input_a_cpu
,
Place
(),
*
context
,
&
input_a
,
true
);
TensorCopy
Sync
(
input_a_cpu
,
Place
(),
&
input_a
);
TensorCopy
(
input_b_cpu
,
Place
(),
*
context
,
&
input_b
,
true
);
TensorCopy
Sync
(
input_b_cpu
,
Place
(),
&
input_b
);
}
}
std
::
vector
<
Tensor
>
input
;
std
::
vector
<
Tensor
>
input
;
...
@@ -89,7 +89,7 @@ void testConcat() {
...
@@ -89,7 +89,7 @@ void testConcat() {
int
*
out_ptr
;
int
*
out_ptr
;
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
TensorCopy
(
out
,
CPUPlace
(),
*
context
,
&
out_cpu
,
true
);
TensorCopy
Sync
(
out
,
CPUPlace
(),
&
out_cpu
);
out_ptr
=
out_cpu
.
data
<
int
>
();
out_ptr
=
out_cpu
.
data
<
int
>
();
}
else
{
}
else
{
out_ptr
=
out
.
data
<
int
>
();
out_ptr
=
out
.
data
<
int
>
();
...
@@ -144,8 +144,8 @@ void testConcat() {
...
@@ -144,8 +144,8 @@ void testConcat() {
}
}
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
TensorCopy
(
input_a_cpu
,
Place
(),
*
context
,
&
input_a
,
true
);
TensorCopy
Sync
(
input_a_cpu
,
Place
(),
&
input_a
);
TensorCopy
(
input_b_cpu
,
Place
(),
*
context
,
&
input_b
,
true
);
TensorCopy
Sync
(
input_b_cpu
,
Place
(),
&
input_b
);
}
}
input
.
clear
();
input
.
clear
();
...
@@ -159,7 +159,7 @@ void testConcat() {
...
@@ -159,7 +159,7 @@ void testConcat() {
PADDLE_ENFORCE_EQ
(
input_b
.
dims
(),
dim_b
);
PADDLE_ENFORCE_EQ
(
input_b
.
dims
(),
dim_b
);
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
TensorCopy
(
out
,
CPUPlace
(),
*
context
,
&
out_cpu
,
true
);
TensorCopy
Sync
(
out
,
CPUPlace
(),
&
out_cpu
);
out_ptr
=
out_cpu
.
data
<
int
>
();
out_ptr
=
out_cpu
.
data
<
int
>
();
}
else
{
}
else
{
out_ptr
=
out
.
data
<
int
>
();
out_ptr
=
out
.
data
<
int
>
();
...
@@ -216,8 +216,8 @@ void testConcat() {
...
@@ -216,8 +216,8 @@ void testConcat() {
}
}
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
TensorCopy
(
input_a_cpu
,
Place
(),
*
context
,
&
input_a
,
true
);
TensorCopy
Sync
(
input_a_cpu
,
Place
(),
&
input_a
);
TensorCopy
(
input_b_cpu
,
Place
(),
*
context
,
&
input_b
,
true
);
TensorCopy
Sync
(
input_b_cpu
,
Place
(),
&
input_b
);
}
}
input
.
clear
();
input
.
clear
();
...
@@ -231,7 +231,7 @@ void testConcat() {
...
@@ -231,7 +231,7 @@ void testConcat() {
PADDLE_ENFORCE_EQ
(
input_b
.
dims
(),
dim_b
);
PADDLE_ENFORCE_EQ
(
input_b
.
dims
(),
dim_b
);
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
TensorCopy
(
out
,
CPUPlace
(),
*
context
,
&
out_cpu
,
true
);
TensorCopy
Sync
(
out
,
CPUPlace
(),
&
out_cpu
);
out_ptr
=
out_cpu
.
data
<
int
>
();
out_ptr
=
out_cpu
.
data
<
int
>
();
}
else
{
}
else
{
out_ptr
=
out
.
data
<
int
>
();
out_ptr
=
out
.
data
<
int
>
();
...
@@ -290,8 +290,8 @@ void testConcat() {
...
@@ -290,8 +290,8 @@ void testConcat() {
}
}
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
TensorCopy
(
input_a_cpu
,
Place
(),
*
context
,
&
input_a
,
true
);
TensorCopy
Sync
(
input_a_cpu
,
Place
(),
&
input_a
);
TensorCopy
(
input_b_cpu
,
Place
(),
*
context
,
&
input_b
,
true
);
TensorCopy
Sync
(
input_b_cpu
,
Place
(),
&
input_b
);
}
}
input
.
clear
();
input
.
clear
();
...
@@ -305,7 +305,7 @@ void testConcat() {
...
@@ -305,7 +305,7 @@ void testConcat() {
PADDLE_ENFORCE_EQ
(
input_b
.
dims
(),
dim_b
);
PADDLE_ENFORCE_EQ
(
input_b
.
dims
(),
dim_b
);
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
if
(
paddle
::
platform
::
is_gpu_place
(
Place
()))
{
TensorCopy
(
out
,
CPUPlace
(),
*
context
,
&
out_cpu
,
true
);
TensorCopy
Sync
(
out
,
CPUPlace
(),
&
out_cpu
);
out_ptr
=
out_cpu
.
data
<
int
>
();
out_ptr
=
out_cpu
.
data
<
int
>
();
}
else
{
}
else
{
out_ptr
=
out
.
data
<
int
>
();
out_ptr
=
out
.
data
<
int
>
();
...
...
paddle/fluid/operators/reader/create_double_buffer_reader_op.cc
浏览文件 @
30f9dc92
...
@@ -177,9 +177,9 @@ void DoubleBufferReader::PrefetchThreadFunc() {
...
@@ -177,9 +177,9 @@ void DoubleBufferReader::PrefetchThreadFunc() {
}
}
if
(
platform
::
is_gpu_place
(
place_
))
{
if
(
platform
::
is_gpu_place
(
place_
))
{
auto
&
gpu_batch
=
gpu_tensor_cache_
[
cached_tensor_id
];
auto
&
gpu_batch
=
gpu_tensor_cache_
[
cached_tensor_id
];
auto
*
gpu_ctx
=
ctxs_
[
cached_tensor_id
].
get
();
gpu_batch
.
resize
(
cpu_batch
.
size
());
gpu_batch
.
resize
(
cpu_batch
.
size
());
for
(
size_t
i
=
0
;
i
<
cpu_batch
.
size
();
++
i
)
{
for
(
size_t
i
=
0
;
i
<
cpu_batch
.
size
();
++
i
)
{
// TODO(fengjiayi): Use asynchronous TensorCopy instead
framework
::
TensorCopySync
(
cpu_batch
[
i
],
place_
,
&
gpu_batch
[
i
]);
framework
::
TensorCopySync
(
cpu_batch
[
i
],
place_
,
&
gpu_batch
[
i
]);
gpu_batch
[
i
].
set_lod
(
cpu_batch
[
i
].
lod
());
gpu_batch
[
i
].
set_lod
(
cpu_batch
[
i
].
lod
());
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录