IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NMS5 dynamism issues (#3137)

Browse Source 
* Fixed ConvertNMS5ToLegacy conversion pass to resolve dynamism as soon as possible; fixed output precision to avoid troubles during convert_precision pass

* Added NMS5ToLegacy conversion for cldnn plugin

* Fixed NMS3 copy method

* Updated NMS5ToLegacy pass to avoid convert precision issues

* Updated nGraph reader and Functional tests

* Removing odd CF call

* removed xfail for test that is expected to pass

* Fixed Convert operations friendly_name

* Removed NMS5ToLegacy from opset1_to_legacy conversion

* Update NMS5 layer tests

* Update NMS5 DSR tests
This commit is contained in:
Gleb Kazantaev
2020-11-17 18:34:05 +03:00
committed by GitHub
parent c18a456d67
commit fc8df42e7e
15 changed files with 99 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ngraph/python/tests/__init__.py
View File

@@ -174,30 +174,6 @@ xfail_issue_38735 = xfail_test(reason="RuntimeError: nGraph does not support the
xfail_issue_38736 = xfail_test(reason="RuntimeError: nGraph does not support the following ONNX operations:"
"NegativeLogLikelihoodLoss")
xfail_issue_42779 = xfail_test(reason="Unsupported dynamic ops:"
"v1::TopKIE TopK_6774 (Gather_706[0]:f32{16000}, Unsqueeze_7522[0]:"
"i32{1}) -> (f32{?}, i32{?})"
"v0::Convert TopK_718.1 (TopK_6774[1]:i32{?}) -> (i32{?})"
"v0::GatherIE Gather_733 (Gather_706[0]:f32{16000}, TopK_718.1[0]:"
"i32{?}) -> (f32{?})"
"v1::Reshape scores (Gather_733[0]:f32{?}, Constant_6852[0]:i32{2})"
" -> (f32{1,?})"
"v0::Result scores (scores[0]:f32{1,?}) -> (f32{1,?})"
"v0::GatherIE Gather_729 (Gather_690[0]:i32{16000}, TopK_718.1[0]:"
"i32{?}) -> (i32{?})"
"v1::Reshape Unsqueeze_730 (Gather_729[0]:i32{?}, Constant_6854[0]:"
"i32{2}) -> (i32{1,?})"
"v1::Eltwise labels (Unsqueeze_730[0]:i32{1,?}, Constant_6855[0]:"
"i32{}) -> (i32{1,?})"
"v0::Result labels (labels[0]:i32{1,?}) -> (i32{1,?})"
"v0::GatherIE Gather_720 (Gather_697[0]:i32{16000}, TopK_718.1[0]:"
"i32{?}) -> (i32{?})"
"v0::GatherIE Gather_727 (Squeeze_719[0]:f32{15130,4}, Gather_720[0]:"
"i32{?}) -> (f32{?,4})"
"v1::Reshape bboxes (Gather_727[0]:f32{?,4}, Constant_6859[0]:i32{3})"
" -> (f32{1,?,4})"
"v0::Result bboxes (bboxes[0]:f32{1,?,4}) -> (f32{1,?,4}))")
# Model ONNX Zoo issues:
xfail_issue_36533 = xfail_test(reason="AssertionError: zoo models results mismatch")
xfail_issue_39684 = xfail_test(reason="ngraph.exceptions.UserInputError:"

4
ngraph/python/tests/test_onnx/test_zoo_models.py
View File

@@ -37,8 +37,7 @@ from tests import (
xfail_issue_38084,
xfail_issue_39669,
xfail_issue_38726,
xfail_issue_40686,
xfail_issue_42779)
xfail_issue_40686)
MODELS_ROOT_DIR = tests.MODEL_ZOO_DIR
@@ -157,7 +156,6 @@ if len(zoo_models) > 0:
(xfail_issue_39685, "test_onnx_model_zoo_text_machine_comprehension_roberta_model_roberta_sequence_classification_9_roberta_sequence_classification_9_roberta_sequence_classification_9_cpu"),
(xfail_issue_39669, "test_onnx_model_zoo_text_machine_comprehension_t5_model_t5_encoder_12_t5_encoder_cpu"),
(xfail_issue_38084, "test_onnx_model_zoo_vision_object_detection_segmentation_mask_rcnn_model_MaskRCNN_10_mask_rcnn_R_50_FPN_1x_cpu"),
(xfail_issue_42779, "test_onnx_model_zoo_vision_object_detection_segmentation_ssd_model_ssd_10_model_cpu"),
(xfail_issue_38084, "test_onnx_model_zoo_vision_object_detection_segmentation_faster_rcnn_model_FasterRCNN_10_faster_rcnn_R_50_FPN_1x_cpu"),
(xfail_issue_41815, "test_onnx_model_zoo_vision_object_detection_segmentation_yolov3_model_yolov3_10_yolov3_yolov3_cpu"),
(xfail_issue_41815, "test_onnx_model_zoo_vision_object_detection_segmentation_tiny_yolov3_model_tiny_yolov3_11_yolov3_tiny_cpu"),