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/armnnSerializer/test/SerializerTests.cpp | 84 ---------------------------- 1 file changed, 84 deletions(-) (limited to 'src/armnnSerializer/test/SerializerTests.cpp') diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index a70c891849..58f56f484f 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -1009,48 +1009,6 @@ BOOST_AUTO_TEST_CASE(SerializeDivision) deserializedNetwork->Accept(verifier); } -BOOST_AUTO_TEST_CASE(SerializeEqual) -{ - class EqualLayerVerifier : public LayerVerifierBase - { - public: - EqualLayerVerifier(const std::string& layerName, - const std::vector& inputInfos, - const std::vector& outputInfos) - : LayerVerifierBase(layerName, inputInfos, outputInfos) {} - - void VisitEqualLayer(const armnn::IConnectableLayer* layer, const char* name) override - { - VerifyNameAndConnections(layer, name); - } - }; - - const std::string layerName("equal"); - const armnn::TensorInfo inputTensorInfo1 = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Float32); - const armnn::TensorInfo inputTensorInfo2 = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Float32); - const armnn::TensorInfo outputTensorInfo = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Boolean); - - armnn::INetworkPtr network = armnn::INetwork::Create(); - armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(0); - armnn::IConnectableLayer* const inputLayer2 = network->AddInputLayer(1); - armnn::IConnectableLayer* const equalLayer = network->AddEqualLayer(layerName.c_str()); - armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); - - inputLayer1->GetOutputSlot(0).Connect(equalLayer->GetInputSlot(0)); - inputLayer2->GetOutputSlot(0).Connect(equalLayer->GetInputSlot(1)); - equalLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); - - inputLayer1->GetOutputSlot(0).SetTensorInfo(inputTensorInfo1); - inputLayer2->GetOutputSlot(0).SetTensorInfo(inputTensorInfo2); - equalLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); - - armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); - BOOST_CHECK(deserializedNetwork); - - EqualLayerVerifier verifier(layerName, {inputTensorInfo1, inputTensorInfo2}, {outputTensorInfo}); - deserializedNetwork->Accept(verifier); -} - BOOST_AUTO_TEST_CASE(SerializeFloor) { class FloorLayerVerifier : public LayerVerifierBase @@ -1225,48 +1183,6 @@ BOOST_AUTO_TEST_CASE(SerializeGather) deserializedNetwork->Accept(verifier); } -BOOST_AUTO_TEST_CASE(SerializeGreater) -{ - class GreaterLayerVerifier : public LayerVerifierBase - { - public: - GreaterLayerVerifier(const std::string& layerName, - const std::vector& inputInfos, - const std::vector& outputInfos) - : LayerVerifierBase(layerName, inputInfos, outputInfos) {} - - void VisitGreaterLayer(const armnn::IConnectableLayer* layer, const char* name) override - { - VerifyNameAndConnections(layer, name); - } - }; - - const std::string layerName("greater"); - const armnn::TensorInfo inputTensorInfo1({ 1, 2, 2, 2 }, armnn::DataType::Float32); - const armnn::TensorInfo inputTensorInfo2({ 1, 2, 2, 2 }, armnn::DataType::Float32); - const armnn::TensorInfo outputTensorInfo({ 1, 2, 2, 2 }, armnn::DataType::Boolean); - - armnn::INetworkPtr network = armnn::INetwork::Create(); - armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(0); - armnn::IConnectableLayer* const inputLayer2 = network->AddInputLayer(1); - armnn::IConnectableLayer* const greaterLayer = network->AddGreaterLayer(layerName.c_str()); - armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); - - inputLayer1->GetOutputSlot(0).Connect(greaterLayer->GetInputSlot(0)); - inputLayer2->GetOutputSlot(0).Connect(greaterLayer->GetInputSlot(1)); - greaterLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); - - inputLayer1->GetOutputSlot(0).SetTensorInfo(inputTensorInfo1); - inputLayer2->GetOutputSlot(0).SetTensorInfo(inputTensorInfo2); - greaterLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); - - armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); - BOOST_CHECK(deserializedNetwork); - - GreaterLayerVerifier verifier(layerName, {inputTensorInfo1, inputTensorInfo2}, {outputTensorInfo}); - deserializedNetwork->Accept(verifier); -} - BOOST_AUTO_TEST_CASE(SerializeInstanceNormalization) { class InstanceNormalizationLayerVerifier : public LayerVerifierBase -- cgit v1.2.1