From 5d955cf70ae0c5558d4f431f0fc6bd4552cd43a5 Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Mon, 19 Apr 2021 16:59:48 +0100 Subject: IVGCVSW-5721 Remove the Tensorflow Parser from ArmNN Signed-off-by: Nikhil Raj Change-Id: Ida37d3ee3a1af0c75aa905199bd861726c646846 --- tests/ExecuteNetwork/ExecuteNetwork.cpp | 14 +------------- tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp | 3 +-- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'tests/ExecuteNetwork') 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(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>()) ("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()) ("m,model-path", -- cgit v1.2.1