IVGCVSW-2771 Fix SubTensor error in vgg16 ExecuteNetwork NEON
* Add check if Sub-tensors cannot be used, call ACL function
* Add computation of SplitAxis from SplitterDescriptor
* Add NeonSplitterWorkload functions
* Modify IsSplitterSupported to call ACL validate function
if sub-tensor cannot be used
* Also check if quantization parameters match when using sub-tensors
* Add more unit tests for Splitter in TfParser and TfLiteParser
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I31e4c7d055117c83c65b598c4125442173242226
diff --git a/src/backends/neon/workloads/NeonSplitterWorkload.hpp b/src/backends/neon/workloads/NeonSplitterWorkload.hpp
index 2a7ee19..f902566 100644
--- a/src/backends/neon/workloads/NeonSplitterWorkload.hpp
+++ b/src/backends/neon/workloads/NeonSplitterWorkload.hpp
@@ -7,18 +7,26 @@
#include <backendsCommon/Workload.hpp>
+#include <arm_compute/runtime/NEON/NEFunctions.h>
+
+#include <functional>
+
namespace armnn
{
+arm_compute::Status NeonSplitterWorkloadValidate(const TensorInfo& input,
+ const std::vector<std::reference_wrapper<TensorInfo>>& outputs,
+ unsigned int splitAxis);
+
class NeonSplitterWorkload : public BaseWorkload<SplitterQueueDescriptor>
{
public:
- using BaseWorkload<SplitterQueueDescriptor>::BaseWorkload;
+ NeonSplitterWorkload(const SplitterQueueDescriptor& descriptor, const WorkloadInfo& info);
- virtual void Execute() const override
- {
- // With subtensors, splitter is a no-op.
- }
+ void Execute() const override;
+
+private:
+ mutable std::unique_ptr<arm_compute::NESplit> m_Layer;
};
} //namespace armnn