Check disabled tests (openvinotoolkit#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
mryzhov · Jan 14, 2021 · bb55289 · bb55289
1 parent 5f0a815
commit bb55289
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 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
@@ -42,6 +42,7 @@ CNNLayer::Ptr ActivationLayerCreator::CreateLayer(pugi::xml_node& node, LayerPar
         {"elu", std::make_shared<LayerCreator<CNNLayer>>("ELU")},
         {"sigmoid", std::make_shared<LayerCreator<CNNLayer>>("Sigmoid")},
         {"tanh", std::make_shared<LayerCreator<CNNLayer>>("TanH")},
+        {"not", std::make_shared<LayerCreator<CNNLayer>>("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
@@ -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(
 <net name="Network" version="10">
     <layers>

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
@@ -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(
 <net name="Network" version="10">
     <layers>

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
@@ -4,7 +4,7 @@
 
 #include <string>
 #include "ngraph_reader_tests.hpp"
-TEST_F(NGraphReaderTests, DISABLED_ReadLogicalAndNetwork) {
+TEST_F(NGraphReaderTests, ReadLogicalAndNetwork) {
     std::string model = R"V0G0N(
 <net name="Network" version="10">
     <layers>

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
@@ -4,7 +4,8 @@
 
 #include <string>
 #include "ngraph_reader_tests.hpp"
-TEST_F(NGraphReaderTests, DISABLED_ReadLogicalNotNetwork) {
+
+TEST_F(NGraphReaderTests, ReadLogicalNotNetwork) {
     std::string model = R"V0G0N(
 <net name="Network" version="10">
     <layers>

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
@@ -4,7 +4,7 @@
 
 #include <string>
 #include "ngraph_reader_tests.hpp"
-TEST_F(NGraphReaderTests, DISABLED_ReadLogicalOrNetwork) {
+TEST_F(NGraphReaderTests, ReadLogicalOrNetwork) {
     std::string model = R"V0G0N(
 <net name="Network" version="10">
     <layers>

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
@@ -4,7 +4,7 @@
 
 #include <string>
 #include "ngraph_reader_tests.hpp"
-TEST_F(NGraphReaderTests, DISABLED_ReadLogicalXorNetwork) {
+TEST_F(NGraphReaderTests, ReadLogicalXorNetwork) {
     std::string model = R"V0G0N(
 <net name="Network" version="10">
     <layers>

diff --git a/...rence-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_and_tests.cpp b/...rence-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_and_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <string>
 #include "ngraph_reader_tests.hpp"
-TEST_F(NGraphReaderTests, DISABLED_ReadReduceLogicalAndNetwork) {
+TEST_F(NGraphReaderTests, ReadReduceLogicalAndNetwork) {
     std::string model = R"V0G0N(
 <net name="Network" version="10">
     <layers>

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
@@ -4,7 +4,7 @@
 
 #include <string>
 #include "ngraph_reader_tests.hpp"
-TEST_F(NGraphReaderTests, DISABLED_ReadReduceLogicalOrNetwork) {
+TEST_F(NGraphReaderTests, ReadReduceLogicalOrNetwork) {
     std::string model = R"V0G0N(
 <net name="Network" version="10">
     <layers>

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
@@ -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(