From a524498efe8f1273bafe7e1a874ef272ce00bb1d Mon Sep 17 00:00:00 2001
From: dangqingqing <dangqingqing@baidu.com>
Date: Thu, 21 Sep 2017 12:55:46 +0800
Subject: [PATCH] fix the bug in TeamCity environment.

---
 paddle/framework/operator.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/paddle/framework/operator.h b/paddle/framework/operator.h
index 4a078258d23..82a23797d47 100644
--- a/paddle/framework/operator.h
+++ b/paddle/framework/operator.h
@@ -342,10 +342,9 @@ class InferShapeContext {
     PADDLE_ENFORCE_LT(j, OutputSize(out));
     auto* in_var = MultiInputVar(in)[i];
     auto* out_var = MultiOutputVar(out)[j];
-    PADDLE_ENFORCE(in_var->IsType<LoDTensor>(),
-                   "The %d-th input of Input(%s) must be LoDTensor.", in);
+    if (!in_var->IsType<LoDTensor>()) return;
     PADDLE_ENFORCE(out_var->IsType<LoDTensor>(),
-                   "The %d-th output of Output(%s) must be LoDTensor.", out);
+                   "The %d-th output of Output(%s) must be LoDTensor.", j, out);
     auto in_tensor = in_var->Get<LoDTensor>();
     auto* out_tensor = out_var->GetMutable<LoDTensor>();
     out_tensor->set_lod(in_tensor.lod());
@@ -363,6 +362,13 @@ template <>
 const std::vector<const Tensor*> InferShapeContext::MultiInput<Tensor>(
     const std::string& name) const;
 
+template <>
+Tensor* InferShapeContext::Output<Tensor>(const std::string& name) const;
+
+template <>
+std::vector<Tensor*> InferShapeContext::MultiOutput<Tensor>(
+    const std::string& name) const;
+
 template <typename T>
 struct EigenDeviceConverter;
 
-- 
GitLab