Merge remote-tracking branch 'upstream/master' into ak/yolo_models

Author: akorobeinikov

demos/smartlab_demo/python/evaluator.py

@@ -31,7 +31,7 @@ def __init__(self):
         self.rider_portion = 6  # [IS_rider & MS_rider] divide the distance between 2 roundscrew1 into rider_portion portion, if rider falls in the first portion mean rider at zeroth position
         self.rider_move_threshold = 20  # [MS_rider_tweezers] if rider moves more than this value, check if tweezers or hand is used to move rider
         self.buffer_rider_size_limit = 30  # [MS_rider_tweezers]
-        self.use_tweezers_threshold = 100  # [MS_rider_tweezers & MS_weights_tweezers] if tweezer and rider/weight distance more than tweezer treshold, consider use hand instead of use tweezer
+        self.use_tweezers_threshold = 99  # [MS_rider_tweezers & MS_weights_tweezers] if tweezer and rider/weight distance more than tweezer treshold, consider use hand instead of use tweezer
         self.tweezers_warning_duration = 60  # [MS_rider_tweezers & MS_weights_tweezers] if score related to tweezers is 0 more than this duration/frames, score is 0 and unrevertible; else still revertible
         self.battery_aspect_ratio = 1.9
         self.reset()
@@ -424,7 +424,7 @@ def get_center_coordinate(self, coor):
     def is_inside(self, small_item_center_coor, big_item_coor):
         [big_x_min, big_y_min, big_x_max, big_y_max] = big_item_coor
         [small_center_x, small_center_y] = small_item_center_coor
-        if small_center_x >= big_x_min and small_center_x <= big_x_max and small_center_y > big_y_min and small_center_y < big_y_max:
+        if big_x_min <= small_center_x <= big_x_max and big_y_min < small_center_y < big_y_max:
             return True
         else:
             return False
@@ -574,12 +574,15 @@ def evaluate_rider_tweezers(self):
                     elif np.linalg.norm(rider_min_coordinate - tweezers_min_coordinate) > self.use_tweezers_threshold:
                         self.scoring['measuring_score_rider_tweezers'] = 0
                         self.keyframe['measuring_score_rider_tweezers'] = self.frame_counter
-                        self.rider_tweezers_lock_mark = True  # once detected not using tweezers, will lose mark and not able to gain back this mark again
-        # corner case: rider and tweezer can't found correctly at the same time. we only detect tweezer_coor whether under balance
+                        # once detected not using tweezers, will lose mark and not able to gain back this mark again
+                        self.rider_tweezers_lock_mark = True
+        # corner case: rider and tweezer can't found correctly at the same time.
+        # we only detect tweezer_coor whether under balance
         elif len(tweezers_coor) == 1 and len(self.side_object_dict['balance']) == 1:
             tweezers_coor = self.side_object_dict['tweezers'][0]
             balance_coor = self.side_object_dict['balance'][0]
-            if self.is_behind(tweezers_coor, balance_coor):
+            if self.is_behind(tweezers_coor, balance_coor) and self.is_inside(self.get_center_coordinate(tweezers_coor),
+                                                                              balance_coor):
                 self.scoring['measuring_score_rider_tweezers'] = 1
                 self.keyframe['measuring_score_rider_tweezers'] = self.frame_counter
 
@@ -789,7 +792,7 @@ def evaluate_weights_tweezers(self, weight_inside_tray):
                 if not self.tweezers_warning \
                     or self.frame_counter - self.tweezers_warning < self.tweezers_warning_duration:
                     self.tweezers_warning = None
-                    if all(use_tweezers_bool):
+                    if all(use_tweezers_bool) and len(use_tweezers_bool) > 0:
                         self.scoring['measuring_score_weights_tweezers'] = 1
                         self.keyframe['measuring_score_weights_tweezers'] = self.frame_counter
                     else:

tools/accuracy_checker/README.md

