Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix gather op bug #19168

Merged
merged 4 commits into from
Aug 14, 2019
Merged

Fix gather op bug #19168

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
462a587
fix gather op bug
Aug 13, 2019
163dd3c
update error info
Aug 13, 2019
8e4ceb9
update error info
Aug 13, 2019
7479376
follow comment
Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions paddle/fluid/operators/gather.cu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,16 @@ __global__ void GatherCUDAKernel(const T* params, const IndexT* indices,
template <typename T, typename IndexT = int>
void GPUGather(const platform::DeviceContext& ctx, const Tensor& src,
const Tensor& index, Tensor* output) {
// PADDLE_ENFORCE(platform::is_gpu_place(place));
// check index of shape 1-D
PADDLE_ENFORCE(index.dims().size() == 1 ||
(index.dims().size() == 2 && index.dims()[1] == 1));
if (index.dims().size() == 1) {
PADDLE_ENFORCE_GT(index.dims()[0], 0,
"The index of gather_op should not be empty when the "
"index's rank is 1.");
} else if (index.dims().size() == 2) {
PADDLE_ENFORCE_EQ(index.dims()[1], 1,
" If the index's rank of gather_op is 2, the second "
"dimension should be 1.");
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. 有了56-60行，52，54，55行可以去掉了。
  2. 57行，59行的报错信息需要增强。举例：
The index of gather_op should not be empty when index.dims().size() == 1.
The index of gather_op should be 1-D when index.dims().size() == 2.

1-D是1还是1维？


int index_size = index.dims()[0];

Expand Down