IVGCVSW-5721 Remove the Tensorflow Parser from ArmNN

Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: Ida37d3ee3a1af0c75aa905199bd861726c646846

17 files changed, 10 insertions, 3753 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0b26384612..1531fd5f24 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,50 +16,6 @@ target_include_directories(inferenceTest PRIVATE ../src/armnnUtils)
 target_include_directories(inferenceTest PRIVATE ../src/backends)
 target_include_directories(inferenceTest PRIVATE ../third-party/stb)
 
-if(BUILD_TF_PARSER)
-    macro(TfParserTest testName sources)
-        add_executable_ex(${testName} ${sources})
-        target_include_directories(${testName} PRIVATE ../src/armnnUtils)
-        target_include_directories(${testName} PRIVATE ../src/backends)
-
-        target_link_libraries(${testName} inferenceTest)
-        target_link_libraries(${testName} armnnTfParser)
-        target_link_libraries(${testName} armnn)
-        target_link_libraries(${testName} ${CMAKE_THREAD_LIBS_INIT})
-        addDllCopyCommands(${testName})
-    endmacro()
-
-    set(TfMnist-Armnn_sources
-        TfMnist-Armnn/TfMnist-Armnn.cpp
-        MnistDatabase.hpp
-        MnistDatabase.cpp)
-    TfParserTest(TfMnist-Armnn "${TfMnist-Armnn_sources}")
-
-    set(TfCifar10-Armnn_sources
-        TfCifar10-Armnn/TfCifar10-Armnn.cpp
-        Cifar10Database.hpp
-        Cifar10Database.cpp)
-    TfParserTest(TfCifar10-Armnn "${TfCifar10-Armnn_sources}")
-
-    set(TfMobileNet-Armnn_sources
-        TfMobileNet-Armnn/TfMobileNet-Armnn.cpp
-        ImagePreprocessor.hpp
-        ImagePreprocessor.cpp)
-    TfParserTest(TfMobileNet-Armnn "${TfMobileNet-Armnn_sources}")
-
-    set(TfInceptionV3-Armnn_sources
-        TfInceptionV3-Armnn/TfInceptionV3-Armnn.cpp
-        ImagePreprocessor.hpp
-        ImagePreprocessor.cpp)
-    TfParserTest(TfInceptionV3-Armnn "${TfInceptionV3-Armnn_sources}")
-
-    set(TfResNext-Armnn_sources
-        TfResNext_Quantized-Armnn/TfResNext_Quantized-Armnn.cpp
-        ImagePreprocessor.hpp
-        ImagePreprocessor.cpp)
-    TfParserTest(TfResNext-Armnn "${TfResNext-Armnn_sources}")
-endif()
-
 if (BUILD_TF_LITE_PARSER)
     macro(TfLiteParserTest testName sources)
         add_executable_ex(${testName} ${sources})
@@ -146,6 +102,9 @@ if (BUILD_TF_LITE_PARSER)
         ImagePreprocessor.hpp
         ImagePreprocessor.cpp)
     TfLiteParserTest(TfLiteYoloV3Big-Armnn "${TfLiteYoloV3Big-Armnn_sources}")
+
+
+
 endif()
 
 if (BUILD_ONNX_PARSER)
@@ -193,9 +152,6 @@ if (BUILD_ARMNN_SERIALIZER OR BUILD_TF_PARSER OR BUILD_TF_LITE_PARSER OR BUILD_O
     if (BUILD_ARMNN_SERIALIZER)
         target_link_libraries(ExecuteNetwork armnnSerializer)
     endif()
-    if (BUILD_TF_PARSER)
-        target_link_libraries(ExecuteNetwork armnnTfParser)
-    endif()
 
     if (BUILD_TF_LITE_PARSER)
         target_link_libraries(ExecuteNetwork armnnTfLiteParser)
@@ -218,9 +174,6 @@ if(BUILD_ACCURACY_TOOL)
         if (BUILD_ARMNN_SERIALIZER)
             target_link_libraries(${executorName} armnnSerializer)
         endif()
-        if (BUILD_TF_PARSER)
-            target_link_libraries(${executorName} armnnTfParser)
-        endif()
         if (BUILD_TF_LITE_PARSER)
             target_link_libraries(${executorName} armnnTfLiteParser)
         endif()
diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp
index 8ab286b16b..60e4ec3401 100644
--- a/tests/ExecuteNetwork/ExecuteNetwork.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp
@@ -13,9 +13,6 @@
 #if defined(ARMNN_SERIALIZER)
 #include "armnnDeserializer/IDeserializer.hpp"
 #endif
-#if defined(ARMNN_TF_PARSER)
-#include "armnnTfParser/ITfParser.hpp"
-#endif
 #if defined(ARMNN_TF_LITE_PARSER)
 #include "armnnTfLiteParser/ITfLiteParser.hpp"
 #endif
@@ -478,15 +475,6 @@ int main(int argc, const char* argv[])
         return EXIT_FAILURE;
     #endif
     }
-    else if (modelFormat.find("tensorflow") != std::string::npos)
-    {
-    #if defined(ARMNN_TF_PARSER)
-        return MainImpl<armnnTfParser::ITfParser, float>(ProgramOptions.m_ExNetParams, runtime);
-    #else
-        ARMNN_LOG(fatal) << "Not built with Tensorflow parser support.";
-        return EXIT_FAILURE;
-    #endif
-    }
     else if(modelFormat.find("tflite") != std::string::npos)
     {
         if (ProgramOptions.m_ExNetParams.m_TfLiteExecutor == ExecuteNetworkParams::TfLiteExecutor::ArmNNTfLiteParser)
@@ -514,7 +502,7 @@ int main(int argc, const char* argv[])
     else
     {
         ARMNN_LOG(fatal) << "Unknown model format: '" << modelFormat
-                         << "'. Please include 'tensorflow', 'tflite' or 'onnx'";
+                         << "'. Please include 'tflite' or 'onnx'";
         return EXIT_FAILURE;
     }
 }