@@ -92,14 +92,13 @@ You can use any of them or several at a time. For correct work, Accuracy Checker
 If all prerequisite are installed, then you are ready to install **Accuracy Checker**:
 
 ```bash
-python3 setup.py install
+python3 -m pip install .
 ```
 
-Accuracy Checker is a modular tool and have some task-specific dependencies, all specific required modules can be found in `requirements.in` file.
-Instead of the standard installation, you can install only the core part of the tool without additional dependencies and manage them by yourself using the following command:
-
+Accuracy Checker is a modular tool and have some task-specific dependencies, all specific required modules can be found in `requirements-extra.in` file.
+Standard installation procedure includes only basic part, in order to obtain extra modules you can execute following command:
 ```bash
-python setup.py install_core
+python3 -m pip install .[extra]
 ```
 
 #### Installation Troubleshooting
@@ -108,7 +107,7 @@ python setup.py install_core
 If you get a directory/file not found error, try manually removing the previous tool version from your environment or install the tool using following command in Accuracy Checker directory instead of setup.py install:
 
 ```bash
-pip install --upgrade --force-reinstall .
+python3 -m pip install --upgrade --force-reinstall .
 ```
 2. If `accuracy_check` command failed with following error:
 ```

tools/accuracy_checker/requirements.in renamed to tools/accuracy_checker/requirements-extra.in

@@ -62,13 +62,6 @@ def check_and_update_numpy(min_acceptable='1.15'):
         subprocess.call([sys.executable, '-m', 'pip', 'install', 'numpy>={}'.format(min_acceptable)])
 
 
-def install_dependencies_with_pip(dependencies):
-    for dep in dependencies:
-        if dep.startswith('#'):
-            continue
-        subprocess.call([sys.executable, '-m', 'pip', 'install', str(dep)])
-
-
 class CoreInstall(install_command):
     pass
 
@@ -81,20 +74,22 @@ def find_version(*path):
 
     raise RuntimeError("Unable to find version string.")
 
-is_arm = platform.processor() == 'aarch64'
 long_description = read("README.md")
 version = find_version("openvino/tools/accuracy_checker", "__init__.py")
 
 
 def prepare_requirements():
     requirements_core = read('requirements-core.in').split('\n')
     if 'install_core' in sys.argv:
-        return requirements_core
-    requirements = read("requirements.in").split('\n')
-    return requirements_core + requirements
+        warnings.warn(
+            '"install_core" command is deprecated and will be removed in 2023.1 release, please use "install" instead',
+            DeprecationWarning
+            )
+    requirements = read("requirements-extra.in").split('\n')
+    return requirements_core, requirements
 
 
-_requirements = prepare_requirements()
+_requirements, _extras = prepare_requirements()
 
 try:
     importlib.import_module('cv2')
@@ -110,8 +105,6 @@ def prepare_requirements():
             + "\n Probably due to unsuitable numpy version, will be updated")
         check_and_update_numpy()
 
-if is_arm:
-    install_dependencies_with_pip(_requirements)
 
 setup(
     name="accuracy_checker",
@@ -125,9 +118,9 @@ def prepare_requirements():
             "convert_annotation=openvino.tools.accuracy_checker.annotation_converters.convert:main"]},
     zip_safe=False,
     python_requires='>=3.5',
-    install_requires=_requirements if not is_arm else '',
+    install_requires=_requirements,
     tests_require=[read("requirements-test.in")],
     cmdclass={'test': PyTest, 'install_core': CoreInstall},
-    extras_require={'extra': ['pycocotools>=2.0.2', 'crf_beam;platform_system=="Linux"', 'torch>=0.4.0', 'torchvision>=0.2.1', 'lpips', 'soundfile',
+    extras_require={'extra': _extras + ['pycocotools>=2.0.2', 'crf_beam;platform_system=="Linux"', 'torch>=0.4.0', 'torchvision>=0.2.1', 'lpips', 'soundfile',
                               'kenlm @ git+https://github.com/kpu/kenlm.git@f01e12d83c7fd03ebe6656e0ad6d73a3e022bd50#egg=kenlm']}
 )