Remove already installed pkg-config, fix cache saving key (#3893)

* Remove already installed pkg-config, fix cache saving key

* Resolve flake8 issues

* Always install video libs

* Remove trailing whitespaces

Author: Wovchena

.github/workflows/cpp_gapi-demos.yml

@@ -15,7 +15,8 @@ jobs:
           mkdir ov
           curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.2/linux/l_openvino_toolkit_ubuntu20_2023.2.0.13089.cfd42bd2cb0_x86_64.tgz | tar --directory ov --strip-components 1 -xz
           sudo ov/install_dependencies/install_openvino_dependencies.sh
-          sudo apt install libgtk2.0-dev pkg-config  # smart_classroom_demo_gapi's OpenCV error asks to install them
+          # smart_classroom_demo_gapi's OpenCV error asks to install libgtk2.0-dev pkg-config, the rest are for OpenCV video
+          sudo apt install libgtk2.0-dev pkg-config ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavresample-dev
       - uses: hendrikmuhs/[email protected]
         with:
           key: ubuntu20_2023.2.0.13089.cfd42bd2cb0  # This action prepends and appends its strings to the key
@@ -35,7 +36,6 @@ jobs:
       - if: ${{ !steps.cache.outputs.cache-hit }}
         name: Compile OpenCV
         run: |
-          sudo apt install pkg-config ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavresample-dev
           rm -rf cache/opencv/.git/  # Minimize cache
           mkdir cache/opencv/build
           cd cache/opencv/build
@@ -63,4 +63,4 @@ jobs:
       - uses: actions/cache/save@v3
         with:
           path: ${{ github.workspace }}/cache
-          key: ubuntu20_2023.1.0.12185.47b736f63ed-${{ github.event.repository.updated_at }}
+          key: ubuntu20_2023.2.0.13089.cfd42bd2cb0-${{ github.event.repository.updated_at }}

tools/accuracy_checker/README.md

@@ -254,7 +254,7 @@ More detailed information about annotation conversion you can find in [Annotatio
 
 - `subset_metrics` - list of dataset subsets with uniqe size and metrics, computed if `--sub_evaluation` flag enabled. If `subsample_size` is defined then only subset with matching `subset_size` is evaluated, otherwise by default the first subset is validated. See [Sub evaluation with subset metrics](#Sub-evaluation-with-subset-metrics).
   - `subset_size` - size of dataset subset to evaluate, its value is compared with `subsample_size` to select desired subset for evaluation.
-  - `metrics` - list of metrics specific for defined subset size 
+  - `metrics` - list of metrics specific for defined subset size
 
 Example of dataset definition:
 
@@ -314,7 +314,7 @@ You may optionally enable `sub_evaluation` flag to quickly get results for subse
 The `subset_metrics` needs to provide subsets with different `subset_size` and `metrics`.
 If `subset_metrics` consist several entries, you may use `subsample_size` value to select desired `subset_size`, otherwise the first defined `subset_size` will be used.
 
-Note: Enabling `sub_evaluation` flag has no effect when accuracy config has no `subset_metrics` defined. 
+Note: Enabling `sub_evaluation` flag has no effect when accuracy config has no `subset_metrics` defined.
 
 Example:
 

tools/accuracy_checker/openvino/tools/accuracy_checker/dataset.py

@@ -853,7 +853,7 @@ def get_subsample_size(config):
     size = config.get('subsample_size')
     sub_evaluation = config.get('sub_evaluation', False)
     if sub_evaluation:
-        subset_metrics = config.get('subset_metrics',[])
+        subset_metrics = config.get('subset_metrics', [])
         for item in subset_metrics:
             subset_size = item.get('subset_size')
             if size is None or subset_size == size:

tools/accuracy_checker/openvino/tools/accuracy_checker/evaluators/model_evaluator.py

@@ -795,11 +795,11 @@ def get_config_metrics(config):
     sub_evaluation = config.get('sub_evaluation', False)
     if sub_evaluation is not None:
         size = config.get('subsample_size')
-        subset_metrics = config.get('subset_metrics',[])
+        subset_metrics = config.get('subset_metrics', [])
         for item in subset_metrics:
             subset_size = item.get('subset_size')
             if size is None or subset_size == size:
                 # first subset_metrics or matching subsample_size
                 metrics = item.get('metrics')
                 break
-    return config.get('metrics',[]) if (metrics is None) else metrics
+    return config.get('metrics', []) if (metrics is None) else metrics

tools/accuracy_checker/tests/test_dataset.py

@@ -406,25 +406,6 @@ def test_sub_evaluation_annotation_conversion_subset_ratio_from_subset_metrics(s
         Dataset.load_annotation(config)
         subset_maker_mock.assert_called_once_with(converted_annotation, 1, 666, True, False)
 
-    def test_sub_evaluation_annotation_conversion_subset_ratio_from_subset_metrics(self, mocker):
-        addition_options = {
-            'annotation_conversion': {'converter': 'wider', 'annotation_file': Path('file')},
-            'sub_evaluation': True,
-            'subset_metrics': [{'subset_size': '50%'}]
-        }
-        config = copy_dataset_config(self.dataset_config)
-        config.update(addition_options)
-        converted_annotation = make_representation(['0 0 0 5 5', '0 1 1 10 10'], True)
-        mocker.patch(
-            'openvino.tools.accuracy_checker.annotation_converters.WiderFormatConverter.convert',
-            return_value=ConverterReturn(converted_annotation, None, None)
-        )
-        subset_maker_mock = mocker.patch(
-            'openvino.tools.accuracy_checker.dataset.make_subset'
-        )
-        Dataset.load_annotation(config)
-        subset_maker_mock.assert_called_once_with(converted_annotation, 1, 666, True, False)
-
     def test_sub_evaluation_annotation_convered_saved_before_subset(self, mocker):
         addition_options = {
             'annotation_conversion': {'converter': 'wider', 'annotation_file': Path('file')},