diff options
| author | Finn Williams <Finn.Williams@arm.com> | 2021-01-26 22:30:06 +0000 |
|---|---|---|
| committer | finn.williams <finn.williams@arm.com> | 2021-02-01 10:28:32 +0000 |
| commit | 85d3671618f0d40b71ebbc80373389140390c2cd (patch) | |
| tree | 9c8ae5bdfdb871a828069943df4373a812ba959d | |
| parent | 244b5bf11ee077b4c3bddd3786bdb80361fc2833 (diff) | |
| download | armnn-85d3671618f0d40b71ebbc80373389140390c2cd.tar.gz | |
IVGCVSW-5593 Implement Pimpl Idiom for serialization classes
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I01c7bd314219e58f71505dcb787d606dbded914a
41 files changed, 359 insertions, 332 deletions
diff --git a/include/armnnDeserializer/IDeserializer.hpp b/include/armnnDeserializer/IDeserializer.hpp index b2e5d10b69..071e7984b7 100644 --- a/include/armnnDeserializer/IDeserializer.hpp +++ b/include/armnnDeserializer/IDeserializer.hpp @@ -32,23 +32,24 @@ public: static void Destroy(IDeserializer* parser); /// Create an input network from binary file contents - virtual armnn::INetworkPtr CreateNetworkFromBinary(const std::vector<uint8_t>& binaryContent) = 0; + armnn::INetworkPtr CreateNetworkFromBinary(const std::vector<uint8_t>& binaryContent); /// Create an input network from a binary input stream - virtual armnn::INetworkPtr CreateNetworkFromBinary(std::istream& binaryContent) = 0; + armnn::INetworkPtr CreateNetworkFromBinary(std::istream& binaryContent); /// 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; + BindingPointInfo GetNetworkInputBindingInfo(unsigned int layerId, const std::string& name) const; /// 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; + BindingPointInfo GetNetworkOutputBindingInfo(unsigned int layerId, const std::string& name) const; -protected: - virtual ~IDeserializer() {}; +private: + IDeserializer(); + ~IDeserializer(); + class DeserializerImpl; + std::unique_ptr<DeserializerImpl> pDeserializerImpl; }; } //namespace armnnDeserializer
\ No newline at end of file diff --git a/include/armnnSerializer/ISerializer.hpp b/include/armnnSerializer/ISerializer.hpp index 7d91af8afe..5c6b3cc71f 100644 --- a/include/armnnSerializer/ISerializer.hpp +++ b/include/armnnSerializer/ISerializer.hpp @@ -23,15 +23,19 @@ public: /// Serializes the network to ArmNN SerializedGraph. /// @param [in] inNetwork The network to be serialized. - virtual void Serialize(const armnn::INetwork& inNetwork) = 0; + void Serialize(const armnn::INetwork& inNetwork); /// Serializes the SerializedGraph to the stream. /// @param [stream] the stream to save to /// @return true if graph is Serialized to the Stream, false otherwise - virtual bool SaveSerializedToStream(std::ostream& stream) = 0; + bool SaveSerializedToStream(std::ostream& stream); -protected: - virtual ~ISerializer() {} +private: + ISerializer(); + ~ISerializer(); + + class SerializerImpl; + std::unique_ptr<SerializerImpl> pSerializerImpl; }; } //namespace armnnSerializer diff --git a/src/armnnDeserializer/CMakeLists.txt b/src/armnnDeserializer/CMakeLists.txt index 63917fccf8..198a9356b5 100755 --- a/src/armnnDeserializer/CMakeLists.txt +++ b/src/armnnDeserializer/CMakeLists.txt @@ -18,9 +18,9 @@ if(BUILD_ARMNN_DESERIALIZER) set(armnn_deserializer_sources) list(APPEND armnn_deserializer_sources - ArmnnSchema_generated.h - Deserializer.hpp - Deserializer.cpp + ArmnnSchema_generated.h + Deserializer.hpp + Deserializer.cpp ) add_library_ex(armnnDeserializer SHARED ${armnn_deserializer_sources}) diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 1bb004d449..14c2af4fe1 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -34,12 +34,51 @@ using namespace armnnSerializer; namespace armnnDeserializer { +IDeserializer::IDeserializer() : pDeserializerImpl(new DeserializerImpl()){} + +IDeserializer::~IDeserializer() = default; + +IDeserializer *IDeserializer::CreateRaw() +{ + return new IDeserializer(); +} + +IDeserializerPtr IDeserializer::Create() +{ + return IDeserializerPtr(CreateRaw(), &IDeserializer::Destroy); +} + +void IDeserializer::Destroy(IDeserializer *parser) +{ + delete parser; +} + +armnn::INetworkPtr IDeserializer::CreateNetworkFromBinary(const std::vector<uint8_t> &binaryContent) +{ + return pDeserializerImpl->CreateNetworkFromBinary(binaryContent); +} + +armnn::INetworkPtr IDeserializer::CreateNetworkFromBinary(std::istream &binaryContent) +{ + return pDeserializerImpl->CreateNetworkFromBinary(binaryContent); +} + +BindingPointInfo IDeserializer::GetNetworkInputBindingInfo(unsigned int layerId, const std::string &name) const +{ + return pDeserializerImpl->GetNetworkInputBindingInfo(layerId, name); +} + +BindingPointInfo IDeserializer::GetNetworkOutputBindingInfo(unsigned int layerId, const std::string &name) const +{ + return pDeserializerImpl->GetNetworkOutputBindingInfo(layerId, name); +} + namespace { const uint32_t VIRTUAL_LAYER_ID = std::numeric_limits<uint32_t>::max(); - void CheckGraph(const Deserializer::GraphPtr& graph, + void CheckGraph(const GraphPtr& graph, unsigned int layersIndex, const CheckLocation& location) { @@ -61,7 +100,7 @@ const uint32_t VIRTUAL_LAYER_ID = std::numeric_limits<uint32_t>::max(); } } -void CheckLayers(const Deserializer::GraphPtr& graph, +void CheckLayers(const GraphPtr& graph, unsigned int layersIndex, unsigned int layerIndex, const CheckLocation& location) @@ -95,7 +134,7 @@ void CheckLayers(const Deserializer::GraphPtr& graph, } } -void CheckTensorPtr(Deserializer::TensorRawPtr rawPtr, +void CheckTensorPtr(TensorRawPtr rawPtr, const CheckLocation& location) { if (rawPtr == nullptr) @@ -106,7 +145,7 @@ void CheckTensorPtr(Deserializer::TensorRawPtr rawPtr, } } -void CheckConstTensorPtr(Deserializer::ConstTensorRawPtr rawPtr, +void CheckConstTensorPtr(ConstTensorRawPtr rawPtr, const CheckLocation& location) { if (rawPtr == nullptr) @@ -164,73 +203,73 @@ bool CheckShape(const armnn::TensorShape& actual, const std::vector<uint32_t>& e return true; } -Deserializer::Deserializer() +IDeserializer::DeserializerImpl::DeserializerImpl() : m_Network(nullptr, nullptr), //May require LayerType_Max to be included -m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) +m_ParserFunctions(Layer_MAX+1, &IDeserializer::DeserializerImpl::ParseUnsupportedLayer) { // register supported layers - m_ParserFunctions[Layer_AbsLayer] = &Deserializer::ParseAbs; - m_ParserFunctions[Layer_ActivationLayer] = &Deserializer::ParseActivation; - m_ParserFunctions[Layer_AdditionLayer] = &Deserializer::ParseAdd; - m_ParserFunctions[Layer_ArgMinMaxLayer] = &Deserializer::ParseArgMinMax; - m_ParserFunctions[Layer_BatchToSpaceNdLayer] = &Deserializer::ParseBatchToSpaceNd; - m_ParserFunctions[Layer_BatchNormalizationLayer] = &Deserializer::ParseBatchNormalization; - m_ParserFunctions[Layer_ComparisonLayer] = &Deserializer::ParseComparison; - m_ParserFunctions[Layer_ConcatLayer] = &Deserializer::ParseConcat; - m_ParserFunctions[Layer_ConstantLayer] = &Deserializer::ParseConstant; - m_ParserFunctions[Layer_Convolution2dLayer] = &Deserializer::ParseConvolution2d; - m_ParserFunctions[Layer_DepthToSpaceLayer] = &Deserializer::ParseDepthToSpace; - m_ParserFunctions[Layer_DepthwiseConvolution2dLayer] = &Deserializer::ParseDepthwiseConvolution2d; - m_ParserFunctions[Layer_DequantizeLayer] = &Deserializer::ParseDequantize; - m_ParserFunctions[Layer_DetectionPostProcessLayer] = &Deserializer::ParseDetectionPostProcess; - m_ParserFunctions[Layer_DivisionLayer] = &Deserializer::ParseDivision; - m_ParserFunctions[Layer_ElementwiseUnaryLayer] = &Deserializer::ParseElementwiseUnary; - m_ParserFunctions[Layer_EqualLayer] = &Deserializer::ParseEqual; - m_ParserFunctions[Layer_FullyConnectedLayer] = &Deserializer::ParseFullyConnected; - m_ParserFunctions[Layer_FillLayer] = &Deserializer::ParseFill; - m_ParserFunctions[Layer_FloorLayer] = &Deserializer::ParseFloor; - m_ParserFunctions[Layer_GatherLayer] = &Deserializer::ParseGather; - m_ParserFunctions[Layer_GreaterLayer] = &Deserializer::ParseGreater; - m_ParserFunctions[Layer_InstanceNormalizationLayer] = &Deserializer::ParseInstanceNormalization; - m_ParserFunctions[Layer_L2NormalizationLayer] = &Deserializer::ParseL2Normalization; - m_ParserFunctions[Layer_LogicalBinaryLayer] = &Deserializer::ParseLogicalBinary; - m_ParserFunctions[Layer_LogSoftmaxLayer] = &Deserializer::ParseLogSoftmax; - m_ParserFunctions[Layer_LstmLayer] = &Deserializer::ParseLstm; - m_ParserFunctions[Layer_MaximumLayer] = &Deserializer::ParseMaximum; - m_ParserFunctions[Layer_MeanLayer] = &Deserializer::ParseMean; - m_ParserFunctions[Layer_MinimumLayer] = &Deserializer::ParseMinimum; - m_ParserFunctions[Layer_MergeLayer] = &Deserializer::ParseMerge; - m_ParserFunctions[Layer_MergerLayer] = &Deserializer::ParseConcat; - m_ParserFunctions[Layer_MultiplicationLayer] = &Deserializer::ParseMultiplication; - m_ParserFunctions[Layer_NormalizationLayer] = &Deserializer::ParseNormalization; - m_ParserFunctions[Layer_PadLayer] = &Deserializer::ParsePad; - m_ParserFunctions[Layer_PermuteLayer] = &Deserializer::ParsePermute; - m_ParserFunctions[Layer_Pooling2dLayer] = &Deserializer::ParsePooling2d; - m_ParserFunctions[Layer_PreluLayer] = &Deserializer::ParsePrelu; - m_ParserFunctions[Layer_QLstmLayer] = &Deserializer::ParseQLstm; - m_ParserFunctions[Layer_QuantizeLayer] = &Deserializer::ParseQuantize; - m_ParserFunctions[Layer_QuantizedLstmLayer] = &Deserializer::ParseQuantizedLstm; - m_ParserFunctions[Layer_RankLayer] = &Deserializer::ParseRank; - m_ParserFunctions[Layer_ReshapeLayer] = &Deserializer::ParseReshape; - m_ParserFunctions[Layer_ResizeBilinearLayer] = &Deserializer::ParseResizeBilinear; - m_ParserFunctions[Layer_ResizeLayer] = &Deserializer::ParseResize; - m_ParserFunctions[Layer_RsqrtLayer] = &Deserializer::ParseRsqrt; - m_ParserFunctions[Layer_SliceLayer] = &Deserializer::ParseSlice; - m_ParserFunctions[Layer_SoftmaxLayer] = &Deserializer::ParseSoftmax; - m_ParserFunctions[Layer_SpaceToBatchNdLayer] = &Deserializer::ParseSpaceToBatchNd; - m_ParserFunctions[Layer_SpaceToDepthLayer] = &Deserializer::ParseSpaceToDepth; - m_ParserFunctions[Layer_SplitterLayer] = &Deserializer::ParseSplitter; - m_ParserFunctions[Layer_StackLayer] = &Deserializer::ParseStack; - m_ParserFunctions[Layer_StandInLayer] = &Deserializer::ParseStandIn; - m_ParserFunctions[Layer_StridedSliceLayer] = &Deserializer::ParseStridedSlice; - m_ParserFunctions[Layer_SubtractionLayer] = &Deserializer::ParseSubtraction; - m_ParserFunctions[Layer_SwitchLayer] = &Deserializer::ParseSwitch; - m_ParserFunctions[Layer_TransposeConvolution2dLayer] = &Deserializer::ParseTransposeConvolution2d; - m_ParserFunctions[Layer_TransposeLayer] = &Deserializer::ParseTranspose; -} - -Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPtr, unsigned int layerIndex) + m_ParserFunctions[Layer_AbsLayer] = &DeserializerImpl::ParseAbs; + m_ParserFunctions[Layer_ActivationLayer] = &DeserializerImpl::ParseActivation; + m_ParserFunctions[Layer_AdditionLayer] = &DeserializerImpl::ParseAdd; + m_ParserFunctions[Layer_ArgMinMaxLayer] = &DeserializerImpl::ParseArgMinMax; + m_ParserFunctions[Layer_BatchToSpaceNdLayer] = &DeserializerImpl::ParseBatchToSpaceNd; + m_ParserFunctions[Layer_BatchNormalizationLayer] = &DeserializerImpl::ParseBatchNormalization; + m_ParserFunctions[Layer_ComparisonLayer] = &DeserializerImpl::ParseComparison; + m_ParserFunctions[Layer_ConcatLayer] = &DeserializerImpl::ParseConcat; + m_ParserFunctions[Layer_ConstantLayer] = &DeserializerImpl::ParseConstant; + m_ParserFunctions[Layer_Convolution2dLayer] = &DeserializerImpl::ParseConvolution2d; + m_ParserFunctions[Layer_DepthToSpaceLayer] = &DeserializerImpl::ParseDepthToSpace; + m_ParserFunctions[Layer_DepthwiseConvolution2dLayer] = &DeserializerImpl::ParseDepthwiseConvolution2d; + m_ParserFunctions[Layer_DequantizeLayer] = &DeserializerImpl::ParseDequantize; + m_ParserFunctions[Layer_DetectionPostProcessLayer] = &DeserializerImpl::ParseDetectionPostProcess; + m_ParserFunctions[Layer_DivisionLayer] = &DeserializerImpl::ParseDivision; + m_ParserFunctions[Layer_ElementwiseUnaryLayer] = &DeserializerImpl::ParseElementwiseUnary; + m_ParserFunctions[Layer_EqualLayer] = &DeserializerImpl::ParseEqual; + m_ParserFunctions[Layer_FullyConnectedLayer] = &DeserializerImpl::ParseFullyConnected; + m_ParserFunctions[Layer_FillLayer] = &DeserializerImpl::ParseFill; + m_ParserFunctions[Layer_FloorLayer] = &DeserializerImpl::ParseFloor; + m_ParserFunctions[Layer_GatherLayer] = &DeserializerImpl::ParseGather; + m_ParserFunctions[Layer_GreaterLayer] = &DeserializerImpl::ParseGreater; + m_ParserFunctions[Layer_InstanceNormalizationLayer] = &DeserializerImpl::ParseInstanceNormalization; + m_ParserFunctions[Layer_L2NormalizationLayer] = &DeserializerImpl::ParseL2Normalization; + m_ParserFunctions[Layer_LogicalBinaryLayer] = &DeserializerImpl::ParseLogicalBinary; + m_ParserFunctions[Layer_LogSoftmaxLayer] = &DeserializerImpl::ParseLogSoftmax; + m_ParserFunctions[Layer_LstmLayer] = &DeserializerImpl::ParseLstm; + m_ParserFunctions[Layer_MaximumLayer] = &DeserializerImpl::ParseMaximum; + m_ParserFunctions[Layer_MeanLayer] = &DeserializerImpl::ParseMean; + m_ParserFunctions[Layer_MinimumLayer] = &DeserializerImpl::ParseMinimum; + m_ParserFunctions[Layer_MergeLayer] = &DeserializerImpl::ParseMerge; + m_ParserFunctions[Layer_MergerLayer] = &DeserializerImpl::ParseConcat; + m_ParserFunctions[Layer_MultiplicationLayer] = &DeserializerImpl::ParseMultiplication; + m_ParserFunctions[Layer_NormalizationLayer] = &DeserializerImpl::ParseNormalization; + m_ParserFunctions[Layer_PadLayer] = &DeserializerImpl::ParsePad; + m_ParserFunctions[Layer_PermuteLayer] = &DeserializerImpl::ParsePermute; + m_ParserFunctions[Layer_Pooling2dLayer] = &DeserializerImpl::ParsePooling2d; + m_ParserFunctions[Layer_PreluLayer] = &DeserializerImpl::ParsePrelu; + m_ParserFunctions[Layer_QLstmLayer] = &DeserializerImpl::ParseQLstm; + m_ParserFunctions[Layer_QuantizeLayer] = &DeserializerImpl::ParseQuantize; + m_ParserFunctions[Layer_QuantizedLstmLayer] = &DeserializerImpl::ParseQuantizedLstm; + m_ParserFunctions[Layer_RankLayer] = &DeserializerImpl::ParseRank; + m_ParserFunctions[Layer_ReshapeLayer] = &DeserializerImpl::ParseReshape; + m_ParserFunctions[Layer_ResizeBilinearLayer] = &DeserializerImpl::ParseResizeBilinear; + m_ParserFunctions[Layer_ResizeLayer] = &DeserializerImpl::ParseResize; + m_ParserFunctions[Layer_RsqrtLayer] = &DeserializerImpl::ParseRsqrt; + m_ParserFunctions[Layer_SliceLayer] = &DeserializerImpl::ParseSlice; + m_ParserFunctions[Layer_SoftmaxLayer] = &DeserializerImpl::ParseSoftmax; + m_ParserFunctions[Layer_SpaceToBatchNdLayer] = &DeserializerImpl::ParseSpaceToBatchNd; + m_ParserFunctions[Layer_SpaceToDepthLayer] = &DeserializerImpl::ParseSpaceToDepth; + m_ParserFunctions[Layer_SplitterLayer] = &DeserializerImpl::ParseSplitter; + m_ParserFunctions[Layer_StackLayer] = &DeserializerImpl::ParseStack; + m_ParserFunctions[Layer_StandInLayer] = &DeserializerImpl::ParseStandIn; + m_ParserFunctions[Layer_StridedSliceLayer] = &DeserializerImpl::ParseStridedSlice; + m_ParserFunctions[Layer_SubtractionLayer] = &DeserializerImpl::ParseSubtraction; + m_ParserFunctions[Layer_SwitchLayer] = &DeserializerImpl::ParseSwitch; + m_ParserFunctions[Layer_TransposeConvolution2dLayer] = &DeserializerImpl::ParseTransposeConvolution2d; + m_ParserFunctions[Layer_TransposeLayer] = &DeserializerImpl::ParseTranspose; +} + +LayerBaseRawPtr IDeserializer::DeserializerImpl::GetBaseLayer(const GraphPtr& graphPtr, unsigned int layerIndex) { auto layerType = graphPtr->layers()->Get(layerIndex)->layer_type(); @@ -362,14 +401,14 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt } } -std::string Deserializer::GetLayerName(const GraphPtr& graph, unsigned int index) +std::string IDeserializer::DeserializerImpl::GetLayerName(const GraphPtr& graph, unsigned int index) { auto layer = GetBaseLayer(graph, index); assert(layer); return layer->layerName()->str(); } -int32_t Deserializer::GetBindingLayerInfo(const GraphPtr& graphPtr, unsigned int layerIndex) +int32_t IDeserializer::DeserializerImpl::GetBindingLayerInfo(const GraphPtr& graphPtr, unsigned int layerIndex) { auto layerType = graphPtr->layers()->Get(layerIndex)->layer_type(); @@ -506,7 +545,7 @@ armnn::ResizeMethod ToResizeMethod(armnnSerializer::ResizeMethod method) } } -armnn::TensorInfo ToTensorInfo(Deserializer::TensorRawPtr tensorPtr) +armnn::TensorInfo ToTensorInfo(TensorRawPtr tensorPtr) { armnn::DataType type; CHECK_TENSOR_PTR(tensorPtr); @@ -591,7 +630,7 @@ armnn::TensorInfo ToTensorInfo(Deserializer::TensorRawPtr tensorPtr) return result; } -armnn::ConstTensor ToConstTensor(Deserializer::ConstTensorRawPtr constTensorPtr) +armnn::ConstTensor ToConstTensor(ConstTensorRawPtr constTensorPtr) { CHECK_CONST_TENSOR_PTR(constTensorPtr); armnn::TensorInfo tensorInfo = ToTensorInfo(constTensorPtr->info()); @@ -633,8 +672,7 @@ armnn::ConstTensor ToConstTensor(Deserializer::ConstTensorRawPtr constTensorPtr) } } -Deserializer::TensorRawPtrVector Deserializer::GetInputs(const GraphPtr& graphPtr, - unsigned int layerIndex) +TensorRawPtrVector IDeserializer::DeserializerImpl::GetInputs(const GraphPtr& graphPtr, unsigned int layerIndex) { CHECK_LAYERS(graphPtr, 0, layerIndex); auto layer = GetBaseLayer(graphPtr, layerIndex); @@ -651,8 +689,7 @@ Deserializer::TensorRawPtrVector Deserializer::GetInputs(const GraphPtr& graphPt return result; } -Deserializer::TensorRawPtrVector Deserializer::GetOutputs(const GraphPtr& graphPtr, - unsigned int layerIndex) +TensorRawPtrVector IDeserializer::DeserializerImpl::GetOutputs(const GraphPtr& graphPtr, unsigned int layerIndex) { CHECK_LAYERS(graphPtr, 0, layerIndex); auto layer = GetBaseLayer(graphPtr, layerIndex); @@ -667,7 +704,7 @@ Deserializer::TensorRawPtrVector Deserializer::GetOutputs(const GraphPtr& graphP return result; } -void Deserializer::ParseUnsupportedLayer(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseUnsupportedLayer(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); const auto layerName = GetBaseLayer(graph, layerIndex)->layerName()->c_str(); @@ -678,36 +715,22 @@ void Deserializer::ParseUnsupportedLayer(GraphPtr graph, unsigned int layerIndex CHECK_LOCATION().AsString())); } -void Deserializer::ResetParser() +void IDeserializer::DeserializerImpl::ResetParser() { m_Network = armnn::INetworkPtr(nullptr, nullptr); m_InputBindings.clear(); m_OutputBindings.clear(); } -IDeserializer* IDeserializer::CreateRaw() -{ - return new Deserializer(); -} -IDeserializerPtr IDeserializer::Create() -{ - return IDeserializerPtr(CreateRaw(), &IDeserializer::Destroy); -} - -void IDeserializer::Destroy(IDeserializer* parser) -{ - delete parser; -} - -INetworkPtr Deserializer::CreateNetworkFromBinary(const std::vector<uint8_t>& binaryContent) +INetworkPtr IDeserializer::DeserializerImpl::CreateNetworkFromBinary(const std::vector<uint8_t>& binaryContent) { ResetParser(); GraphPtr graph = LoadGraphFromBinary(binaryContent.data(), binaryContent.size()); return CreateNetworkFromGraph(graph); } -armnn::INetworkPtr Deserializer::CreateNetworkFromBinary(std::istream& binaryContent) +armnn::INetworkPtr IDeserializer::DeserializerImpl::CreateNetworkFromBinary(std::istream& binaryContent) { ResetParser(); std::vector<uint8_t> content((std::istreambuf_iterator<char>(binaryContent)), std::istreambuf_iterator<char>()); @@ -715,7 +738,7 @@ armnn::INetworkPtr Deserializer::CreateNetworkFromBinary(std::istream& binaryCon return CreateNetworkFromGraph(graph); } -Deserializer::GraphPtr Deserializer::LoadGraphFromBinary(const uint8_t* binaryContent, size_t len) +GraphPtr IDeserializer::DeserializerImpl::LoadGraphFromBinary(const uint8_t* binaryContent, size_t len) { if (binaryContent == nullptr) { @@ -733,7 +756,7 @@ Deserializer::GraphPtr Deserializer::LoadGraphFromBinary(const uint8_t* binaryCo return GetSerializedGraph(binaryContent); } -INetworkPtr Deserializer::CreateNetworkFromGraph(GraphPtr graph) +INetworkPtr IDeserializer::DeserializerImpl::CreateNetworkFromGraph(GraphPtr graph) { m_Network = INetwork::Create(); ARMNN_ASSERT(graph != nullptr); @@ -774,7 +797,7 @@ INetworkPtr Deserializer::CreateNetworkFromGraph(GraphPtr graph) return std::move(m_Network); } -BindingPointInfo Deserializer::GetNetworkInputBindingInfo(unsigned int layerIndex, +BindingPointInfo IDeserializer::DeserializerImpl::GetNetworkInputBindingInfo(unsigned int layerIndex, const std::string& name) const { IgnoreUnused(layerIndex); @@ -790,7 +813,7 @@ BindingPointInfo Deserializer::GetNetworkInputBindingInfo(unsigned int layerInde CHECK_LOCATION().AsString())); } -BindingPointInfo Deserializer::GetNetworkOutputBindingInfo(unsigned int layerIndex, +BindingPointInfo IDeserializer::DeserializerImpl::GetNetworkOutputBindingInfo(unsigned int layerIndex, const std::string& name) const { IgnoreUnused(layerIndex); @@ -806,7 +829,7 @@ BindingPointInfo Deserializer::GetNetworkOutputBindingInfo(unsigned int layerInd CHECK_LOCATION().AsString())); } -unsigned int Deserializer::GetInputLayerInVector(GraphPtr graph, int targetId) +unsigned int IDeserializer::DeserializerImpl::GetInputLayerInVector(GraphPtr graph, int targetId) { for (unsigned int i = 0; i < graph->layers()->size(); i++) { @@ -823,7 +846,7 @@ unsigned int Deserializer::GetInputLayerInVector(GraphPtr graph, int targetId) throw ParseException("Input layer with given layerBindingId not found"); } -unsigned int Deserializer::GetOutputLayerInVector(GraphPtr graph, int targetId) +unsigned int IDeserializer::DeserializerImpl::GetOutputLayerInVector(GraphPtr graph, int targetId) { for (unsigned int i = 0; i < graph->layers()->size(); i++) { @@ -840,7 +863,7 @@ unsigned int Deserializer::GetOutputLayerInVector(GraphPtr graph, int targetId) throw ParseException("Output layer with given layerBindingId not found"); } -unsigned int Deserializer::GetLayerIndexInVector(GraphPtr graph, unsigned int targetIndex) +unsigned int IDeserializer::DeserializerImpl::GetLayerIndexInVector(GraphPtr graph, unsigned int targetIndex) { for (unsigned int i = 0; i < graph->layers()->size(); i++) { @@ -853,9 +876,9 @@ unsigned int Deserializer::GetLayerIndexInVector(GraphPtr graph, unsigned int ta throw ParseException("Layer with given index not found"); } -Deserializer::FeatureVersions Deserializer::GetFeatureVersions(GraphPtr graph) +IDeserializer::DeserializerImpl::FeatureVersions IDeserializer::DeserializerImpl::GetFeatureVersions(GraphPtr graph) { - Deserializer::FeatureVersions versions; + IDeserializer::DeserializerImpl::FeatureVersions versions; if (graph->featureVersions()) { @@ -865,7 +888,7 @@ Deserializer::FeatureVersions Deserializer::GetFeatureVersions(GraphPtr graph) return versions; } -void Deserializer::SetupInputLayers(GraphPtr graph) +void IDeserializer::DeserializerImpl::SetupInputLayers(GraphPtr graph) { CHECK_GRAPH(graph, 0); const unsigned int numInputs = graph->inputIds()->size(); @@ -904,7 +927,7 @@ void Deserializer::SetupInputLayers(GraphPtr graph) } } -void Deserializer::SetupOutputLayers(GraphPtr graph) +void IDeserializer::DeserializerImpl::SetupOutputLayers(GraphPtr graph) { CHECK_GRAPH(graph, 0); const unsigned int numOutputs = graph->outputIds()->size(); @@ -946,7 +969,7 @@ void Deserializer::SetupOutputLayers(GraphPtr graph) } } -void Deserializer::RegisterOutputSlots(GraphPtr graph, +void IDeserializer::DeserializerImpl::RegisterOutputSlots(GraphPtr graph, uint32_t layerIndex, IConnectableLayer* layer) { @@ -972,7 +995,7 @@ void Deserializer::RegisterOutputSlots(GraphPtr graph, } } -void Deserializer::RegisterInputSlots(GraphPtr graph, +void IDeserializer::DeserializerImpl::RegisterInputSlots(GraphPtr graph, uint32_t layerIndex, armnn::IConnectableLayer* layer) { @@ -998,7 +1021,7 @@ void Deserializer::RegisterInputSlots(GraphPtr graph, } } -void Deserializer::RegisterInputSlotOfConnection(uint32_t sourceLayerIndex, +void IDeserializer::DeserializerImpl::RegisterInputSlotOfConnection(uint32_t sourceLayerIndex, uint32_t outputSlotIndex, armnn::IInputSlot* inputSlot) { @@ -1018,7 +1041,7 @@ void Deserializer::RegisterInputSlotOfConnection(uint32_t sourceLayerIndex, } } -void Deserializer::RegisterOutputSlotOfConnection(uint32_t sourceLayerIndex, +void IDeserializer::DeserializerImpl::RegisterOutputSlotOfConnection(uint32_t sourceLayerIndex, uint32_t outputSlotIndex, armnn::IOutputSlot* outputSlot) { @@ -1036,7 +1059,7 @@ void Deserializer::RegisterOutputSlotOfConnection(uint32_t sourceLayerIndex, connections.outputSlots[outputSlotIndex] = outputSlot; } -void Deserializer::ParseAbs(armnnDeserializer::Deserializer::GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseAbs(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1057,7 +1080,7 @@ void Deserializer::ParseAbs(armnnDeserializer::Deserializer::GraphPtr graph, uns RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseActivation(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseActivation(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1085,7 +1108,7 @@ void Deserializer::ParseActivation(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseAdd(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseAdd(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1105,7 +1128,7 @@ void Deserializer::ParseAdd(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseArgMinMax(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseArgMinMax(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1131,14 +1154,14 @@ void Deserializer::ParseArgMinMax(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseBatchToSpaceNd(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseBatchToSpaceNd(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_BatchToSpaceNdLayer()->descriptor(); @@ -1173,7 +1196,7 @@ void Deserializer::ParseBatchToSpaceNd(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseBatchNormalization(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseBatchNormalization(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -1210,7 +1233,7 @@ void Deserializer::ParseBatchNormalization(GraphPtr graph, unsigned int layerInd RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseConstant(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseConstant(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); CHECK_LOCATION(); @@ -1233,7 +1256,7 @@ void Deserializer::ParseConstant(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseConvolution2d(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseConvolution2d(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1279,7 +1302,7 @@ void Deserializer::ParseConvolution2d(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseDepthToSpace(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseDepthToSpace(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -1305,7 +1328,7 @@ void Deserializer::ParseDepthToSpace(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseDepthwiseConvolution2d(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseDepthwiseConvolution2d(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1352,7 +1375,7 @@ void Deserializer::ParseDepthwiseConvolution2d(GraphPtr graph, unsigned int laye RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseDetectionPostProcess(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseDetectionPostProcess(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1394,7 +1417,7 @@ void Deserializer::ParseDetectionPostProcess(GraphPtr graph, unsigned int layerI RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseDivision(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseDivision(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1414,7 +1437,7 @@ void Deserializer::ParseDivision(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseEqual(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseEqual(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1435,7 +1458,7 @@ void Deserializer::ParseEqual(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseFill(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseFill(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1456,7 +1479,7 @@ void Deserializer::ParseFill(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseGreater(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseGreater(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1477,7 +1500,7 @@ void Deserializer::ParseGreater(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseInstanceNormalization(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseInstanceNormalization(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -1506,7 +1529,7 @@ void Deserializer::ParseInstanceNormalization(GraphPtr graph, unsigned int layer RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseL2Normalization(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseL2Normalization(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -1532,7 +1555,7 @@ void Deserializer::ParseL2Normalization(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseLogicalBinary(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseLogicalBinary(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); CHECK_LOCATION(); @@ -1559,14 +1582,14 @@ void Deserializer::ParseLogicalBinary(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseLogSoftmax(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseLogSoftmax(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); armnn::LogSoftmaxDescriptor descriptor; @@ -1583,7 +1606,7 @@ void Deserializer::ParseLogSoftmax(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseMinimum(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseMinimum(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1603,7 +1626,7 @@ void Deserializer::ParseMinimum(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseMaximum(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseMaximum(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1639,7 +1662,7 @@ const armnnSerializer::OriginsDescriptor* GetOriginsDescriptor(const armnnSerial } } -void Deserializer::ParseComparison(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseComparison(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); CHECK_LOCATION(); @@ -1666,7 +1689,7 @@ void Deserializer::ParseComparison(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseElementwiseUnary(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseElementwiseUnary(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); CHECK_LOCATION(); @@ -1693,7 +1716,7 @@ void Deserializer::ParseElementwiseUnary(GraphPtr graph, unsigned int layerIndex RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseConcat(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseConcat(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); CHECK_LOCATION(); @@ -1731,7 +1754,7 @@ void Deserializer::ParseConcat(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseMultiplication(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseMultiplication(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1751,7 +1774,7 @@ void Deserializer::ParseMultiplication(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseFloor(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseFloor(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); CHECK_LOCATION(); @@ -1775,7 +1798,7 @@ void Deserializer::ParseFloor(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseFullyConnected(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseFullyConnected(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -1814,14 +1837,14 @@ void Deserializer::ParseFullyConnected(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParsePad(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParsePad(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_PadLayer()->descriptor(); @@ -1853,7 +1876,7 @@ void Deserializer::ParsePad(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParsePermute(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParsePermute(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -1877,7 +1900,7 @@ void Deserializer::ParsePermute(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -armnn::Pooling2dDescriptor Deserializer::GetPoolingDescriptor(Deserializer::PoolingDescriptor pooling2dDesc, +armnn::Pooling2dDescriptor IDeserializer::DeserializerImpl::GetPoolingDescriptor(PoolingDescriptor pooling2dDesc, unsigned int layerIndex) { IgnoreUnused(layerIndex); @@ -1967,7 +1990,9 @@ armnn::Pooling2dDescriptor Deserializer::GetPoolingDescriptor(Deserializer::Pool return desc; } -void Deserializer::ParsePooling2d(GraphPtr graph, unsigned int layerIndex) + + +void IDeserializer::DeserializerImpl::ParsePooling2d(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -1988,7 +2013,7 @@ void Deserializer::ParsePooling2d(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseQuantize(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseQuantize(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -2007,7 +2032,7 @@ void Deserializer::ParseQuantize(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -armnn::TensorInfo Deserializer::OutputShapeOfReshape(const armnn::TensorInfo& inputTensorInfo, +armnn::TensorInfo IDeserializer::DeserializerImpl::OutputShapeOfReshape(const armnn::TensorInfo& inputTensorInfo, const std::vector<uint32_t>& targetDimsIn) { std::vector<unsigned int> outputDims(targetDimsIn.begin(), targetDimsIn.end()); @@ -2037,14 +2062,14 @@ armnn::TensorInfo Deserializer::OutputShapeOfReshape(const armnn::TensorInfo& in return reshapeInfo; } -void Deserializer::ParseRank(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseRank(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto layerName = GetLayerName(graph, layerIndex); @@ -2057,7 +2082,7 @@ void Deserializer::ParseRank(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseReshape(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseReshape(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -2071,7 +2096,7 @@ void Deserializer::ParseReshape(GraphPtr graph, unsigned int layerIndex) const auto targetDims = graph->layers()->Get(layerIndex)->layer_as_ReshapeLayer()->descriptor()->targetShape(); std::vector<uint32_t> outputDims(targetDims->begin(), targetDims->begin() + targetDims->size()); - armnn::TensorInfo reshapeOutputTensorInfo = Deserializer::OutputShapeOfReshape(inputTensorInfo, outputDims); + armnn::TensorInfo reshapeOutputTensorInfo = DeserializerImpl::OutputShapeOfReshape(inputTensorInfo, outputDims); const armnn::TensorShape& reshapeOutputTensorShape = reshapeOutputTensorInfo.GetShape(); const std::vector<uint32_t> expectedDims(outputs[0]->dimensions()->begin(), @@ -2100,14 +2125,14 @@ void Deserializer::ParseReshape(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseResize(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseResize(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_ResizeLayer()->descriptor(); @@ -2130,14 +2155,14 @@ void Deserializer::ParseResize(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseResizeBilinear(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseResizeBilinear(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_ResizeBilinearLayer()->descriptor(); @@ -2160,14 +2185,14 @@ void Deserializer::ParseResizeBilinear(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseSoftmax(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseSoftmax(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); armnn::SoftmaxDescriptor descriptor; @@ -2183,14 +2208,14 @@ void Deserializer::ParseSoftmax(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseSpaceToBatchNd(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseSpaceToBatchNd(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_SpaceToBatchNdLayer()->descriptor(); @@ -2226,14 +2251,14 @@ void Deserializer::ParseSpaceToBatchNd(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseSpaceToDepth(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseSpaceToDepth(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_SpaceToDepthLayer()->descriptor(); @@ -2252,8 +2277,8 @@ void Deserializer::ParseSpaceToDepth(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -armnn::NormalizationDescriptor Deserializer::GetNormalizationDescriptor( - Deserializer::NormalizationDescriptorPtr normalizationDescriptor, +armnn::NormalizationDescriptor IDeserializer::DeserializerImpl::GetNormalizationDescriptor( + NormalizationDescriptorPtr normalizationDescriptor, unsigned int layerIndex) { IgnoreUnused(layerIndex); @@ -2321,16 +2346,16 @@ armnn::NormalizationDescriptor Deserializer::GetNormalizationDescriptor( return desc; } -void Deserializer::ParseNormalization(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseNormalization(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto normalizationDes = graph->layers()->Get(layerIndex)->layer_as_NormalizationLayer()->descriptor(); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto outputInfo = ToTensorInfo(outputs[0]); @@ -2345,7 +2370,7 @@ void Deserializer::ParseNormalization(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseRsqrt(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseRsqrt(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -2366,7 +2391,7 @@ void Deserializer::ParseRsqrt(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseSlice(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseSlice(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -2401,14 +2426,14 @@ void Deserializer::ParseSlice(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseStridedSlice(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseStridedSlice(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_StridedSliceLayer()->descriptor(); @@ -2446,7 +2471,7 @@ void Deserializer::ParseStridedSlice(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseSubtraction(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseSubtraction(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -2466,14 +2491,14 @@ void Deserializer::ParseSubtraction(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseGather(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseGather(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 2); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); armnn::GatherDescriptor descriptor; @@ -2489,14 +2514,14 @@ void Deserializer::ParseGather(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseMean(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseMean(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_MeanLayer()->descriptor(); @@ -2517,14 +2542,14 @@ void Deserializer::ParseMean(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseSplitter(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseSplitter(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); auto flatBufferViewsDescriptor = graph->layers()->Get(layerIndex)->layer_as_SplitterLayer()->descriptor(); auto flatBufferViewSizes = flatBufferViewsDescriptor->viewSizes(); @@ -2561,7 +2586,7 @@ void Deserializer::ParseSplitter(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -armnn::LstmDescriptor Deserializer::GetLstmDescriptor(Deserializer::LstmDescriptorPtr lstmDescriptor) +armnn::LstmDescriptor IDeserializer::DeserializerImpl::GetLstmDescriptor(LstmDescriptorPtr lstmDescriptor) { armnn::LstmDescriptor desc; @@ -2576,7 +2601,7 @@ armnn::LstmDescriptor Deserializer::GetLstmDescriptor(Deserializer::LstmDescript return desc; } -void Deserializer::ParseLstm(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseLstm(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -2692,7 +2717,7 @@ void Deserializer::ParseLstm(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -armnn::QLstmDescriptor Deserializer::GetQLstmDescriptor(Deserializer::QLstmDescriptorPtr qLstmDescriptor) +armnn::QLstmDescriptor IDeserializer::DeserializerImpl::GetQLstmDescriptor(QLstmDescriptorPtr qLstmDescriptor) { armnn::QLstmDescriptor desc; @@ -2715,7 +2740,7 @@ armnn::QLstmDescriptor Deserializer::GetQLstmDescriptor(Deserializer::QLstmDescr return desc; } -void Deserializer::ParseQLstm(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseQLstm(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -2841,7 +2866,7 @@ void Deserializer::ParseQLstm(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseQuantizedLstm(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseQuantizedLstm(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -2895,14 +2920,14 @@ void Deserializer::ParseQuantizedLstm(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseDequantize(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseDequantize(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 1); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); const std::string layerName = GetLayerName(graph, layerIndex); @@ -2915,14 +2940,14 @@ void Deserializer::ParseDequantize(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseMerge(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseMerge(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); - Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + TensorRawPtrVector inputs = GetInputs(graph, layerIndex); CHECK_VALID_SIZE(inputs.size(), 2); - Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); CHECK_VALID_SIZE(outputs.size(), 1); const std::string layerName = GetLayerName(graph, layerIndex); @@ -2935,7 +2960,7 @@ void Deserializer::ParseMerge(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseSwitch(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseSwitch(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -2958,7 +2983,7 @@ void Deserializer::ParseSwitch(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParsePrelu(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParsePrelu(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -2978,7 +3003,7 @@ void Deserializer::ParsePrelu(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseTranspose(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseTranspose(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -3001,7 +3026,7 @@ void Deserializer::ParseTranspose(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseTransposeConvolution2d(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseTransposeConvolution2d(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); @@ -3046,7 +3071,7 @@ void Deserializer::ParseTransposeConvolution2d(GraphPtr graph, unsigned int laye RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseStack(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseStack(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); auto inputs = GetInputs(graph, layerIndex); @@ -3094,7 +3119,7 @@ void Deserializer::ParseStack(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseStandIn(GraphPtr graph, unsigned int layerIndex) +void IDeserializer::DeserializerImpl::ParseStandIn(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index 2a8639f7fc..e232feed9b 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -5,50 +5,53 @@ #pragma once -#include "armnn/INetwork.hpp" -#include "armnnDeserializer/IDeserializer.hpp" +#include <armnn/INetwork.hpp> +#include <armnnDeserializer/IDeserializer.hpp> #include <ArmnnSchema_generated.h> #include <unordered_map> namespace armnnDeserializer { -class Deserializer : public IDeserializer -{ -public: - // Shorthands for deserializer types - using ConstTensorRawPtr = const armnnSerializer::ConstTensor *; - using GraphPtr = const armnnSerializer::SerializedGraph *; - using TensorRawPtr = const armnnSerializer::TensorInfo *; - using PoolingDescriptor = const armnnSerializer::Pooling2dDescriptor *; - using NormalizationDescriptorPtr = const armnnSerializer::NormalizationDescriptor *; - using LstmDescriptorPtr = const armnnSerializer::LstmDescriptor *; - using LstmInputParamsPtr = const armnnSerializer::LstmInputParams *; - using QLstmDescriptorPtr = const armnnSerializer::QLstmDescriptor *; - using QunatizedLstmInputParamsPtr = const armnnSerializer::QuantizedLstmInputParams *; - using TensorRawPtrVector = std::vector<TensorRawPtr>; - using LayerRawPtr = const armnnSerializer::LayerBase *; - using LayerBaseRawPtr = const armnnSerializer::LayerBase *; - using LayerBaseRawPtrVector = std::vector<LayerBaseRawPtr>; +// Shorthands for deserializer types +using ConstTensorRawPtr = const armnnSerializer::ConstTensor *; +using GraphPtr = const armnnSerializer::SerializedGraph *; +using TensorRawPtr = const armnnSerializer::TensorInfo *; +using PoolingDescriptor = const armnnSerializer::Pooling2dDescriptor *; +using NormalizationDescriptorPtr = const armnnSerializer::NormalizationDescriptor *; +using LstmDescriptorPtr = const armnnSerializer::LstmDescriptor *; +using LstmInputParamsPtr = const armnnSerializer::LstmInputParams *; +using QLstmDescriptorPtr = const armnnSerializer::QLstmDescriptor *; +using QunatizedLstmInputParamsPtr = const armnnSerializer::QuantizedLstmInputParams *; +using TensorRawPtrVector = std::vector<TensorRawPtr>; +using LayerRawPtr = const armnnSerializer::LayerBase *; +using LayerBaseRawPtr = const armnnSerializer::LayerBase *; +using LayerBaseRawPtrVector = std::vector<LayerBaseRawPtr>; + +class IDeserializer::DeserializerImpl +{ public: /// Create an input network from binary file contents - armnn::INetworkPtr CreateNetworkFromBinary(const std::vector<uint8_t>& binaryContent) override; + armnn::INetworkPtr CreateNetworkFromBinary(const std::vector<uint8_t>& binaryContent); /// Create an input network from a binary input stream - armnn::INetworkPtr CreateNetworkFromBinary(std::istream& binaryContent) override; + armnn::INetworkPtr CreateNetworkFromBinary(std::istream& binaryContent); /// Retrieve binding info (layer id and tensor info) for the network input identified by the given layer name - BindingPointInfo GetNetworkInputBindingInfo(unsigned int layerId, const std::string& name) const override; + BindingPointInfo GetNetworkInputBindingInfo(unsigned int layerId, 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(unsigned int layerId, const std::string& name) const override; + BindingPointInfo GetNetworkOutputBindingInfo(unsigned int layerId, const std::string& name) const; - Deserializer(); - ~Deserializer() {} + DeserializerImpl(); + ~DeserializerImpl() = default; + + // No copying allowed until it is wanted and properly implemented + DeserializerImpl(const DeserializerImpl&) = delete; + DeserializerImpl& operator=(const DeserializerImpl&) = delete; -public: // testable helpers static GraphPtr LoadGraphFromBinary(const uint8_t* binaryContent, size_t len); static TensorRawPtrVector GetInputs(const GraphPtr& graph, unsigned int layerIndex); @@ -68,15 +71,11 @@ public: const std::vector<uint32_t> & targetDimsIn); private: - // No copying allowed until it is wanted and properly implemented - Deserializer(const Deserializer&) = delete; - Deserializer& operator=(const Deserializer&) = delete; - /// Create the network from an already loaded flatbuffers graph armnn::INetworkPtr CreateNetworkFromGraph(GraphPtr graph); // signature for the parser functions - using LayerParsingFunction = void(Deserializer::*)(GraphPtr graph, unsigned int layerIndex); + using LayerParsingFunction = void(DeserializerImpl::*)(GraphPtr graph, unsigned int layerIndex); void ParseUnsupportedLayer(GraphPtr graph, unsigned int layerIndex); void ParseAbs(GraphPtr graph, unsigned int layerIndex); @@ -188,4 +187,4 @@ private: std::unordered_map<unsigned int, Connections> m_GraphConnections; }; -} // namespace armnnDeserializer +} // namespace armnnDeserializer
\ No newline at end of file diff --git a/src/armnnDeserializer/test/DeserializeAbs.cpp b/src/armnnDeserializer/test/DeserializeAbs.cpp index bdaa869e87..97f9b50e06 100644 --- a/src/armnnDeserializer/test/DeserializeAbs.cpp +++ b/src/armnnDeserializer/test/DeserializeAbs.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeActivation.cpp b/src/armnnDeserializer/test/DeserializeActivation.cpp index 44765d56a0..a5f71c9959 100644 --- a/src/armnnDeserializer/test/DeserializeActivation.cpp +++ b/src/armnnDeserializer/test/DeserializeActivation.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(DeserializeParser) diff --git a/src/armnnDeserializer/test/DeserializeAdd.cpp b/src/armnnDeserializer/test/DeserializeAdd.cpp index 4f29189ccc..01612086ed 100644 --- a/src/armnnDeserializer/test/DeserializeAdd.cpp +++ b/src/armnnDeserializer/test/DeserializeAdd.cpp @@ -5,12 +5,11 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeBatchNormalization.cpp b/src/armnnDeserializer/test/DeserializeBatchNormalization.cpp index 3e1be6cf72..ba3f01ee5f 100644 --- a/src/armnnDeserializer/test/DeserializeBatchNormalization.cpp +++ b/src/armnnDeserializer/test/DeserializeBatchNormalization.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeBatchToSpaceNd.cpp b/src/armnnDeserializer/test/DeserializeBatchToSpaceNd.cpp index e85f4ada9d..2105792993 100644 --- a/src/armnnDeserializer/test/DeserializeBatchToSpaceNd.cpp +++ b/src/armnnDeserializer/test/DeserializeBatchToSpaceNd.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializeComparison.cpp b/src/armnnDeserializer/test/DeserializeComparison.cpp index 9881b9e61e..c995c928d0 100644 --- a/src/armnnDeserializer/test/DeserializeComparison.cpp +++ b/src/armnnDeserializer/test/DeserializeComparison.cpp @@ -4,7 +4,7 @@ // #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> diff --git a/src/armnnDeserializer/test/DeserializeConstant.cpp b/src/armnnDeserializer/test/DeserializeConstant.cpp index cb0e4ad42f..7aceb7b48c 100644 --- a/src/armnnDeserializer/test/DeserializeConstant.cpp +++ b/src/armnnDeserializer/test/DeserializeConstant.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(DeserializeParser) diff --git a/src/armnnDeserializer/test/DeserializeConvolution2d.cpp b/src/armnnDeserializer/test/DeserializeConvolution2d.cpp index 86f7cac3bb..b09c095196 100644 --- a/src/armnnDeserializer/test/DeserializeConvolution2d.cpp +++ b/src/armnnDeserializer/test/DeserializeConvolution2d.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeDepthToSpace.cpp b/src/armnnDeserializer/test/DeserializeDepthToSpace.cpp index 8f74de7f5b..55de807a7a 100644 --- a/src/armnnDeserializer/test/DeserializeDepthToSpace.cpp +++ b/src/armnnDeserializer/test/DeserializeDepthToSpace.cpp @@ -5,7 +5,7 @@ #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/armnnDeserializer/test/DeserializeDivision.cpp b/src/armnnDeserializer/test/DeserializeDivision.cpp index d12b043ce0..a77cb92f7c 100644 --- a/src/armnnDeserializer/test/DeserializeDivision.cpp +++ b/src/armnnDeserializer/test/DeserializeDivision.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeFill.cpp b/src/armnnDeserializer/test/DeserializeFill.cpp index 163a0fe968..70434798da 100644 --- a/src/armnnDeserializer/test/DeserializeFill.cpp +++ b/src/armnnDeserializer/test/DeserializeFill.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializeFloor.cpp b/src/armnnDeserializer/test/DeserializeFloor.cpp index 211fa1b54b..8ce235eb37 100644 --- a/src/armnnDeserializer/test/DeserializeFloor.cpp +++ b/src/armnnDeserializer/test/DeserializeFloor.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeFullyConnected.cpp b/src/armnnDeserializer/test/DeserializeFullyConnected.cpp index 90698cb993..66269dc4c3 100644 --- a/src/armnnDeserializer/test/DeserializeFullyConnected.cpp +++ b/src/armnnDeserializer/test/DeserializeFullyConnected.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(DeserializeParser) diff --git a/src/armnnDeserializer/test/DeserializeGather.cpp b/src/armnnDeserializer/test/DeserializeGather.cpp index 0f75db4abb..0590e701e4 100644 --- a/src/armnnDeserializer/test/DeserializeGather.cpp +++ b/src/armnnDeserializer/test/DeserializeGather.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeInstanceNormalization.cpp b/src/armnnDeserializer/test/DeserializeInstanceNormalization.cpp index 4873fd1d2f..5f634296a1 100644 --- a/src/armnnDeserializer/test/DeserializeInstanceNormalization.cpp +++ b/src/armnnDeserializer/test/DeserializeInstanceNormalization.cpp @@ -4,7 +4,7 @@ // #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializeL2Normalization.cpp b/src/armnnDeserializer/test/DeserializeL2Normalization.cpp index d8604a5cd5..c32343f08e 100644 --- a/src/armnnDeserializer/test/DeserializeL2Normalization.cpp +++ b/src/armnnDeserializer/test/DeserializeL2Normalization.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeLogSoftmax.cpp b/src/armnnDeserializer/test/DeserializeLogSoftmax.cpp index bcf4825f65..201b64b620 100644 --- a/src/armnnDeserializer/test/DeserializeLogSoftmax.cpp +++ b/src/armnnDeserializer/test/DeserializeLogSoftmax.cpp @@ -4,7 +4,7 @@ // #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/armnnDeserializer/test/DeserializeMean.cpp b/src/armnnDeserializer/test/DeserializeMean.cpp index 4ea745628c..e8eebdf7f9 100644 --- a/src/armnnDeserializer/test/DeserializeMean.cpp +++ b/src/armnnDeserializer/test/DeserializeMean.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeMultiplication.cpp b/src/armnnDeserializer/test/DeserializeMultiplication.cpp index 8198001f58..313c78cf05 100644 --- a/src/armnnDeserializer/test/DeserializeMultiplication.cpp +++ b/src/armnnDeserializer/test/DeserializeMultiplication.cpp @@ -4,14 +4,13 @@ // #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <boost/test/unit_test.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeNormalization.cpp b/src/armnnDeserializer/test/DeserializeNormalization.cpp index eb7e958c5b..de68167612 100644 --- a/src/armnnDeserializer/test/DeserializeNormalization.cpp +++ b/src/armnnDeserializer/test/DeserializeNormalization.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializePad.cpp b/src/armnnDeserializer/test/DeserializePad.cpp index d9087d963e..c2d21e5431 100644 --- a/src/armnnDeserializer/test/DeserializePad.cpp +++ b/src/armnnDeserializer/test/DeserializePad.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializePermute.cpp b/src/armnnDeserializer/test/DeserializePermute.cpp index be50a67328..8cfe25baca 100644 --- a/src/armnnDeserializer/test/DeserializePermute.cpp +++ b/src/armnnDeserializer/test/DeserializePermute.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializePooling2d.cpp b/src/armnnDeserializer/test/DeserializePooling2d.cpp index b63aeb5fdc..4d75740475 100644 --- a/src/armnnDeserializer/test/DeserializePooling2d.cpp +++ b/src/armnnDeserializer/test/DeserializePooling2d.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeRank.cpp b/src/armnnDeserializer/test/DeserializeRank.cpp index 8f14af150b..920283fa40 100644 --- a/src/armnnDeserializer/test/DeserializeRank.cpp +++ b/src/armnnDeserializer/test/DeserializeRank.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializeReshape.cpp b/src/armnnDeserializer/test/DeserializeReshape.cpp index 554b867db7..c771a232b0 100644 --- a/src/armnnDeserializer/test/DeserializeReshape.cpp +++ b/src/armnnDeserializer/test/DeserializeReshape.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeResizeBilinear.cpp b/src/armnnDeserializer/test/DeserializeResizeBilinear.cpp index b01832499e..a9e5522595 100644 --- a/src/armnnDeserializer/test/DeserializeResizeBilinear.cpp +++ b/src/armnnDeserializer/test/DeserializeResizeBilinear.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializeRsqrt.cpp b/src/armnnDeserializer/test/DeserializeRsqrt.cpp index 4361e50485..68de783fb2 100644 --- a/src/armnnDeserializer/test/DeserializeRsqrt.cpp +++ b/src/armnnDeserializer/test/DeserializeRsqrt.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeSlice.cpp b/src/armnnDeserializer/test/DeserializeSlice.cpp index 44c66d308a..bc5cea67aa 100644 --- a/src/armnnDeserializer/test/DeserializeSlice.cpp +++ b/src/armnnDeserializer/test/DeserializeSlice.cpp @@ -5,7 +5,7 @@ #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp b/src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp index 4b34390ed5..6ee2a3f0d4 100644 --- a/src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp +++ b/src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializeStridedSlice.cpp b/src/armnnDeserializer/test/DeserializeStridedSlice.cpp index 7c273070d9..66342223ac 100644 --- a/src/armnnDeserializer/test/DeserializeStridedSlice.cpp +++ b/src/armnnDeserializer/test/DeserializeStridedSlice.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnDeserializer/test/DeserializeSubtraction.cpp b/src/armnnDeserializer/test/DeserializeSubtraction.cpp index a4bd0fbeb4..789653c4bc 100644 --- a/src/armnnDeserializer/test/DeserializeSubtraction.cpp +++ b/src/armnnDeserializer/test/DeserializeSubtraction.cpp @@ -5,10 +5,9 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> -#include <iostream> BOOST_AUTO_TEST_SUITE(Deserializer) diff --git a/src/armnnDeserializer/test/DeserializeTranspose.cpp b/src/armnnDeserializer/test/DeserializeTranspose.cpp index bf0f043a4a..3e5ad56f5a 100644 --- a/src/armnnDeserializer/test/DeserializeTranspose.cpp +++ b/src/armnnDeserializer/test/DeserializeTranspose.cpp @@ -5,7 +5,7 @@ #include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" -#include "../Deserializer.hpp" +#include <armnnDeserializer/IDeserializer.hpp> #include <string> diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 379cce2109..a0c99b9cca 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -12,8 +12,6 @@ #include <iostream> -#include <flatbuffers/util.h> - #include "SerializerUtils.hpp" using namespace armnn; @@ -23,6 +21,37 @@ namespace serializer = armnnSerializer; namespace armnnSerializer { +ISerializer::ISerializer() : pSerializerImpl(new SerializerImpl()) +{ +} + +ISerializer::~ISerializer() = default; + +ISerializer* ISerializer::CreateRaw() +{ + return new ISerializer(); +} + +ISerializerPtr ISerializer::Create() +{ + return ISerializerPtr(CreateRaw(), &ISerializer::Destroy); +} + +void ISerializer::Destroy(ISerializer* serializer) +{ + delete serializer; +} + +void ISerializer::Serialize(const armnn::INetwork& inNetwork) +{ + pSerializerImpl->Serialize(inNetwork); +} + +bool ISerializer::SaveSerializedToStream(std::ostream& stream) +{ + return pSerializerImpl->SaveSerializedToStream(stream); +} + serializer::ActivationFunction GetFlatBufferActivationFunction(armnn::ActivationFunction function) { switch (function) @@ -1729,23 +1758,7 @@ std::vector<fb::Offset<serializer::OutputSlot>> return outputSlots; } - -ISerializer* ISerializer::CreateRaw() -{ - return new Serializer(); -} - -ISerializerPtr ISerializer::Create() -{ - return ISerializerPtr(CreateRaw(), &ISerializer::Destroy); -} - -void ISerializer::Destroy(ISerializer* serializer) -{ - delete serializer; -} - -void Serializer::Serialize(const INetwork& inNetwork) +void ISerializer::SerializerImpl::Serialize(const INetwork& inNetwork) { // Iterate through to network inNetwork.Accept(m_SerializerVisitor); @@ -1763,7 +1776,7 @@ void Serializer::Serialize(const INetwork& inNetwork) fbBuilder.Finish(serializedGraph); } -bool Serializer::SaveSerializedToStream(std::ostream& stream) +bool ISerializer::SerializerImpl::SaveSerializedToStream(std::ostream& stream) { flatbuffers::FlatBufferBuilder& fbBuilder = m_SerializerVisitor.GetFlatBufferBuilder(); @@ -1772,4 +1785,5 @@ bool Serializer::SaveSerializedToStream(std::ostream& stream) return !stream.bad(); } + } // namespace armnnSerializer diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 8c44ced72f..f28be09036 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -345,20 +345,20 @@ private: uint32_t m_layerId; }; -class Serializer : public ISerializer +class ISerializer::SerializerImpl { public: - Serializer() {} - ~Serializer() {} + SerializerImpl() = default; + ~SerializerImpl() = default; /// Serializes the network to ArmNN SerializedGraph. /// @param [in] inNetwork The network to be serialized. - void Serialize(const armnn::INetwork& inNetwork) override; + void Serialize(const armnn::INetwork& inNetwork); /// Serializes the SerializedGraph to the stream. /// @param [stream] the stream to save to /// @return true if graph is Serialized to the Stream, false otherwise - bool SaveSerializedToStream(std::ostream& stream) override; + bool SaveSerializedToStream(std::ostream& stream); private: diff --git a/src/armnnSerializer/test/ActivationSerializationTests.cpp b/src/armnnSerializer/test/ActivationSerializationTests.cpp index abc63ae64d..1645731413 100644 --- a/src/armnnSerializer/test/ActivationSerializationTests.cpp +++ b/src/armnnSerializer/test/ActivationSerializationTests.cpp @@ -54,11 +54,12 @@ BOOST_AUTO_TEST_CASE(ActivationSerialization) activationLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); activationLayer->GetOutputSlot(0).SetTensorInfo(outputInfo); - armnnSerializer::Serializer serializer; - serializer.Serialize(*network); + armnnSerializer::ISerializerPtr serializer = armnnSerializer::ISerializer::Create(); + + serializer->Serialize(*network); std::stringstream stream; - serializer.SaveSerializedToStream(stream); + serializer->SaveSerializedToStream(stream); std::string const serializerString{stream.str()}; std::vector<std::uint8_t> const serializerVector{serializerString.begin(), serializerString.end()}; diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 6866391e0f..11177f5d04 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -237,11 +237,12 @@ armnn::INetworkPtr DeserializeNetwork(const std::string& serializerString) std::string SerializeNetwork(const armnn::INetwork& network) { - armnnSerializer::Serializer serializer; - serializer.Serialize(network); + armnnSerializer::ISerializerPtr serializer = armnnSerializer::ISerializer::Create(); + + serializer->Serialize(network); std::stringstream stream; - serializer.SaveSerializedToStream(stream); + serializer->SaveSerializedToStream(stream); std::string serializerString{stream.str()}; return serializerString; |