diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2023-07-18 12:03:41 +0100 |
|---|---|---|
| committer | mike.kelly <mike.kelly@arm.com> | 2023-07-21 16:01:50 +0000 |
| commit | b6de7a1444c09c0eb44c84a923c45c041b1f6092 (patch) | |
| tree | c1d9e9241854e7d9bbb09da4f4a6f4652ff5c66c /src/armnn | |
| parent | c32adef195b523854144737ca05180235f5ca824 (diff) | |
| download | armnn-b6de7a1444c09c0eb44c84a923c45c041b1f6092.tar.gz | |
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 <mike.kelly@arm.com>
Change-Id: I0e3d0895888f3a3f0a9758ce30bc031aba50812b
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/Network.cpp | 2 | ||||
| -rw-r--r-- | src/armnn/SerializeLayerParameters.cpp | 6 | ||||
| -rw-r--r-- | src/armnn/SerializeLayerParameters.hpp | 5 |
3 files changed, 12 insertions, 1 deletions
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<DepthwiseConvolution2dDescriptor>::Serialize( fn("DataLayout", GetDataLayoutName(desc.m_DataLayout)); } +void StringifyLayerParameters<ElementwiseBinaryDescriptor>::Serialize(ParameterStringifyFunction& fn, + const ElementwiseBinaryDescriptor& desc) +{ + fn("BinaryOperation", GetBinaryOperationAsCString(desc.m_Operation)); +} + void StringifyLayerParameters<ElementwiseUnaryDescriptor>::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<DepthwiseConvolution2dDescriptor> static void Serialize(ParameterStringifyFunction& fn, const DepthwiseConvolution2dDescriptor& desc); }; +template <> struct StringifyLayerParameters<ElementwiseBinaryDescriptor> +{ + static void Serialize(ParameterStringifyFunction& fn, const ElementwiseBinaryDescriptor& desc); +}; + template <> struct StringifyLayerParameters<ElementwiseUnaryDescriptor> { static void Serialize(ParameterStringifyFunction& fn, const ElementwiseUnaryDescriptor& desc); |