From 0028d1b0ce5f4c2c6a6eb3c66f38111c21eb47a3 Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Wed, 20 Feb 2019 13:57:42 +0000 Subject: IVGSVSW-2736 Rename DeserializeParser => Deserializer & fix namespaces Change-Id: I4166c0bbb5ba7f8b8884e71134c21f43d1fc27b0 Signed-off-by: Derek Lamberti --- .../armnnDeserializeParser/IDeserializeParser.hpp | 51 ---------------------- include/armnnDeserializer/IDeserializer.hpp | 50 +++++++++++++++++++++ 2 files changed, 50 insertions(+), 51 deletions(-) delete mode 100644 include/armnnDeserializeParser/IDeserializeParser.hpp create mode 100644 include/armnnDeserializer/IDeserializer.hpp (limited to 'include') diff --git a/include/armnnDeserializeParser/IDeserializeParser.hpp b/include/armnnDeserializeParser/IDeserializeParser.hpp deleted file mode 100644 index ab64dc9e14..0000000000 --- a/include/armnnDeserializeParser/IDeserializeParser.hpp +++ /dev/null @@ -1,51 +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 armnnDeserializeParser -{ - -using BindingPointInfo = std::pair; - -class IDeserializeParser; -using IDeserializeParserPtr = std::unique_ptr; - -class IDeserializeParser -{ -public: - static IDeserializeParser* CreateRaw(); - static IDeserializeParserPtr Create(); - static void Destroy(IDeserializeParser* parser); - - /// Create an input network from binary file contents - virtual armnn::INetworkPtr CreateNetworkFromBinary(const std::vector& binaryContent) = 0; - - /// Create an input network from a binary input stream - virtual armnn::INetworkPtr CreateNetworkFromBinary(std::istream& binaryContent) = 0; - - /// Retrieve binding info (layer id and tensor info) for the network input identified by - /// the given layer name and layers id - virtual BindingPointInfo GetNetworkInputBindingInfo(unsigned int layerId, - const std::string& name) const = 0; - - /// Retrieve binding info (layer id and tensor info) for the network output identified by - /// the given layer name and layers id - virtual BindingPointInfo GetNetworkOutputBindingInfo(unsigned int layerId, - const std::string& name) const = 0; - -protected: - virtual ~IDeserializeParser() {}; - -}; -} \ No newline at end of file diff --git a/include/armnnDeserializer/IDeserializer.hpp b/include/armnnDeserializer/IDeserializer.hpp new file mode 100644 index 0000000000..11e098a523 --- /dev/null +++ b/include/armnnDeserializer/IDeserializer.hpp @@ -0,0 +1,50 @@ +// +// 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 armnnDeserializer +{ +using BindingPointInfo = std::pair; + +class IDeserializer; +using IDeserializerPtr = std::unique_ptr; + +class IDeserializer +{ +public: + static IDeserializer* CreateRaw(); + static IDeserializerPtr Create(); + static void Destroy(IDeserializer* parser); + + /// Create an input network from binary file contents + virtual armnn::INetworkPtr CreateNetworkFromBinary(const std::vector& binaryContent) = 0; + + /// Create an input network from a binary input stream + virtual armnn::INetworkPtr CreateNetworkFromBinary(std::istream& binaryContent) = 0; + + /// Retrieve binding info (layer id and tensor info) for the network input identified by + /// the given layer name and layers id + virtual BindingPointInfo GetNetworkInputBindingInfo(unsigned int layerId, + const std::string& name) const = 0; + + /// Retrieve binding info (layer id and tensor info) for the network output identified by + /// the given layer name and layers id + virtual BindingPointInfo GetNetworkOutputBindingInfo(unsigned int layerId, + const std::string& name) const = 0; + +protected: + virtual ~IDeserializer() {}; + +}; +} //namespace armnnDeserializer \ No newline at end of file -- cgit v1.2.1