From b6de7a1444c09c0eb44c84a923c45c041b1f6092 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Tue, 18 Jul 2023 12:03:41 +0100 Subject: IVGCVSW-7830 Clean up * Follow up review to clean up whitespace and copyright errors mentioned in https://review.mlplatform.org/c/ml/armnn/+/9885 * Added BinaryElementwiseOperation to .dot files * Refactored ConnectedToSplitterWithMoreThan4Dims function to more generally useful ConnectedToLayerType function Signed-off-by: Mike Kelly Change-Id: I0e3d0895888f3a3f0a9758ce30bc031aba50812b --- src/armnn/Network.cpp | 2 +- src/armnn/SerializeLayerParameters.cpp | 6 ++++++ src/armnn/SerializeLayerParameters.hpp | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'src/armnn') diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 010fa0076b..27e91ae39c 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -1322,7 +1322,7 @@ OptimizationResult ApplyBackendOptimizations(OptimizedNetworkImpl* optNetObjPtr, parentOut->Disconnect(inputSlot); for (unsigned int out = deletedLayer->GetOutputSlot(in -1).GetNumConnections(); out > 0; --out) { - InputSlot *childIn = deletedLayer->GetOutputSlot(in - 1).GetConnection(out -1); + InputSlot* childIn = deletedLayer->GetOutputSlot(in - 1).GetConnection(out -1); deletedLayer->GetOutputSlot(in - 1).Disconnect(*childIn); parentOut->Connect(*childIn); } diff --git a/src/armnn/SerializeLayerParameters.cpp b/src/armnn/SerializeLayerParameters.cpp index c318d5273f..67520a72d6 100644 --- a/src/armnn/SerializeLayerParameters.cpp +++ b/src/armnn/SerializeLayerParameters.cpp @@ -187,6 +187,12 @@ void StringifyLayerParameters::Serialize( fn("DataLayout", GetDataLayoutName(desc.m_DataLayout)); } +void StringifyLayerParameters::Serialize(ParameterStringifyFunction& fn, + const ElementwiseBinaryDescriptor& desc) +{ + fn("BinaryOperation", GetBinaryOperationAsCString(desc.m_Operation)); +} + void StringifyLayerParameters::Serialize(ParameterStringifyFunction& fn, const ElementwiseUnaryDescriptor& desc) { diff --git a/src/armnn/SerializeLayerParameters.hpp b/src/armnn/SerializeLayerParameters.hpp index b786c53882..b90f9d85e8 100644 --- a/src/armnn/SerializeLayerParameters.hpp +++ b/src/armnn/SerializeLayerParameters.hpp @@ -75,6 +75,11 @@ template <> struct StringifyLayerParameters static void Serialize(ParameterStringifyFunction& fn, const DepthwiseConvolution2dDescriptor& desc); }; +template <> struct StringifyLayerParameters +{ + static void Serialize(ParameterStringifyFunction& fn, const ElementwiseBinaryDescriptor& desc); +}; + template <> struct StringifyLayerParameters { static void Serialize(ParameterStringifyFunction& fn, const ElementwiseUnaryDescriptor& desc); -- cgit v1.2.1