IVGCVSW-5155 Update Arm NN API to allow for call to shape inference
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I0a2babe5b5b09eb81c9900dc3a05071034a0440b
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index e0607bd..132924a 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -42,14 +42,14 @@
namespace armnn
{
-armnn::INetwork* INetwork::CreateRaw()
+armnn::INetwork* INetwork::CreateRaw(NetworkOptions networkOptions)
{
- return new Network();
+ return new Network(networkOptions);
}
-armnn::INetworkPtr INetwork::Create()
+armnn::INetworkPtr INetwork::Create(NetworkOptions networkOptions)
{
- return INetworkPtr(CreateRaw(), &INetwork::Destroy);
+ return INetworkPtr(CreateRaw(networkOptions), &INetwork::Destroy);
}
void INetwork::Destroy(INetwork* network)
@@ -1147,11 +1147,19 @@
return optNet;
}
-
-Network::Network()
-: m_Graph(std::make_unique<Graph>())
+bool Network::GetShapeInferenceMethod()
{
+ if (m_NetworkOptions.size() > 0 && m_NetworkOptions[0].GetBackendId().Get() == "ShapeInferenceMethod")
+ {
+ return m_NetworkOptions[0].GetOption(0).GetValue().AsBool();
+ }
+
+ return false;
}
+Network::Network(NetworkOptions networkOptions)
+: m_NetworkOptions(networkOptions),
+ m_Graph(std::make_unique<Graph>(GetShapeInferenceMethod()))
+{}
Network::~Network()
{