Fix gather op bug #19168
Merged
Fix gather op bug #19168
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
test=develop
luotao1
reviewed
Aug 13, 2019
paddle/fluid/operators/gather.cu.h
Outdated
| @@ -51,7 +51,7 @@ 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 || | |||
| PADDLE_ENFORCE((index.dims().size() == 1 && index.dims()[0] > 0) || | |||
| (index.dims().size() == 2 && index.dims()[1] == 1)); | |||
There was a problem hiding this comment.
if (index.dims().size() == 1)
PADDLE_ENFORCE_GT(index.dims()[0], 0, "error_msg");
else if (index.dims().size() == 2)
PADDLE_ENFORCE_EQ(index.dims()[1], 1, "error_msg");
paddle/fluid/operators/gather_op.cu
Outdated
| @@ -41,6 +41,7 @@ class GatherOpCUDAKernel : public framework::OpKernel<T> { | |||
| paddle::framework::DataTypeToString(index_type), | |||
| paddle::framework::DataTypeToString(framework::proto::VarType::INT32), | |||
| paddle::framework::DataTypeToString(framework::proto::VarType::INT64)); | |||
| PADDLE_ENFORCE_GT(index->numel(), 0, "The index is empty."); | |||
There was a problem hiding this comment.
The error msg is too simple. The index of gather_op should not be empty?
test=develop
chengduoZH
force-pushed
the
fix_gather_op_bug
branch
from
20a2af2 to
163dd3c
Compare
luotao1
reviewed
Aug 13, 2019
| PADDLE_ENFORCE_GT(index.dims()[0], 0, "The index should not be empty."); | ||
| } else if (index.dims().size() == 2) { | ||
| PADDLE_ENFORCE_EQ(index.dims()[1], 1, "The index should be 1-D."); | ||
| } |
There was a problem hiding this comment.
- 有了56-60行，52，54，55行可以去掉了。
- 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维？
test=develop
chengduoZH
force-pushed
the
fix_gather_op_bug
branch
from
fe06260 to
8e4ceb9
Compare
chenwhql
requested changes
Aug 14, 2019
paddle/fluid/operators/gather.cu.h
Outdated
| if (index.dims().size() == 1) { | ||
| PADDLE_ENFORCE_GT(index.dims()[0], 0, | ||
| "The index of gather_op should not be empty when " | ||
| "index.dims().size() == 1."); |
There was a problem hiding this comment.
I think index.dims().size() == 1 isn't a good description, maybe when the dimension size of index equals 1. is better
paddle/fluid/operators/gather.cu.h
Outdated
| } else if (index.dims().size() == 2) { | ||
| PADDLE_ENFORCE_EQ( | ||
| index.dims()[1], 1, | ||
| "If index.dims().size() is 2, the seconde dim should be 1."); |
There was a problem hiding this comment.
seconde -> second, maybe the whole sentence can be polish to If the dimension size of index is 2, the second dimension should be equal to 2.
test=develop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related issue #19085.
The return of
DDim::size()is the rank info, this is to say, if thetensoris empty, thetensor.dims().size()is 1.Paddle/paddle/fluid/framework/ddim.h
Lines 61 to 62 in 0019eb3