diff options
| author | Keith Davis <keith.davis@arm.com> | 2022-04-07 11:32:00 +0100 |
|---|---|---|
| committer | Keith Davis <keith.davis@arm.com> | 2022-05-16 16:08:54 +0100 |
| commit | b4dd5cc86d4eb841de670f0f102ede599e0d9c40 (patch) | |
| tree | 77857cf739baecaf63701b66c1a2646b7930a834 /src/armnn/LoadedNetwork.cpp | |
| parent | b86ec6641b4b06ccddad5eebbc21010d6184fe79 (diff) | |
| download | armnn-b4dd5cc86d4eb841de670f0f102ede599e0d9c40.tar.gz | |
IVGCVSW-6124 ConstTensorsAsInput: Conv2d - FrontEnd
* Update Front-end and Tools.
* Updated Serializer, Deserializer and unit tests to reflect this.
* Updated TfLiteDelegate, TfLiteParser and OnnxParser.
* Updated Ref.
* Fixed resulting Neon / CL tests
* Unified optimizers for conv2d ops
* Optimizer Fix - Fp32ToBf16
* Partial implementation for ACL backends to fix VTS failures
!android-nn-driver:7477
Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I5fb18877f7ee32643e15a9818945356274bb401b
Diffstat (limited to 'src/armnn/LoadedNetwork.cpp')
| -rw-r--r-- | src/armnn/LoadedNetwork.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index a88fa5ab9c..228927db57 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -330,10 +330,10 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net, if (layer->GetType() == LayerType::Constant) { + // Place the Constant Workloads into a queue so that they can be executed first ConstWorkloads.push_back(m_WorkloadQueue.back().get()); } } - // release the constant data in the layer.. layer->ReleaseConstantData(); break; @@ -513,10 +513,7 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net, AllocateAndExecuteConstantWorkloadsAsync(); } } - - // If synchronous, execute all constant layer workloads as the FoldPad optimization - // may have created a new conv2d layer prior to the input constant layers which will - // cause a failure if constant workloads are not executed + // If synchronous, execute all constant layer workloads if (!networkProperties.m_AsyncEnabled) { for (auto workload: ConstWorkloads) |