From 1b2654fb799c3d25ffcef4d31b5d026d359e2f8f Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Fri, 24 Sep 2021 15:45:46 +0100 Subject: IVGCVSW-5985 Remove deprecated code * Removes deprecated AddLayer, IsLayerSupported functions * Marks the whole LayerVisitor class as deprecated not just the constructor. This required to wrap all Accept functions in a no deprecate macro because the LayerVisitor is used as a parameter in there * Removes usage of deprecated LayerVisitor and replaces it with ExecuteStrategy. This required a few structural changes in the unit tests * Adds a default implementation for IStrategy called StrategyBase * Changes pyarmnn to use non deprecated constructor for INetworkProperties and adds related unit test * Marks usage of deprecated code in pyarmnn as deprecated. This required to extend INetworkProperties to allow backwards compatibility * Removes deprecated functions from CpuAcc, GpuAcc and Ref backends Note: This patch breaks compatibility with backends that are not updated in this patch !android-nn-driver:6325 Signed-off-by: Jan Eilers Change-Id: Id13b6f37a74d26eadeda2da1dc92915e725ed5a5 --- src/backends/reference/workloads/CMakeLists.txt | 2 - src/backends/reference/workloads/Decoders.hpp | 7 ---- src/backends/reference/workloads/Encoders.hpp | 10 ----- .../workloads/RefResizeBilinearWorkload.cpp | 45 ---------------------- .../workloads/RefResizeBilinearWorkload.hpp | 24 ------------ src/backends/reference/workloads/RefWorkloads.hpp | 1 - 6 files changed, 89 deletions(-) delete mode 100644 src/backends/reference/workloads/RefResizeBilinearWorkload.cpp delete mode 100644 src/backends/reference/workloads/RefResizeBilinearWorkload.hpp (limited to 'src/backends/reference/workloads') diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index e169c03ad8..5727291be3 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -148,8 +148,6 @@ list(APPEND armnnRefBackendWorkloads_sources RefReduceWorkload.hpp RefReshapeWorkload.cpp RefReshapeWorkload.hpp - RefResizeBilinearWorkload.cpp - RefResizeBilinearWorkload.hpp RefResizeWorkload.cpp RefResizeWorkload.hpp RefShapeWorkload.hpp diff --git a/src/backends/reference/workloads/Decoders.hpp b/src/backends/reference/workloads/Decoders.hpp index cd0dc5d40f..c2a456bfce 100644 --- a/src/backends/reference/workloads/Decoders.hpp +++ b/src/backends/reference/workloads/Decoders.hpp @@ -67,13 +67,6 @@ inline std::unique_ptr> MakeDecoder(const TensorInfo& info, const { switch(info.GetDataType()) { - ARMNN_NO_DEPRECATE_WARN_BEGIN - case armnn::DataType::QuantizedSymm8PerAxis: - { - std::pair> params = armnnUtils::GetPerAxisParams(info); - return std::make_unique(static_cast(data), info); - } - ARMNN_NO_DEPRECATE_WARN_END case DataType::QAsymmS8: { return std::make_unique( diff --git a/src/backends/reference/workloads/Encoders.hpp b/src/backends/reference/workloads/Encoders.hpp index a2d565ec4a..a7be9e172b 100644 --- a/src/backends/reference/workloads/Encoders.hpp +++ b/src/backends/reference/workloads/Encoders.hpp @@ -22,16 +22,6 @@ inline std::unique_ptr> MakeEncoder(const TensorInfo& info, void* { switch(info.GetDataType()) { - ARMNN_NO_DEPRECATE_WARN_BEGIN - case armnn::DataType::QuantizedSymm8PerAxis: - { - std::pair> params = armnnUtils::GetPerAxisParams(info); - return std::make_unique( - static_cast(data), - params.second, - params.first); - } - ARMNN_NO_DEPRECATE_WARN_END case armnn::DataType::QAsymmS8: { return std::make_unique( diff --git a/src/backends/reference/workloads/RefResizeBilinearWorkload.cpp b/src/backends/reference/workloads/RefResizeBilinearWorkload.cpp deleted file mode 100644 index 2cf5888f33..0000000000 --- a/src/backends/reference/workloads/RefResizeBilinearWorkload.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "RefResizeBilinearWorkload.hpp" - -#include "RefWorkloadUtils.hpp" -#include "Resize.hpp" -#include "BaseIterator.hpp" -#include "Profiling.hpp" - -#include "BaseIterator.hpp" -#include "Decoders.hpp" -#include "Encoders.hpp" - -namespace armnn -{ - -void RefResizeBilinearWorkload::Execute() const -{ - Execute(m_Data.m_Inputs, m_Data.m_Outputs); -} - -void RefResizeBilinearWorkload::ExecuteAsync(WorkingMemDescriptor &workingMemDescriptor) -{ - Execute(workingMemDescriptor.m_Inputs, workingMemDescriptor.m_Outputs); -} - -void RefResizeBilinearWorkload::Execute(std::vector inputs, std::vector outputs) const -{ - ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefResizeBilinearWorkload_Execute"); - - const TensorInfo& inputInfo = GetTensorInfo(inputs[0]); - const TensorInfo& outputInfo = GetTensorInfo(outputs[0]); - - std::unique_ptr> decoderPtr = MakeDecoder(inputInfo, inputs[0]->Map()); - Decoder &decoder = *decoderPtr; - std::unique_ptr> encoderPtr = MakeEncoder(outputInfo, outputs[0]->Map()); - Encoder &encoder = *encoderPtr; - - Resize(decoder, inputInfo, encoder, outputInfo, m_Data.m_Parameters.m_DataLayout, armnn::ResizeMethod::Bilinear); -} - -} //namespace armnn diff --git a/src/backends/reference/workloads/RefResizeBilinearWorkload.hpp b/src/backends/reference/workloads/RefResizeBilinearWorkload.hpp deleted file mode 100644 index 5ada3d1ff8..0000000000 --- a/src/backends/reference/workloads/RefResizeBilinearWorkload.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include -#include - -namespace armnn -{ - -class RefResizeBilinearWorkload : public BaseWorkload -{ -public: - using BaseWorkload::BaseWorkload; - void Execute() const override; - void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; -private: - void Execute(std::vector inputs, std::vector outputs) const; -}; - -} //namespace armnn diff --git a/src/backends/reference/workloads/RefWorkloads.hpp b/src/backends/reference/workloads/RefWorkloads.hpp index ed3aa90e5f..914137c23d 100644 --- a/src/backends/reference/workloads/RefWorkloads.hpp +++ b/src/backends/reference/workloads/RefWorkloads.hpp @@ -59,7 +59,6 @@ #include "RefRankWorkload.hpp" #include "RefReduceWorkload.hpp" #include "RefReshapeWorkload.hpp" -#include "RefResizeBilinearWorkload.hpp" #include "RefResizeWorkload.hpp" #include "RefShapeWorkload.hpp" #include "RefSliceWorkload.hpp" -- cgit v1.2.1