diff options
Diffstat (limited to 'src/armnnTfParser/TfParser.cpp')
| -rwxr-xr-x | src/armnnTfParser/TfParser.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/armnnTfParser/TfParser.cpp b/src/armnnTfParser/TfParser.cpp index e5948d55f4..78f479063e 100755 --- a/src/armnnTfParser/TfParser.cpp +++ b/src/armnnTfParser/TfParser.cpp @@ -1308,7 +1308,10 @@ ParsedTfOperationPtr TfParser::ParseConv2D(const tensorflow::NodeDef& nodeDef, CalcPadding(inputHeight, weightHeight, desc.m_StrideY, desc.m_PadTop, desc.m_PadBottom, padding); CalcPadding(inputWidth, weightWidth, desc.m_StrideX, desc.m_PadLeft, desc.m_PadRight, padding); - IConnectableLayer* layer = m_Network->AddConvolution2dLayer(desc, weightTensor, nodeDef.name().c_str()); + IConnectableLayer* layer = m_Network->AddConvolution2dLayer(desc, + weightTensor, + EmptyOptional(), + nodeDef.name().c_str()); layer->GetOutputSlot(0).SetTensorInfo(outputInfo); inputSlot.Connect(layer->GetInputSlot(0)); @@ -1426,7 +1429,10 @@ ParsedTfOperationPtr TfParser::ParseDepthwiseConv2D(const tensorflow::NodeDef& n CalcPadding(inputHeight, weightHeight, desc.m_StrideY, desc.m_PadTop, desc.m_PadBottom, padding); CalcPadding(inputWidth, weightWidth, desc.m_StrideX, desc.m_PadLeft, desc.m_PadRight, padding); - IConnectableLayer* layer = m_Network->AddDepthwiseConvolution2dLayer(desc, weightTensor, nodeDef.name().c_str()); + IConnectableLayer* layer = m_Network->AddDepthwiseConvolution2dLayer(desc, + weightTensor, + EmptyOptional(), + nodeDef.name().c_str()); layer->GetOutputSlot(0).SetTensorInfo(outputInfo); inputSlot.Connect(layer->GetInputSlot(0)); @@ -3127,10 +3133,11 @@ IConnectableLayer* TfParser::AddFullyConnectedLayer(const tensorflow::NodeDef& m desc.m_BiasEnabled = addNodeDef != nullptr; IConnectableLayer* layer = nullptr; + Optional<ConstTensor> optionalBiases; + std::vector<float> biasTensorData; // Makes the layer. if (addNodeDef != nullptr) { - std::vector<float> biasTensorData; ConstTensor biases = biasNode->GetConstTensor(biasTensorData); if (weights.GetShape()[1] != biases.GetShape()[0]) @@ -3145,12 +3152,9 @@ IConnectableLayer* TfParser::AddFullyConnectedLayer(const tensorflow::NodeDef& m % CHECK_LOCATION().AsString())); } - layer = m_Network->AddFullyConnectedLayer(desc, weights, biases, armnnLayerName); - } - else - { - layer = m_Network->AddFullyConnectedLayer(desc, weights, armnnLayerName); + optionalBiases = Optional<ConstTensor>(biases); } + layer = m_Network->AddFullyConnectedLayer(desc, weights, optionalBiases, armnnLayerName); BOOST_ASSERT(layer != nullptr); |