aboutsummaryrefslogtreecommitdiff
path: root/src/armnnTfParser/TfParser.cpp
diff options
context:
space:
mode:
authorjimfly01 <jim.flynn@arm.com>2018-12-04 17:47:22 +0000
committerjimfly01 <jim.flynn@arm.com>2018-12-06 17:48:14 +0000
commit23be07e855c066f192c1007d529064462853a27c (patch)
treeb7ca3e5a62625984f9d43c1a46e29e2880d43903 /src/armnnTfParser/TfParser.cpp
parent8a121500c0db27c60af90a99691ea6b7dc06840d (diff)
downloadarmnn-23be07e855c066f192c1007d529064462853a27c.tar.gz
IVGCVSW-2333 Add ParseSub method to TfParser
* Also added unit test Sub.cpp Change-Id: I6d23c11ae894ee433cd28ffdf0248b14e01b0131
Diffstat (limited to 'src/armnnTfParser/TfParser.cpp')
-rw-r--r--src/armnnTfParser/TfParser.cpp40
1 files changed, 40 insertions, 0 deletions
diff --git a/src/armnnTfParser/TfParser.cpp b/src/armnnTfParser/TfParser.cpp
index 0d425257e8..8f6352c6e7 100644
--- a/src/armnnTfParser/TfParser.cpp
+++ b/src/armnnTfParser/TfParser.cpp
@@ -385,6 +385,7 @@ const std::map<std::string, TfParser::OperationParsingFunction> TfParser::ms_Ope
{ "Maximum", &TfParser::ParseMaximum },
{ "Minimum", &TfParser::ParseMinimum },
{ "Pad", &TfParser::ParsePad },
+ { "Sub", &TfParser::ParseSub },
};
ITfParser* ITfParser::CreateRaw()
@@ -1612,6 +1613,45 @@ ParsedTfOperationPtr TfParser::ParseMinimum(const tensorflow::NodeDef& nodeDef,
return std::make_unique<SingleLayerParsedTfOperation>(this, nodeDef, layer);
}
+ParsedTfOperationPtr TfParser::ParseSub(const tensorflow::NodeDef& nodeDef, const tensorflow::GraphDef& graphDef)
+{
+ std::vector<OutputOfParsedTfOperation> inputs = GetInputParsedTfOperationsChecked(nodeDef, 2);
+
+ IOutputSlot* input0Slot = &inputs[0].m_IndexedValue->ResolveArmnnOutputSlot(inputs[0].m_Index);
+ IOutputSlot* input1Slot = &inputs[1].m_IndexedValue->ResolveArmnnOutputSlot(inputs[1].m_Index);
+
+ const TensorInfo& input0Info = input0Slot->GetTensorInfo();
+ const TensorInfo& input1Info = input1Slot->GetTensorInfo();
+
+ if (input0Info.GetNumDimensions() == 1)
+ {
+ const bool isNHWC = true;
+ input0Slot = AddBroadcastReshapeLayer(input1Slot, input0Slot, isNHWC, *m_Network, nodeDef);
+ }
+
+ if (input1Info.GetNumDimensions() == 1)
+ {
+ const bool isNHWC = true;
+ input1Slot = AddBroadcastReshapeLayer(input0Slot, input1Slot, isNHWC, *m_Network, nodeDef);
+ }
+
+ IConnectableLayer* const layer = m_Network->AddSubtractionLayer(nodeDef.name().c_str());
+
+ input0Slot->Connect(layer->GetInputSlot(0));
+ input1Slot->Connect(layer->GetInputSlot(1));
+
+ if (input0Info.GetNumDimensions() == 1)
+ {
+ layer->GetOutputSlot(0).SetTensorInfo(input1Slot->GetTensorInfo());
+ }
+ else
+ {
+ layer->GetOutputSlot(0).SetTensorInfo(input0Slot->GetTensorInfo());
+ }
+
+ return std::make_unique<SingleLayerParsedTfOperation>(this, nodeDef, layer);
+}
+
unsigned int CheckPaddingTensor(const ConstTensor& paddingTensor,
const TensorInfo& inputTensorInfo,
const std::string& nodeName)