Merge pull request #2238 from openvinotoolkit/release

Merge OpenVINO toolkit 2021.3 content into master

Author: Roman Donchenko

.flake8

@@ -0,0 +1,39 @@
+[flake8]
+exclude=
+    # generic excludes
+    .git,__pycache__,
+    # generated files
+    demos/speech_recognition_demo/python/ctcdecode-numpy/ctcdecode_numpy/impl.py,
+    models/public/mozilla-deepspeech-0.8.2/mds_convert_utils/memmapped_file_system_pb2.py,
+
+select=
+    # indentation problems
+    E10,E11,
+    # closing bracket does not match indentation of opening brackets line
+    E123,
+    # whitespace before '('
+    E211,
+    # missing whitespace after ',', ';', or ':'
+    E231,
+    # missing whitespace after keyword
+    E275,
+    # expected 1 blank line, found 0
+    E301,
+    # blank lines found after function decorator
+    E304,
+    # the backslash is redundant between brackets
+    E502,
+    # statement style issues
+    E7,
+    # parse errors
+    E9,
+    # pyflakes checks
+    F4,F5,F6,F7,F8,F9,
+    # deprecation warnings
+    W6,
+
+ignore=
+    # multiple statements on one line (colon/def)
+    # ignored because putting a statement after a colon is harmless and
+    # sometimes results in more compact code
+    E701,E704,

.gitattributes

@@ -7,8 +7,9 @@
 # so allow it.
 *.patch whitespace=-blank-at-eol
 
-.git* -omz.package
 .editorconfig -omz.package
+.flake8 -omz.package
+.git* -omz.package
 .yamllint -omz.package
 /ci/** -omz.package
 /demos/build_demos.sh omz.package=l,m
@@ -21,6 +22,7 @@
 /ci/requirements-conversion.txt omz.ci.job-for-change.demos omz.ci.job-for-change.models
 /ci/requirements-demos.txt omz.ci.job-for-change.demos
 /ci/requirements-downloader.txt omz.ci.job-for-change.demos omz.ci.job-for-change.models
+/ci/requirements-quantization.txt omz.ci.job-for-change.downloader
 
 /demos/** omz.ci.job-for-change.demos
 /demos/**/*.md -omz.ci.job-for-change.demos

.yamllint

@@ -11,14 +11,16 @@ yaml-files:
 
 ignore: |
   demos/thirdparty/
-  tools/accuracy_checker/.yamllint
+  tools/accuracy_checker/dataset_definitions.yml
   tools/accuracy_checker/configs/
 
 rules:
   line-length: disable
   braces: enable
   brackets: enable
-  colons: disable
+  colons:
+    max-spaces-before: 0
+    max-spaces-after: -1
   commas: enable
   comments:
     level: warning
@@ -34,7 +36,7 @@ rules:
   key-ordering: disable
   new-line-at-end-of-file: enable
   new-lines: disable
-  octal-values: disable
+  octal-values: enable
   quoted-strings: disable
   trailing-spaces: enable
   truthy: disable

README.md

@@ -1,5 +1,5 @@
 # [OpenVINO™ Toolkit](https://01.org/openvinotoolkit) - Open Model Zoo repository
-[![Stable release](https://img.shields.io/badge/version-2021.2-green.svg)](https://github.com/openvinotoolkit/open_model_zoo/releases/tag/2021.2)
+[![Stable release](https://img.shields.io/badge/version-2021.3-green.svg)](https://github.com/openvinotoolkit/open_model_zoo/releases/tag/2021.3)
 [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open_model_zoo/community)
 [![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE)
 

ci/check-basics.py

@@ -49,6 +49,8 @@ def complain(message):
         cwd=OMZ_ROOT,
     ).stdout.strip()
 
+    print('running text checks...', flush=True)
+
     if subprocess.run(['git', '--no-pager', 'diff', '--check', empty_tree_hash, '--'],
             cwd=OMZ_ROOT).returncode != 0:
         all_passed = False
@@ -135,9 +137,14 @@ def complain(message):
                     shebang_program.endswith('/env') and shebang_args == 'python'):
                 complain(f"{path}:1: use 'python3', not 'python'")
 
+    print('running yamllint...', flush=True)
     if subprocess.run([sys.executable, '-m', 'yamllint', '-s', '.'], cwd=OMZ_ROOT).returncode != 0:
         all_passed = False
 
+    print('running flake8...', flush=True)
+    if subprocess.run([sys.executable, '-m', 'flake8', '--config=.flake8'], cwd=OMZ_ROOT).returncode != 0:
+        all_passed = False
+
     sys.exit(0 if all_passed else 1)
 
 

ci/documentation_updater/README.md

@@ -13,10 +13,10 @@ pip install ruamel.yaml
 
 To update description of single model:
 ```
-python documentation_updater.py -d <OMZ dir>/models/public/<model dir> --mode update
+python documentation_updater.py -d <omz_dir>/models/public/<model_dir> --mode update
 ```
 
 To check descriptions of all public models:
 ```
-python documentation_updater.py -d <OMZ dir>/models/public
+python documentation_updater.py -d <omz_dir>/models/public
 ```

ci/documentation_updater/documentation_updater.py

@@ -20,7 +20,6 @@
 import logging
 import re
 import ruamel.yaml
-import shlex
 
 from pathlib import Path
 from ruamel.yaml.scalarstring import FoldedScalarString
@@ -29,7 +28,7 @@
 MODES = [
     'check',
     'update'
-    ]
+]
 
 LOG_LEVELS = [
     'CRITICAL',
@@ -79,7 +78,7 @@ def convert(lines):
             result += ' '
         result += line.rstrip('\n')
     result = re.sub(r"\[(.*?)\]\((.*?)\)", r"\1 <\2>", result) # Links transformation
-    result = result.replace("`", "\"").replace("\*", "*")
+    result = result.replace("`", "\"").replace("\\*", "*")
     return result.strip()