From 77bfb5e32faadb1383d48364a6f54adbff84ad80 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Wed, 16 Oct 2019 17:45:38 +0100 Subject: IVGCVSW-3993 Add frontend and reference workload for ComparisonLayer * Added frontend for ComparisonLayer * Added RefComparisonWorkload * Deprecated and removed Equal and Greater layers and workloads * Updated tests to ensure backward compatibility Signed-off-by: Aron Virginas-Tar Change-Id: Id50c880be1b567c531efff919c0c366d0a71cbe9 --- src/armnn/InternalTypes.cpp | 3 +- src/armnn/InternalTypes.hpp | 3 +- src/armnn/LayerSupport.cpp | 14 +++- src/armnn/LayersFwd.hpp | 6 +- src/armnn/Network.cpp | 10 ++- src/armnn/Network.hpp | 5 ++ src/armnn/layers/ComparisonLayer.cpp | 80 ++++++++++++++++++++++ src/armnn/layers/ComparisonLayer.hpp | 50 ++++++++++++++ src/armnn/layers/EqualLayer.cpp | 39 ----------- src/armnn/layers/EqualLayer.hpp | 38 ---------- src/armnn/layers/GreaterLayer.cpp | 39 ----------- src/armnn/layers/GreaterLayer.hpp | 39 ----------- .../test/TestNameAndDescriptorLayerVisitor.cpp | 9 ++- .../test/TestNameAndDescriptorLayerVisitor.hpp | 1 + src/armnn/test/TestNameOnlyLayerVisitor.cpp | 2 - src/armnn/test/TestNameOnlyLayerVisitor.hpp | 2 - 16 files changed, 168 insertions(+), 172 deletions(-) create mode 100644 src/armnn/layers/ComparisonLayer.cpp create mode 100644 src/armnn/layers/ComparisonLayer.hpp delete mode 100644 src/armnn/layers/EqualLayer.cpp delete mode 100644 src/armnn/layers/EqualLayer.hpp delete mode 100644 src/armnn/layers/GreaterLayer.cpp delete mode 100644 src/armnn/layers/GreaterLayer.hpp (limited to 'src/armnn') diff --git a/src/armnn/InternalTypes.cpp b/src/armnn/InternalTypes.cpp index 7c39128bec..f713644656 100644 --- a/src/armnn/InternalTypes.cpp +++ b/src/armnn/InternalTypes.cpp @@ -20,6 +20,7 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::ArgMinMax: return "ArgMinMax"; case LayerType::BatchNormalization: return "BatchNormalization"; case LayerType::BatchToSpaceNd: return "BatchToSpaceNd"; + case LayerType::Comparison: return "Comparison"; case LayerType::Concat: return "Concat"; case LayerType::Constant: return "Constant"; case LayerType::ConvertFp16ToFp32: return "ConvertFp16ToFp32"; @@ -31,12 +32,10 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::Dequantize: return "Dequantize"; case LayerType::DetectionPostProcess: return "DetectionPostProcess"; case LayerType::Division: return "Division"; - case LayerType::Equal: return "Equal"; case LayerType::FakeQuantization: return "FakeQuantization"; case LayerType::Floor: return "Floor"; case LayerType::FullyConnected: return "FullyConnected"; case LayerType::Gather: return "Gather"; - case LayerType::Greater: return "Greater"; case LayerType::Input: return "Input"; case LayerType::InstanceNormalization: return "InstanceNormalization"; case LayerType::L2Normalization: return "L2Normalization"; diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index 895fe3235d..d7f932f699 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -20,6 +20,7 @@ enum class LayerType ArgMinMax, BatchNormalization, BatchToSpaceNd, + Comparison, Concat, Constant, ConvertFp16ToFp32, @@ -31,12 +32,10 @@ enum class LayerType Dequantize, DetectionPostProcess, Division, - Equal, FakeQuantization, Floor, FullyConnected, Gather, - Greater, Input, InstanceNormalization, L2Normalization, diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index f88e4e1cc9..997b5f245a 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -262,7 +262,12 @@ bool IsEqualSupported(const BackendId& backend, char* reasonIfUnsupported, size_t reasonIfUnsupportedMaxLength) { - FORWARD_LAYER_SUPPORT_FUNC(backend, IsEqualSupported, input0, input1, output); + FORWARD_LAYER_SUPPORT_FUNC(backend, + IsComparisonSupported, + input0, + input1, + output, + ComparisonDescriptor(ComparisonOperation::Equal)); } bool IsFakeQuantizationSupported(const BackendId& backend, @@ -317,7 +322,12 @@ bool IsGreaterSupported(const BackendId& backend, char* reasonIfUnsupported, size_t reasonIfUnsupportedMaxLength) { - FORWARD_LAYER_SUPPORT_FUNC(backend, IsGreaterSupported, input0, input1, output); + FORWARD_LAYER_SUPPORT_FUNC(backend, + IsComparisonSupported, + input0, + input1, + output, + ComparisonDescriptor(ComparisonOperation::Greater)); } bool IsInputSupported(const BackendId& backend, diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index 7bb9c64818..6c30749904 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -12,6 +12,7 @@ #include "layers/ArgMinMaxLayer.hpp" #include "layers/BatchNormalizationLayer.hpp" #include "layers/BatchToSpaceNdLayer.hpp" +#include "layers/ComparisonLayer.hpp" #include "layers/ConcatLayer.hpp" #include "layers/ConstantLayer.hpp" #include "layers/ConvertFp16ToFp32Layer.hpp" @@ -23,12 +24,10 @@ #include "layers/DequantizeLayer.hpp" #include "layers/DetectionPostProcessLayer.hpp" #include "layers/DivisionLayer.hpp" -#include "layers/EqualLayer.hpp" #include "layers/FakeQuantizationLayer.hpp" #include "layers/FloorLayer.hpp" #include "layers/FullyConnectedLayer.hpp" #include "layers/GatherLayer.hpp" -#include "layers/GreaterLayer.hpp" #include "layers/InputLayer.hpp" #include "layers/InstanceNormalizationLayer.hpp" #include "layers/L2NormalizationLayer.hpp" @@ -97,6 +96,7 @@ DECLARE_LAYER(Addition) DECLARE_LAYER(ArgMinMax) DECLARE_LAYER(BatchNormalization) DECLARE_LAYER(BatchToSpaceNd) +DECLARE_LAYER(Comparison) DECLARE_LAYER(Concat) DECLARE_LAYER(Constant) DECLARE_LAYER(ConvertFp16ToFp32) @@ -108,12 +108,10 @@ DECLARE_LAYER(DepthwiseConvolution2d) DECLARE_LAYER(Dequantize) DECLARE_LAYER(DetectionPostProcess) DECLARE_LAYER(Division) -DECLARE_LAYER(Equal) DECLARE_LAYER(FakeQuantization) DECLARE_LAYER(Floor) DECLARE_LAYER(FullyConnected) DECLARE_LAYER(Gather) -DECLARE_LAYER(Greater) DECLARE_LAYER(Input) DECLARE_LAYER(InstanceNormalization) DECLARE_LAYER(L2Normalization) diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index b2fc1a6389..857f6b3959 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -938,6 +938,12 @@ IConnectableLayer* Network::AddBatchToSpaceNdLayer(const BatchToSpaceNdDescripto return m_Graph->AddLayer(batchToSpaceNdDescriptor, name); } +IConnectableLayer* Network::AddComparisonLayer(const ComparisonDescriptor& comparisonDescriptor, + const char* name) +{ + return m_Graph->AddLayer(comparisonDescriptor, name); +} + IConnectableLayer* Network::AddFullyConnectedLayerImpl(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, const Optional& biases, @@ -1436,12 +1442,12 @@ IConnectableLayer* Network::AddStridedSliceLayer(const StridedSliceDescriptor& s IConnectableLayer* Network::AddGreaterLayer(const char* name) { - return m_Graph->AddLayer(name); + return AddComparisonLayer(ComparisonDescriptor(ComparisonOperation::Greater), name); } IConnectableLayer* Network::AddEqualLayer(const char* name) { - return m_Graph->AddLayer(name); + return AddComparisonLayer(ComparisonDescriptor(ComparisonOperation::Equal), name); } IConnectableLayer* Network::AddRsqrtLayer(const char * name) diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index ad1e7c456e..c1d99a9010 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -42,6 +42,9 @@ public: IConnectableLayer* AddBatchToSpaceNdLayer(const BatchToSpaceNdDescriptor& batchToSpaceNdDescriptor, const char* name = nullptr) override; + IConnectableLayer* AddComparisonLayer(const ComparisonDescriptor& comparisonDescriptor, + const char* name = nullptr) override; + IConnectableLayer* AddConcatLayer(const ConcatDescriptor& concatDescriptor, const char* name = nullptr) override; @@ -197,8 +200,10 @@ public: IConnectableLayer* AddMinimumLayer(const char* name = nullptr) override; + ARMNN_DEPRECATED_MSG("Use AddComparisonLayer instead") IConnectableLayer* AddGreaterLayer(const char* name = nullptr) override; + ARMNN_DEPRECATED_MSG("Use AddComparisonLayer instead") IConnectableLayer* AddEqualLayer(const char* name = nullptr) override; IConnectableLayer* AddRsqrtLayer(const char* name = nullptr) override; diff --git a/src/armnn/layers/ComparisonLayer.cpp b/src/armnn/layers/ComparisonLayer.cpp new file mode 100644 index 0000000000..75518e580e --- /dev/null +++ b/src/armnn/layers/ComparisonLayer.cpp @@ -0,0 +1,80 @@ +// +// Copyright © 2019 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "ComparisonLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include +#include + +#include + +namespace armnn +{ + +ComparisonLayer::ComparisonLayer(const ComparisonDescriptor& param, const char* name) + : LayerWithParameters(2, 1, LayerType::Comparison, param, name) +{ +} + +std::unique_ptr ComparisonLayer::CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const +{ + ComparisonQueueDescriptor descriptor; + return factory.CreateComparison(descriptor, PrepInfoAndDesc(descriptor, graph)); +} + +ComparisonLayer* ComparisonLayer::Clone(Graph& graph) const +{ + return CloneBase(graph, m_Param, GetName()); +} + +std::vector ComparisonLayer::InferOutputShapes(const std::vector& inputShapes) const +{ + BOOST_ASSERT(inputShapes.size() == 2); + const TensorShape& input0 = inputShapes[0]; + const TensorShape& input1 = inputShapes[1]; + + BOOST_ASSERT(input0.GetNumDimensions() == input1.GetNumDimensions()); + unsigned int numDims = input0.GetNumDimensions(); + + std::vector dims(numDims); + for (unsigned int i = 0; i < numDims; i++) + { + unsigned int dim0 = input0[i]; + unsigned int dim1 = input1[i]; + + BOOST_ASSERT_MSG(dim0 == dim1 || dim0 == 1 || dim1 == 1, + "Dimensions should either match or one should be of size 1."); + + dims[i] = std::max(dim0, dim1); + } + + return std::vector({ TensorShape(numDims, dims.data()) }); +} + +void ComparisonLayer::ValidateTensorShapesFromInputs() +{ + VerifyLayerConnections(2, CHECK_LOCATION()); + + std::vector inferredShapes = InferOutputShapes({ + GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape(), + GetInputSlot(1).GetConnection()->GetTensorInfo().GetShape() + }); + BOOST_ASSERT(inferredShapes.size() == 1); + + ConditionalThrowIfNotEqual( + "ComparisonLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", + GetOutputSlot(0).GetTensorInfo().GetShape(), + inferredShapes[0]); +} + +void ComparisonLayer::Accept(ILayerVisitor& visitor) const +{ + visitor.VisitComparisonLayer(this, GetParameters(), GetName()); +} + +} // namespace armnn diff --git a/src/armnn/layers/ComparisonLayer.hpp b/src/armnn/layers/ComparisonLayer.hpp new file mode 100644 index 0000000000..bbc2b573bf --- /dev/null +++ b/src/armnn/layers/ComparisonLayer.hpp @@ -0,0 +1,50 @@ +// +// Copyright © 2019 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "LayerWithParameters.hpp" + +namespace armnn +{ + +/// This layer represents a comparison operation. +class ComparisonLayer : public LayerWithParameters +{ +public: + /// Makes a workload for the Comparison type + /// @param [in] graph The graph where this layer can be found + /// @param [in] factory The workload factory which will create the workload + /// @return A pointer to the created workload, or nullptr if not created + virtual std::unique_ptr CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const override; + + /// Creates a dynamically-allocated copy of this layer + /// @param [in] graph The graph into which this layer is being cloned + ComparisonLayer* Clone(Graph& graph) const override; + + /// By default returns inputShapes if the number of inputs are equal to number of outputs, + /// otherwise infers the output shapes from given input shapes and layer properties. + /// @param [in] inputShapes The input shapes layer has. + /// @return A vector to the inferred output shape. + std::vector InferOutputShapes(const std::vector& inputShapes) const override; + + /// Check if the input tensor shape(s) will lead to a valid configuration + /// of @ref ComparisonLayer + void ValidateTensorShapesFromInputs() override; + + void Accept(ILayerVisitor& visitor) const override; + +protected: + /// Constructor to create a ComparisonLayer + /// @param [in] param ComparisonDescriptor to configure the ComparisonLayer + /// @param [in] name Optional name for the layer + ComparisonLayer(const ComparisonDescriptor& param, const char* name); + + /// Default destructor + ~ComparisonLayer() = default; +}; + +} // namespace armnn diff --git a/src/armnn/layers/EqualLayer.cpp b/src/armnn/layers/EqualLayer.cpp deleted file mode 100644 index 7d16668b06..0000000000 --- a/src/armnn/layers/EqualLayer.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "EqualLayer.hpp" - -#include "LayerCloneBase.hpp" - -#include -#include -#include - -namespace armnn -{ - -EqualLayer::EqualLayer(const char* name) - : ElementwiseBaseLayer(2, 1, LayerType::Equal, name) -{ -} - -std::unique_ptr EqualLayer::CreateWorkload(const Graph& graph, - const IWorkloadFactory& factory) const -{ - EqualQueueDescriptor descriptor; - return factory.CreateEqual(descriptor, PrepInfoAndDesc(descriptor, graph)); -} - -EqualLayer* EqualLayer::Clone(Graph& graph) const -{ - return CloneBase(graph, GetName()); -} - -void EqualLayer::Accept(ILayerVisitor& visitor) const -{ - visitor.VisitEqualLayer(this, GetName()); -} - -} // namespace armnn diff --git a/src/armnn/layers/EqualLayer.hpp b/src/armnn/layers/EqualLayer.hpp deleted file mode 100644 index b6a01eff2d..0000000000 --- a/src/armnn/layers/EqualLayer.hpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include "ElementwiseBaseLayer.hpp" - -namespace armnn -{ -/// This layer represents an equal operation. -class EqualLayer : public ElementwiseBaseLayer -{ -public: - /// Makes a workload for the Equal type. - /// @param [in] graph The graph where this layer can be found. - /// @param [in] factory The workload factory which will create the workload. - /// @return A pointer to the created workload, or nullptr if not created. - virtual std::unique_ptr CreateWorkload(const Graph& graph, - const IWorkloadFactory& factory) const override; - - /// Creates a dynamically-allocated copy of this layer. - /// @param [in] graph The graph into which this layer is being cloned. - EqualLayer* Clone(Graph& graph) const override; - - void Accept(ILayerVisitor& visitor) const override; - -protected: - /// Constructor to create a EqualLayer. - /// @param [in] name Optional name for the layer. - EqualLayer(const char* name); - - /// Default destructor - ~EqualLayer() = default; -}; - -} //namespace armnn diff --git a/src/armnn/layers/GreaterLayer.cpp b/src/armnn/layers/GreaterLayer.cpp deleted file mode 100644 index a9fe5e0d8c..0000000000 --- a/src/armnn/layers/GreaterLayer.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "GreaterLayer.hpp" - -#include "LayerCloneBase.hpp" - -#include -#include -#include - -namespace armnn -{ - -GreaterLayer::GreaterLayer(const char* name) - : ElementwiseBaseLayer(2, 1, LayerType::Greater, name) -{ -} - -std::unique_ptr GreaterLayer::CreateWorkload(const Graph& graph, - const IWorkloadFactory& factory) const -{ - GreaterQueueDescriptor descriptor; - return factory.CreateGreater(descriptor, PrepInfoAndDesc(descriptor, graph)); -} - -GreaterLayer* GreaterLayer::Clone(Graph& graph) const -{ - return CloneBase(graph, GetName()); -} - -void GreaterLayer::Accept(ILayerVisitor& visitor) const -{ - visitor.VisitGreaterLayer(this, GetName()); -} - -} // namespace armnn diff --git a/src/armnn/layers/GreaterLayer.hpp b/src/armnn/layers/GreaterLayer.hpp deleted file mode 100644 index bdee948d6e..0000000000 --- a/src/armnn/layers/GreaterLayer.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include "ElementwiseBaseLayer.hpp" - -namespace armnn -{ - -/// This layer represents a greater operation. -class GreaterLayer : public ElementwiseBaseLayer -{ -public: - /// Makes a workload for the Greater type. - /// @param [in] graph The graph where this layer can be found. - /// @param [in] factory The workload factory which will create the workload. - /// @return A pointer to the created workload, or nullptr if not created. - virtual std::unique_ptr CreateWorkload(const Graph& graph, - const IWorkloadFactory& factory) const override; - - /// Creates a dynamically-allocated copy of this layer. - /// @param [in] graph The graph into which this layer is being cloned. - GreaterLayer* Clone(Graph& graph) const override; - - void Accept(ILayerVisitor& visitor) const override; - -protected: - /// Constructor to create a GreaterLayer. - /// @param [in] name Optional name for the layer. - GreaterLayer(const char* name); - - /// Default destructor - ~GreaterLayer() = default; -}; - -} //namespace armnn diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp index 0b126235e8..36bbd36792 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp @@ -64,6 +64,12 @@ armnn::BatchToSpaceNdDescriptor GetDescriptor() return armnn::BatchToSpaceNdDescriptor({ 1, 1 }, {{ 0, 0 }, { 0, 0 }}); } +template<> +armnn::ComparisonDescriptor GetDescriptor() +{ + return armnn::ComparisonDescriptor(armnn::ComparisonOperation::GreaterOrEqual); +} + template<> armnn::ConcatDescriptor GetDescriptor() { @@ -243,6 +249,7 @@ TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Activation) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(ArgMinMax) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(DepthToSpace) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(BatchToSpaceNd) +TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Comparison) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Concat) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(InstanceNormalization) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(L2Normalization) @@ -262,4 +269,4 @@ TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Splitter) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Stack) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(StridedSlice) -BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp index aefcba5f59..b1f7f57075 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp @@ -46,6 +46,7 @@ public: \ DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Activation) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(ArgMinMax) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(BatchToSpaceNd) +DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Comparison) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Concat) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(DepthToSpace) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(InstanceNormalization) diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.cpp b/src/armnn/test/TestNameOnlyLayerVisitor.cpp index 6bc2dc7c65..32de94e7ef 100644 --- a/src/armnn/test/TestNameOnlyLayerVisitor.cpp +++ b/src/armnn/test/TestNameOnlyLayerVisitor.cpp @@ -42,10 +42,8 @@ TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Abs) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Addition) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Dequantize) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Division) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Equal) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Floor) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Gather) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Greater) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Maximum) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Merge) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Minimum) diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.hpp b/src/armnn/test/TestNameOnlyLayerVisitor.hpp index a772cb3283..c770b5e9e0 100644 --- a/src/armnn/test/TestNameOnlyLayerVisitor.hpp +++ b/src/armnn/test/TestNameOnlyLayerVisitor.hpp @@ -29,10 +29,8 @@ DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Abs) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Addition) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Dequantize) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Division) -DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Equal) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Floor) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Gather) -DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Greater) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Maximum) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Merge) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Minimum) -- cgit v1.2.1