From f1f5dfc5b8f66f2d52594283583c568ec06c045b Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Thu, 18 Jul 2019 12:56:34 -0700
Subject: [PATCH] Bump required conv2d version.

PiperOrigin-RevId: 258827317
---
 tensorflow/lite/tools/optimize/operator_property.cc  |  2 +-
 .../lite/tools/optimize/quantize_model_test.cc       | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tensorflow/lite/tools/optimize/operator_property.cc b/tensorflow/lite/tools/optimize/operator_property.cc
index ad974e7aca3..ce1927a183e 100644
--- a/tensorflow/lite/tools/optimize/operator_property.cc
+++ b/tensorflow/lite/tools/optimize/operator_property.cc
@@ -59,7 +59,7 @@ OperatorProperty GetOperatorProperty(const BuiltinOperator& op) {
       property.inputs = {{0, {}}, {1, tensor_property}};
       property.outputs = {{0, {}}};
       property.biases = {2};
-      property.version = 2;
+      property.version = 3;
       break;
     }
     case BuiltinOperator_DEPTHWISE_CONV_2D: {
diff --git a/tensorflow/lite/tools/optimize/quantize_model_test.cc b/tensorflow/lite/tools/optimize/quantize_model_test.cc
index 7de8398c287..9ee5933f2a5 100644
--- a/tensorflow/lite/tools/optimize/quantize_model_test.cc
+++ b/tensorflow/lite/tools/optimize/quantize_model_test.cc
@@ -120,7 +120,7 @@ TEST_F(QuantizeConvModelTest, TensorShapesAndStructureIsUnchanged) {
   // check op and versioning.
   EXPECT_EQ(model_.operator_codes.size(), 1);
   EXPECT_EQ(model_.operator_codes[0]->builtin_code, BuiltinOperator_CONV_2D);
-  EXPECT_EQ(model_.operator_codes[0]->version, 2);
+  EXPECT_EQ(model_.operator_codes[0]->version, 3);
 }
 
 TEST_F(QuantizeConvModelTest, OperatorsAreUnchanged) {
@@ -133,7 +133,11 @@ TEST_F(QuantizeConvModelTest, OperatorsAreUnchanged) {
     const auto float_model_op = readonly_model_->operator_codes()->Get(i);
     EXPECT_EQ(model_.operator_codes[i]->builtin_code,
               float_model_op->builtin_code());
-    EXPECT_EQ(model_.operator_codes[i]->version, 2);
+    if (model_.operator_codes[i]->builtin_code == BuiltinOperator_CONV_2D) {
+      EXPECT_EQ(model_.operator_codes[i]->version, 3);
+    } else {
+      EXPECT_EQ(model_.operator_codes[i]->version, 2);
+    }
   }
 
   ASSERT_EQ(model_.subgraphs.size(), readonly_model_->subgraphs()->size());
@@ -471,7 +475,7 @@ TEST_F(QuantizeConvModel1Test, VerifyConvQuantizationWithUnitScale) {
   // check op and versioning.
   EXPECT_EQ(model_.operator_codes.size(), 1);
   EXPECT_EQ(model_.operator_codes[0]->builtin_code, BuiltinOperator_CONV_2D);
-  EXPECT_EQ(model_.operator_codes[0]->version, 2);
+  EXPECT_EQ(model_.operator_codes[0]->version, 3);
 }
 
 class QuantizeConvModel2Test : public QuantizeModelTest {
@@ -569,7 +573,7 @@ TEST_F(QuantizeConvModel2Test, VerifyConvQuantization) {
   // check op and versioning.
   EXPECT_EQ(model_.operator_codes.size(), 1);
   EXPECT_EQ(model_.operator_codes[0]->builtin_code, BuiltinOperator_CONV_2D);
-  EXPECT_EQ(model_.operator_codes[0]->version, 2);
+  EXPECT_EQ(model_.operator_codes[0]->version, 3);
 }
 
 class QuantizeSoftmaxTest : public QuantizeModelTest {