aboutsummaryrefslogtreecommitdiff
path: root/src/armnnTfParser/TfParser.hpp
diff options
context:
space:
mode:
authorjimfly01 <jim.flynn@arm.com>2018-12-19 13:14:46 +0000
committerjimfly01 <jim.flynn@arm.com>2018-12-20 14:19:25 +0000
commit84c70e65a193aa5faa959d305af82783fa8f78b5 (patch)
tree4e22d949b863c21c6bb7aa1bb92e8465a337dd79 /src/armnnTfParser/TfParser.hpp
parent4fa0916386e720e254bee6b9fd1576e90ba6a42f (diff)
downloadarmnn-84c70e65a193aa5faa959d305af82783fa8f78b5.tar.gz
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
Diffstat (limited to 'src/armnnTfParser/TfParser.hpp')
-rw-r--r--src/armnnTfParser/TfParser.hpp11
1 files changed, 11 insertions, 0 deletions
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 <map>
#include <memory>
#include <unordered_map>
+#include <utility>
#include <vector>
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<armnn::IOutputSlot*, armnn::IOutputSlot*> 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<armnn::LayerBindingId, armnn::TensorInfo> GetBindingInfo(const std::string& layerName,
const char* bindingPointDesc,
const std::unordered_map<std::string, BindingPointInfo>& nameToBindingInfo);