Merge remote-tracking branch 'upstream/master'

.ci/azure/linux.yml

@@ -82,9 +82,10 @@ jobs:
   - script: |
       sudo apt --assume-yes install libusb-1.0-0-dev
       # For opencv-python: setuptools and upgrade
-      sudo apt-get install python3-setuptools
+      sudo apt-get install python3-setuptools patchelf
       python3 -m pip install --upgrade pip
       python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/requirements.txt
+      python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/wheel/requirements-dev.txt
       # For running Python API tests
       python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/src/requirements-dev.txt
       # Speed up build
@@ -106,6 +107,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DENABLE_PYTHON=ON
         -DPYTHON_EXECUTABLE=/usr/bin/python3.6
+        -DENABLE_WHEEL=ON
         -DENABLE_TESTS=ON
         -DNGRAPH_ONNX_IMPORT_ENABLE=ON
         -DNGRAPH_ONNX_EDITOR_ENABLE=ON

.ci/azure/linux_onnxruntime.yml

@@ -94,7 +94,6 @@ jobs:
         -DENABLE_PROFILING_ITT=OFF
         -DENABLE_SAMPLES=OFF
         -DENABLE_SPEECH_DEMO=OFF
-        -DENABLE_PYTHON=ON
         -DNGRAPH_ONNX_IMPORT_ENABLE=ON
         -DNGRAPH_ONNX_EDITOR_ENABLE=ON
         -DNGRAPH_INTERPRETER_ENABLE=ON

.github/org_control/check_pr.py

@@ -8,6 +8,7 @@
 # pylint: disable=fixme,no-member
 
 import re
+import sys
 import datetime
 from argparse import ArgumentParser
 from enum import Enum
@@ -18,10 +19,11 @@
 
 class PrType(Enum):
     """Constants for type of GitHub pull request by author membership"""
-    EXTERNAL = 'ExternalPR'
-    INTEL = 'ExternalIntelPR'
-    ORG = 'OpenvinoPR'
-    BAD = 'BadPR'
+
+    EXTERNAL = "ExternalPR"
+    INTEL = "ExternalIntelPR"
+    ORG = "OpenvinoPR"
+    BAD = "BadPR"
 
 
 def get_pr_labels(pull):
@@ -36,7 +38,7 @@ def set_pr_labels(pull, labels):
     """Sets new PR labels (all previously set labels are removed)"""
     if not labels or Config().DRY_RUN:
         return
-    print('Set PR labels:', labels)
+    print("Set PR labels:", labels)
     # set_labels() should accept list but fails with empty "AssertionError:"
     pull.set_labels(labels)
 
@@ -45,7 +47,7 @@ def add_pr_labels(pull, labels):
     """Adds PR labels"""
     if not labels or Config().DRY_RUN:
         return
-    print('Add PR labels:', labels)
+    print("Add PR labels:", labels)
     for label in labels:
         pull.add_to_labels(label)
 
@@ -58,19 +60,19 @@ def get_pr_type_by_labels(pull):
     if not pr_types_labels:
         return None
     if len(pr_types_labels) > 1:
-        print(f'Duplicated labels: {pr_types_labels}')
+        print(f"Duplicated labels: {pr_types_labels}")
         return PrType.BAD
     return PrType(PrType(pr_types_labels.pop()))
 
 
 def get_label_by_team_name_re(team_name):
     """Generates label by PR reviwer team name using regular expressions"""
-    if 'admins' in team_name:
-        return 'category: ci'
-    re_compile_label = re.compile(rf'{Config().GITHUB_REPO}-(.+)-maintainers')
+    if "admins" in team_name:
+        return "category: ci"
+    re_compile_label = re.compile(rf"{Config().GITHUB_REPO}-(.+)-maintainers")
     re_label = re_compile_label.match(team_name)
     if re_label:
-        return f'category: {re_label.group(1).strip()}'
+        return f"category: {re_label.group(1).strip()}"
     return None
 
 
@@ -97,21 +99,98 @@ def get_pr_info_str(pull):
     # Workaround for PyGithub issue: https://github.com/PyGithub/PyGithub/issues/512
     pr_created_at = pull.created_at.replace(tzinfo=datetime.timezone.utc).astimezone()
 
