From 73c547da9b403ff19adb94032db51d8d0f1ee767 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Tue, 15 Feb 2022 20:47:34 +0000 Subject: Refactor Forced Import * Find and replace all workloads associated with imported IO * Only attempt tensorhandle replacement if supported by all workloads * Add new RefBaseWorkload to enable forced input for ref backend * Store imported tensorhandles in preImportedTensorhandles instead of outputHandles * Create pre-imported tensorhandles at network load-time * Front load import workload validation to load network time * Only call ReplaceTensorHandle when needed Change-Id: I3816a71b7f57ae90388bb16462a75d4ef3544fa7 Signed-off-by: Finn Williams --- include/armnn/backends/IWorkload.hpp | 4 ++++ include/armnn/backends/Workload.hpp | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'include/armnn/backends') diff --git a/include/armnn/backends/IWorkload.hpp b/include/armnn/backends/IWorkload.hpp index d63e0acc72..ce3914bc5a 100644 --- a/include/armnn/backends/IWorkload.hpp +++ b/include/armnn/backends/IWorkload.hpp @@ -31,6 +31,10 @@ public: virtual profiling::ProfilingGuid GetGuid() const = 0; + // SupportsTensorHandleReplacement signals that a given workload is capable of + // replacing any of its I/O tensors via ReplaceInput/OutputTensorHandle + virtual bool SupportsTensorHandleReplacement() const = 0; + // Replace input tensor handle with the given TensorHandle virtual void ReplaceInputTensorHandle(ITensorHandle* /*input*/, unsigned int /*slot*/) = 0; diff --git a/include/armnn/backends/Workload.hpp b/include/armnn/backends/Workload.hpp index 07e1abb392..21109480dc 100644 --- a/include/armnn/backends/Workload.hpp +++ b/include/armnn/backends/Workload.hpp @@ -54,16 +54,23 @@ public: profiling::ProfilingGuid GetGuid() const final { return m_Guid; } + virtual bool SupportsTensorHandleReplacement() const override + { + return false; + } + // Replace input tensor handle with the given TensorHandle void ReplaceInputTensorHandle(ITensorHandle* tensorHandle, unsigned int slot) override { - m_Data.m_Inputs[slot] = tensorHandle; + armnn::IgnoreUnused(tensorHandle, slot); + throw armnn::UnimplementedException("ReplaceInputTensorHandle not implemented for this workload"); } // Replace output tensor handle with the given TensorHandle void ReplaceOutputTensorHandle(ITensorHandle* tensorHandle, unsigned int slot) override { - m_Data.m_Outputs[slot] = tensorHandle; + armnn::IgnoreUnused(tensorHandle, slot); + throw armnn::UnimplementedException("ReplaceOutputTensorHandle not implemented for this workload"); } protected: -- cgit v1.2.1