fix merge_lod_tensor_op infer shape, test=develop

7 years ago · 4a83522c38
parent 82cff5ec42
commit 4a83522c38
1 changed files with 3 additions and 1 deletions
--- a/paddle/fluid/operators/merge_lod_tensor_op.cc
+++ b/paddle/fluid/operators/merge_lod_tensor_op.cc
@ -164,7 +164,9 @@ class MergeLoDTensorInferShape : public framework::InferShapeBase {

    auto mask_dim = context->GetInputDim("Mask");
    PADDLE_ENFORCE_EQ(mask_dim.size(), 2);
-    PADDLE_ENFORCE_EQ(mask_dim[1], 1);
+    if (context->IsRuntime() || mask_dim[1] > 0) {
+      PADDLE_ENFORCE_EQ(mask_dim[1], 1);
+    }

    context->SetOutputDim("Out", context->GetInputDim("InTrue"));
  }