diff --git a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
index 7c1db61841..286c970d72 100644
--- a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
@@ -173,8 +173,7 @@ ProgramOptions::ProgramOptions() : m_CxxOptions{"ExecuteNetwork",
                  cxxopts::value<std::vector<std::string>>())
 
                 ("f,model-format",
-                 "armnn-binary, onnx-binary, onnx-text, tflite-binary, tensorflow-binary or "
-                 "tensorflow-text.",
+                 "armnn-binary, onnx-binary, onnx-text, tflite-binary",
                  cxxopts::value<std::string>())
 
                 ("m,model-path",
diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.hpp b/tests/ImageTensorGenerator/ImageTensorGenerator.hpp
index f2ee470a7a..5aa2ca8124 100644
--- a/tests/ImageTensorGenerator/ImageTensorGenerator.hpp
+++ b/tests/ImageTensorGenerator/ImageTensorGenerator.hpp
@@ -24,8 +24,7 @@ struct NormalizationParameters
 
 enum class SupportedFrontend
 {
-    TensorFlow = 0,
-    TFLite     = 1,
+    TFLite     = 0,
 };
 
 /** Get normalization parameters.
@@ -45,7 +44,6 @@ NormalizationParameters GetNormalizationParameters(const SupportedFrontend& mode
     normParams.stddev = { 1.0, 1.0, 1.0 };
     switch (modelFormat)
     {
-        case SupportedFrontend::TensorFlow:
         case SupportedFrontend::TFLite:
         default:
             switch (outputType)
diff --git a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp
index 345a0fed98..e1a637a2d1 100644
--- a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp
+++ b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp
@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
                     "Path to armnn format model file",
                     cxxopts::value<std::string>(modelPath))
                 ("f,model-format",
-                    "The model format. Supported values: tensorflow, tflite",
+                    "The model format. Supported values: tflite",
                     cxxopts::value<std::string>(modelFormat))
                 ("i,input-name",
                     "Identifier of the input tensors in the network separated by comma with no space.",
@@ -312,11 +312,7 @@ int main(int argc, char* argv[])
             const unsigned int batchSize = 1;
             // Get normalisation parameters
             SupportedFrontend modelFrontend;
-            if (modelFormat == "tensorflow")
-            {
-                modelFrontend = SupportedFrontend::TensorFlow;
-            }
-            else if (modelFormat == "tflite")
+            if (modelFormat == "tflite")
             {
                 modelFrontend = SupportedFrontend::TFLite;
             }
diff --git a/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp b/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp
index 9c51d3f0a7..133b8d885f 100644
--- a/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp
+++ b/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp
@@ -6,7 +6,7 @@
 #include "armnn/ArmNN.hpp"
 #include "armnn/Utils.hpp"
 #include "armnn/INetwork.hpp"
-#include "armnnTfParser/TfParser.hpp"
+#include "armnnTfLiteParser/TfLiteParser.hpp"
 #include "../Cifar10Database.hpp"
 #include "../InferenceTest.hpp"
 #include "../InferenceModel.hpp"
@@ -123,7 +123,7 @@ int main(int argc, char* argv[])
         };
         std::vector<Net> networks;
 
-        armnnTfParser::ITfParserPtr parser(armnnTfParser::ITfParser::Create());
+        armnnTfLiteParser::ITfLiteParserPtr parser(armnnTfLiteParser::ITfLiteParserPtr::Create());
 
         const int networksCount = 4;
         for (int i = 0; i < networksCount; ++i)
diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp
index 74c878304d..e5da1491b6 100644
--- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp
+++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp
@@ -12,9 +12,6 @@
 #if defined(ARMNN_SERIALIZER)
 #include "armnnDeserializer/IDeserializer.hpp"
 #endif
-#if defined(ARMNN_TF_PARSER)
-#include "armnnTfParser/ITfParser.hpp"
-#endif
 #if defined(ARMNN_TF_LITE_PARSER)
 #include "armnnTfLiteParser/ITfLiteParser.hpp"
 #endif
diff --git a/tests/TfCifar10-Armnn/TfCifar10-Armnn.cpp b/tests/TfCifar10-Armnn/TfCifar10-Armnn.cpp
deleted file mode 100644
index 6a88af29a6..0000000000
--- a/tests/TfCifar10-Armnn/TfCifar10-Armnn.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#include "../InferenceTest.hpp"
-#include "../Cifar10Database.hpp"
-#include "armnnTfParser/ITfParser.hpp"
-
-int main(int argc, char* argv[])
-{
-    armnn::TensorShape inputTensorShape({ 1, 32, 32, 3 });
-
-    int retVal = EXIT_FAILURE;
-    try
-    {
-        using DataType = float;
-        using DatabaseType = Cifar10Database;
-        using ParserType = armnnTfParser::ITfParser;
-        using ModelType = InferenceModel<ParserType, DataType>;
-
-        // Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions.
-        retVal = armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>(
-                     argc, argv, "cifar10_tf.prototxt", false,
-                     "data", "prob", { 0, 1, 2, 4, 7 },
-                     [](const char* dataDir, const ModelType&) {
-                         return DatabaseType(dataDir, true);
-                     }, &inputTensorShape);
-    }
-    catch (const std::exception& e)
-    {
-        // Coverity fix: BOOST_LOG_TRIVIAL (typically used to report errors) may throw an
-        // exception of type std::length_error.
-        // Using stderr instead in this context as there is no point in nesting try-catch blocks here.
-        std::cerr << "WARNING: TfCifar10-Armnn: An error has occurred when running "
-                     "the classifier inference tests: " << e.what() << std::endl;
-    }
-    return retVal;
-}
diff --git a/tests/TfCifar10-Armnn/Validation.txt b/tests/TfCifar10-Armnn/Validation.txt
deleted file mode 100644
index a7b59465eb..0000000000
--- a/tests/TfCifar10-Armnn/Validation.txt
+++ /dev/null
@@ -1,1000 +0,0 @@
-3
-8
-8
-8
-6
-8
-5
-6
-3
-8
-0
-9
-5
-7
-9
-8
-5
-7
-8
-6
-7
-0
-8
-9
-4
-3
-3
-0
-9
-6
-6
-5
-8
-3
-9
-3
-7
-9
-9
-5
-0
-6
-7
-3
-0
-9
-3
-8
-7
-2
-9
-8
-5
-5
-8
-8
-7
-5
-5
-3
-7
-5
-2
-3
-6
-7
-8
-0
-3
-7
-0
-3
-8
-8
-0
-2
-0
-8
-5
-8
-8
-0
-1
-7
-3
-0
-3
-3
-8
-9
-0
-2
-8
-6
-7
-3
-6
-0
-0
-7
-8
-5
-6
-3
-1
-1
-3
-6
-8
-7
-5
-0
-2
-3
-0
-3
-0
-3
-7
-5
-8
-0
-1
-2
-8
-8
-8
-3
-6
-0
-4
-1
-8
-9
-1
-0
-9
-4
-2
-8
-3
-5
-6
-5
-8
-0
-6
-5
-5
-5
-8
-9
-5
-0
-0
-5
-0
-9
-5
-4
-0
-0
-0
-6
-0
-0
-8
-8
-5
-8
-9
-0
-8
-8
-9
-9
-3
-7
-5
-0
-0
-5
-2
-8
-0
-8
-5
-3
-3
-8
-5
-8
-0
-1
-7
-3
-8
-8
-7
-8
-5
-0
-8
-0
-1
-3
-8
-5
-7
-8
-7
-0
-5
-8
-8
-0
-7
-9
-8
-2
-7
-5
-8
-5
-5
-9
-8
-0
-3
-6
-5
-1
-7
-8
-8
-0
-4
-0
-5
-3
-1
-1
-8
-3
-0
-8
-1
-8
-2
-0
-5
-5
-9
-9
-2
-8
-3
-0
-8
-9
-8
-8
-3
-3
-0
-8
-8
-4
-7
-0
-0
-3
-6
-3
-8
-0
-0
-3
-2
-5
-9
-0
-6
-1
-0
-9
-8
-8
-7
-9
-8
-2
-6
-9
-3
-0
-6
-0
-0
-6
-6
-3
-3
-8
-8
-8
-8
-3
-1
-0
-8
-6
-0
-0
-8
-0
-7
-7
-5
-5
-3
-3
-2
-0
-5
-0
-7
-7
-3
-6
-1
-9
-3
-6
-6
-9
-3
-8
-0
-7
-0
-6
-2
-5
-8
-5
-7
-6
-8
-9
-9
-1
-8
-2
-3
-7
-5
-2
-8
-0
-9
-5
-8
-8
-9
-4
-0
-5
-8
-0
-0
-7
-9
-3
-2
-7
-3
-7
-8
-6
-6
-9
-0
-8
-5
-0
-7
-3
-5
-5
-1
-2
-6
-2
-3
-6
-2
-3
-0
-8
-9
-8
-7
-8
-8
-4
-0
-8
-8
-3
-5
-8
-3
-8
-1
-9
-0
-5
-5
-7
-4
-7
-8
-0
-0
-9
-3
-7
-0
-6
-3
-3
-8
-7
-3
-7
-8
-5
-3
-8
-1
-3
-9
-8
-8
-7
-3
-0
-0
-0
-2
-9
-7
-0
-8
-3
-4
-5
-3
-8
-5
-6
-8
-7
-3
-8
-4
-3
-7
-8
-5
-7
-8
-8
-3
-7
-4
-0
-5
-4
-3
-6
-0
-8
-5
-8
-9
-9
-8
-0
-0
-0
-0
-1
-8
-8
-0
-5
-2
-0
-4
-0
-5
-2
-9
-4
-7
-9
-0
-4
-5
-6
-8
-9
-5
-5
-8
-9
-3
-8
-5
-7
-0
-7
-0
-5
-0
-0
-0
-6
-8
-8
-9
-5
-6
-3
-6
-3
-9
-8
-1
-7
-0
-7
-5
-9
-0
-6
-5
-5
-3
-3
-8
-3
-9
-8
-6
-4
-3
-2
-0
-7
-6
-0
-2
-3
-9
-5
-8
-0
-6
-7
-8
-3
-6
-8
-8
-8
-7
-5
-4
-0
-8
-4
-0
-8
-3
-5
-8
-9
-6
-9
-2
-3
-0
-0
-7
-8
-8
-3
-8
-5
-0
-2
-1
-6
-3
-4
-3
-9
-6
-9
-8
-8
-5
-8
-6
-3
-2
-1
-7
-7
-1
-2
-7
-9
-9
-4
-4
-0
-8
-3
-2
-8
-7
-0
-8
-3
-0
-3
-3
-8
-0
-7
-9
-1
-8
-0
-4
-5
-3
-9
-3
-0
-8
-0
-1
-5
-4
-1
-8
-0
-7
-6
-3
-0
-9
-0
-8
-2
-6
-3
-2
-3
-0
-0
-3
-8
-0
-3
-9
-6
-8
-0
-9
-2
-8
-2
-3
-0
-3
-2
-2
-7
-8
-3
-8
-0
-7
-5
-7
-0
-4
-8
-7
-4
-8
-3
-8
-8
-6
-0
-8
-7
-4
-3
-3
-8
-4
-8
-7
-8
-8
-9
-8
-8
-1
-3
-3
-5
-5
-0
-7
-9
-8
-0
-8
-4
-1
-3
-5
-7
-8
-7
-8
-7
-4
-6
-2
-5
-8
-0
-8
-1
-2
-0
-6
-8
-2
-1
-3
-5
-6
-0
-1
-2
-0
-8
-3
-0
-5
-0
-6
-8
-0
-2
-7
-6
-0
-6
-9
-1
-7
-8
-7
-0
-3
-9
-7
-8
-0
-0
-3
-3
-7
-5
-4
-8
-8
-8
-7
-1
-2
-7
-4
-4
-8
-4
-7
-7
-3
-2
-7
-2
-0
-8
-8
-5
-8
-0
-8
-2
-0
-8
-7
-5
-0
-8
-5
-0
-0
-8
-2
-2
-2
-8
-9
-2
-7
-2
-7
-0
-7
-2
-1
-0
-0
-0
-8
-4
-7
-9
-8
-0
-0
-7
-7
-0
-7
-8
-4
-4
-3
-5
-0
-1
-3
-7
-0
-1
-8
-1
-4
-2
-3
-8
-4
-5
-0
-7
-8
-8
-3
-0
-8
-8
-8
-8
-8
-4
-3
-6
-7
-3
-1
-8
-3
-7
-7
-5
-5
-6
-6
-5
-8
-8
-1
-6
-8
-8
-3
-3
-3
-2
-0
-1
-8
-8
-8
-0
-0
-9
-9
-3
-3
-5
-8
-3
-0
-0
-4
-2
-3
-3
-7
-3
-0
-5
-8
-8
-9
-8
-5
-4
-8
-3
-0
-8
-7
-8
-3
-9
-2
-8
-4
-7
-8
-3
-7
-8
-8
-8
-8
-3
-6
-3
-3
-8
-1
-9
-9
-4
-6
-8
-0
-0
-0
-8
-8
-9
-2
-8
-8
-8
-7
-8
-3
-1
-7
-0
-1
-5
-8
-3
-3
-3
-8
-9
-3
-8
diff --git a/tests/TfInceptionV3-Armnn/TfInceptionV3-Armnn.cpp b/tests/TfInceptionV3-Armnn/TfInceptionV3-Armnn.cpp
deleted file mode 100644
index 7208872204..0000000000
--- a/tests/TfInceptionV3-Armnn/TfInceptionV3-Armnn.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#include "../InferenceTest.hpp"
-#include "../ImagePreprocessor.hpp"
-#include "armnnTfParser/ITfParser.hpp"
-
-int main(int argc, char* argv[])
-{
-    int retVal = EXIT_FAILURE;
-    try
-    {
-        // Coverity fix: The following code may throw an exception of type std::length_error.
-        std::vector<ImageSet> imageSet =
-        {
-            { "Dog.jpg", 208 },
-            // Top five predictions in tensorflow:
-            // -----------------------------------
-            // 208:golden retriever 0.57466376
-            // 209:Labrador retriever 0.30202731
-            // 853:tennis ball 0.0060001756
-            // 223:kuvasz 0.0053707925
-            // 160:Rhodesian ridgeback 0.0018179063
-
-            { "Cat.jpg", 283 },
-            // Top five predictions in tensorflow:
-            // -----------------------------------
-            // 283:tiger cat 0.4667799
-            // 282:tabby, tabby cat 0.32511184
-            // 286:Egyptian cat 0.1038616
-            // 288:lynx, catamount 0.0017019814
-            // 284:Persian cat 0.0011340436
-
-            { "shark.jpg", 3 },
-            // Top five predictions in tensorflow:
-            // -----------------------------------
-            // 3:great white shark, white shark, ... 0.98808634
-            // 148:grey whale, gray whale, ... 0.00070245547
-            // 234:Bouvier des Flandres, ... 0.00024639888
-            // 149:killer whale, killer, ... 0.00014115588
-            // 95:hummingbird 0.00011129203
-        };
-
-        armnn::TensorShape inputTensorShape({ 1, 299, 299, 3 });
-
-        using DataType = float;
-        using DatabaseType = ImagePreprocessor<float>;
-        using ParserType = armnnTfParser::ITfParser;
-        using ModelType = InferenceModel<ParserType, DataType>;
-
-        // Coverity fix: InferenceTestMain() may throw uncaught exceptions.
-        retVal = armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>(
-                    argc, argv, "inception_v3_2016_08_28_frozen.pb", true,
-                    "input", "InceptionV3/Predictions/Reshape_1", { 0, 1, 2, },
-                    [&imageSet](const char* dataDir, const ModelType&) {
-                        return DatabaseType(dataDir, 299, 299, imageSet);
-                    },
-                    &inputTensorShape);
-    }
-    catch (const std::exception& e)
-    {
-        // Coverity fix: BOOST_LOG_TRIVIAL (typically used to report errors) may throw an
-        // exception of type std::length_error.
-        // Using stderr instead in this context as there is no point in nesting try-catch blocks here.
-        std::cerr << "WARNING: TfInceptionV3-Armnn: An error has occurred when running "
-                     "the classifier inference tests: " << e.what() << std::endl;
-    }
-    return retVal;
-}
diff --git a/tests/TfInceptionV3-Armnn/Validation.txt b/tests/TfInceptionV3-Armnn/Validation.txt
deleted file mode 100644
index 81b64dd7c5..0000000000
--- a/tests/TfInceptionV3-Armnn/Validation.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
-208
-283
-3
diff --git a/tests/TfMnist-Armnn/TfMnist-Armnn.cpp b/tests/TfMnist-Armnn/TfMnist-Armnn.cpp
deleted file mode 100644
index d2b83061a1..0000000000
--- a/tests/TfMnist-Armnn/TfMnist-Armnn.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#include "../InferenceTest.hpp"
-#include "../MnistDatabase.hpp"
-#include "armnnTfParser/ITfParser.hpp"
-
-int main(int argc, char* argv[])
-{
-    armnn::TensorShape inputTensorShape({ 1, 784, 1, 1 });
-
-    int retVal = EXIT_FAILURE;
-    try
-    {
-        using DataType = float;
-        using DatabaseType = MnistDatabase;
-        using ParserType = armnnTfParser::ITfParser;
-        using ModelType = InferenceModel<ParserType, DataType>;
-
-        // Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions.
-        retVal = armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>(
-                     argc, argv, "simple_mnist_tf.prototxt", false,
-                     "Placeholder", "Softmax", { 0, 1, 2, 3, 4 },
-                     [](const char* dataDir, const ModelType&) {
-                         return DatabaseType(dataDir, true);
-                     },
-                     &inputTensorShape);
-    }
-    catch (const std::exception& e)
-    {
-        // Coverity fix: BOOST_LOG_TRIVIAL (typically used to report errors) may throw an
-        // exception of type std::length_error.
-        // Using stderr instead in this context as there is no point in nesting try-catch blocks here.
-        std::cerr << "WARNING: TfMnist-Armnn: An error has occurred when running "
-                     "the classifier inference tests: " << e.what() << std::endl;
-    }
-    return retVal;
-}
diff --git a/tests/TfMnist-Armnn/Validation.txt b/tests/TfMnist-Armnn/Validation.txt
deleted file mode 100644
index 175778ff07..0000000000
--- a/tests/TfMnist-Armnn/Validation.txt
+++ /dev/null
@@ -1,1000 +0,0 @@
-7
-2
-1
-0
-4
-1
-4
-9
-6
-9
-0
-6
-9
-0
-1
-5
-9
-7
-3
-4
-9
-6
-6
-5
-4
-0
-7
-4
-0
-1
-3
-1
-3
-6
-7
-2
-7
-1
-2
-1
-1
-9
-9
-2
-3
-5
-3
-2
-4
-4
-6
-3
-5
-5
-6
-0
-4
-1
-9
-5
-7
-8
-9
-2
-3
-4
-3
-4
-3
-0
-7
-0
-2
-9
-1
-7
-3
-2
-9
-7
-9
-6
-2
-7
-8
-4
-7
-3
-6
-1
-3
-6
-9
-3
-1
-4
-1
-7
-6
-9
-6
-0
-5
-4
-9
-9
-2
-1
-9
-4
-8
-1
-3
-9
-7
-9
-4
-4
-9
-2
-5
-9
-7
-6
-9
-9
-0
-5
-8
-5
-6
-6
-5
-7
-8
-1
-0
-1
-6
-9
-6
-7
-3
-1
-9
-1
-8
-2
-0
-9
-9
-9
-5
-5
-1
-5
-6
-0
-3
-9
-4
-6
-5
-4
-6
-5
-4
-5
-1
-4
-4
-7
-2
-3
-2
-7
-1
-8
-1
-8
-1
-8
-5
-0
-8
-9
-2
-5
-0
-1
-1
-1
-0
-3
-0
-5
-1
-6
-4
-2
-3
-6
-1
-1
-1
-3
-9
-5
-2
-9
-4
-5
-9
-3
-9
-0
-3
-6
-5
-5
-7
-2
-2
-7
-2
-2
-8
-4
-1
-7
-3
-3
-8
-9
-7
-9
-2
-2
-4
-1
-5
-5
-8
-7
-2
-5
-0
-2
-4
-2
-4
-5
-9
-5
-7
-7
-2
-2
-2
-0
-8
-5
-7
-7
-9
-1
-8
-1
-8
-0
-3
-0
-1
-9
-9
-4
-1
-8
-2
-1
-2
-9
-2
-5
-9
-2
-6
-4
-1
-5
-4
-2
-9
-2
-0
-4
-0
-0
-2
-8
-4
-7
-1
-2
-4
-0
-2
-9
-4
-3
-3
-0
-0
-5
-1
-9
-6
-5
-2
-5
-7
-7
-9
-3
-0
-9
-2
-0
-7
-1
-1
-2
-1
-5
-3
-2
-9
-7
-8
-6
-3
-6
-1
-3
-5
-1
-0
-5
-1
-3
-1
-5
-0
-6
-2
-8
-5
-1
-9
-9
-4
-6
-7
-2
-5
-0
-6
-5
-6
-3
-7
-2
-0
-8
-8
-5
-9
-1
-1
-4
-0
-3
-3
-7
-6
-1
-6
-2
-1
-9
-2
-8
-6
-1
-9
-5
-2
-5
-4
-4
-2
-8
-3
-9
-2
-4
-5
-0
-3
-1
-7
-7
-3
-7
-9
-7
-1
-9
-2
-1
-4
-2
-9
-2
-0
-2
-9
-1
-9
-8
-1
-8
-4
-5
-9
-7
-8
-3
-7
-6
-0
-0
-3
-0
-8
-0
-6
-9
-9
-5
-3
-3
-2
-3
-9
-1
-2
-6
-8
-0
-9
-6
-6
-6
-3
-8
-8
-2
-9
-5
-8
-9
-6
-1
-8
-4
-1
-2
-8
-3
-1
-9
-7
-5
-4
-0
-8
-9
-9
-1
-0
-5
-2
-3
-7
-2
-9
-4
-0
-6
-3
-9
-3
-2
-1
-3
-1
-5
-6
-5
-2
-8
-2
-2
-6
-2
-6
-6
-5
-4
-8
-9
-3
-1
-3
-0
-3
-8
-2
-1
-9
-6
-9
-4
-6
-4
-1
-1
-8
-2
-5
-4
-2
-3
-4
-0
-0
-2
-3
-2
-7
-1
-0
-8
-7
-4
-4
-7
-9
-6
-9
-0
-9
-8
-0
-9
-6
-0
-6
-4
-5
-9
-9
-3
-3
-9
-3
-3
-2
-7
-8
-0
-2
-2
-1
-7
-0
-6
-5
-4
-3
-2
-0
-9
-6
-3
-8
-0
-9
-9
-6
-8
-6
-8
-5
-9
-5
-6
-0
-2
-9
-0
-2
-8
-3
-1
-9
-7
-5
-1
-0
-8
-4
-6
-2
-6
-7
-9
-3
-6
-9
-8
-2
-2
-9
-2
-7
-3
-5
-9
-1
-8
-0
-2
-0
-5
-2
-1
-3
-7
-6
-7
-1
-2
-5
-8
-0
-3
-9
-9
-4
-0
-9
-1
-8
-6
-9
-7
-4
-3
-4
-9
-1
-9
-5
-1
-7
-3
-9
-7
-6
-9
-1
-3
-2
-8
-3
-3
-6
-9
-2
-4
-7
-8
-5
-1
-3
-4
-4
-3
-1
-0
-7
-7
-0
-7
-9
-9
-4
-8
-5
-5
-9
-0
-5
-2
-1
-6
-8
-4
-8
-0
-4
-0
-6
-1
-7
-3
-8
-6
-7
-2
-6
-9
-3
-1
-4
-6
-2
-5
-9
-2
-0
-6
-2
-1
-7
-3
-9
-1
-0
-5
-9
-3
-1
-1
-7
-4
-9
-9
-9
-8
-4
-0
-2
-4
-5
-1
-1
-6
-4
-7
-1
-9
-4
-2
-4
-1
-5
-5
-3
-5
-3
-1
-4
-5
-6
-8
-9
-4
-1
-9
-3
-8
-0
-3
-2
-5
-1
-2
-9
-3
-4
-4
-0
-8
-8
-3
-3
-1
-3
-3
-5
-9
-6
-3
-2
-6
-1
-3
-6
-0
-7
-2
-1
-7
-1
-4
-2
-8
-2
-1
-9
-9
-6
-1
-1
-2
-4
-3
-1
-7
-7
-4
-7
-0
-7
-3
-1
-3
-1
-0
-7
-7
-0
-3
-5
-3
-2
-9
-6
-6
-9
-2
-8
-3
-4
-2
-2
-5
-6
-0
-9
-2
-9
-2
-8
-2
-8
-8
-7
-9
-9
-3
-0
-6
-6
-3
-2
-1
-5
-2
-2
-9
-3
-0
-5
-5
-2
-8
-1
-4
-4
-6
-0
-2
-9
-1
-4
-7
-4
-7
-3
-9
-8
-8
-4
-7
-1
-2
-1
-2
-2
-3
-2
-3
-2
-3
-9
-1
-7
-4
-0
-3
-5
-5
-8
-6
-5
-0
-6
-7
-6
-6
-3
-2
-7
-9
-1
-1
-2
-4
-6
-4
-9
-5
-2
-3
-3
-4
-7
-8
-9
-1
-1
-0
-9
-1
-4
-4
-5
-4
-0
-6
-2
-3
-3
-1
-5
-1
-2
-0
-2
-8
-1
-2
-6
-7
-1
-6
-2
-3
-9
-0
-3
-2
-2
-0
-9
-9
diff --git a/tests/TfMobileNet-Armnn/TfMobileNet-Armnn.cpp b/tests/TfMobileNet-Armnn/TfMobileNet-Armnn.cpp
deleted file mode 100644
index 6748b12d9d..0000000000
--- a/tests/TfMobileNet-Armnn/TfMobileNet-Armnn.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#include "../InferenceTest.hpp"
-#include "../ImagePreprocessor.hpp"
-#include "armnnTfParser/ITfParser.hpp"
-
-int main(int argc, char* argv[])
-{
-    int retVal = EXIT_FAILURE;
-    try
-    {
-        // Coverity fix: The following code may throw an exception of type std::length_error.
-        std::vector<ImageSet> imageSet =
-        {
-            {"Dog.jpg", 209},
-            // Top five predictions in tensorflow:
-            // -----------------------------------
-            // 209:Labrador retriever 0.46392533
-            // 160:Rhodesian ridgeback 0.29911423
-            // 208:golden retriever 0.108059585
-            // 169:redbone 0.033753652
-            // 274:dingo, warrigal, warragal, ... 0.01232666
-
-            {"Cat.jpg", 283},
-            // Top five predictions in tensorflow:
-            // -----------------------------------
-            // 283:tiger cat 0.6508582
-            // 286:Egyptian cat 0.2604343
-            // 282:tabby, tabby cat 0.028786005
-            // 288:lynx, catamount 0.020673484
-            // 40:common iguana, iguana, ... 0.0080499435
-
-            {"shark.jpg", 3},
-            // Top five predictions in tensorflow:
-            // -----------------------------------
-            // 3:great white shark, white shark, ... 0.96672016
-            // 4:tiger shark, Galeocerdo cuvieri 0.028302953
-            // 149:killer whale, killer, orca, ... 0.0020228163
-            // 5:hammerhead, hammerhead shark 0.0017547971
-            // 150:dugong, Dugong dugon 0.0003968083
-        };
-
-        armnn::TensorShape inputTensorShape({ 1, 224, 224, 3  });
-
-        using DataType = float;
-        using DatabaseType = ImagePreprocessor<float>;
-        using ParserType = armnnTfParser::ITfParser;
-        using ModelType = InferenceModel<ParserType, DataType>;
-
-        // Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions.
-        retVal = armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>(
-                     argc, argv,
-                     "mobilenet_v1_1.0_224_frozen.pb",              // model name
-                     true,                                          // model is binary
-                     "input", "MobilenetV1/Predictions/Reshape_1",  // input and output tensor names
-                     { 0, 1, 2 },                                   // test images to test with as above
-                     [&imageSet](const char* dataDir, const ModelType&) {
-                         // This creates a 224x224x3 NHWC float tensor to pass to Armnn
-                         return DatabaseType(
-                             dataDir,
-                             224,
-                             224,
-                             imageSet);
-                     },
-                     &inputTensorShape);
-    }
-    catch (const std::exception& e)
-    {
-        // Coverity fix: BOOST_LOG_TRIVIAL (typically used to report errors) may throw an
-        // exception of type std::length_error.
-        // Using stderr instead in this context as there is no point in nesting try-catch blocks here.
-        std::cerr << "WARNING: TfMobileNet-Armnn: An error has occurred when running "
-                     "the classifier inference tests: " << e.what() << std::endl;
-    }
-    return retVal;
-}
diff --git a/tests/TfMobileNet-Armnn/Validation.txt b/tests/TfMobileNet-Armnn/Validation.txt
deleted file mode 100644
index 94a11bdabc..0000000000
--- a/tests/TfMobileNet-Armnn/Validation.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
-209
-283
-3
\ No newline at end of file
diff --git a/tests/TfMobileNet-Armnn/labels.txt b/tests/TfMobileNet-Armnn/labels.txt
deleted file mode 100644
index d74ff557dd..0000000000
--- a/tests/TfMobileNet-Armnn/labels.txt
+++ /dev/null
@@ -1,1001 +0,0 @@
-0:background
-1:tench, Tinca tinca
-2:goldfish, Carassius auratus
-3:great white shark, white shark, man-eater, man-eating shark, Carcharodon carcharias
-4:tiger shark, Galeocerdo cuvieri
-5:hammerhead, hammerhead shark
-6:electric ray, crampfish, numbfish, torpedo
-7:stingray
-8:cock
-9:hen
-10:ostrich, Struthio camelus
-11:brambling, Fringilla montifringilla
-12:goldfinch, Carduelis carduelis
-13:house finch, linnet, Carpodacus mexicanus
-14:junco, snowbird
-15:indigo bunting, indigo finch, indigo bird, Passerina cyanea
-16:robin, American robin, Turdus migratorius
-17:bulbul
-18:jay
-19:magpie
-20:chickadee
-21:water ouzel, dipper
-22:kite
-23:bald eagle, American eagle, Haliaeetus leucocephalus
-24:vulture
-25:great grey owl, great gray owl, Strix nebulosa
-26:European fire salamander, Salamandra salamandra
-27:common newt, Triturus vulgaris
-28:eft
-29:spotted salamander, Ambystoma maculatum
-30:axolotl, mud puppy, Ambystoma mexicanum
-31:bullfrog, Rana catesbeiana
-32:tree frog, tree-frog
-33:tailed frog, bell toad, ribbed toad, tailed toad, Ascaphus trui
-34:loggerhead, loggerhead turtle, Caretta caretta
-35:leatherback turtle, leatherback, leathery turtle, Dermochelys coriacea
-36:mud turtle
-37:terrapin
-38:box turtle, box tortoise
-39:banded gecko
-40:common iguana, iguana, Iguana iguana
-41:American chameleon, anole, Anolis carolinensis
-42:whiptail, whiptail lizard
-43:agama
-44:frilled lizard, Chlamydosaurus kingi
-45:alligator lizard
-46:Gila monster, Heloderma suspectum
-47:green lizard, Lacerta viridis
-48:African chameleon, Chamaeleo chamaeleon
-49:Komodo dragon, Komodo lizard, dragon lizard, giant lizard, Varanus komodoensis
-50:African crocodile, Nile crocodile, Crocodylus niloticus
-51:American alligator, Alligator mississipiensis
-52:triceratops
-53:thunder snake, worm snake, Carphophis amoenus
-54:ringneck snake, ring-necked snake, ring snake
-55:hognose snake, puff adder, sand viper
-56:green snake, grass snake
-57:king snake, kingsnake
-58:garter snake, grass snake
-59:water snake
-60:vine snake
-61:night snake, Hypsiglena torquata
-62:boa constrictor, Constrictor constrictor
-63:rock python, rock snake, Python sebae
-64:Indian cobra, Naja naja
-65:green mamba
-66:sea snake
-67:horned viper, cerastes, sand viper, horned asp, Cerastes cornutus
-68:diamondback, diamondback rattlesnake, Crotalus adamanteus
-69:sidewinder, horned rattlesnake, Crotalus cerastes
-70:trilobite
-71:harvestman, daddy longlegs, Phalangium opilio
-72:scorpion
-73:black and gold garden spider, Argiope aurantia
-74:barn spider, Araneus cavaticus
-75:garden spider, Aranea diademata
-76:black widow, Latrodectus mactans
-77:tarantula
-78:wolf spider, hunting spider
-79:tick
-80:centipede
-81:black grouse
-82:ptarmigan
-83:ruffed grouse, partridge, Bonasa umbellus
-84:prairie chicken, prairie grouse, prairie fowl
-85:peacock
-86:quail
-87:partridge
-88:African grey, African gray, Psittacus erithacus
-89:macaw
-90:sulphur-crested cockatoo, Kakatoe galerita, Cacatua galerita
-91:lorikeet
-92:coucal
-93:bee eater
-94:hornbill
-95:hummingbird
-96:jacamar
-97:toucan
-98:drake
-99:red-breasted merganser, Mergus serrator
-100:goose
-101:black swan, Cygnus atratus
-102:tusker
-103:echidna, spiny anteater, anteater
-104:platypus, duckbill, duckbilled platypus, duck-billed platypus, Ornithorhynchus anatinus
-105:wallaby, brush kangaroo
-106:koala, koala bear, kangaroo bear, native bear, Phascolarctos cinereus
-107:wombat
-108:jellyfish
-109:sea anemone, anemone
-110:brain coral
-111:flatworm, platyhelminth
-112:nematode, nematode worm, roundworm
-113:conch
-114:snail
-115:slug
-116:sea slug, nudibranch
-117:chiton, coat-of-mail shell, sea cradle, polyplacophore
-118:chambered nautilus, pearly nautilus, nautilus
-119:Dungeness crab, Cancer magister
-120:rock crab, Cancer irroratus
-121:fiddler crab
-122:king crab, Alaska crab, Alaskan king crab, Alaska king crab, Paralithodes camtschatica
-123:American lobster, Northern lobster, Maine lobster, Homarus americanus
-124:spiny lobster, langouste, rock lobster, crawfish, crayfish, sea crawfish
-125:crayfish, crawfish, crawdad, crawdaddy
-126:hermit crab
-127:isopod
-128:white stork, Ciconia ciconia
-129:black stork, Ciconia nigra
-130:spoonbill
-131:flamingo
-132:little blue heron, Egretta caerulea
-133:American egret, great white heron, Egretta albus
-134:bittern
-135:crane
-136:limpkin, Aramus pictus
-137:European gallinule, Porphyrio porphyrio
-138:American coot, marsh hen, mud hen, water hen, Fulica americana
-139:bustard
-140:ruddy turnstone, Arenaria interpres
-141:red-backed sandpiper, dunlin, Erolia alpina
-142:redshank, Tringa totanus
-143:dowitcher
-144:oystercatcher, oyster catcher
-145:pelican
-146:king penguin, Aptenodytes patagonica
-147:albatross, mollymawk
-148:grey whale, gray whale, devilfish, Eschrichtius gibbosus, Eschrichtius robustus
-149:killer whale, killer, orca, grampus, sea wolf, Orcinus orca
-150:dugong, Dugong dugon
-151:sea lion
-152:Chihuahua
-153:Japanese spaniel
-154:Maltese dog, Maltese terrier, Maltese
-155:Pekinese, Pekingese, Peke
-156:Shih-Tzu
-157:Blenheim spaniel
-158:papillon
-159:toy terrier
-160:Rhodesian ridgeback
-161:Afghan hound, Afghan
-162:basset, basset hound
-163:beagle
-164:bloodhound, sleuthhound
-165:bluetick
-166:black-and-tan coonhound
-167:Walker hound, Walker foxhound
-168:English foxhound
-169:redbone
-170:borzoi, Russian wolfhound
-171:Irish wolfhound
-172:Italian greyhound
-173:whippet
-174:Ibizan hound, Ibizan Podenco
-175:Norwegian elkhound, elkhound
-176:otterhound, otter hound
-177:Saluki, gazelle hound
-178:Scottish deerhound, deerhound
-179:Weimaraner
-180:Staffordshire bullterrier, Staffordshire bull terrier
-181:American Staffordshire terrier, Staffordshire terrier, American pit bull terrier, pit bull terrier
-182:Bedlington terrier
-183:Border terrier
-184:Kerry blue terrier
-185:Irish terrier
-186:Norfolk terrier
-187:Norwich terrier
-188:Yorkshire terrier
-189:wire-haired fox terrier
-190:Lakeland terrier
-191:Sealyham terrier, Sealyham
-192:Airedale, Airedale terrier
-193:cairn, cairn terrier
-194:Australian terrier
-195:Dandie Dinmont, Dandie Dinmont terrier
-196:Boston bull, Boston terrier
-197:miniature schnauzer
-198:giant schnauzer
-199:standard schnauzer
-200:Scotch terrier, Scottish terrier, Scottie
-201:Tibetan terrier, chrysanthemum dog
-202:silky terrier, Sydney silky
-203:soft-coated wheaten terrier
-204:West Highland white terrier
-205:Lhasa, Lhasa apso
-206:flat-coated retriever
-207:curly-coated retriever
-208:golden retriever
-209:Labrador retriever
-210:Chesapeake Bay retriever
-211:German short-haired pointer
-212:vizsla, Hungarian pointer
-213:English setter
-214:Irish setter, red setter
-215:Gordon setter
-216:Brittany spaniel
-217:clumber, clumber spaniel
-218:English springer, English springer spaniel
-219:Welsh springer spaniel
-220:cocker spaniel, English cocker spaniel, cocker
-221:Sussex spaniel
-222:Irish water spaniel
-223:kuvasz
-224:schipperke
-225:groenendael
-226:malinois
-227:briard
-228:kelpie
-229:komondor
-230:Old English sheepdog, bobtail
-231:Shetland sheepdog, Shetland sheep dog, Shetland
-232:collie
-233:Border collie
-234:Bouvier des Flandres, Bouviers des Flandres
-235:Rottweiler
-236:German shepherd, German shepherd dog, German police dog, alsatian
-237:Doberman, Doberman pinscher
-238:miniature pinscher
-239:Greater Swiss Mountain dog
-240:Bernese mountain dog
-241:Appenzeller
-242:EntleBucher
-243:boxer
-244:bull mastiff
-245:Tibetan mastiff
-246:French bulldog
-247:Great Dane
-248:Saint Bernard, St Bernard
-249:Eskimo dog, husky
-250:malamute, malemute, Alaskan malamute
-251:Siberian husky
-252:dalmatian, coach dog, carriage dog
-253:affenpinscher, monkey pinscher, monkey dog
-254:basenji
-255:pug, pug-dog
-256:Leonberg
-257:Newfoundland, Newfoundland dog
-258:Great Pyrenees
-259:Samoyed, Samoyede
-260:Pomeranian
-261:chow, chow chow
-262:keeshond
-263:Brabancon griffon
-264:Pembroke, Pembroke Welsh corgi
-265:Cardigan, Cardigan Welsh corgi
-266:toy poodle
-267:miniature poodle
-268:standard poodle
-269:Mexican hairless
-270:timber wolf, grey wolf, gray wolf, Canis lupus
-271:white wolf, Arctic wolf, Canis lupus tundrarum
-272:red wolf, maned wolf, Canis rufus, Canis niger
-273:coyote, prairie wolf, brush wolf, Canis latrans
-274:dingo, warrigal, warragal, Canis dingo
-275:dhole, Cuon alpinus
-276:African hunting dog, hyena dog, Cape hunting dog, Lycaon pictus
-277:hyena, hyaena
-278:red fox, Vulpes vulpes
-279:kit fox, Vulpes macrotis
-280:Arctic fox, white fox, Alopex lagopus
-281:grey fox, gray fox, Urocyon cinereoargenteus
-282:tabby, tabby cat
-283:tiger cat
-284:Persian cat
-285:Siamese cat, Siamese
-286:Egyptian cat
-287:cougar, puma, catamount, mountain lion, painter, panther, Felis concolor
-288:lynx, catamount
-289:leopard, Panthera pardus
-290:snow leopard, ounce, Panthera uncia
-291:jaguar, panther, Panthera onca, Felis onca
-292:lion, king of beasts, Panthera leo
-293:tiger, Panthera tigris
-294:cheetah, chetah, Acinonyx jubatus
-295:brown bear, bruin, Ursus arctos
-296:American black bear, black bear, Ursus americanus, Euarctos americanus
-297:ice bear, polar bear, Ursus Maritimus, Thalarctos maritimus
-298:sloth bear, Melursus ursinus, Ursus ursinus
-299:mongoose
-300:meerkat, mierkat
-301:tiger beetle
-302:ladybug, ladybeetle, lady beetle, ladybird, ladybird beetle
-303:ground beetle, carabid beetle
-304:long-horned beetle, longicorn, longicorn beetle
-305:leaf beetle, chrysomelid
-306:dung beetle
-307:rhinoceros beetle
-308:weevil
-309:fly
-310:bee
-311:ant, emmet, pismire
-312:grasshopper, hopper
-313:cricket
-314:walking stick, walkingstick, stick insect
-315:cockroach, roach
-316:mantis, mantid
-317:cicada, cicala
-318:leafhopper
-319:lacewing, lacewing fly
-320:dragonfly, darning needle, devil's darning needle, sewing needle, snake feeder, snake doctor, mosquito hawk, skeeter hawk
-321:damselfly
-322:admiral
-323:ringlet, ringlet butterfly
-324:monarch, monarch butterfly, milkweed butterfly, Danaus plexippus
-325:cabbage butterfly
-326:sulphur butterfly, sulfur butterfly
-327:lycaenid, lycaenid butterfly
-328:starfish, sea star
-329:sea urchin
-330:sea cucumber, holothurian
-331:wood rabbit, cottontail, cottontail rabbit
-332:hare
-333:Angora, Angora rabbit
-334:hamster
-335:porcupine, hedgehog
-336:fox squirrel, eastern fox squirrel, Sciurus niger
-337:marmot
-338:beaver
-339:guinea pig, Cavia cobaya
-340:sorrel
-341:zebra
-342:hog, pig, grunter, squealer, Sus scrofa
-343:wild boar, boar, Sus scrofa
-344:warthog
-345:hippopotamus, hippo, river horse, Hippopotamus amphibius
-346:ox
-347:water buffalo, water ox, Asiatic buffalo, Bubalus bubalis
-348:bison
-349:ram, tup
-350:bighorn, bighorn sheep, cimarron, Rocky Mountain bighorn, Rocky Mountain sheep, Ovis canadensis
-351:ibex, Capra ibex
-352:hartebeest
-353:impala, Aepyceros melampus
-354:gazelle
-355:Arabian camel, dromedary, Camelus dromedarius
-356:llama
-357:weasel
-358:mink
-359:polecat, fitch, foulmart, foumart, Mustela putorius
-360:black-footed ferret, ferret, Mustela nigripes
-361:otter
-362:skunk, polecat, wood pussy
-363:badger
-364:armadillo
-365:three-toed sloth, ai, Bradypus tridactylus
-366:orangutan, orang, orangutang, Pongo pygmaeus
-367:gorilla, Gorilla gorilla
-368:chimpanzee, chimp, Pan troglodytes
-369:gibbon, Hylobates lar
-370:siamang, Hylobates syndactylus, Symphalangus syndactylus
-371:guenon, guenon monkey
-372:patas, hussar monkey, Erythrocebus patas
-373:baboon
-374:macaque
-375:langur
-376:colobus, colobus monkey
-377:proboscis monkey, Nasalis larvatus
-378:marmoset
-379:capuchin, ringtail, Cebus capucinus
-380:howler monkey, howler
-381:titi, titi monkey
-382:spider monkey, Ateles geoffroyi
-383:squirrel monkey, Saimiri sciureus
-384:Madagascar cat, ring-tailed lemur, Lemur catta
-385:indri, indris, Indri indri, Indri brevicaudatus
-386:Indian elephant, Elephas maximus
-387:African elephant, Loxodonta africana
-388:lesser panda, red panda, panda, bear cat, cat bear, Ailurus fulgens
-389:giant panda, panda, panda bear, coon bear, Ailuropoda melanoleuca
-390:barracouta, snoek
-391:eel
-392:coho, cohoe, coho salmon, blue jack, silver salmon, Oncorhynchus kisutch
-393:rock beauty, Holocanthus tricolor
-394:anemone fish
-395:sturgeon
-396:gar, garfish, garpike, billfish, Lepisosteus osseus
-397:lionfish
-398:puffer, pufferfish, blowfish, globefish
-399:abacus
-400:abaya
-401:academic gown, academic robe, judge's robe
-402:accordion, piano accordion, squeeze box
-403:acoustic guitar
-404:aircraft carrier, carrier, flattop, attack aircraft carrier
-405:airliner
-406:airship, dirigible
-407:altar
-408:ambulance
-409:amphibian, amphibious vehicle
-410:analog clock
-411:apiary, bee house
-412:apron
-413:ashcan, trash can, garbage can, wastebin, ash bin, ash-bin, ashbin, dustbin, trash barrel, trash bin
-414:assault rifle, assault gun
-415:backpack, back pack, knapsack, packsack, rucksack, haversack
-416:bakery, bakeshop, bakehouse
-417:balance beam, beam
-418:balloon
-419:ballpoint, ballpoint pen, ballpen, Biro
-420:Band Aid
-421:banjo
-422:bannister, banister, balustrade, balusters, handrail
-423:barbell
-424:barber chair
-425:barbershop
-426:barn
-427:barometer
-428:barrel, cask
-429:barrow, garden cart, lawn cart, wheelbarrow
-430:baseball
-431:basketball
-432:bassinet
-433:bassoon
-434:bathing cap, swimming cap
-435:bath towel
-436:bathtub, bathing tub, bath, tub
-437:beach wagon, station wagon, wagon, estate car, beach waggon, station waggon, waggon
-438:beacon, lighthouse, beacon light, pharos
-439:beaker
-440:bearskin, busby, shako
-441:beer bottle
-442:beer glass
-443:bell cote, bell cot
-444:bib
-445:bicycle-built-for-two, tandem bicycle, tandem
-446:bikini, two-piece
-447:binder, ring-binder
-448:binoculars, field glasses, opera glasses
-449:birdhouse
-450:boathouse
-451:bobsled, bobsleigh, bob
-452:bolo tie, bolo, bola tie, bola
-453:bonnet, poke bonnet
-454:bookcase
-455:bookshop, bookstore, bookstall
-456:bottlecap
-457:bow
-458:bow tie, bow-tie, bowtie
-459:brass, memorial tablet, plaque
-460:brassiere, bra, bandeau
-461:breakwater, groin, groyne, mole, bulwark, seawall, jetty
-462:breastplate, aegis, egis
-463:broom
-464:bucket, pail
-465:buckle
-466:bulletproof vest
-467:bullet train, bullet
-468:butcher shop, meat market
-469:cab, hack, taxi, taxicab
-470:caldron, cauldron
-471:candle, taper, wax light
-472:cannon
-473:canoe
-474:can opener, tin opener
-475:cardigan
-476:car mirror
-477:carousel, carrousel, merry-go-round, roundabout, whirligig
-478:carpenter's kit, tool kit
-479:carton
-480:car wheel
-481:cash machine, cash dispenser, automated teller machine, automatic teller machine, automated teller, automatic teller, ATM
-482:cassette
-483:cassette player
-484:castle
-485:catamaran
-486:CD player
-487:cello, violoncello
-488:cellular telephone, cellular phone, cellphone, cell, mobile phone
-489:chain
-490:chainlink fence
-491:chain mail, ring mail, mail, chain armor, chain armour, ring armor, ring armour
-492:chain saw, chainsaw
-493:chest
-494:chiffonier, commode
-495:chime, bell, gong
-496:china cabinet, china closet
-497:Christmas stocking
-498:church, church building
-499:cinema, movie theater, movie theatre, movie house, picture palace
-500:cleaver, meat cleaver, chopper
-501:cliff dwelling
-502:cloak
-503:clog, geta, patten, sabot
-504:cocktail shaker
-505:coffee mug
-506:coffeepot
-507:coil, spiral, volute, whorl, helix
-508:combination lock
-509:computer keyboard, keypad
-510:confectionery, confectionary, candy store
-511:container ship, containership, container vessel
-512:convertible
-513:corkscrew, bottle screw
-514:cornet, horn, trumpet, trump
-515:cowboy boot
-516:cowboy hat, ten-gallon hat
-517:cradle
-518:crane
-519:crash helmet
-520:crate
-521:crib, cot
-522:Crock Pot
-523:croquet ball
-524:crutch
-525:cuirass
-526:dam, dike, dyke
-527:desk
-528:desktop computer
-529:dial telephone, dial phone
-530:diaper, nappy, napkin
-531:digital clock
-532:digital watch
-533:dining table, board
-534:dishrag, dishcloth
-535:dishwasher, dish washer, dishwashing machine
-536:disk brake, disc brake
-537:dock, dockage, docking facility
-538:dogsled, dog sled, dog sleigh
-539:dome
-540:doormat, welcome mat
-541:drilling platform, offshore rig
-542:drum, membranophone, tympan
-543:drumstick
-544:dumbbell
-545:Dutch oven
-546:electric fan, blower
-547:electric guitar
-548:electric locomotive
-549:entertainment center
-550:envelope
-551:espresso maker
-552:face powder
-553:feather boa, boa
-554:file, file cabinet, filing cabinet
-555:fireboat
-556:fire engine, fire truck
-557:fire screen, fireguard
-558:flagpole, flagstaff
-559:flute, transverse flute
-560:folding chair
-561:football helmet
-562:forklift
-563:fountain
-564:fountain pen
-565:four-poster
-566:freight car
-567:French horn, horn
-568:frying pan, frypan, skillet
-569:fur coat
-570:garbage truck, dustcart
-571:gasmask, respirator, gas helmet
-572:gas pump, gasoline pump, petrol pump, island dispenser
-573:goblet
-574:go-kart
-575:golf ball
-576:golfcart, golf cart
-577:gondola
-578:gong, tam-tam
-579:gown
-580:grand piano, grand
-581:greenhouse, nursery, glasshouse
-582:grille, radiator grille
-583:grocery store, grocery, food market, market
-584:guillotine
-585:hair slide
-586:hair spray
-587:half track
-588:hammer
-589:hamper
-590:hand blower, blow dryer, blow drier, hair dryer, hair drier
-591:hand-held computer, hand-held microcomputer
-592:handkerchief, hankie, hanky, hankey
-593:hard disc, hard disk, fixed disk
-594:harmonica, mouth organ, harp, mouth harp
-595:harp
-596:harvester, reaper
-597:hatchet
-598:holster
-599:home theater, home theatre
-600:honeycomb
-601:hook, claw
-602:hoopskirt, crinoline
-603:horizontal bar, high bar
-604:horse cart, horse-cart
-605:hourglass
-606:iPod
-607:iron, smoothing iron
-608:jack-o'-lantern
-609:jean, blue jean, denim
-610:jeep, landrover
-611:jersey, T-shirt, tee shirt
-612:jigsaw puzzle
-613:jinrikisha, ricksha, rickshaw
-614:joystick
-615:kimono
-616:knee pad
-617:knot
-618:lab coat, laboratory coat
-619:ladle
-620:lampshade, lamp shade
-621:laptop, laptop computer
-622:lawn mower, mower
-623:lens cap, lens cover
-624:letter opener, paper knife, paperknife
-625:library
-626:lifeboat
-627:lighter, light, igniter, ignitor
-628:limousine, limo
-629:liner, ocean liner
-630:lipstick, lip rouge
-631:Loafer
-632:lotion
-633:loudspeaker, speaker, speaker unit, loudspeaker system, speaker system
-634:loupe, jeweler's loupe
-635:lumbermill, sawmill
-636:magnetic compass
-637:mailbag, postbag
-638:mailbox, letter box
-639:maillot
-640:maillot, tank suit
-641:manhole cover
-642:maraca
-643:marimba, xylophone
-644:mask
-645:matchstick
-646:maypole
-647:maze, labyrinth
-648:measuring cup
-649:medicine chest, medicine cabinet
-650:megalith, megalithic structure
-651:microphone, mike
-652:microwave, microwave oven
-653:military uniform
-654:milk can
-655:minibus
-656:miniskirt, mini
-657:minivan
-658:missile
-659:mitten
-660:mixing bowl
-661:mobile home, manufactured home
-662:Model T
-663:modem
-664:monastery
-665:monitor
-666:moped
-667:mortar
-668:mortarboard
-669:mosque
-670:mosquito net
-671:motor scooter, scooter
-672:mountain bike, all-terrain bike, off-roader
-673:mountain tent
-674:mouse, computer mouse
-675:mousetrap
-676:moving van
-677:muzzle
-678:nail
-679:neck brace
-680:necklace
-681:nipple
-682:notebook, notebook computer
-683:obelisk
-684:oboe, hautboy, hautbois
-685:ocarina, sweet potato
-686:odometer, hodometer, mileometer, milometer
-687:oil filter
-688:organ, pipe organ
-689:oscilloscope, scope, cathode-ray oscilloscope, CRO
-690:overskirt
-691:oxcart
-692:oxygen mask
-693:packet
-694:paddle, boat paddle
-695:paddlewheel, paddle wheel
-696:padlock
-697:paintbrush
-698:pajama, pyjama, pj's, jammies
-699:palace
-700:panpipe, pandean pipe, syrinx
-701:paper towel
-702:parachute, chute
-703:parallel bars, bars
-704:park bench
-705:parking meter
-706:passenger car, coach, carriage
-707:patio, terrace
-708:pay-phone, pay-station
-709:pedestal, plinth, footstall
-710:pencil box, pencil case
-711:pencil sharpener
-712:perfume, essence
-713:Petri dish
-714:photocopier
-715:pick, plectrum, plectron
-716:pickelhaube
-717:picket fence, paling
-718:pickup, pickup truck
-719:pier
-720:piggy bank, penny bank
-721:pill bottle
-722:pillow
-723:ping-pong ball
-724:pinwheel
-725:pirate, pirate ship
-726:pitcher, ewer
-727:plane, carpenter's plane, woodworking plane
-728:planetarium
-729:plastic bag
-730:plate rack
-731:plow, plough
-732:plunger, plumber's helper
-733:Polaroid camera, Polaroid Land camera
-734:pole
-735:police van, police wagon, paddy wagon, patrol wagon, wagon, black Maria
-736:poncho
-737:pool table, billiard table, snooker table
-738:pop bottle, soda bottle
-739:pot, flowerpot
-740:potter's wheel
-741:power drill
-742:prayer rug, prayer mat
-743:printer
-744:prison, prison house
-745:projectile, missile
-746:projector
-747:puck, hockey puck
-748:punching bag, punch bag, punching ball, punchball
-749:purse
-750:quill, quill pen
-751:quilt, comforter, comfort, puff
-752:racer, race car, racing car
-753:racket, racquet
-754:radiator
-755:radio, wireless
-756:radio telescope, radio reflector
-757:rain barrel
-758:recreational vehicle, RV, R.V.
-759:reel
-760:reflex camera
-761:refrigerator, icebox
-762:remote control, remote
-763:restaurant, eating house, eating place, eatery
-764:revolver, six-gun, six-shooter
-765:rifle
-766:rocking chair, rocker
-767:rotisserie
-768:rubber eraser, rubber, pencil eraser
-769:rugby ball
-770:rule, ruler
-771:running shoe
-772:safe
-773:safety pin
-774:saltshaker, salt shaker
-775:sandal
-776:sarong
-777:sax, saxophone
-778:scabbard
-779:scale, weighing machine
-780:school bus
-781:schooner
-782:scoreboard
-783:screen, CRT screen
-784:screw
-785:screwdriver
-786:seat belt, seatbelt
-787:sewing machine
-788:shield, buckler
-789:shoe shop, shoe-shop, shoe store
-790:shoji
-791:shopping basket
-792:shopping cart
-793:shovel
-794:shower cap
-795:shower curtain
-796:ski
-797:ski mask
-798:sleeping bag
-799:slide rule, slipstick
-800:sliding door
-801:slot, one-armed bandit
-802:snorkel
-803:snowmobile
-804:snowplow, snowplough
-805:soap dispenser
-806:soccer ball
-807:sock
-808:solar dish, solar collector, solar furnace
-809:sombrero
-810:soup bowl
-811:space bar
-812:space heater
-813:space shuttle
-814:spatula
-815:speedboat
-816:spider web, spider's web
-817:spindle
-818:sports car, sport car
-819:spotlight, spot
-820:stage
-821:steam locomotive
-822:steel arch bridge
-823:steel drum
-824:stethoscope
-825:stole
-826:stone wall
-827:stopwatch, stop watch
-828:stove
-829:strainer
-830:streetcar, tram, tramcar, trolley, trolley car
-831:stretcher
-832:studio couch, day bed
-833:stupa, tope
-834:submarine, pigboat, sub, U-boat
-835:suit, suit of clothes
-836:sundial
-837:sunglass
-838:sunglasses, dark glasses, shades
-839:sunscreen, sunblock, sun blocker
-840:suspension bridge
-841:swab, swob, mop
-842:sweatshirt
-843:swimming trunks, bathing trunks
-844:swing
-845:switch, electric switch, electrical switch
-846:syringe
-847:table lamp
-848:tank, army tank, armored combat vehicle, armoured combat vehicle
-849:tape player
-850:teapot
-851:teddy, teddy bear
-852:television, television system
-853:tennis ball
-854:thatch, thatched roof
-855:theater curtain, theatre curtain
-856:thimble
-857:thresher, thrasher, threshing machine
-858:throne
-859:tile roof
-860:toaster
-861:tobacco shop, tobacconist shop, tobacconist
-862:toilet seat
-863:torch
-864:totem pole
-865:tow truck, tow car, wrecker
-866:toyshop
-867:tractor
-868:trailer truck, tractor trailer, trucking rig, rig, articulated lorry, semi
-869:tray
-870:trench coat
-871:tricycle, trike, velocipede
-872:trimaran
-873:tripod
-874:triumphal arch
-875:trolleybus, trolley coach, trackless trolley
-876:trombone
-877:tub, vat
-878:turnstile
-879:typewriter keyboard
-880:umbrella
-881:unicycle, monocycle
-882:upright, upright piano
-883:vacuum, vacuum cleaner
-884:vase
-885:vault
-886:velvet
-887:vending machine
-888:vestment
-889:viaduct
-890:violin, fiddle
-891:volleyball
-892:waffle iron
-893:wall clock
-894:wallet, billfold, notecase, pocketbook
-895:wardrobe, closet, press
-896:warplane, military plane
-897:washbasin, handbasin, washbowl, lavabo, wash-hand basin
-898:washer, automatic washer, washing machine
-899:water bottle
-900:water jug
-901:water tower
-902:whiskey jug
-903:whistle
-904:wig
-905:window screen
-906:window shade
-907:Windsor tie
-908:wine bottle
-909:wing
-910:wok
-911:wooden spoon
-912:wool, woolen, woollen
-913:worm fence, snake fence, snake-rail fence, Virginia fence
-914:wreck
-915:yawl
-916:yurt
-917:web site, website, internet site, site
-918:comic book
-919:crossword puzzle, crossword
-920:street sign
-921:traffic light, traffic signal, stoplight
-922:book jacket, dust cover, dust jacket, dust wrapper
-923:menu
-924:plate
-925:guacamole
-926:consomme
-927:hot pot, hotpot
-928:trifle
-929:ice cream, icecream
-930:ice lolly, lolly, lollipop, popsicle
-931:French loaf
-932:bagel, beigel
-933:pretzel
-934:cheeseburger
-935:hotdog, hot dog, red hot
-936:mashed potato
-937:head cabbage
-938:broccoli
-939:cauliflower
-940:zucchini, courgette
-941:spaghetti squash
-942:acorn squash
-943:butternut squash
-944:cucumber, cuke
-945:artichoke, globe artichoke
-946:bell pepper
-947:cardoon
-948:mushroom
-949:Granny Smith
-950:strawberry
-951:orange
-952:lemon
-953:fig
-954:pineapple, ananas
-955:banana
-956:jackfruit, jak, jack
-957:custard apple
-958:pomegranate
-959:hay
-960:carbonara
-961:chocolate sauce, chocolate syrup
-962:dough
-963:meat loaf, meatloaf
-964:pizza, pizza pie
-965:potpie
-966:burrito
-967:red wine
-968:espresso
-969:cup
-970:eggnog
-971:alp
-972:bubble
-973:cliff, drop, drop-off
-974:coral reef
-975:geyser
-976:lakeside, lakeshore
-977:promontory, headland, head, foreland
-978:sandbar, sand bar
-979:seashore, coast, seacoast, sea-coast
-980:valley, vale
-981:volcano
-982:ballplayer, baseball player
-983:groom, bridegroom
-984:scuba diver
-985:rapeseed
-986:daisy
-987:yellow lady's slipper, yellow lady-slipper, Cypripedium calceolus, Cypripedium parviflorum
-988:corn
-989:acorn
-990:hip, rose hip, rosehip
-991:buckeye, horse chestnut, conker
-992:coral fungus
-993:agaric
-994:gyromitra
-995:stinkhorn, carrion fungus
-996:earthstar
-997:hen-of-the-woods, hen of the woods, Polyporus frondosus, Grifola frondosa
-998:bolete
-999:ear, spike, capitulum
-1000:toilet tissue, toilet paper, bathroom tissue
diff --git a/tests/TfResNext_Quantized-Armnn/TfResNext_Quantized-Armnn.cpp b/tests/TfResNext_Quantized-Armnn/TfResNext_Quantized-Armnn.cpp
deleted file mode 100644
index bec2771d4b..0000000000
--- a/tests/TfResNext_Quantized-Armnn/TfResNext_Quantized-Armnn.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#include "../InferenceTest.hpp"
-#include "../ImagePreprocessor.hpp"
-#include "armnnTfParser/ITfParser.hpp"
-
-int main(int argc, char* argv[])
-{
-    int retVal = EXIT_FAILURE;
-    try
-    {
-        // Coverity fix: The following code may throw an exception of type std::length_error.
-        std::vector<ImageSet> imageSet =
-        {
-            {"ILSVRC2012_val_00000018.JPEG",  21 },
-            {"shark.jpg", 2}
-        };
-
-        armnn::TensorShape inputTensorShape({ 1, 3, 224, 224 });
-
-        using DataType = float;
-        using DatabaseType = ImagePreprocessor<DataType>;;
-        using ParserType = armnnTfParser::ITfParser;
-        using ModelType = InferenceModel<ParserType, DataType>;
-
-        // Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions.
-        retVal = armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>(
-                     argc, argv, "resnext_TF_quantized_for_armnn_team.pb", true,
-                     "inputs", "pool1", { 0, 1 },
-                     [&imageSet](const char* dataDir, const ModelType &) {
-                         return DatabaseType(dataDir, 224, 224, imageSet);
-                     },
-                     &inputTensorShape);
-    }
-    catch (const std::exception& e)
-    {
-        // Coverity fix: BOOST_LOG_TRIVIAL (typically used to report errors) may throw an
-        // exception of type std::length_error.
-        // Using stderr instead in this context as there is no point in nesting try-catch blocks here.
-        std::cerr << "WARNING: TfResNext_Quantized-Armnn: An error has occurred when running "
-                     "the classifier inference tests: " << e.what() << std::endl;
-    }
-    return retVal;
-}