-    return f'PR: {pull.number} - {pr_title} - Created: {pr_created_at} - ' \
-           f'Labels: {get_pr_labels(pull)} - Type: {get_pr_type_by_labels(pull)}'
+    return (
+        f"PR: {pull.number} - {pr_title} - Created: {pr_created_at} - "
+        f"Labels: {get_pr_labels(pull)} - Type: {get_pr_type_by_labels(pull)}"
+    )
+
+
+def update_labels(gh_api, pull, non_org_intel_pr_users, non_org_pr_users):
+    """Checks and updates labels"""
+    print("Check and update labels:")
+    pr_type_by_labels = get_pr_type_by_labels(pull)
+    add_labels = []
+
+    # Checks PR source type
+    if gh_api.is_org_user(pull.user):
+        print(" - Org user")
+    elif github_api.is_intel_email(pull.user.email) or github_api.is_intel_company(
+        pull.user.company
+    ):
+        print(" - Non org user with Intel email or company")
+        non_org_intel_pr_users.add(pull.user)
+        if pr_type_by_labels is not PrType.INTEL:
+            print(f'NO "{PrType.INTEL.value}" label: ', end="")
+            github_api.print_users(pull.user)
+            add_labels.append(PrType.INTEL.value)
+    elif github_api.is_user_ignored(pull.user):
+        print(" - IGNORED non org user with NO Intel email or company")
+    else:
+        print(" - Non org user with NO Intel email or company")
+        non_org_pr_users.add(pull.user)
+        if pr_type_by_labels is not PrType.EXTERNAL:
+            print(f'NO "{PrType.EXTERNAL.value}" label: ', end="")
+            github_api.print_users(pull.user)
+            add_labels.append(PrType.EXTERNAL.value)
+
+    add_labels += get_category_labels(pull)
+    add_pr_labels(pull, add_labels)
+
+
+def get_wrong_commits(pull):
+    """Returns commits with incorrect user and email"""
+    pr_author_email = pull.user.email.lower()
+    print("GitHub PR author email:", pr_author_email)
+    print("Check commits:")
+    wrong_commits = set()
+    for commit in pull.get_commits():
+        # import pprint; pprint.pprint(commit.raw_data)
+        print("Commit SHA:", commit.sha)
+        # Use raw data because commit author can be non GitHub user
+        commit_email = commit.raw_data["commit"]["author"]["email"].lower()
+        print("    Commit email:", commit_email)
+        if not github_api.is_valid_user(commit.author):
+            print(
+                "    ERROR: User with the commit email is absent in GitHub:",
+                commit.raw_data["commit"]["author"]["name"],
+            )
+            wrong_commits.add(commit.sha)
+        if not commit.raw_data["commit"]["verification"]["verified"]:
+            print(
+                "    WARNING: The commit is not verified. Reason:",
+                commit.raw_data["commit"]["verification"]["reason"],
+            )
+            if pr_author_email != commit_email:
+                print("    WARNING: Commit email and GitHub PR author public email are differnt")
+    return wrong_commits
 
 
 def main():
     """The main entry point function"""
     arg_parser = ArgumentParser()
-    arg_parser.add_argument("--cfg-file", metavar="PATH", default=Config.default_cfg_path,
-                            help=f"Path to json configuration file, e.g. {Config.default_cfg_path}")
-    arg_parser.add_argument("--pr", metavar="NUMBER",
-                            help="Get GitHub pull request with the number")
-    arg_parser.add_argument("--pr-state", default="open", choices=["open", "closed"],
-                            help="Set GitHub pull request state")
-    arg_parser.add_argument("--newer", metavar="MINUTES",
-                            help="Get newly created GitHub pull request only")
+    arg_parser.add_argument(
+        "--cfg-file",
+        metavar="PATH",
+        default=Config.default_cfg_path,
+        help=f"Path to json configuration file, e.g. {Config.default_cfg_path}",
+    )
+    arg_parser.add_argument(
+        "--pr", metavar="NUMBER", help="Get GitHub pull request with the number"
+    )
+    arg_parser.add_argument(
+        "--pr-state",
+        default="open",
+        choices=["open", "closed"],
+        help="Set GitHub pull request state",
+    )
+    arg_parser.add_argument(
+        "--newer", metavar="MINUTES", help="Get newly created GitHub pull request only"
+    )
+    arg_parser.add_argument(
+        "--check-commits",
+        action="store_true",
+        help="Check and compare git commit email with GitHub account email",
+    )
     args, unknown_args = arg_parser.parse_known_args()
 
     Config(args.cfg_file, unknown_args)
