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/NeonMergerWorkload.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/NeonMergerWorkload.cpp')
-rw-r--r-- | src/backends/neon/workloads/NeonMergerWorkload.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/backends/neon/workloads/NeonMergerWorkload.cpp b/src/backends/neon/workloads/NeonMergerWorkload.cpp index f82e24453a..be096b4b25 100644 --- a/src/backends/neon/workloads/NeonMergerWorkload.cpp +++ b/src/backends/neon/workloads/NeonMergerWorkload.cpp @@ -4,11 +4,14 @@ // #include "NeonMergerWorkload.hpp" -#include <armnn/ArmNN.hpp> + +#include "NeonWorkloadUtils.hpp" + #include <aclCommon/ArmComputeTensorUtils.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <neon/NeonTensorHandle.hpp> +#include <arm_compute/runtime/NEON/functions/NEConcatenateLayer.h> namespace armnn { @@ -66,9 +69,11 @@ const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) arm_compute::DataLayoutDimension aclAxis = arm_compute::DataLayoutDimension::WIDTH; - m_Layer.configure(aclInputs, &output, aclAxis); + auto layer = std::make_unique<arm_compute::NEConcatenateLayer>(); + layer->configure(aclInputs, &output, aclAxis); + m_Layer.reset(layer.release()); - m_Layer.prepare(); + m_Layer->prepare(); } void NeonMergerWorkload::Execute() const @@ -76,7 +81,7 @@ void NeonMergerWorkload::Execute() const if (m_Execute) { ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonMergerWorkload_Execute"); - m_Layer.run(); + m_Layer->run(); } } |