commit 80b4ef074239c56900ffe27ec5cc47a295deebbb
author Cathal Corbett <cathal.corbett@arm.com> Wed May 25 11:21:11 2022 +0100
committer Nikhil Raj <nikhil.raj@arm.com> Fri Aug 05 15:52:42 2022 +0100
tree a555c3fc9ecb25e0cbb15066a943f5baad2a7197
parent 91b574f57ebf90fbb6445ddc25d215029c330a13

Fix '#if defined(ARMNN_POST_TFLITE_2_3)' in TfLiteParser Conv3D test.

Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I5c68b81a67fc2b5a33cf62753351440564bb868e

delegate/include/armnn_delegate.hpp

diff --git a/delegate/include/armnn_delegate.hpp b/delegate/include/armnn_delegate.hpp
index 8aaf255..79ab4bf 100644
--- a/delegate/include/armnn_delegate.hpp
+++ b/delegate/include/armnn_delegate.hpp
@@ -17,6 +17,10 @@
 #define ARMNN_POST_TFLITE_2_3
 #endif
 
+#if TF_MAJOR_VERSION > 2 || (TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION > 4)
+#define ARMNN_POST_TFLITE_2_4
+#endif
+
 #if TF_MAJOR_VERSION > 2 || (TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION > 5)
 #define ARMNN_POST_TFLITE_2_5
 #endif

src/armnnTfLiteParser/TfLiteParser.cpp

diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp
index 91420ab..3356795 100644
--- a/src/armnnTfLiteParser/TfLiteParser.cpp
+++ b/src/armnnTfLiteParser/TfLiteParser.cpp
@@ -684,7 +684,7 @@
     m_ParserFunctions[tflite::BuiltinOperator_CONCATENATION]           = &TfLiteParserImpl::ParseConcatenation;
     m_ParserFunctions[tflite::BuiltinOperator_CONV_2D]                 = &TfLiteParserImpl::ParseConv2D;
     // Conv3D support was added in TF 2.5, so for backwards compatibility a hash define is needed.
-    #if defined(ARMNN_POST_TFLITE_2_3)
+    #if defined(ARMNN_POST_TFLITE_2_4)
     m_ParserFunctions[tflite::BuiltinOperator_CONV_3D]                 = &TfLiteParserImpl::ParseConv3D;
     #endif
     m_ParserFunctions[tflite::BuiltinOperator_CUSTOM]                  = &TfLiteParserImpl::ParseCustomOperator;
@@ -1160,7 +1160,7 @@
 }
 
 // Conv3D support was added in TF 2.5, so for backwards compatibility a hash define is needed.
-#if defined(ARMNN_POST_TFLITE_2_3)
+#if defined(ARMNN_POST_TFLITE_2_4)
 void TfLiteParserImpl::ParseConv3D(size_t subgraphIndex, size_t operatorIndex)
 {
     CHECK_MODEL(m_Model, subgraphIndex, operatorIndex);

src/armnnTfLiteParser/TfLiteParser.hpp

diff --git a/src/armnnTfLiteParser/TfLiteParser.hpp b/src/armnnTfLiteParser/TfLiteParser.hpp
index e742d30..49744a0 100644
--- a/src/armnnTfLiteParser/TfLiteParser.hpp
+++ b/src/armnnTfLiteParser/TfLiteParser.hpp
@@ -120,7 +120,7 @@
     void ParseConcatenation(size_t subgraphIndex, size_t operatorIndex);
     void ParseConv2D(size_t subgraphIndex, size_t operatorIndex);
     // Conv3D support was added in TF 2.5, so for backwards compatibility a hash define is needed.
-    #if defined(ARMNN_POST_TFLITE_2_3)
+    #if defined(ARMNN_POST_TFLITE_2_4)
     void ParseConv3D(size_t subgraphIndex, size_t operatorIndex);
     #endif
     void ParseDepthToSpace(size_t subgraphIndex, size_t operatorIndex);

src/armnnTfLiteParser/test/Conv3D.cpp

diff --git a/src/armnnTfLiteParser/test/Conv3D.cpp b/src/armnnTfLiteParser/test/Conv3D.cpp
index dd55aea..5333210 100644
--- a/src/armnnTfLiteParser/test/Conv3D.cpp
+++ b/src/armnnTfLiteParser/test/Conv3D.cpp
@@ -7,7 +7,7 @@
 #include <sstream>
 
 // Conv3D support was added in TF 2.5, so for backwards compatibility a hash define is needed.
-#if defined(ARMNN_POST_TFLITE_2_3)
+#if defined(ARMNN_POST_TFLITE_2_4)
 TEST_SUITE("TensorflowLiteParser_Conv3D")
 {
 struct SimpleConv3DFixture : public ParserFlatbuffersFixture