From 0790dcea1056298d63f97dec904c8ade5d21f439 Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Mon, 15 Apr 2019 18:37:35 +0100 Subject: IVGCVSW-2957 MergerLayer subtensor optimization now backend agnostic + Update clframework pin + Cl and Neon Merger workloads updated to use MemoryLayout agnostic API + Workloads only use sub-tensor optimization if ALL input tensors are sub-tensors + Refactor LayerSupportCommon code to be a bit more succinct Change-Id: Ib61ad4ccbd767e924dff07e61022e0cda4069828 Signed-off-by: Derek Lamberti --- src/backends/cl/ClWorkloadFactory.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/backends/cl/ClWorkloadFactory.cpp') diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index d41a7e5997..e4097a1b50 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -113,6 +113,12 @@ std::unique_ptr ClWorkloadFactory::CreateSubTensorHandle(ITensorH coords.set(i, boost::numeric_cast(subTensorOrigin[revertedIndex])); } + const arm_compute::TensorShape parentShape = armcomputetensorutils::BuildArmComputeTensorShape(parent.GetShape()); + if (!::arm_compute::error_on_invalid_subtensor(__func__, __FILE__, __LINE__, parentShape, coords, shape)) + { + return nullptr; + } + return std::make_unique( boost::polymorphic_downcast(&parent), shape, coords); } -- cgit v1.2.1