From 02bdfdbaba7c1c8b9df3d628cfa1cb07745ecadc Mon Sep 17 00:00:00 2001 From: xiemoyuan Date: Wed, 23 Sep 2020 11:17:40 +0000 Subject: [PATCH] Optimize the error message of GatherTreeOP. --- paddle/fluid/operators/gather_tree_op.cc | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/paddle/fluid/operators/gather_tree_op.cc b/paddle/fluid/operators/gather_tree_op.cc index f743727a281..830134e57e0 100644 --- a/paddle/fluid/operators/gather_tree_op.cc +++ b/paddle/fluid/operators/gather_tree_op.cc @@ -22,19 +22,16 @@ class GatherTreeOp : public framework::OperatorWithKernel { using framework::OperatorWithKernel::OperatorWithKernel; void InferShape(framework::InferShapeContext* ctx) const override { - PADDLE_ENFORCE_EQ(ctx->HasInput("Ids"), true, - "Input(Ids) of GatherTreeOp should not be null."); - PADDLE_ENFORCE_EQ(ctx->HasInput("Parents"), true, - "Input(Parents) of GatherTreeOp should not be null."); - PADDLE_ENFORCE_EQ(ctx->HasOutput("Out"), true, - "Output(Out) of GatherTreeOp should not be null."); + OP_INOUT_CHECK(ctx->HasInput("Ids"), "Input", "Ids", "GatherTree"); + OP_INOUT_CHECK(ctx->HasInput("Parents"), "Input", "Parents", "GatherTree"); + OP_INOUT_CHECK(ctx->HasOutput("Out"), "Output", "Out", "GatherTree"); auto ids_dims = ctx->GetInputDim("Ids"); auto parents_dims = ctx->GetInputDim("Parents"); - PADDLE_ENFORCE_EQ( - ids_dims == parents_dims, true, - "The shape of Input(Parents) must be same with the shape of " - "Input(Ids)."); + PADDLE_ENFORCE_EQ(ids_dims == parents_dims, true, + platform::errors::InvalidArgument( + "The shape of Input(Parents) must be same with the " + "shape of Input(Ids).")); ctx->SetOutputDim("Out", ids_dims); } -- GitLab