From 6dd178f2395b34cfb360eabb0130c19ed258f5fa Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Fri, 2 Apr 2021 22:04:39 +0100 Subject: IVGCVSW-5720 Remove the Caffe Parser from ArmNN Signed-off-by: Nikhil Raj Change-Id: Ib00be204f549efa9aa5971ecf65c2dec4a10b10f --- include/armnnCaffeParser/ICaffeParser.hpp | 66 ------------------------------- include/armnnCaffeParser/Version.hpp | 29 -------------- 2 files changed, 95 deletions(-) delete mode 100644 include/armnnCaffeParser/ICaffeParser.hpp delete mode 100644 include/armnnCaffeParser/Version.hpp (limited to 'include') diff --git a/include/armnnCaffeParser/ICaffeParser.hpp b/include/armnnCaffeParser/ICaffeParser.hpp deleted file mode 100644 index 0e31ad4461..0000000000 --- a/include/armnnCaffeParser/ICaffeParser.hpp +++ /dev/null @@ -1,66 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// -#pragma once - -#include "armnn/Types.hpp" -#include "armnn/NetworkFwd.hpp" -#include "armnn/Tensor.hpp" -#include "armnn/INetwork.hpp" - -#include -#include -#include - -namespace armnnCaffeParser -{ - -using BindingPointInfo = armnn::BindingPointInfo; - -class ICaffeParser; -using ICaffeParserPtr = std::unique_ptr; - -class ICaffeParser -{ -public: - static ICaffeParser* CreateRaw(); - static ICaffeParserPtr Create(); - static void Destroy(ICaffeParser* parser); - - /// Create the network from a protobuf text file on the disk. - armnn::INetworkPtr CreateNetworkFromTextFile( - const char* graphFile, - const std::map& inputShapes, - const std::vector& requestedOutputs); - - /// Create the network from a protobuf binary file on the disk. - armnn::INetworkPtr CreateNetworkFromBinaryFile( - const char* graphFile, - const std::map& inputShapes, - const std::vector& requestedOutputs); - - /// Create the network directly from protobuf text in a string. Useful for debugging/testin.g - armnn::INetworkPtr CreateNetworkFromString( - const char* protoText, - const std::map& inputShapes, - const std::vector& requestedOutputs); - - /// Retrieve binding info (layer id and tensor info) for the network input identified by the given layer name. - BindingPointInfo GetNetworkInputBindingInfo(const std::string& name) const; - - /// Retrieve binding info (layer id and tensor info) for the network output identified by the given layer name. - BindingPointInfo GetNetworkOutputBindingInfo(const std::string& name) const; - -private: - friend class CaffeParser; - friend class RecordByRecordCaffeParser; - - ICaffeParser(); - ~ICaffeParser(); - - class CaffeParserImpl; - std::unique_ptr pCaffeParserImpl; -}; - -} \ No newline at end of file diff --git a/include/armnnCaffeParser/Version.hpp b/include/armnnCaffeParser/Version.hpp deleted file mode 100644 index 6e7ce5a539..0000000000 --- a/include/armnnCaffeParser/Version.hpp +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -namespace armnnCaffeParser -{ - -/// Macro utils -#define STRINGIFY_VALUE(s) STRINGIFY_MACRO(s) -#define STRINGIFY_MACRO(s) #s - -// CaffeParser version components -#define CAFFE_PARSER_MAJOR_VERSION 24 -#define CAFFE_PARSER_MINOR_VERSION 1 -#define CAFFE_PARSER_PATCH_VERSION 0 - -/// CAFFE_PARSER_VERSION: "X.Y.Z" -/// where: -/// X = Major version number -/// Y = Minor version number -/// Z = Patch version number -#define CAFFE_PARSER_VERSION STRINGIFY_VALUE(CAFFE_PARSER_MAJOR_VERSION) "." \ - STRINGIFY_VALUE(CAFFE_PARSER_MINOR_VERSION) "." \ - STRINGIFY_VALUE(CAFFE_PARSER_PATCH_VERSION) - -} //namespace armnnCaffeParser \ No newline at end of file -- cgit v1.2.1