m53297601
/
Paddle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refine reshape_op shape error message (#22480)

Browse Source 
test=develop
revert-22710-feature/integrated_ps_api
Tao Luo 5 years ago committed by GitHub
parent 2b1386b2b2
commit 7c9ce097f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File

54
paddle/fluid/operators/reshape_op.cc
Unescape View File

@ -29,10 +29,11 @@ inline std::vector<int> get_new_shape(
auto tensor = list_new_shape_tensor[i]; auto tensor = list_new_shape_tensor[i];
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(
tensor->dims(), framework::make_ddim({1}), tensor->dims(), framework::make_ddim({1}),
"ShapeError: If the element type of 'shape' in ReshapeOp is Tensor, " platform::errors::InvalidArgument(
"If the element type of 'shape' in ReshapeOp is Tensor, "
"the element's shape must be [1]. But received the element's shape " "the element's shape must be [1]. But received the element's shape "
"is [%s]", "is [%s]",
tensor->dims()); tensor->dims()));
if (platform::is_gpu_place(tensor->place())) { if (platform::is_gpu_place(tensor->place())) {
framework::Tensor temp; framework::Tensor temp;
TensorCopySync(*tensor, platform::CPUPlace(), &temp); TensorCopySync(*tensor, platform::CPUPlace(), &temp);
@ -64,10 +65,11 @@ class ReshapeOp : public framework::OperatorWithKernel {
auto ShapeTensor = ctx->Inputs("ShapeTensor"); auto ShapeTensor = ctx->Inputs("ShapeTensor");
PADDLE_ENFORCE_GT( PADDLE_ENFORCE_GT(
ShapeTensor.size(), 0, ShapeTensor.size(), 0,
"ShapeError: When `shape` in ReshapeOp is a list or tuple " platform::errors::InvalidArgument(
"When `shape` in ReshapeOp is a list or tuple "
"which contains Tensor, the shape's size can't be zero. " "which contains Tensor, the shape's size can't be zero. "
"But received shape's size is %d.", "But received shape's size is %d.",
ShapeTensor.size()); ShapeTensor.size()));
auto infer_shape = ctx->Attrs().Get<std::vector<int>>("shape"); auto infer_shape = ctx->Attrs().Get<std::vector<int>>("shape");
const int64_t copy_dim_val = 0; const int64_t copy_dim_val = 0;
auto in_dims = ctx->GetInputDim("X"); auto in_dims = ctx->GetInputDim("X");
@ -75,10 +77,11 @@ class ReshapeOp : public framework::OperatorWithKernel {
if (infer_shape[i] == copy_dim_val) { if (infer_shape[i] == copy_dim_val) {
PADDLE_ENFORCE_LT( PADDLE_ENFORCE_LT(
static_cast<int>(i), in_dims.size(), static_cast<int>(i), in_dims.size(),
"ShapeError: The index of 0 in `shape` must be less than " platform::errors::InvalidArgument(
"The index of 0 in `shape` must be less than "
"the input tensor X's dimensions. But received shape[%d] " "the input tensor X's dimensions. But received shape[%d] "
"= 0, X's dimensions = %d, X's shape = [%s].", "= 0, X's dimensions = %d, X's shape = [%s].",
i, in_dims.size(), in_dims); i, in_dims.size(), in_dims));
infer_shape[i] = in_dims[i]; infer_shape[i] = in_dims[i];
} }
} }
@ -108,10 +111,10 @@ class ReshapeOp : public framework::OperatorWithKernel {
return; return;
} }
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(!shape.empty(), true,
!shape.empty(), true, platform::errors::InvalidArgument(
"ShapeError: The parameter 'shape' in ReshapeOp must be set. " "The parameter 'shape' in ReshapeOp must be set. "
"But received 'shape' is empty."); "But received 'shape' is empty."));
auto x_dims = ctx->GetInputDim("X"); auto x_dims = ctx->GetInputDim("X");
auto out_dims = ValidateShape(shape, x_dims); auto out_dims = ValidateShape(shape, x_dims);
ctx->SetOutputDim("Out", out_dims); ctx->SetOutputDim("Out", out_dims);
@ -140,25 +143,28 @@ class ReshapeOp : public framework::OperatorWithKernel {
if (shape[i] == unk_dim_val) { if (shape[i] == unk_dim_val) {
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(
unk_dim_idx, -1, unk_dim_idx, -1,
"ShapeError: Only one dimension value of 'shape' in ReshapeOp can " platform::errors::InvalidArgument(
"Only one dimension value of 'shape' in ReshapeOp can "
"be -1. But received shape = [%s], shape[%d] is also -1.", "be -1. But received shape = [%s], shape[%d] is also -1.",
framework::make_ddim(shape), i); framework::make_ddim(shape), i));
unk_dim_idx = i; unk_dim_idx = i;
} else if (shape[i] == copy_dim_val) { } else if (shape[i] == copy_dim_val) {
PADDLE_ENFORCE_LT( PADDLE_ENFORCE_LT(
static_cast<int>(i), in_dims.size(), static_cast<int>(i), in_dims.size(),
"ShapeError: The index of 0 in `shape` must be less than " platform::errors::InvalidArgument(
"The index of 0 in `shape` must be less than "
"the input tensor X's dimensions. " "the input tensor X's dimensions. "
"But received shape = [%s], shape[%d] = 0, X's shape = [%s], " "But received shape = [%s], shape[%d] = 0, X's shape = [%s], "
"X's dimensions = %d.", "X's dimensions = %d.",
framework::make_ddim(shape), i, in_dims, in_dims.size()); framework::make_ddim(shape), i, in_dims, in_dims.size()));
} else { } else {
PADDLE_ENFORCE_GT( PADDLE_ENFORCE_GT(
shape[i], 0, shape[i], 0,
"ShapeError: Each dimension value of 'shape' in ReshapeOp must not " platform::errors::InvalidArgument(
"Each dimension value of 'shape' in ReshapeOp must not "
"be negtive except one unknown dimension. " "be negtive except one unknown dimension. "
"But received shape = [%s], shape[%d] = %d.", "But received shape = [%s], shape[%d] = %d.",
framework::make_ddim(shape), i, shape[i]); framework::make_ddim(shape), i, shape[i]));
} }
capacity *= (shape[i] ? shape[i] : in_dims[i]); capacity *= (shape[i] ? shape[i] : in_dims[i]);
@ -180,8 +186,7 @@ class ReshapeOp : public framework::OperatorWithKernel {
"The input tensor X'size must be divisible by known " "The input tensor X'size must be divisible by known "
"capacity of 'shape'. " "capacity of 'shape'. "
"But received X's shape = [%s], X's size = %d, " "But received X's shape = [%s], X's size = %d, "
"'shape' is [%s], known " "'shape' is [%s], known capacity of 'shape' is %d.",
"capacity of 'shape' is %d.",
in_dims, in_size, framework::make_ddim(shape), capacity)); in_dims, in_size, framework::make_ddim(shape), capacity));
} else { } else {
output_shape[unk_dim_idx] = -1; output_shape[unk_dim_idx] = -1;
@ -190,12 +195,13 @@ class ReshapeOp : public framework::OperatorWithKernel {
if (all_positive) { if (all_positive) {
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(
capacity, in_size, capacity, in_size,
"ShapeError: The 'shape' in ReshapeOp is invalid. " platform::errors::InvalidArgument(
"The input tensor X'size must be equal to the capacity of 'shape'. " "The 'shape' in ReshapeOp is invalid. "
"But received X's shape = [%s], X's size = %d, 'shape' is [%s], " "The input tensor X'size must be equal to the capacity of "
"the " "'shape'. "
"capacity of 'shape' is %d.", "But received X's shape = [%s], X's size = %d, 'shape' is "
in_dims, in_size, framework::make_ddim(shape), capacity); "[%s], the capacity of 'shape' is %d.",
in_dims, in_size, framework::make_ddim(shape), capacity));
} }
} }
return framework::make_ddim(output_shape); return framework::make_ddim(output_shape);

Write Preview
Loading…
Cancel
Save