From a3268f13d2b7abb9ae075389b4faae2b660d4889 Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Tue, 21 Sep 2021 09:06:31 +0000
Subject: Revert "IVGCVSW-6181 patch to allow building against tflite > v2.3"

This reverts commit fc8d434bb318aebb433a2f6d8ce9c066cd9c1b1e.

Reason for revert: Causes failures in the armv8 builds need to back out and fix again later

Change-Id: I5ccdbb622caaa6413de41e1ee073f38dcabff7d8
---
 src/armnnTfLiteParser/TfLiteParser.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'src/armnnTfLiteParser/TfLiteParser.cpp')

diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp
index 0f0e67c539..bedefdec2f 100644
--- a/src/armnnTfLiteParser/TfLiteParser.cpp
+++ b/src/armnnTfLiteParser/TfLiteParser.cpp
@@ -32,8 +32,6 @@
 
 #include <fmt/format.h>
 
-#include <tensorflow/lite/version.h>
-
 #include <algorithm>
 #include <fstream>
 #include <iostream>
@@ -769,14 +767,7 @@ INetworkPtr TfLiteParserImpl::CreateNetworkFromModel()
             for (OperatorPtr const& op : subgraph->operators)
             {
                 auto const& opCodePtr = m_Model->operator_codes[op->opcode_index];
-
-// work around the introduction of the deprecated_builtin_code introduced in 2.4 in a backwards compatible manner
-#if TF_MAJOR_VERSION > 2 || (TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION > 3)
-                auto builtinCode = std::max(opCodePtr->builtin_code,
-                        static_cast<tflite::BuiltinOperator>(opCodePtr->deprecated_builtin_code));
-#else
                 auto builtinCode = opCodePtr->builtin_code;
-#endif
 
                 if (builtinCode > tflite::BuiltinOperator_MAX)
                 {
@@ -896,14 +887,7 @@ void TfLiteParserImpl::ParseUnsupportedOperator(size_t subgraphIndex, size_t ope
     const auto & operatorPtr = m_Model->subgraphs[subgraphIndex]->operators[operatorIndex];
 
     auto opcodeIndex = operatorPtr->opcode_index;
-
-// work around the introduction of the deprecated_builtin_code introduced in 2.4 in a backwards compatible manner
-#if TF_MAJOR_VERSION > 2 || (TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION > 3)
-    auto opcode      = std::max(m_Model->operator_codes[opcodeIndex]->builtin_code,
-            static_cast<tflite::BuiltinOperator>(m_Model->operator_codes[opcodeIndex]->deprecated_builtin_code));
-#else
     auto opcode      = m_Model->operator_codes[opcodeIndex]->builtin_code;
-#endif
 
     if (!m_Options || !m_Options.value().m_StandInLayerForUnsupported)
     {
-- 
cgit v1.2.1