From 323d6f6073db309a2b50035c45a6e3ef181c73f1 Mon Sep 17 00:00:00 2001
From: Karim Nosir <karimnosseir@google.com>
Date: Thu, 26 Mar 2020 10:12:54 -0700
Subject: [PATCH] Fix compilation error and wrong version for relu in hexagon
 delegate

PiperOrigin-RevId: 303139159
Change-Id: I4abd3b23f7b01451bb292eaafc0aa00ba8866e51
---
 .../delegates/hexagon/builders/tests/mul_test.cc             | 5 +++--
 tensorflow/lite/experimental/delegates/hexagon/utils.cc      | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/mul_test.cc b/tensorflow/lite/experimental/delegates/hexagon/builders/tests/mul_test.cc
index 3fd68c30586..db7eef46150 100644
--- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/mul_test.cc
+++ b/tensorflow/lite/experimental/delegates/hexagon/builders/tests/mul_test.cc
@@ -26,8 +26,9 @@ class MulOpModel : public SingleOpModelWithHexagon {
     input1_ = AddInput(input1);
     input2_ = AddInput(input2);
     output_ = AddOutput(output);
-    SetBuiltinOp(BuiltinOperator_MUL, BuiltinOptions_MulOptions,
-                 CreateMulOptions(builder_, activation_type).Union());
+    SetBuiltinOp(
+        BuiltinOperator_MUL, BuiltinOptions_MulOptions,
+        CreateMulOptions(builder_, ActivationFunctionType_NONE).Union());
     BuildInterpreter({GetShape(input1_), GetShape(input2_)});
   }
 
diff --git a/tensorflow/lite/experimental/delegates/hexagon/utils.cc b/tensorflow/lite/experimental/delegates/hexagon/utils.cc
index b1ecde764ad..508f6657e61 100644
--- a/tensorflow/lite/experimental/delegates/hexagon/utils.cc
+++ b/tensorflow/lite/experimental/delegates/hexagon/utils.cc
@@ -67,6 +67,8 @@ bool CheckOpVersion(const TfLiteRegistration* registration) {
     case kTfLiteBuiltinDepthwiseConv2d:
     case kTfLiteBuiltinSoftmax:
       return registration->version <= 2;
+    case kTfLiteBuiltinRelu:
+      return registration->version >= 2;
     default:
       return registration->version == 1;
   }