Removing unnecessary schema dependency from delegate unit tests.
* All of the unit tests were including the TfL schema even though it
is not used. This prevented building with delegate and not TfL parser.
* Fixing some template compile errors that were introduced when
FileComparisonExecutorTests.cpp was compiled without TfL parser.
Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I86742d57a6520ab6bd8336a683fee29de326fff5
diff --git a/delegate/test/ActivationTest.cpp b/delegate/test/ActivationTest.cpp
index 70321cd..5eafa49 100644
--- a/delegate/test/ActivationTest.cpp
+++ b/delegate/test/ActivationTest.cpp
@@ -9,7 +9,6 @@
#include <flatbuffers/flatbuffers.h>
#include <tensorflow/lite/interpreter.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ActivationTestHelper.hpp b/delegate/test/ActivationTestHelper.hpp
index 7beb53b..2bd118f 100644
--- a/delegate/test/ActivationTestHelper.hpp
+++ b/delegate/test/ActivationTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/ArgMinMaxTest.cpp b/delegate/test/ArgMinMaxTest.cpp
index 1c05503..2f08c94 100644
--- a/delegate/test/ArgMinMaxTest.cpp
+++ b/delegate/test/ArgMinMaxTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ArgMinMaxTestHelper.hpp b/delegate/test/ArgMinMaxTestHelper.hpp
index fd230ff..1086a5e 100644
--- a/delegate/test/ArgMinMaxTestHelper.hpp
+++ b/delegate/test/ArgMinMaxTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/BatchMatMulTest.cpp b/delegate/test/BatchMatMulTest.cpp
index fcf1ec2..d38e934 100644
--- a/delegate/test/BatchMatMulTest.cpp
+++ b/delegate/test/BatchMatMulTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/BatchMatMulTestHelper.hpp b/delegate/test/BatchMatMulTestHelper.hpp
index d45f438..86f1c53 100644
--- a/delegate/test/BatchMatMulTestHelper.hpp
+++ b/delegate/test/BatchMatMulTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/BatchSpaceTest.cpp b/delegate/test/BatchSpaceTest.cpp
index f4c041d..dd6047a 100644
--- a/delegate/test/BatchSpaceTest.cpp
+++ b/delegate/test/BatchSpaceTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/BatchSpaceTestHelper.hpp b/delegate/test/BatchSpaceTestHelper.hpp
index ba6afb1..8f3d76a 100644
--- a/delegate/test/BatchSpaceTestHelper.hpp
+++ b/delegate/test/BatchSpaceTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/BroadcastToTest.cpp b/delegate/test/BroadcastToTest.cpp
index f4692cf..30909b8 100644
--- a/delegate/test/BroadcastToTest.cpp
+++ b/delegate/test/BroadcastToTest.cpp
@@ -10,7 +10,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/BroadcastToTestHelper.hpp b/delegate/test/BroadcastToTestHelper.hpp
index 630fe3a..6d05863 100644
--- a/delegate/test/BroadcastToTestHelper.hpp
+++ b/delegate/test/BroadcastToTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/CastTest.cpp b/delegate/test/CastTest.cpp
index d3c3e29..e02bf2a 100644
--- a/delegate/test/CastTest.cpp
+++ b/delegate/test/CastTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/CastTestHelper.hpp b/delegate/test/CastTestHelper.hpp
index ac8f033..c169be9 100644
--- a/delegate/test/CastTestHelper.hpp
+++ b/delegate/test/CastTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/ComparisonTest.cpp b/delegate/test/ComparisonTest.cpp
index b044c27..8374025 100644
--- a/delegate/test/ComparisonTest.cpp
+++ b/delegate/test/ComparisonTest.cpp
@@ -11,7 +11,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ComparisonTestHelper.hpp b/delegate/test/ComparisonTestHelper.hpp
index a1114cb..dc471d8 100644
--- a/delegate/test/ComparisonTestHelper.hpp
+++ b/delegate/test/ComparisonTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/ControlTest.cpp b/delegate/test/ControlTest.cpp
index ec7ff88..e567d67 100644
--- a/delegate/test/ControlTest.cpp
+++ b/delegate/test/ControlTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ControlTestHelper.hpp b/delegate/test/ControlTestHelper.hpp
index 9e082a7..0b76ebe 100644
--- a/delegate/test/ControlTestHelper.hpp
+++ b/delegate/test/ControlTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/Convolution2dTest.cpp b/delegate/test/Convolution2dTest.cpp
index 4b54a14..0e11445 100644
--- a/delegate/test/Convolution2dTest.cpp
+++ b/delegate/test/Convolution2dTest.cpp
@@ -11,7 +11,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/Convolution3dTest.cpp b/delegate/test/Convolution3dTest.cpp
index fe987be..e1a0a94 100644
--- a/delegate/test/Convolution3dTest.cpp
+++ b/delegate/test/Convolution3dTest.cpp
@@ -11,7 +11,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ConvolutionTestHelper.hpp b/delegate/test/ConvolutionTestHelper.hpp
index 6a3400e..bb8852e 100644
--- a/delegate/test/ConvolutionTestHelper.hpp
+++ b/delegate/test/ConvolutionTestHelper.hpp
@@ -14,7 +14,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/DelegateOptionsTestHelper.hpp b/delegate/test/DelegateOptionsTestHelper.hpp
index 148a6d2..76d1272 100644
--- a/delegate/test/DelegateOptionsTestHelper.hpp
+++ b/delegate/test/DelegateOptionsTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/DepthwiseConvolution2dTest.cpp b/delegate/test/DepthwiseConvolution2dTest.cpp
index 5fdbfc4..755c6ec 100644
--- a/delegate/test/DepthwiseConvolution2dTest.cpp
+++ b/delegate/test/DepthwiseConvolution2dTest.cpp
@@ -11,7 +11,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ElementwiseBinaryTest.cpp b/delegate/test/ElementwiseBinaryTest.cpp
index 2f22e7d..a36708d 100644
--- a/delegate/test/ElementwiseBinaryTest.cpp
+++ b/delegate/test/ElementwiseBinaryTest.cpp
@@ -11,7 +11,7 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ElementwiseBinaryTestHelper.hpp b/delegate/test/ElementwiseBinaryTestHelper.hpp
index fc75491..e2887a2 100644
--- a/delegate/test/ElementwiseBinaryTestHelper.hpp
+++ b/delegate/test/ElementwiseBinaryTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/ElementwiseUnaryTest.cpp b/delegate/test/ElementwiseUnaryTest.cpp
index b4bdd29..14a6061 100644
--- a/delegate/test/ElementwiseUnaryTest.cpp
+++ b/delegate/test/ElementwiseUnaryTest.cpp
@@ -11,7 +11,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ElementwiseUnaryTestHelper.hpp b/delegate/test/ElementwiseUnaryTestHelper.hpp
index 7f8879b..7ef11f4 100644
--- a/delegate/test/ElementwiseUnaryTestHelper.hpp
+++ b/delegate/test/ElementwiseUnaryTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/FillTest.cpp b/delegate/test/FillTest.cpp
index a12715c..e9def8d 100644
--- a/delegate/test/FillTest.cpp
+++ b/delegate/test/FillTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/FillTestHelper.hpp b/delegate/test/FillTestHelper.hpp
index 70162c4..100aee7 100644
--- a/delegate/test/FillTestHelper.hpp
+++ b/delegate/test/FillTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/FullyConnectedTestHelper.hpp b/delegate/test/FullyConnectedTestHelper.hpp
index e9e5c09..20c1102 100644
--- a/delegate/test/FullyConnectedTestHelper.hpp
+++ b/delegate/test/FullyConnectedTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/GatherNdTest.cpp b/delegate/test/GatherNdTest.cpp
index 066248f..26dc332 100644
--- a/delegate/test/GatherNdTest.cpp
+++ b/delegate/test/GatherNdTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/GatherNdTestHelper.hpp b/delegate/test/GatherNdTestHelper.hpp
index 604b215..c8e9a72 100644
--- a/delegate/test/GatherNdTestHelper.hpp
+++ b/delegate/test/GatherNdTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/GatherTest.cpp b/delegate/test/GatherTest.cpp
index e4012b4..c49c10d 100644
--- a/delegate/test/GatherTest.cpp
+++ b/delegate/test/GatherTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/GatherTestHelper.hpp b/delegate/test/GatherTestHelper.hpp
index 43717a3..5d24cda 100644
--- a/delegate/test/GatherTestHelper.hpp
+++ b/delegate/test/GatherTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/LogicalTest.cpp b/delegate/test/LogicalTest.cpp
index 8414293..8292727 100644
--- a/delegate/test/LogicalTest.cpp
+++ b/delegate/test/LogicalTest.cpp
@@ -9,7 +9,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/LogicalTestHelper.hpp b/delegate/test/LogicalTestHelper.hpp
index 7da8ad9..9732917 100644
--- a/delegate/test/LogicalTestHelper.hpp
+++ b/delegate/test/LogicalTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/LstmTest.cpp b/delegate/test/LstmTest.cpp
index 1034a01..87b87be 100644
--- a/delegate/test/LstmTest.cpp
+++ b/delegate/test/LstmTest.cpp
@@ -8,7 +8,7 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
+
#include <doctest/doctest.h>
namespace armnnDelegate
diff --git a/delegate/test/LstmTestHelper.hpp b/delegate/test/LstmTestHelper.hpp
index 4ff5175..ce1efe0 100644
--- a/delegate/test/LstmTestHelper.hpp
+++ b/delegate/test/LstmTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/MirrorPadTest.cpp b/delegate/test/MirrorPadTest.cpp
index 14c4755..5b45986 100644
--- a/delegate/test/MirrorPadTest.cpp
+++ b/delegate/test/MirrorPadTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/NeonDelegateTests_NDK_Issue.cpp b/delegate/test/NeonDelegateTests_NDK_Issue.cpp
index 5dad598..b2651c4 100644
--- a/delegate/test/NeonDelegateTests_NDK_Issue.cpp
+++ b/delegate/test/NeonDelegateTests_NDK_Issue.cpp
@@ -9,7 +9,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/NormalizationTestHelper.hpp b/delegate/test/NormalizationTestHelper.hpp
index a9db6b8..d7930d9 100644
--- a/delegate/test/NormalizationTestHelper.hpp
+++ b/delegate/test/NormalizationTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/PackTest.cpp b/delegate/test/PackTest.cpp
index 1e7eb69..51f545c 100644
--- a/delegate/test/PackTest.cpp
+++ b/delegate/test/PackTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/PackTestHelper.hpp b/delegate/test/PackTestHelper.hpp
index 112eccb..1d032a3 100644
--- a/delegate/test/PackTestHelper.hpp
+++ b/delegate/test/PackTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/PadTest.cpp b/delegate/test/PadTest.cpp
index be54ede..17fabe6 100644
--- a/delegate/test/PadTest.cpp
+++ b/delegate/test/PadTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/PadTestHelper.hpp b/delegate/test/PadTestHelper.hpp
index c4bfd89..fefcec6 100644
--- a/delegate/test/PadTestHelper.hpp
+++ b/delegate/test/PadTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/Pooling2dTest.cpp b/delegate/test/Pooling2dTest.cpp
index ea87a29..c202a95 100644
--- a/delegate/test/Pooling2dTest.cpp
+++ b/delegate/test/Pooling2dTest.cpp
@@ -11,7 +11,7 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/Pooling2dTestHelper.hpp b/delegate/test/Pooling2dTestHelper.hpp
index d08a45b..3059f3b 100644
--- a/delegate/test/Pooling2dTestHelper.hpp
+++ b/delegate/test/Pooling2dTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/Pooling3dTest.cpp b/delegate/test/Pooling3dTest.cpp
index 85202e1..a79ee33 100644
--- a/delegate/test/Pooling3dTest.cpp
+++ b/delegate/test/Pooling3dTest.cpp
@@ -11,7 +11,7 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/Pooling3dTestHelper.hpp b/delegate/test/Pooling3dTestHelper.hpp
index 59d2e18..a23413e 100644
--- a/delegate/test/Pooling3dTestHelper.hpp
+++ b/delegate/test/Pooling3dTestHelper.hpp
@@ -16,8 +16,6 @@
#include <tensorflow/lite/kernels/custom_ops_register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/PreluTest.cpp b/delegate/test/PreluTest.cpp
index f65e15b..3240eaf 100644
--- a/delegate/test/PreluTest.cpp
+++ b/delegate/test/PreluTest.cpp
@@ -11,7 +11,7 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/PreluTestHelper.hpp b/delegate/test/PreluTestHelper.hpp
index c2a9435..fa6122f 100644
--- a/delegate/test/PreluTestHelper.hpp
+++ b/delegate/test/PreluTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/QuantizationTest.cpp b/delegate/test/QuantizationTest.cpp
index 0210602..8f9fbff 100644
--- a/delegate/test/QuantizationTest.cpp
+++ b/delegate/test/QuantizationTest.cpp
@@ -8,7 +8,7 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
+
#include <doctest/doctest.h>
diff --git a/delegate/test/QuantizationTestHelper.hpp b/delegate/test/QuantizationTestHelper.hpp
index 8554a01..9429028 100644
--- a/delegate/test/QuantizationTestHelper.hpp
+++ b/delegate/test/QuantizationTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/RedefineTestHelper.hpp b/delegate/test/RedefineTestHelper.hpp
index af9b446..c1838e0 100644
--- a/delegate/test/RedefineTestHelper.hpp
+++ b/delegate/test/RedefineTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/ReduceTest.cpp b/delegate/test/ReduceTest.cpp
index 5c031d9..f8606a8 100644
--- a/delegate/test/ReduceTest.cpp
+++ b/delegate/test/ReduceTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ReduceTestHelper.hpp b/delegate/test/ReduceTestHelper.hpp
index adbbfc3..f6acdbc 100644
--- a/delegate/test/ReduceTestHelper.hpp
+++ b/delegate/test/ReduceTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/ReshapeTest.cpp b/delegate/test/ReshapeTest.cpp
index c3df8b2..9a34173 100644
--- a/delegate/test/ReshapeTest.cpp
+++ b/delegate/test/ReshapeTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ResizeTest.cpp b/delegate/test/ResizeTest.cpp
index f3bfe43..95f4d93 100644
--- a/delegate/test/ResizeTest.cpp
+++ b/delegate/test/ResizeTest.cpp
@@ -11,7 +11,7 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ResizeTestHelper.hpp b/delegate/test/ResizeTestHelper.hpp
index ff0c413..5421082 100644
--- a/delegate/test/ResizeTestHelper.hpp
+++ b/delegate/test/ResizeTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/ReverseV2Test.cpp b/delegate/test/ReverseV2Test.cpp
index 430cf2c..e842217 100644
--- a/delegate/test/ReverseV2Test.cpp
+++ b/delegate/test/ReverseV2Test.cpp
@@ -11,7 +11,7 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/ReverseV2TestHelper.hpp b/delegate/test/ReverseV2TestHelper.hpp
index 8c4acd1..82f0bd7 100644
--- a/delegate/test/ReverseV2TestHelper.hpp
+++ b/delegate/test/ReverseV2TestHelper.hpp
@@ -14,9 +14,7 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-#include <doctest/doctest.h>
namespace
{
diff --git a/delegate/test/RoundTest.cpp b/delegate/test/RoundTest.cpp
index b4f0446..4aac1a7 100644
--- a/delegate/test/RoundTest.cpp
+++ b/delegate/test/RoundTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/RoundTestHelper.hpp b/delegate/test/RoundTestHelper.hpp
index 3aa066b..b7bd32f 100644
--- a/delegate/test/RoundTestHelper.hpp
+++ b/delegate/test/RoundTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/ShapeTestHelper.hpp b/delegate/test/ShapeTestHelper.hpp
index 42f258b..1d1da2f 100644
--- a/delegate/test/ShapeTestHelper.hpp
+++ b/delegate/test/ShapeTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/SliceTestHelper.hpp b/delegate/test/SliceTestHelper.hpp
index 19f2b3d..2e84d8d 100644
--- a/delegate/test/SliceTestHelper.hpp
+++ b/delegate/test/SliceTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/SoftmaxTest.cpp b/delegate/test/SoftmaxTest.cpp
index 27f7809..3584053 100644
--- a/delegate/test/SoftmaxTest.cpp
+++ b/delegate/test/SoftmaxTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/SoftmaxTestHelper.hpp b/delegate/test/SoftmaxTestHelper.hpp
index ffd02ab..609882d 100644
--- a/delegate/test/SoftmaxTestHelper.hpp
+++ b/delegate/test/SoftmaxTestHelper.hpp
@@ -15,8 +15,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/SpaceDepthTest.cpp b/delegate/test/SpaceDepthTest.cpp
index 8a8bbae..6cffba3 100644
--- a/delegate/test/SpaceDepthTest.cpp
+++ b/delegate/test/SpaceDepthTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/SpaceDepthTestHelper.hpp b/delegate/test/SpaceDepthTestHelper.hpp
index 912472d..6d566a6 100644
--- a/delegate/test/SpaceDepthTestHelper.hpp
+++ b/delegate/test/SpaceDepthTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/SplitTest.cpp b/delegate/test/SplitTest.cpp
index b54ce21..1d14b6d 100644
--- a/delegate/test/SplitTest.cpp
+++ b/delegate/test/SplitTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/SplitTestHelper.hpp b/delegate/test/SplitTestHelper.hpp
index 1d5f459..54c859c 100644
--- a/delegate/test/SplitTestHelper.hpp
+++ b/delegate/test/SplitTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/StridedSliceTestHelper.hpp b/delegate/test/StridedSliceTestHelper.hpp
index d3d1601..0ae6384 100644
--- a/delegate/test/StridedSliceTestHelper.hpp
+++ b/delegate/test/StridedSliceTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/TileTest.cpp b/delegate/test/TileTest.cpp
index 32f5610..ef80396 100644
--- a/delegate/test/TileTest.cpp
+++ b/delegate/test/TileTest.cpp
@@ -10,7 +10,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/TileTestHelper.hpp b/delegate/test/TileTestHelper.hpp
index f376612..0bdee9d 100644
--- a/delegate/test/TileTestHelper.hpp
+++ b/delegate/test/TileTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/TransposeConvolution2dTest.cpp b/delegate/test/TransposeConvolution2dTest.cpp
index 4630a90..b526192 100644
--- a/delegate/test/TransposeConvolution2dTest.cpp
+++ b/delegate/test/TransposeConvolution2dTest.cpp
@@ -11,7 +11,6 @@
#include <tensorflow/lite/interpreter.h>
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/model.h>
-#include <schema_generated.h>
#include <tensorflow/lite/version.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/TransposeTestHelper.hpp b/delegate/test/TransposeTestHelper.hpp
index 57f4e29..d72bb76 100644
--- a/delegate/test/TransposeTestHelper.hpp
+++ b/delegate/test/TransposeTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace
diff --git a/delegate/test/UnidirectionalSequenceLstmTest.cpp b/delegate/test/UnidirectionalSequenceLstmTest.cpp
index 7fd43fc..d4716e6 100644
--- a/delegate/test/UnidirectionalSequenceLstmTest.cpp
+++ b/delegate/test/UnidirectionalSequenceLstmTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
namespace armnnDelegate
diff --git a/delegate/test/UnidirectionalSequenceLstmTestHelper.hpp b/delegate/test/UnidirectionalSequenceLstmTestHelper.hpp
index c058d83..c27f8d8 100644
--- a/delegate/test/UnidirectionalSequenceLstmTestHelper.hpp
+++ b/delegate/test/UnidirectionalSequenceLstmTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
#include <armnn/utility/IgnoreUnused.hpp>
diff --git a/delegate/test/UnpackTest.cpp b/delegate/test/UnpackTest.cpp
index 7c4b12a..4caba84 100644
--- a/delegate/test/UnpackTest.cpp
+++ b/delegate/test/UnpackTest.cpp
@@ -8,7 +8,6 @@
#include <armnn_delegate.hpp>
#include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
#include <doctest/doctest.h>
diff --git a/delegate/test/UnpackTestHelper.hpp b/delegate/test/UnpackTestHelper.hpp
index 2d6565f..1b1ab49 100644
--- a/delegate/test/UnpackTestHelper.hpp
+++ b/delegate/test/UnpackTestHelper.hpp
@@ -14,8 +14,6 @@
#include <tensorflow/lite/kernels/register.h>
#include <tensorflow/lite/version.h>
-#include <schema_generated.h>
-
#include <doctest/doctest.h>
namespace