From: Alexandre Passos <apassos@google.com>
Date: Mon, 12 Feb 2018 18:27:18 +0000 (-0800)
Subject: Fix shape inference bug in tensorlist
X-Git-Tag: upstream/v1.7.0~31^2~793
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ae3ed1dd2096382f1bd044edfd0517d7905e0ad;p=platform%2Fupstream%2Ftensorflow.git

Fix shape inference bug in tensorlist

PiperOrigin-RevId: 185397219
---

diff --git a/tensorflow/core/ops/list_ops.cc b/tensorflow/core/ops/list_ops.cc
index fa40f41..3487c95 100644
--- a/tensorflow/core/ops/list_ops.cc
+++ b/tensorflow/core/ops/list_ops.cc
@@ -241,6 +241,7 @@ REGISTER_OP("TensorListSetItem")
       DataType t;
       TF_RETURN_IF_ERROR(c->GetAttr("element_dtype", &t));
       auto* handle_data = c->input_handle_shapes_and_types(0);
+      c->set_output(0, c->Scalar());
       if (handle_data == nullptr) {
         c->set_output_handle_shapes_and_types(0, {{c->UnknownShape(), t}});
         return Status::OK();