From 008270f8c1359a7d62c2f881326b4d3f0d8b7b56 Mon Sep 17 00:00:00 2001 From: Nikhil Raj Arm Date: Fri, 11 Aug 2023 08:55:21 +0000 Subject: Revert "MLCE-1093 Reshape and concat invalid results" This reverts commit 4980e21193f0a14fef084a7f4b4197392f3c0845. Reason for revert: Android Build for v82a failed due to schema not re-generating Change-Id: Ic19cf471b487f321c97ff837d36526512fb12fa4 --- .../test/layerTests/SplitterTestImpl.cpp | 49 +--------------------- 1 file changed, 1 insertion(+), 48 deletions(-) (limited to 'src/backends/backendsCommon/test/layerTests') diff --git a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp index 13483e5ebd..9e3d83c0f4 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019-2020,2023 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017, 2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -199,29 +199,11 @@ std::vector> SplitterTestCommon( // Do the first split armnn::SplitterQueueDescriptor data; - data.m_Parameters = armnn::SplitterDescriptor(2, 3); - armnn::WorkloadInfo info; AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); AddOutputToWorkload(data, info, outputTensorInfo1, outputHandle1.get()); AddOutputToWorkload(data, info, outputTensorInfo2, outputHandle2.get()); - data.m_Parameters.SetViewSize(0, 0, outputChannels1); - data.m_Parameters.SetViewSize(0, 1, outputHeight1); - data.m_Parameters.SetViewSize(0, 2, outputWidth1); - - data.m_Parameters.SetViewSize(1, 0, outputChannels2); - data.m_Parameters.SetViewSize(1, 1, outputHeight2); - data.m_Parameters.SetViewSize(1, 2, outputWidth2); - - data.m_Parameters.SetViewOriginCoord(0, 0, 0); - data.m_Parameters.SetViewOriginCoord(0, 1, 0); - data.m_Parameters.SetViewOriginCoord(0, 2, 0); - - data.m_Parameters.SetViewOriginCoord(1, 0, 1); - data.m_Parameters.SetViewOriginCoord(1, 1, 0); - data.m_Parameters.SetViewOriginCoord(1, 2, 0); - data.m_ViewOrigins.push_back(window1); data.m_ViewOrigins.push_back(window2); @@ -242,29 +224,11 @@ std::vector> SplitterTestCommon( // Do the second split. armnn::SplitterQueueDescriptor data2; - data2.m_Parameters = armnn::SplitterDescriptor(2, 3); - armnn::WorkloadInfo info2; AddInputToWorkload(data2, info2, outputTensorInfo2, outputHandle2.get()); AddOutputToWorkload(data2, info2, outputTensorInfo3, outputHandle3.get()); AddOutputToWorkload(data2, info2, outputTensorInfo4, outputHandle4.get()); - data2.m_Parameters.SetViewSize(0, 0, outputChannels1); - data2.m_Parameters.SetViewSize(0, 1, outputHeight1); - data2.m_Parameters.SetViewSize(0, 2, outputWidth1); - - data2.m_Parameters.SetViewSize(1, 0, outputChannels2); - data2.m_Parameters.SetViewSize(1, 1, outputHeight2); - data2.m_Parameters.SetViewSize(1, 2, outputWidth1); - - data2.m_Parameters.SetViewOriginCoord(0, 0, 0); - data2.m_Parameters.SetViewOriginCoord(0, 1, 0); - data2.m_Parameters.SetViewOriginCoord(0, 2, 0); - - data2.m_Parameters.SetViewOriginCoord(1, 0, 1); - data2.m_Parameters.SetViewOriginCoord(1, 1, 0); - data2.m_Parameters.SetViewOriginCoord(1, 2, 0); - data2.m_ViewOrigins.push_back(window3); data2.m_ViewOrigins.push_back(window4); @@ -343,17 +307,6 @@ LayerTestResult CopyViaSplitterTestImpl( AddInputToWorkload(data, info, tensorInfo, inputHandle.get()); AddOutputToWorkload(data, info, tensorInfo, outputHandle.get()); - data.m_Parameters = armnn::SplitterDescriptor(1, 3); - data.m_Parameters.SetAxis(0); - - data.m_Parameters.SetViewSize(0, 0, 3); - data.m_Parameters.SetViewSize(0, 1, 6); - data.m_Parameters.SetViewSize(0, 2, 5); - - data.m_Parameters.SetViewOriginCoord(0, 0, 0); - data.m_Parameters.SetViewOriginCoord(0, 1, 0); - data.m_Parameters.SetViewOriginCoord(0, 2, 0); - data.m_ViewOrigins.push_back(window); std::unique_ptr workload = workloadFactory.CreateWorkload(armnn::LayerType::Splitter, -- cgit v1.2.1