From b454c5c65efb238c130b042ace390b2bc7f0bf75 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Tue, 9 Feb 2021 15:56:23 +0000 Subject: IVGCVSW-4893 Refactor ILayerVisitor using unified interface strategy. Signed-off-by: Jan Eilers Signed-off-by: Finn Williams Signed-off-by: Francis Murtagh Change-Id: Id7bc8255a8e3f9e5aac65d510bec8a559bf37246 --- .../test/ActivationSerializationTests.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/armnnSerializer/test/ActivationSerializationTests.cpp') diff --git a/src/armnnSerializer/test/ActivationSerializationTests.cpp b/src/armnnSerializer/test/ActivationSerializationTests.cpp index 1645731413..fbe1ae0ad4 100644 --- a/src/armnnSerializer/test/ActivationSerializationTests.cpp +++ b/src/armnnSerializer/test/ActivationSerializationTests.cpp @@ -17,15 +17,20 @@ BOOST_AUTO_TEST_SUITE(SerializerTests) -class VerifyActivationName : public armnn::LayerVisitorBase +class VerifyActivationName : public armnn::IStrategy { public: - void VisitActivationLayer(const armnn::IConnectableLayer* layer, - const armnn::ActivationDescriptor& activationDescriptor, - const char* name) override + void ExecuteStrategy(const armnn::IConnectableLayer* layer, + const armnn::BaseDescriptor& descriptor, + const std::vector& constants, + const char* name, + const armnn::LayerBindingId id = 0) override { - IgnoreUnused(layer, activationDescriptor); - BOOST_TEST(name == "activation"); + IgnoreUnused(layer, descriptor, constants, id); + if (layer->GetType() == armnn::LayerType::Activation) + { + BOOST_TEST(name == "activation"); + } } }; @@ -67,7 +72,7 @@ BOOST_AUTO_TEST_CASE(ActivationSerialization) armnn::INetworkPtr deserializedNetwork = parser->CreateNetworkFromBinary(serializerVector); VerifyActivationName visitor; - deserializedNetwork->Accept(visitor); + deserializedNetwork->ExecuteStrategy(visitor); armnn::IRuntime::CreationOptions options; // default options armnn::IRuntimePtr run = armnn::IRuntime::Create(options); -- cgit v1.2.1