@@ -121,52 +200,52 @@ def main():
         pulls = [gh_api.repo.get_pull(int(args.pr))]
     else:
         pulls = gh_api.repo.get_pulls(state=args.pr_state)
-        print(f'\nPRs count ({args.pr_state}):', pulls.totalCount)
+        print(f"\nPRs count ({args.pr_state}):", pulls.totalCount)
 
     if args.newer:
-        pr_created_after = (datetime.datetime.now() -
-                            datetime.timedelta(minutes=int(args.newer))).astimezone()
-        print('Checking PRs created after:', pr_created_after)
+        pr_created_after = (
+            datetime.datetime.now() - datetime.timedelta(minutes=int(args.newer))
+        ).astimezone()
+        print("Checking PRs created after:", pr_created_after)
+
     non_org_intel_pr_users = set()
     non_org_pr_users = set()
+    wrong_pulls = {}
+
     for pull in pulls:
         pr_created_at = pull.created_at.replace(tzinfo=datetime.timezone.utc).astimezone()
         if args.newer and pr_created_at <= pr_created_after:
-            print(f'\nIGNORE: {get_pr_info_str(pull)}')
+            print(f"\nIGNORE: {get_pr_info_str(pull)}")
             continue
-        pr_type_by_labels = get_pr_type_by_labels(pull)
-        add_labels = []
-        print(f'\n{get_pr_info_str(pull)}', end='')
-
-        # Checks PR source type
-        if gh_api.is_org_user(pull.user):
-            print(' - Org user')
-        elif github_api.is_intel_email(pull.user.email) or \
-             github_api.is_intel_company(pull.user.company):
-            print(' - Non org user with Intel email or company')
-            non_org_intel_pr_users.add(pull.user)
-            if pr_type_by_labels is not PrType.INTEL:
-                print(f'NO "{PrType.INTEL.value}" label: ', end='')
-                github_api.print_users(pull.user)
-                add_labels.append(PrType.INTEL.value)
-        elif github_api.is_user_ignored(pull.user):
-            print(' - IGNORED non org user with NO Intel email or company')
-        else:
-            print(' - Non org user with NO Intel email or company')
-            non_org_pr_users.add(pull.user)
-            if pr_type_by_labels is not PrType.EXTERNAL:
-                print(f'NO "{PrType.EXTERNAL.value}" label: ', end='')
-                github_api.print_users(pull.user)
-                add_labels.append(PrType.EXTERNAL.value)
 
-        add_labels += get_category_labels(pull)
-        add_pr_labels(pull, add_labels)
-
-    print('\nNon org user with Intel email or company:')
-    github_api.print_users(non_org_intel_pr_users)
-    print('\nNon org user with NO Intel email or company:')
-    github_api.print_users(non_org_pr_users)
-
-
-if __name__ == '__main__':
+        print(f"\n{get_pr_info_str(pull)}")
+        if args.check_commits:
+            wrong_commits = get_wrong_commits(pull)
+            if wrong_commits:
+                wrong_pulls[pull.number] = wrong_commits
+        else:
+            update_labels(gh_api, pull, non_org_intel_pr_users, non_org_pr_users)
+
+    if wrong_pulls:
+        for pull_number, wrong_commits in wrong_pulls.items():
+            print(
+                f"\nERROR: Remove or replace wrong commits in the PR {pull_number}:\n    ",
+                "\n    ".join(wrong_commits),
+            )
+        print(
+            "\nAbout commit signature verification:\n    ",
+            "https://docs.github.com/en/github/authenticating-to-github/"
+            "managing-commit-signature-verification/about-commit-signature-verification",
+        )
+        sys.exit(1)
+
+    if non_org_intel_pr_users:
+        print("\nNon org user with Intel email or company:")
+        github_api.print_users(non_org_intel_pr_users)
+    if non_org_pr_users:
+        print("\nNon org user with NO Intel email or company:")
+        github_api.print_users(non_org_pr_users)
+
+
+if __name__ == "__main__":
     main()

