diff options
author | Matthew Bentham <matthew.bentham@arm.com> | 2019-01-08 17:52:37 +0000 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2019-01-08 18:00:12 +0000 |
commit | d80a7126b0abdd532a9f731559827a23f2e565e0 (patch) | |
tree | e04f6454e2353469dd9806b2a589c54b61dd777d /src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp | |
parent | a1d3c6a49f35d7d3f11cc7e1b588d1d5401bdbf1 (diff) | |
download | armnn-d80a7126b0abdd532a9f731559827a23f2e565e0.tar.gz |
Refactor: Don't include all ComputeLibrary function definitions everywhere.
Just include the function definition that is specifically needed for each workload.
Also, tighten up the scope where Compute Library functions are available.
Knocks about 30seconds off a 4m30s single-threaded compile of the Neon workloads.
Change-Id: Idac438f3bc77ff978295fbc9505cb42447def145
Diffstat (limited to 'src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp')
-rw-r--r-- | src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp index 854ecd3c59..92c0396d86 100644 --- a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp @@ -4,10 +4,13 @@ // #include "NeonNormalizationFloatWorkload.hpp" -#include <neon/NeonLayerSupport.hpp> + +#include "NeonWorkloadUtils.hpp" #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> +#include <arm_compute/runtime/NEON/functions/NENormalizationLayer.h> + using namespace armnn::armcomputetensorutils; namespace armnn @@ -57,7 +60,6 @@ NeonNormalizationFloatWorkload::NeonNormalizationFloatWorkload(const Normalizati const WorkloadInfo& info, std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager) : FloatWorkload<NormalizationQueueDescriptor>(descriptor, info) - , m_NormalizationLayer(memoryManager) { m_Data.ValidateInputsOutputs("NeonNormalizationFloatWorkload", 1, 1); std::string reasonIfUnsupported; @@ -89,14 +91,15 @@ NeonNormalizationFloatWorkload::NeonNormalizationFloatWorkload(const Normalizati m_Data.m_Parameters.m_Beta, m_Data.m_Parameters.m_K, false); - - m_NormalizationLayer.configure(&input, &output, normalizationInfo); + auto layer = std::make_unique<arm_compute::NENormalizationLayer>(memoryManager); + layer->configure(&input, &output, normalizationInfo); + m_NormalizationLayer.reset(layer.release()); } void NeonNormalizationFloatWorkload::Execute() const { ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonNormalizationFloatWorkload_Execute"); - m_NormalizationLayer.run(); + m_NormalizationLayer->run(); } } //namespace armnn |