From b1a934877a5e04b695f8bc15f3d723891abe9c89 Mon Sep 17 00:00:00 2001
From: gracehoney <31743510+aaroey@users.noreply.github.com>
Date: Sun, 11 Feb 2018 13:01:30 -0800
Subject: [PATCH] Fix segment_test and run clang-format on trt_conversion.i.

---
 .../contrib/tensorrt/segment/segment_test.cc       |  9 ++++
 tensorflow/contrib/tensorrt/trt_conversion.i       | 52 +++++++++++-----------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/tensorflow/contrib/tensorrt/segment/segment_test.cc b/tensorflow/contrib/tensorrt/segment/segment_test.cc
index 93c113e..74cbc5f 100644
--- a/tensorflow/contrib/tensorrt/segment/segment_test.cc
+++ b/tensorflow/contrib/tensorrt/segment/segment_test.cc
@@ -117,6 +117,7 @@ TEST_F(SegmentTest, Empty) {
 
   // Expect no segments/subgraphs.
   EXPECT_TRUE(segments.empty());
+  TF_DeleteGraph(graph);
 }
 
 TEST_F(SegmentTest, Simple) {
@@ -167,6 +168,8 @@ TEST_F(SegmentTest, Simple) {
     EXPECT_TRUE(segments[0].find(ex) != segments[0].end())
         << "Missing expected node " << ex;
   }
+  TF_DeleteGraph(graph);
+  TF_DeleteStatus(s);
 }
 
 TEST_F(SegmentTest, AvoidCycle) {
@@ -214,6 +217,8 @@ TEST_F(SegmentTest, AvoidCycle) {
 
   // Expect no subgraphs
   EXPECT_EQ(segments.size(), 0);
+  TF_DeleteGraph(graph);
+  TF_DeleteStatus(s);
 }
 
 TEST_F(SegmentTest, Multiple) {
@@ -282,6 +287,8 @@ TEST_F(SegmentTest, Multiple) {
     EXPECT_TRUE(segments[1].find(ex) != segments[1].end())
         << "Missing expected node " << ex;
   }
+  TF_DeleteGraph(graph);
+  TF_DeleteStatus(s);
 }
 
 TEST_F(SegmentTest, BigIfElse) {
@@ -350,6 +357,8 @@ TEST_F(SegmentTest, BigIfElse) {
     EXPECT_TRUE(segments[1].find(ex) != segments[1].end())
         << "Missing expected node " << ex;
   }
+  TF_DeleteGraph(graph);
+  TF_DeleteStatus(s);
 }
 
 }  // namespace test
diff --git a/tensorflow/contrib/tensorrt/trt_conversion.i b/tensorflow/contrib/tensorrt/trt_conversion.i
index 40c3392..d679945 100644
--- a/tensorflow/contrib/tensorrt/trt_conversion.i
+++ b/tensorflow/contrib/tensorrt/trt_conversion.i
@@ -21,41 +21,39 @@ limitations under the License.
 %include "tensorflow/python/platform/base.i"
 
 %{
-  PyObject* pair_helper(std::pair<string,string>* in){
-    PyObject *first(nullptr), *second(nullptr), *tuple(nullptr);
-    first = PyBytes_FromStringAndSize(in->first.data(), in->first.length());
-    if(!first){
-      if(!PyErr_Occurred()){
-        PyErr_SetString(PyExc_TypeError,
-                        "Pair conversion first argument failed");
-      }
-      return NULL;
+PyObject* pair_helper(std::pair<string, string>* in) {
+  PyObject *first(nullptr), *second(nullptr), *tuple(nullptr);
+  first = PyBytes_FromStringAndSize(in->first.data(), in->first.length());
+  if (!first) {
+    if (!PyErr_Occurred()) {
+      PyErr_SetString(PyExc_TypeError, "Pair conversion first argument failed");
     }
-    second=PyBytes_FromStringAndSize(in->second.data(), in->second.length());
-    if(!second){
-      if(!PyErr_Occurred()){
-        PyErr_SetString(PyExc_TypeError,
-                        "Pair conversion second argument failed");
-      }
-      return NULL;
+    return NULL;
+  }
+  second = PyBytes_FromStringAndSize(in->second.data(), in->second.length());
+  if (!second) {
+    if (!PyErr_Occurred()) {
+      PyErr_SetString(PyExc_TypeError,
+                      "Pair conversion second argument failed");
     }
-    tuple=Py_BuildValue("(OO)", first, second);
-    if(!tuple){
-      if(!PyErr_Occurred()){
-        PyErr_SetString(PyExc_TypeError,
-                        "Tuple creation from pair<string,string> failed!");
-      }
-      return NULL;
+    return NULL;
+  }
+  tuple = Py_BuildValue("(OO)", first, second);
+  if (!tuple) {
+    if (!PyErr_Occurred()) {
+      PyErr_SetString(PyExc_TypeError,
+                      "Tuple creation from pair<string,string> failed!");
     }
-    return tuple;
+    return NULL;
   }
-
+  return tuple;
+}
 %}
 %typemap(out) std::pair<string, string> {
   PyObject *tuple = pair_helper(&$1);
-  if(!tuple) SWIG_fail;
+  if (!tuple) SWIG_fail;
   $result = tuple;
- }
+}
 %{
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
-- 
2.7.4