Update OV to 2023.1 (openvinotoolkit#2505)

* Update OV * Update NNCF * Update demo requirements * Use datumaro with updated OV * add rust toolchain installation step for ov2023.1 testing * change rust toolchain setup action * Lower accuracy threshold for MRCNN in e2e * bump datumaro to 1.5.1rc1 * remove rust toolchain setup step from workflow * bump datumaro version to 1.6.0rc0 * Update OTX commit in demo * Update IS tests * Update skips in iseg tiling tests --------- Co-authored-by: Yunchu Lee <[email protected]>
jaegukhyun · Oct 24, 2023 · 8ee933c · 8ee933c
1 parent 6d44fc0
commit 8ee933c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,7 +4,7 @@ natsort>=6.0.0
 prettytable
 protobuf>=3.20.0
 pyyaml
-datumaro~=1.5.0
+datumaro~=1.6.0rc0
 psutil
 scipy>=1.8
 bayesian-optimization>=1.2.0

diff --git a/requirements/openvino.txt b/requirements/openvino.txt
@@ -3,6 +3,6 @@
 nncf==2.6.0
 onnx==1.13.0
 openvino-model-api==0.1.6
-openvino==2023.0
-openvino-dev==2023.0
+openvino==2023.1.0
+openvino-dev==2023.1.0
 openvino-telemetry>=2022.1.0
diff --git a/src/otx/api/usecases/exportable_code/demo/requirements.txt b/src/otx/api/usecases/exportable_code/demo/requirements.txt
@@ -1,4 +1,4 @@
 openvino==2023.0
 openvino-model-api==0.1.6
-otx @ git+https://github.com/openvinotoolkit/training_extensions/@4bfbf8a4873d3d39a369cb2c3f08cfb358feb21e#egg=otx
+otx @ git+https://github.com/openvinotoolkit/training_extensions/@0e1200f4cc5343dcac597674fc97a898fc9829c2#egg=otx
 numpy>=1.21.0,<=1.23.5  # np.bool was removed in 1.24.0 which was used in openvino runtime
diff --git a/tests/e2e/cli/instance_segmentation/test_tiling_instseg.py b/tests/e2e/cli/instance_segmentation/test_tiling_instseg.py
@@ -124,10 +124,11 @@ def test_otx_eval(self, template, tmp_dir_path):
     @e2e_pytest_component
     @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
     @pytest.mark.parametrize("template", templates, ids=templates_ids)
-    @pytest.mark.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
     @pytest.mark.parametrize("half_precision", [True, False])
     def test_otx_eval_openvino(self, template, tmp_dir_path, half_precision):
         tmp_dir_path = tmp_dir_path / "tiling_ins_seg"
+        if "ResNet50" in template.name:
+            pytest.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
         otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.2, half_precision=half_precision)
 
     @e2e_pytest_component
@@ -140,9 +141,10 @@ def test_otx_explain(self, template, tmp_dir_path):
     @e2e_pytest_component
     @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
     @pytest.mark.parametrize("template", templates, ids=templates_ids)
-    @pytest.mark.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
     def test_otx_explain_openvino(self, template, tmp_dir_path):
         tmp_dir_path = tmp_dir_path / "tiling_ins_seg"
+        if "ResNet50" in template.name:
+            pytest.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
         otx_explain_openvino_testing(template, tmp_dir_path, otx_dir, args)
 
     @e2e_pytest_component
@@ -155,33 +157,37 @@ def test_otx_demo(self, template, tmp_dir_path):
     @e2e_pytest_component
     @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
     @pytest.mark.parametrize("template", templates, ids=templates_ids)
-    @pytest.mark.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
     def test_otx_demo_openvino(self, template, tmp_dir_path):
         tmp_dir_path = tmp_dir_path / "tiling_ins_seg"
+        if "ResNet50" in template.name:
+            pytest.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
         otx_demo_openvino_testing(template, tmp_dir_path, otx_dir, args)
 
     @e2e_pytest_component
     @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
     @pytest.mark.parametrize("template", templates, ids=templates_ids)
-    @pytest.mark.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
     def test_otx_deploy_openvino(self, template, tmp_dir_path):
+        if "ResNet50" in template.name:
+            pytest.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
         tmp_dir_path = tmp_dir_path / "tiling_ins_seg"
         otx_deploy_openvino_testing(template, tmp_dir_path, otx_dir, args)
 
     @e2e_pytest_component
     @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
     @pytest.mark.parametrize("template", templates, ids=templates_ids)
-    @pytest.mark.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
     def test_otx_eval_deployment(self, template, tmp_dir_path):
         tmp_dir_path = tmp_dir_path / "tiling_ins_seg"
+        if "ResNet50" in template.name:
+            pytest.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
         otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0)
 
     @e2e_pytest_component
     @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
     @pytest.mark.parametrize("template", templates, ids=templates_ids)
-    @pytest.mark.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
     def test_otx_demo_deployment(self, template, tmp_dir_path):
         tmp_dir_path = tmp_dir_path / "tiling_ins_seg"
+        if "ResNet50" in template.name:
+            pytest.skip(reason="Issue#2290: MaskRCNN shows degraded performance when inferencing in OpenVINO")
         otx_demo_deployment_testing(template, tmp_dir_path, otx_dir, args)
 
     @e2e_pytest_component