Add a proposal of InferShapeCommonFunctions

paddle/operators/add_op.cc

@@ -15,6 +15,7 @@ limitations under the License. */
 #include "paddle/operators/add_op.h"
 #include "paddle/framework/op_registry.h"
 #include "paddle/framework/tensor.h"
+#include "paddle/operators/infer_shape_common_functions.h"
 
 namespace paddle {
 namespace operators {
@@ -26,9 +27,10 @@ class AddOp : public framework::OperatorWithKernel {
       const std::vector<framework::Tensor *> &outputs) const override {
     PADDLE_ENFORCE(inputs.size() == 2, "Input size of AddOp must be two");
     PADDLE_ENFORCE(outputs.size() == 1, "Output size of AddOp must be one");
-    PADDLE_ENFORCE(
-        inputs[0] != nullptr && inputs[1] != nullptr && outputs[0] != nullptr,
-        "Inputs/Outputs of AddOp must all be set");
+    InferShapeCommonFunctions::EnforceAllNotNull(
+        inputs, "Input %d of AddOp must be set");
+    InferShapeCommonFunctions::EnforceAllNotNull(
+        outputs, "Output %d of AddOp must be set");
     PADDLE_ENFORCE(inputs[0]->dims() == inputs[1]->dims(),
                    "Two input of Add Op's dimension must be same.");
     outputs[0]->set_dims(inputs[0]->dims());

paddle/operators/infer_shape_common_functions.h

@@ -0,0 +1,33 @@
+/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License. */
+
+#pragma once
+
+#include "paddle/framework/tensor.h"
+
+namespace paddle {
+namespace operators {
+
+struct InferShapeCommonFunctions {
+  template <typename Container>
+  static void EnforceAllNotNull(Container c, const char* fmt) {
+    size_t idx = 0;
+    for (auto& ptr : c) {
+      PADDLE_ENFORCE(ptr != nullptr, fmt, idx);
+      ++idx;
+    }
+  }
+};
+}  // namespace operators
+}  // namespace paddle