From 52e90bf59ecbe90d33368d8fc1fd120f07658aaf Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Wed, 15 Mar 2023 15:06:23 +0000 Subject: IVGCVSW-3808 Deprecation notices for old ElementwiseBinary layers * Added Deprecation notices for old ElementwiseBinary layers. Signed-off-by: Mike Kelly Change-Id: Iebbbaff38cc9c347b25eb2f9054c914a4f931c68 --- shim/sl/canonical/Converter.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'shim') diff --git a/shim/sl/canonical/Converter.cpp b/shim/sl/canonical/Converter.cpp index be052a6faa..90fd71154f 100644 --- a/shim/sl/canonical/Converter.cpp +++ b/shim/sl/canonical/Converter.cpp @@ -209,6 +209,7 @@ bool Converter::ConvertAdd(const Operation& operation, const Model& model, Conve armnn::BackendId setBackend; auto validateFunc = [&](const armnn::TensorInfo& outputInfo, bool& isSupported) { + ARMNN_NO_DEPRECATE_WARN_BEGIN FORWARD_LAYER_SUPPORT_FUNC(__func__, IsAdditionSupported, data.m_Backends, @@ -217,6 +218,7 @@ bool Converter::ConvertAdd(const Operation& operation, const Model& model, Conve inputInfo0, inputInfo1, outputInfo); + ARMNN_NO_DEPRECATE_WARN_END }; if(!IsDynamicTensor(outputInfo)) @@ -233,7 +235,9 @@ bool Converter::ConvertAdd(const Operation& operation, const Model& model, Conve return false; } + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const startLayer = data.m_Network->AddAdditionLayer(); + ARMNN_NO_DEPRECATE_WARN_END startLayer->SetBackendId(setBackend); bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data); @@ -1536,6 +1540,7 @@ bool Converter::ConvertDiv(const Operation& operation, const Model& model, Conve armnn::BackendId setBackend; auto validateFunc = [&](const armnn::TensorInfo& outputInfo, bool& isSupported) { + ARMNN_NO_DEPRECATE_WARN_BEGIN FORWARD_LAYER_SUPPORT_FUNC(__func__, IsDivisionSupported, data.m_Backends, @@ -1544,6 +1549,7 @@ bool Converter::ConvertDiv(const Operation& operation, const Model& model, Conve input0.GetTensorInfo(), input1.GetTensorInfo(), outputInfo); + ARMNN_NO_DEPRECATE_WARN_END }; if(!IsDynamicTensor(outputInfo)) @@ -1560,7 +1566,9 @@ bool Converter::ConvertDiv(const Operation& operation, const Model& model, Conve return false; } + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const startLayer = data.m_Network->AddDivisionLayer(); + ARMNN_NO_DEPRECATE_WARN_END startLayer->SetBackendId(setBackend); bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data); @@ -3378,6 +3386,7 @@ bool Converter::ConvertMaximum(const Operation& operation, const Model& model, C armnn::BackendId setBackend; auto validateFunc = [&](const armnn::TensorInfo& outInfo, bool& isSupported) { + ARMNN_NO_DEPRECATE_WARN_BEGIN FORWARD_LAYER_SUPPORT_FUNC(__func__, IsMaximumSupported, data.m_Backends, @@ -3386,6 +3395,7 @@ bool Converter::ConvertMaximum(const Operation& operation, const Model& model, C input0.GetTensorInfo(), input1.GetTensorInfo(), outInfo); + ARMNN_NO_DEPRECATE_WARN_END }; if(IsDynamicTensor(outInfo)) @@ -3402,7 +3412,9 @@ bool Converter::ConvertMaximum(const Operation& operation, const Model& model, C return false; } + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer* layer = data.m_Network->AddMaximumLayer(); + ARMNN_NO_DEPRECATE_WARN_END layer->SetBackendId(setBackend); assert(layer != nullptr); bool isReshapeSupported = BroadcastTensor(input0, input1, layer, data); @@ -3524,6 +3536,7 @@ bool Converter::ConvertMinimum(const Operation& operation, const Model& model, C armnn::BackendId setBackend; auto validateFunc = [&](const armnn::TensorInfo& outputInfo, bool& isSupported) { + ARMNN_NO_DEPRECATE_WARN_BEGIN FORWARD_LAYER_SUPPORT_FUNC(__func__, IsMinimumSupported, data.m_Backends, @@ -3532,6 +3545,7 @@ bool Converter::ConvertMinimum(const Operation& operation, const Model& model, C input0.GetTensorInfo(), input1.GetTensorInfo(), outputInfo); + ARMNN_NO_DEPRECATE_WARN_END }; if(IsDynamicTensor(outputInfo)) @@ -3548,7 +3562,9 @@ bool Converter::ConvertMinimum(const Operation& operation, const Model& model, C return false; } + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer* const layer = data.m_Network->AddMinimumLayer(); + ARMNN_NO_DEPRECATE_WARN_END layer->SetBackendId(setBackend); assert(layer != nullptr); bool isReshapeSupported = BroadcastTensor(input0, input1, layer, data); @@ -3593,6 +3609,7 @@ bool Converter::ConvertMul(const Operation& operation, const Model& model, Conve armnn::BackendId setBackend; auto validateFunc = [&](const armnn::TensorInfo& outputInfo, bool& isSupported) { + ARMNN_NO_DEPRECATE_WARN_BEGIN FORWARD_LAYER_SUPPORT_FUNC(__func__, IsMultiplicationSupported, data.m_Backends, @@ -3601,6 +3618,7 @@ bool Converter::ConvertMul(const Operation& operation, const Model& model, Conve input0.GetTensorInfo(), input1.GetTensorInfo(), outputInfo); + ARMNN_NO_DEPRECATE_WARN_END }; if(!IsDynamicTensor(outputInfo)) @@ -3617,7 +3635,9 @@ bool Converter::ConvertMul(const Operation& operation, const Model& model, Conve return false; } + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const startLayer = data.m_Network->AddMultiplicationLayer(); + ARMNN_NO_DEPRECATE_WARN_END startLayer->SetBackendId(setBackend); bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data); @@ -5340,6 +5360,7 @@ bool Converter::ConvertSub(const Operation& operation, const Model& model, Conve armnn::BackendId setBackend; auto validateFunc = [&](const armnn::TensorInfo& outputInfo, bool& isSupported) { + ARMNN_NO_DEPRECATE_WARN_BEGIN FORWARD_LAYER_SUPPORT_FUNC(__func__, IsSubtractionSupported, data.m_Backends, @@ -5348,6 +5369,7 @@ bool Converter::ConvertSub(const Operation& operation, const Model& model, Conve input0.GetTensorInfo(), input1.GetTensorInfo(), outputInfo); + ARMNN_NO_DEPRECATE_WARN_END }; if(IsDynamicTensor(outputInfo)) @@ -5364,7 +5386,9 @@ bool Converter::ConvertSub(const Operation& operation, const Model& model, Conve return false; } + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const startLayer = data.m_Network->AddSubtractionLayer(); + ARMNN_NO_DEPRECATE_WARN_END startLayer->SetBackendId(setBackend); bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data); -- cgit v1.2.1