.github/workflows/check_pr_commits.yml

@@ -0,0 +1,17 @@
+name: PR Commits
+on: [pull_request]
+
+jobs:
+  Checks:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone OpenVINO
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: python3 -m pip install -r ./.github/org_control/requirements.txt
+
+      - name: PR commits
+        run: python3 ./.github/org_control/check_pr.py --pr=${{ github.event.number }} --check-commits DRY_RUN
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -52,7 +52,6 @@ function(build_ngraph)
     else ()
         ngraph_set(NGRAPH_ADDRESS_SANITIZER OFF)
     endif ()
-    ngraph_set(NGRAPH_PYTHON_BUILD_ENABLE OFF)
 
     if(ENABLE_TESTS AND NOT ANDROID)
         ngraph_set(NGRAPH_UNIT_TEST_ENABLE ON)
@@ -85,6 +84,12 @@ function(build_ngraph)
         ngraph_set(NGRAPH_THREAD_SANITIZER_ENABLE OFF)
     endif()
 
+    if(ENABLE_PYTHON)
+        ngraph_set(NGRAPH_PYTHON_BUILD_ENABLE ON)
+    else()
+        ngraph_set(NGRAPH_PYTHON_BUILD_ENABLE OFF)
+    endif()
+
     if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
         ie_add_compiler_flags(-Wno-error=uninitialized -Wno-error=literal-conversion)
     elseif(UNIX)

cmake/developer_package/compile_flags/os_flags.cmake

@@ -211,6 +211,16 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 
+function(ie_python_minimal_api target)
+    # pybind11 uses a lot of API which is not a part of minimal python API subset
+    # Ref 1: https://docs.python.org/3.11/c-api/stable.html
+    # Ref 2: https://github.com/pybind/pybind11/issues/1755
+    # target_compile_definitions(${target} PRIVATE Py_LIMITED_API=0x03090000)
+    # if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    #     target_compile_options(${target} PRIVATE "-Wno-unused-variable")
+    # endif()
+endfunction()
+
 if(WIN32)
     ie_add_compiler_flags(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
     ie_add_compiler_flags(/EHsc) # no asynchronous structured exception handling

cmake/developer_package/cpplint/cpplint.cmake

@@ -3,9 +3,9 @@
 #
 
 if(ENABLE_CPPLINT)
-    find_package(Python3 COMPONENTS Interpreter)
+    find_package(PythonInterp 3 QUIET)
 
-    if(NOT Python3_Interpreter_FOUND)
+    if(NOT PYTHONINTERP_FOUND)
         message(WARNING "Python3 interpreter was not found (required for cpplint check)")
         set(ENABLE_CPPLINT OFF)
     endif()
@@ -68,6 +68,7 @@ function(add_cpplint_target TARGET_NAME)
                 "${output_file}"
             COMMAND
                 "${CMAKE_COMMAND}"
+                -D "PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
                 -D "CPPLINT_SCRIPT=${IEDevScripts_DIR}/cpplint/cpplint.py"
                 -D "INPUT_FILE=${source_file}"
                 -D "OUTPUT_FILE=${output_file}"

cmake/developer_package/cpplint/cpplint_run.cmake

@@ -25,7 +25,7 @@ set(FILTER "${DEFAULT_FILTER}${CUSTOM_FILTER}")
 
 execute_process(
     COMMAND
-        python3
+        "${PYTHON_EXECUTABLE}"
         "${CPPLINT_SCRIPT}"
         "--linelength=160"
         "--counting=detailed"

cmake/developer_package/version.cmake

@@ -75,11 +75,6 @@ macro(ie_parse_ci_build_number)
     set(IE_VERSION "${IE_VERSION_MAJOR}.${IE_VERSION_MINOR}.${IE_VERSION_PATCH}")
 endmacro()
 
-# WA for DL Benchmark
-if(DEFINED ENV{CI_BUILD_NUMBER} AND "$ENV{CI_BUILD_NUMBER}" STREQUAL "1")
-    unset(ENV{CI_BUILD_NUMBER})
-endif()
-
 if (DEFINED ENV{CI_BUILD_NUMBER})
     set(CI_BUILD_NUMBER $ENV{CI_BUILD_NUMBER})
 else()