diff options
author | Cathal Corbett <catcor01@e127348.nice.arm.com> | 2021-10-07 11:46:40 +0100 |
---|---|---|
committer | Cathal Corbett <cathal.corbett@arm.com> | 2021-10-08 11:28:35 +0000 |
commit | 521032fd424cf86681eb125afbf5eaee47d8c585 (patch) | |
tree | 65162778f203638f1c039097b8240422f99dad76 /src/armnn/Network.cpp | |
parent | 723bc3b5d8a911a369eee658631d9f107ea09896 (diff) | |
download | armnn-521032fd424cf86681eb125afbf5eaee47d8c585.tar.gz |
IVGCVSW-6417: Catch AddFullyConnected API error when weights TensorInfo isn't set
* Updated code in Graph.cpp InferTensorInfos() to be more descriptive.
* Added method VerifyConstantLayerSetTensorInfo() in Graph.cpp/hpp
to error when ConstantLayer TensorInfo is not set.
* Updated Optimize() in Network.cpp to call VerifyConstantLayerSetTensorInfo().
* Added unit test with ConstantLayer TensorInfo not
set to catch error in VerifyConstantLayerSetTensorInfo().
* Added comments around method VerifyConstantLayerSetTensorInfo().
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I366596243f7c5823676222e2d0cce1335bc8c325
Diffstat (limited to 'src/armnn/Network.cpp')
-rw-r--r-- | src/armnn/Network.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index a39b6b1a42..39af10f2ac 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -1576,6 +1576,9 @@ IOptimizedNetworkPtr Optimize(const INetwork& inNetwork, throw InvalidArgumentException("BFloat16 and Float16 optimization cannot be enabled at the same time."); } + // Ensure TensorInfo is set on all output slots of ConstantLayers in the graph + inNetwork.pNetworkImpl->GetGraph().VerifyConstantLayerSetTensorInfo(); + std::unique_ptr<Graph> graph = std::make_unique<Graph>(inNetwork.pNetworkImpl->GetGraph()); auto optNet = IOptimizedNetworkPtr(new IOptimizedNetwork(std::move(graph), options.m_ModelOptions), |