[ONNX] 🛠️🕸️ Fix softmax opsets (#5959)

ngraph/frontend/onnx_import/src/op/softmax.cpp

@@ -69,7 +69,7 @@ namespace ngraph
                     return {result};
                 }
             } // namespace set_1
-            namespace set_7
+            namespace set_11
             {
                 OutputVector softmax(const Node& node)
                 {
@@ -109,7 +109,7 @@ namespace ngraph
 
                     return {result};
                 }
-            } // namespace set_7
+            } // namespace set_11
             namespace set_13
             {
                 OutputVector softmax(const Node& node)

ngraph/frontend/onnx_import/src/op/softmax.hpp

@@ -19,11 +19,11 @@ namespace ngraph
 
             } // namespace set_1
 
-            namespace set_7
+            namespace set_11
             {
                 OutputVector softmax(const Node& node);
 
-            } // namespace set_7
+            } // namespace set_11
 
             namespace set_13
             {

ngraph/frontend/onnx_import/src/ops_bridge.cpp

@@ -437,9 +437,7 @@ namespace ngraph
             REGISTER_OPERATOR("Slice", 1, slice);
             REGISTER_OPERATOR("Slice", 10, slice);
             REGISTER_OPERATOR("Softmax", 1, softmax);
-            // Softmax v7 should be in the 11th opset but,
-            // other frameworks(mxnet and onnxruntime) already use for older models.
-            REGISTER_OPERATOR("Softmax", 7, softmax);
+            REGISTER_OPERATOR("Softmax", 11, softmax);
             REGISTER_OPERATOR("Softmax", 13, softmax);
             REGISTER_OPERATOR("Softplus", 1, softplus);
             REGISTER_OPERATOR("Softsign", 1, softsign);

ngraph/python/tests/__init__.py

@@ -149,5 +149,5 @@ xfail_issue_49753 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1
 xfail_issue_49754 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::TopKIE")
 xfail_issue_52463 = xfail_test(reason="test_operator_add_size1_singleton_broadcast_cpu - "
                                       "Not equal to tolerance")
-
 xfail_issue_45432 = xfail_test(reason="Einsum is not implemented in CPU plugin.")
+xfail_issue_onnx_models_140 = xfail_test(reason="https://github.com/onnx/models/issues/140")

ngraph/python/tests/test_onnx/test_zoo_models.py

@@ -25,7 +25,8 @@ from tests import (
     xfail_issue_47430,
     xfail_issue_47495,
     xfail_issue_48145,
-    xfail_issue_48190)
+    xfail_issue_48190,
+    xfail_issue_onnx_models_140)
 
 MODELS_ROOT_DIR = tests.MODEL_ZOO_DIR
 
@@ -170,6 +171,7 @@ if len(zoo_models) > 0:
             (xfail_issue_47430, "test_onnx_model_zoo_vision_object_detection_segmentation_fcn_model_fcn_resnet101_11_fcn_resnet101_11_model_cpu"),
             (xfail_issue_48145, "test_onnx_model_zoo_text_machine_comprehension_bert_squad_model_bertsquad_8_download_sample_8_bertsquad8_cpu"),
             (xfail_issue_48190, "test_onnx_model_zoo_text_machine_comprehension_roberta_model_roberta_base_11_roberta_base_11_roberta_base_11_cpu"),
+            (xfail_issue_onnx_models_140, "test_onnx_model_zoo_vision_object_detection_segmentation_duc_model_ResNet101_DUC_7_ResNet101_DUC_HDC_ResNet101_DUC_HDC_cpu"),
 
             # Model MSFT
             (xfail_issue_37973, "test_MSFT_opset7_tf_inception_v2_model_cpu"),