From a63fd28be1844524f63e8202a539863dfb82b6fc Mon Sep 17 00:00:00 2001
From: Albin Joy <albin.joy@huawei.com>
Date: Wed, 13 Mar 2019 09:31:48 +0530
Subject: [PATCH 1/2] Test pad ops dynamic output subgraph

---
 tensorflow/lite/kernels/subgraph_test_util.cc   |  4 +++-
 .../lite/kernels/subgraph_test_util_test.cc     | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/tensorflow/lite/kernels/subgraph_test_util.cc b/tensorflow/lite/kernels/subgraph_test_util.cc
index e712be1b516..89377fb80cc 100644
--- a/tensorflow/lite/kernels/subgraph_test_util.cc
+++ b/tensorflow/lite/kernels/subgraph_test_util.cc
@@ -27,9 +27,11 @@ namespace tflite {
 namespace ops {
 namespace builtin {
 // ADD and MUL are used to test simple branch.
+// ADD and MUL can be used to test dynamic sized subgraphs with the
+// use of IF op.
 TfLiteRegistration* Register_ADD();
 TfLiteRegistration* Register_MUL();
-// ADD and MUL are used to test dynamic sized subgraphs.
+// PAD is used to test dynamic sized subgraphs.
 TfLiteRegistration* Register_PAD();
 TfLiteRegistration* Register_LESS_EQUAL();
 }  // namespace builtin
diff --git a/tensorflow/lite/kernels/subgraph_test_util_test.cc b/tensorflow/lite/kernels/subgraph_test_util_test.cc
index 04e5118b543..93c33805312 100644
--- a/tensorflow/lite/kernels/subgraph_test_util_test.cc
+++ b/tensorflow/lite/kernels/subgraph_test_util_test.cc
@@ -17,6 +17,7 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include "tensorflow/lite/interpreter.h"
 #include "tensorflow/lite/kernels/test_util.h"
+#include "tensorflow/lite/kernels/kernel_util.h"
 
 namespace tflite {
 
@@ -106,6 +107,22 @@ TEST_F(SubgraphBuilderTest, TestBuildPadSubgraph) {
   CheckIntTensor(output, {5}, {0, 5, 7, 0, 0});
 }
 
+TEST_F(SubgraphBuilderTest, TestBuildDynamicPadSubgraph) {
+  builder_->BuildPadSubgraph(&interpreter_->primary_subgraph());
+
+  interpreter_->ResizeInputTensor(interpreter_->inputs()[0], {2});
+  interpreter_->ResizeInputTensor(interpreter_->inputs()[1], {1, 2});
+  ASSERT_EQ(interpreter_->AllocateTensors(), kTfLiteOk);
+
+  FillIntTensor(interpreter_->tensor(interpreter_->inputs()[0]), {5, 7});
+  FillIntTensor(interpreter_->tensor(interpreter_->inputs()[1]), {1, 2});
+  ASSERT_EQ(interpreter_->Invoke(), kTfLiteOk);
+
+  TfLiteTensor* output = interpreter_->tensor(interpreter_->outputs()[0]);
+  EXPECT_TRUE(IsDynamicTensor(output));
+  CheckIntTensor(output, {5}, {0, 5, 7, 0, 0});
+}
+
 TEST_F(SubgraphBuilderTest, TestBuildLessEqualCondSubgraph) {
   builder_->BuildLessEqualCondSubgraph(&interpreter_->primary_subgraph(), 3);
 

From 6210c9916be22f2fef867c7b1716c128b9375c9a Mon Sep 17 00:00:00 2001
From: Albin Joy <albin.joy@huawei.com>
Date: Thu, 14 Mar 2019 16:44:25 +0530
Subject: [PATCH 2/2] re-ordered the headers alphabetically

---
 tensorflow/lite/kernels/subgraph_test_util_test.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/lite/kernels/subgraph_test_util_test.cc b/tensorflow/lite/kernels/subgraph_test_util_test.cc
index 93c33805312..f6c262b23ad 100644
--- a/tensorflow/lite/kernels/subgraph_test_util_test.cc
+++ b/tensorflow/lite/kernels/subgraph_test_util_test.cc
@@ -13,11 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/kernels/subgraph_test_util.h"
+
 #include <gtest/gtest.h>
 #include "tensorflow/lite/interpreter.h"
-#include "tensorflow/lite/kernels/test_util.h"
 #include "tensorflow/lite/kernels/kernel_util.h"
+#include "tensorflow/lite/kernels/subgraph_test_util.h"
+#include "tensorflow/lite/kernels/test_util.h"
 
 namespace tflite {