From bc2bd041448e8839c3553f5e231607fad7081e0c Mon Sep 17 00:00:00 2001 From: Bartek Szmelczynski Date: Wed, 23 Dec 2020 05:52:08 +0100 Subject: [PATCH] Check disabled tests (#3441) * add 4 tests for operators based on model zoo * fix wrong names of the models * add functional tests for equal, lstm_cell and psroi_pooling operators * add functional tests for ConverLike and Mod operators * add funtional tests which were disabled, and add a minor change in convert_function_to_cnn_network.cpp file in order to make LogicalNot operator pass a test * back to the previous .xml model * made a changes in ir_layer_parsers.cpp in order to make logicalNot pass a test * minor fixes to LogicalNot operator in ie_layers_parsers.cpp * rename friendly name to "not" * add if statement for Activation type * fix style --- .../src/readers/ir_reader_v7/ie_layer_parsers.cpp | 1 + .../inference_engine/ngraph_reader/greater_tests.cpp | 2 +- .../functional/inference_engine/ngraph_reader/less_tests.cpp | 2 +- .../inference_engine/ngraph_reader/logical_and_tests.cpp | 2 +- .../inference_engine/ngraph_reader/logical_not_tests.cpp | 3 ++- .../inference_engine/ngraph_reader/logical_or_tests.cpp | 2 +- .../inference_engine/ngraph_reader/logical_xor_tests.cpp | 2 +- .../ngraph_reader/reduce_logical_and_tests.cpp | 2 +- .../ngraph_reader/reduce_logical_or_tests.cpp | 2 +- .../functional_test_utils/src/network_utils.cpp | 5 +++++ 10 files changed, 15 insertions(+), 8 deletions(-) diff --git a/inference-engine/src/readers/ir_reader_v7/ie_layer_parsers.cpp b/inference-engine/src/readers/ir_reader_v7/ie_layer_parsers.cpp index 2ca2a80b7f0..961407d1b25 100644 --- a/inference-engine/src/readers/ir_reader_v7/ie_layer_parsers.cpp +++ b/inference-engine/src/readers/ir_reader_v7/ie_layer_parsers.cpp @@ -42,6 +42,7 @@ CNNLayer::Ptr ActivationLayerCreator::CreateLayer(pugi::xml_node& node, LayerPar {"elu", std::make_shared>("ELU")}, {"sigmoid", std::make_shared>("Sigmoid")}, {"tanh", std::make_shared>("TanH")}, + {"not", std::make_shared>("LogicalNot")} }; CNNLayer::Ptr activation; diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/greater_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/greater_tests.cpp index 9222e786e45..429354c0573 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/greater_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/greater_tests.cpp @@ -133,7 +133,7 @@ TEST_F(NGraphReaderTests, DISABLED_ReadGreaterNetwork) { compareIRs(model, modelV5, 3211264); } -TEST_F(NGraphReaderTests, DISABLED_ReadGreaterEqualNetwork) { +TEST_F(NGraphReaderTests, ReadGreaterEqualNetwork) { std::string model = R"V0G0N( diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/less_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/less_tests.cpp index a30f95be3bd..3f12201d03a 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/less_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/less_tests.cpp @@ -133,7 +133,7 @@ TEST_F(NGraphReaderTests, DISABLED_ReadLessNetwork) { compareIRs(model, modelV5, 3211264); } -TEST_F(NGraphReaderTests, DISABLED_ReadLessEqualNetwork) { +TEST_F(NGraphReaderTests, ReadLessEqualNetwork) { std::string model = R"V0G0N( diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_and_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_and_tests.cpp index cd16442dc32..fafa643fc55 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_and_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_and_tests.cpp @@ -4,7 +4,7 @@ #include #include "ngraph_reader_tests.hpp" -TEST_F(NGraphReaderTests, DISABLED_ReadLogicalAndNetwork) { +TEST_F(NGraphReaderTests, ReadLogicalAndNetwork) { std::string model = R"V0G0N( diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_not_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_not_tests.cpp index 7cc7f6b8bfc..41e3a78f941 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_not_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_not_tests.cpp @@ -4,7 +4,8 @@ #include #include "ngraph_reader_tests.hpp" -TEST_F(NGraphReaderTests, DISABLED_ReadLogicalNotNetwork) { + +TEST_F(NGraphReaderTests, ReadLogicalNotNetwork) { std::string model = R"V0G0N( diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_or_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_or_tests.cpp index 5e397049727..f9e5a02ed92 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_or_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_or_tests.cpp @@ -4,7 +4,7 @@ #include #include "ngraph_reader_tests.hpp" -TEST_F(NGraphReaderTests, DISABLED_ReadLogicalOrNetwork) { +TEST_F(NGraphReaderTests, ReadLogicalOrNetwork) { std::string model = R"V0G0N( diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_xor_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_xor_tests.cpp index 8aab79e5208..fcd56e71f6e 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_xor_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/logical_xor_tests.cpp @@ -4,7 +4,7 @@ #include #include "ngraph_reader_tests.hpp" -TEST_F(NGraphReaderTests, DISABLED_ReadLogicalXorNetwork) { +TEST_F(NGraphReaderTests, ReadLogicalXorNetwork) { std::string model = R"V0G0N( diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_and_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_and_tests.cpp index a5993c29382..51b36d28a56 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_and_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_and_tests.cpp @@ -4,7 +4,7 @@ #include #include "ngraph_reader_tests.hpp" -TEST_F(NGraphReaderTests, DISABLED_ReadReduceLogicalAndNetwork) { +TEST_F(NGraphReaderTests, ReadReduceLogicalAndNetwork) { std::string model = R"V0G0N( diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_or_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_or_tests.cpp index e480a62153f..c1cb6d4b916 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_or_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_or_tests.cpp @@ -4,7 +4,7 @@ #include #include "ngraph_reader_tests.hpp" -TEST_F(NGraphReaderTests, DISABLED_ReadReduceLogicalOrNetwork) { +TEST_F(NGraphReaderTests, ReadReduceLogicalOrNetwork) { std::string model = R"V0G0N( diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/src/network_utils.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/src/network_utils.cpp index 8d92cdc2ccd..027bd209773 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/src/network_utils.cpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/src/network_utils.cpp @@ -68,6 +68,11 @@ namespace FuncTestUtils { } else if (layer->type == "TensorIterator") { compareTensorIterators(layer, refLayer, sameNetVersions); } + if (layer->type == "Activation") { + err_log.pop_back(); + layer->type = "not"; + refLayer->params["type"] = "not"; + } if (layer->precision != refLayer->precision) { err_log.push_back(