Merge remote-tracking branch 'origin/develop' into songkich/merge-bac…

…k-0.3.1
openvinotoolkit · Nov 11, 2022 · 5d8b18e · 5d8b18e
2 parents 34ea42c + 214401d
commit 5d8b18e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/external/model-preparation-algorithm/mpa_tasks/apis/classification/task.py b/external/model-preparation-algorithm/mpa_tasks/apis/classification/task.py
@@ -368,8 +368,6 @@ def patch_color_conversion(pipeline):
             elif self._hierarchical:
                 cfg.type = "MPAHierarchicalClsDataset"
                 cfg.hierarchical_info = self._hierarchical_info
-                if subset == "train":
-                    cfg.drop_last = True  # For stable hierarchical information indexing
             else:
                 cfg.type = "MPAClsDataset"
 

diff --git a/external/model-preparation-algorithm/submodule b/external/model-preparation-algorithm/submodule
diff --git a/ote_cli/ote_cli/utils/tests.py b/ote_cli/ote_cli/utils/tests.py
@@ -213,7 +213,8 @@ def ote_eval_openvino_testing(template, root, ote_dir, args, threshold):
 
     for k in trained_performance.keys():
         assert (
-            abs(trained_performance[k] - exported_performance[k])
+            exported_performance[k] > trained_performance[k]
+            or abs(trained_performance[k] - exported_performance[k])
             / (trained_performance[k] + 1e-10)
             <= threshold
         ), f"{trained_performance[k]=}, {exported_performance[k]=}"
@@ -520,7 +521,8 @@ def nncf_eval_testing(template, root, ote_dir, args, threshold):
 
     for k in trained_performance.keys():
         assert (
-            abs(trained_performance[k] - evaluated_performance[k])
+            evaluated_performance[k] > trained_performance[k]
+            or abs(trained_performance[k] - evaluated_performance[k])
             / (trained_performance[k] + 1e-10)
             <= threshold
         ), f"{trained_performance[k]=}, {evaluated_performance[k]=}"