Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
c296618c
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
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看板
未验证
提交
c296618c
编写于
9月 16, 2020
作者:
S
ShenLiang
提交者:
GitHub
9月 16, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix error message in broadcast/allreduce/gather (#27302)
* fix error message
上级
4f9d6529
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
60 addition
and
6 deletion
+60
-6
paddle/fluid/operators/distributed_ops/allreduce_op.h
paddle/fluid/operators/distributed_ops/allreduce_op.h
+2
-1
paddle/fluid/operators/distributed_ops/broadcast_op.cc
paddle/fluid/operators/distributed_ops/broadcast_op.cc
+2
-1
paddle/fluid/operators/distributed_ops/broadcast_op.cu.cc
paddle/fluid/operators/distributed_ops/broadcast_op.cu.cc
+3
-2
paddle/fluid/operators/gather_op.cc
paddle/fluid/operators/gather_op.cc
+15
-2
python/paddle/fluid/tests/unittests/test_broadcast_error.py
python/paddle/fluid/tests/unittests/test_broadcast_error.py
+38
-0
未找到文件。
paddle/fluid/operators/distributed_ops/allreduce_op.h
浏览文件 @
c296618c
...
@@ -76,7 +76,8 @@ class AllReduceOpKernel : public framework::OpKernel<T> {
...
@@ -76,7 +76,8 @@ class AllReduceOpKernel : public framework::OpKernel<T> {
PADDLE_ENFORCE_CUDA_SUCCESS
(
cudaStreamSynchronize
(
stream
));
PADDLE_ENFORCE_CUDA_SUCCESS
(
cudaStreamSynchronize
(
stream
));
}
}
#else
#else
PADDLE_THROW
(
"PaddlePaddle should compile with GPU."
);
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
"PaddlePaddle should compile with GPU."
));
#endif
#endif
}
}
};
};
...
...
paddle/fluid/operators/distributed_ops/broadcast_op.cc
浏览文件 @
c296618c
...
@@ -58,7 +58,8 @@ template <typename T>
...
@@ -58,7 +58,8 @@ template <typename T>
class
BroadcastOpKernel
:
public
framework
::
OpKernel
<
T
>
{
class
BroadcastOpKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
public:
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
PADDLE_THROW
(
"Broadcast op can run on gpu place only for now."
);
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
"Broadcast op can run on gpu place only for now."
));
}
}
};
};
...
...
paddle/fluid/operators/distributed_ops/broadcast_op.cu.cc
浏览文件 @
c296618c
...
@@ -68,10 +68,11 @@ class NCCLBroadcastOpKernel : public framework::OpKernel<T> {
...
@@ -68,10 +68,11 @@ class NCCLBroadcastOpKernel : public framework::OpKernel<T> {
<<
" From "
<<
root_dev_id
<<
" to "
<<
dev_id
;
<<
" From "
<<
root_dev_id
<<
" to "
<<
dev_id
;
if
(
ctx
.
Attr
<
bool
>
(
"sync_mode"
))
{
if
(
ctx
.
Attr
<
bool
>
(
"sync_mode"
))
{
PADDLE_ENFORCE
(
cudaStreamSynchronize
(
stream
));
PADDLE_ENFORCE
_CUDA_SUCCESS
(
cudaStreamSynchronize
(
stream
));
}
}
#else
#else
PADDLE_THROW
(
"PaddlePaddle should compile with GPU."
);
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
"PaddlePaddle should compile with GPU."
));
#endif
#endif
}
}
};
};
...
...
paddle/fluid/operators/gather_op.cc
浏览文件 @
c296618c
...
@@ -37,8 +37,21 @@ class GatherOp : public framework::OperatorWithKernel {
...
@@ -37,8 +37,21 @@ class GatherOp : public framework::OperatorWithKernel {
"Output(Out) of GatherOp should not be null."
));
"Output(Out) of GatherOp should not be null."
));
auto
index_dims
=
ctx
->
GetInputDim
(
"Index"
);
auto
index_dims
=
ctx
->
GetInputDim
(
"Index"
);
PADDLE_ENFORCE
(
index_dims
.
size
()
==
1
||
(
index_dims
.
size
()
==
2
&&
index_dims
[
1
]
==
1
));
if
(
index_dims
.
size
()
==
2
)
{
PADDLE_ENFORCE_EQ
(
index_dims
[
1
],
1
,
platform
::
errors
::
InvalidArgument
(
"The last dim of index should be 1 when it is 2D, but we get %d"
,
index_dims
[
1
]));
}
else
{
PADDLE_ENFORCE_EQ
(
index_dims
.
size
(),
1
,
platform
::
errors
::
InvalidArgument
(
"The index should be 1D, when it is not 2D, but we get %d"
,
index_dims
.
size
()));
}
int
batch_size
=
ctx
->
GetInputDim
(
"Index"
)[
0
];
int
batch_size
=
ctx
->
GetInputDim
(
"Index"
)[
0
];
framework
::
DDim
output_dims
(
ctx
->
GetInputDim
(
"X"
));
framework
::
DDim
output_dims
(
ctx
->
GetInputDim
(
"X"
));
output_dims
[
0
]
=
batch_size
;
output_dims
[
0
]
=
batch_size
;
...
...
python/paddle/fluid/tests/unittests/test_broadcast_error.py
0 → 100644
浏览文件 @
c296618c
# Copyright (c) 2020 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.
import
unittest
import
numpy
as
np
from
op_test
import
OpTest
import
paddle.fluid.core
as
core
class
TestBroadcastOpCpu
(
OpTest
):
def
setUp
(
self
):
self
.
op_type
=
"broadcast"
input
=
np
.
random
.
random
((
100
,
2
)).
astype
(
"float32"
)
np_out
=
input
[:]
self
.
inputs
=
{
"X"
:
input
}
self
.
attrs
=
{
"sync_mode"
:
False
,
"root"
:
0
}
self
.
outputs
=
{
"Out"
:
np_out
}
def
test_check_output_cpu
(
self
):
try
:
self
.
check_output_with_place
(
place
=
core
.
CPUPlace
())
except
:
print
(
"do not support cpu test, skip"
)
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录