From 84c70e65a193aa5faa959d305af82783fa8f78b5 Mon Sep 17 00:00:00 2001 From: jimfly01 Date: Wed, 19 Dec 2018 13:14:46 +0000 Subject: IVGCVSW-2367 Add Equal Operator to TfParser * Unit tests in Equal.cpp * Fixed error in Network::AddEqualLayer * Refactored TfParser::Minimum/Equal to get rid of duplicate code Change-Id: I0ed6f888eb391c995b88be20dc0c1b916dd14c3c --- src/armnnTfParser/TfParser.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/armnnTfParser/TfParser.hpp') diff --git a/src/armnnTfParser/TfParser.hpp b/src/armnnTfParser/TfParser.hpp index 5ca867c0f7..3aba60cc0a 100644 --- a/src/armnnTfParser/TfParser.hpp +++ b/src/armnnTfParser/TfParser.hpp @@ -13,6 +13,7 @@ #include #include #include +#include #include namespace armnn @@ -154,6 +155,7 @@ private: ParsedTfOperationPtr ParseAvgPool(const tensorflow::NodeDef& nodeDef, const tensorflow::GraphDef& graphDef); ParsedTfOperationPtr ParsePooling2d(const tensorflow::NodeDef& nodeDef, const tensorflow::GraphDef& graphDef, armnn::PoolingAlgorithm pooltype); + ParsedTfOperationPtr ParseEqual(const tensorflow::NodeDef& nodeDef, const tensorflow::GraphDef& graphDef); ParsedTfOperationPtr ParseMaximum(const tensorflow::NodeDef& nodeDef, const tensorflow::GraphDef& graphDef); ParsedTfOperationPtr ParseMinimum(const tensorflow::NodeDef& nodeDef, const tensorflow::GraphDef& graphDef); ParsedTfOperationPtr ParsePad(const tensorflow::NodeDef& nodeDef, const tensorflow::GraphDef& graphDef); @@ -175,6 +177,15 @@ private: armnn::IOutputSlot** outputOfLeakyRelu, armnn::ActivationDescriptor & desc); + std::pair ProcessElementwiseInputSlots( + const tensorflow::NodeDef& nodeDef, const std::string& layerName); + + ParsedTfOperationPtr ProcessElementwiseLayer( + armnn::IOutputSlot* input0Slot, + armnn::IOutputSlot* input1Slot, + armnn::IConnectableLayer* const layer, + const tensorflow::NodeDef& nodeDef); + static std::pair GetBindingInfo(const std::string& layerName, const char* bindingPointDesc, const std::unordered_map& nameToBindingInfo); -- cgit v1.2.1