diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2020-11-12 10:58:48 +0000 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-11-13 14:25:30 +0000 |
| commit | 07810fc2fcdd34db74222d90cc73ef12a88e7b78 (patch) | |
| tree | 8becef8453674822d079815b06ae37310b97d2cf /src/armnn/Network.cpp | |
| parent | 8502adeafbbb1db0acefa62560d93453e38dcadb (diff) | |
| download | armnn-07810fc2fcdd34db74222d90cc73ef12a88e7b78.tar.gz | |
IVGCVSW-5328-5329 Fuse Activation
* Added Fused Activation Optimization to both CL and Neon backends.
* Added Fused Activation support to all the CL and Neon workloads
that support it.
* Changed ProfilingTest network to be a Convolution layer
followed by an Abs layer rather than an Activation layer.
* Added IBackendInternal::OptimizeSubgraphView function that can accept a
ModelOptions.
* Network will now call OptimizeSubgraphView passing in the ModelOptions.
Signed-off-by: Keith Davis <keith.davis@arm.com>
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ib536ac3cbafc7d9b35c139ad9a65b7735262cd9d
Diffstat (limited to 'src/armnn/Network.cpp')
| -rw-r--r-- | src/armnn/Network.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 5c55641c82..d41f2f6fa7 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -537,6 +537,7 @@ BackendsMap CreateSupportedBackends(TensorHandleFactoryRegistry& handleFactoryRe OptimizationResult ApplyBackendOptimizations(OptimizedNetwork* optNetObjPtr, BackendSettings& backendSettings, BackendsMap& backends, + const ModelOptions& modelOptions, Optional<std::vector<std::string>&> errMessages) { ARMNN_ASSERT(optNetObjPtr); @@ -572,7 +573,7 @@ OptimizationResult ApplyBackendOptimizations(OptimizedNetwork* optNetObjPtr, for (auto& subgraph : subgraphs) { // Try to optimize the current sub-graph - OptimizationViews optimizationViews = backendObjPtr->OptimizeSubgraphView(*subgraph); + OptimizationViews optimizationViews = backendObjPtr->OptimizeSubgraphView(*subgraph, modelOptions); ARMNN_ASSERT(optimizationViews.Validate(*subgraph)); // Optimization attempted, check the resulting optimized sub-graph @@ -1111,6 +1112,7 @@ IOptimizedNetworkPtr Optimize(const INetwork& inNetwork, OptimizationResult backendOptimizationResult = ApplyBackendOptimizations(optNetObjPtr, backendSettings, backends, + options.m_ModelOptions, messages); if (backendOptimizationResult.m_Error) { |