Merge pull request #8 from ynimmaga/ynimmaga/master_changes

Merging changes from latest master

.ci/azure/linux.yml

@@ -243,6 +243,7 @@ jobs:
         -DCMAKE_C_LINKER_LAUNCHER=ccache
         -DCMAKE_CXX_COMPILER=clang++
         -DCMAKE_C_COMPILER=clang
+        -DENABLE_SYSTEM_SNAPPY=ON
         -DCPACK_GENERATOR=$(CMAKE_CPACK_GENERATOR)
         -DBUILD_nvidia_plugin=OFF
         -S $(REPO_DIR)
@@ -389,17 +390,16 @@ jobs:
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_conditional_compilation_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ConditionalCompilation.xml
     displayName: 'Conditional Compilation Tests'
 
-  - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-PaddleTests.xml
-    displayName: 'Paddle Tests'
-
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_ir_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-IRFrontend.xml
     displayName: 'IR Frontend Tests'
 
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_onnx_frontend_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ONNXFrontend.xml
     displayName: 'ONNX Frontend Tests'
 
+  # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml
     displayName: 'Paddle Frontend UT'
+    enabled: 'false'
 
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml
     displayName: 'TensorFlow Frontend Unit Tests'

.ci/azure/linux_debian.yml

@@ -159,6 +159,7 @@ jobs:
         -DENABLE_TESTS=ON
         -DENABLE_FASTER_BUILD=ON
         -DENABLE_STRICT_DEPENDENCIES=OFF
+        -DENABLE_SYSTEM_SNAPPY=ON
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         -DCMAKE_C_COMPILER_LAUNCHER=ccache
         -DCMAKE_CXX_LINKER_LAUNCHER=ccache
@@ -304,11 +305,12 @@ jobs:
       LD_LIBRARY_PATH: $(INSTALL_TEST_DIR)
     displayName: 'ONNX Frontend Tests'
 
-  - script: |
-      $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml
+  # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
+  - script: $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml
     env:
       LD_LIBRARY_PATH: $(INSTALL_TEST_DIR)
     displayName: 'Paddle Frontend UT'
+    enabled: 'false'
 
   - script: $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml
     env:

.ci/azure/windows.yml

@@ -267,8 +267,9 @@ jobs:
   - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_onnx_frontend_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-ONNXFrontend.xml
     displayName: 'ONNX Frontend Tests'
 
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Paddle.xml
-    displayName: 'Paddle Frontend UT'
+  # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
+  #- script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Paddle.xml
+  #  displayName: 'Paddle Frontend UT'
 
   - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Tensorflow.xml
     displayName: 'TensorFlow Frontend Unit Tests'

.github/dependabot.yml

@@ -6,7 +6,7 @@ updates:
   # Python product dependencies
   #
 
-  # Python API requirements
+  # Python API, Frontends
   - package-ecosystem: pip
     directory: "/src/bindings/python/"
     schedule:
@@ -17,121 +17,65 @@ updates:
     assignees:
       - "jiwaszki"
       - "p-wysocki"
+      - "akuporos"
       - "rkazants"
-    versioning-strategy: increase-if-necessary
-
-  # Model Optimizer requirements
-  - package-ecosystem: pip
-    directory: "/tools/mo"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Asia/Dubai"
-    open-pull-requests-limit: 3
-    assignees:
-      - "rkazants"
-      - "andrei-kochin"
-      - "jiwaszki"
-      - "p-wysocki"
-    allow:
-      - dependency-name: "*"
-        dependency-type: "production"
-    versioning-strategy: increase-if-necessary
-
-  # POT requirements
-  - package-ecosystem: pip
-    directory: "/tools/pot"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Asia/Dubai"
-    open-pull-requests-limit: 3
-    assignees:
-      - "AlexKoff88"
-      - "KodiaqQ"
-      - "jiwaszki"
-      - "p-wysocki"
-      - "rkazants"
-    versioning-strategy: increase-if-necessary
-
-  # benchmark_tool requirements
-  - package-ecosystem: pip
-    directory: "/tools/benchmark_tool"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Asia/Dubai"
-    open-pull-requests-limit: 3
-    assignees:
-      - "Wovchena"
-      - "jiwaszki"
-      - "p-wysocki"
-      - "rkazants"
-    versioning-strategy: increase-if-necessary
-
-  #
-  # Tests requirements for frontends
-  #
-
-  # PaddlePaddle FE tests requirements
-  - package-ecosystem: pip
-    directory: "/src/frontends/paddle/tests/"
-    schedule:
-      interval: "daily"
-      time: "09:00"
-      timezone: "Asia/Shanghai"
-    open-pull-requests-limit: 3
-    assignees:
       - "ceciliapeng2011"
       - "meiyang-intel"
-      - "jiwaszki"
-      - "p-wysocki"
-      - "rkazants"
+      - "mbencer"
+      - "tomdol"
+      - "jane-intel"
     versioning-strategy: increase-if-necessary
 
-  # ONNX FE tests requirements
+  # Tests
   - package-ecosystem: pip
-    directory: "/src/frontends/onnx/tests/"
+    directory: "/tests"
     schedule:
       interval: "daily"
       time: "09:00"
       timezone: "Poland"
     open-pull-requests-limit: 3
     assignees:
-      - "mbencer"
-      - "tomdol"
       - "jiwaszki"
       - "p-wysocki"
+      - "akuporos"
       - "rkazants"
     versioning-strategy: increase-if-necessary
 
-  # TensorFlow FE tests requirements
+  # Model Optimizer, openvino_dev and Benchmark tool
   - package-ecosystem: pip
-    directory: "/src/frontends/tensorflow/tests/"
+    directory: "/tools"
     schedule:
       interval: "daily"
       time: "09:00"
       timezone: "Asia/Dubai"
     open-pull-requests-limit: 3
     assignees:
       - "rkazants"
+      - "andrei-kochin"
       - "jiwaszki"
       - "p-wysocki"
+      - "akuporos"
+      - "Wovchena"
+    allow:
+      - dependency-name: "*"
+        dependency-type: "production"
     versioning-strategy: increase-if-necessary
 
-  # TensorFlow Lite FE tests requirements
+  # POT requirements
   - package-ecosystem: pip
-    directory: "/src/frontends/tensorflow_lite/tests/"
+    directory: "/tools/pot"
     schedule:
       interval: "daily"
       time: "09:00"
       timezone: "Asia/Dubai"
     open-pull-requests-limit: 3
     assignees:
-      - "jane-intel"
-      - "rkazants"
+      - "AlexKoff88"
+      - "KodiaqQ"
       - "jiwaszki"
       - "p-wysocki"
+      - "akuporos"
+      - "rkazants"
     versioning-strategy: increase-if-necessary
 
   #
@@ -149,6 +93,7 @@ updates:
       - "Wovchena"
       - "jiwaszki"
       - "p-wysocki"
+      - "akuporos"
       - "rkazants"
     versioning-strategy: increase-if-necessary
 
@@ -163,6 +108,7 @@ updates:
       - "Wovchena"
       - "jiwaszki"
       - "p-wysocki"
+      - "akuporos"
       - "rkazants"
     versioning-strategy: increase-if-necessary
 
@@ -177,6 +123,7 @@ updates:
       - "Wovchena"
       - "jiwaszki"
       - "p-wysocki"
+      - "akuporos"
       - "rkazants"
     versioning-strategy: increase-if-necessary
 
@@ -191,6 +138,7 @@ updates:
       - "Wovchena"
       - "jiwaszki"
       - "p-wysocki"
+      - "akuporos"
       - "rkazants"
     versioning-strategy: increase-if-necessary
 

.github/workflows/build_doc.yml

@@ -11,7 +11,7 @@ env:
   DOXYREST_VER: '2.1.3'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -25,7 +25,7 @@ jobs:
           lfs: true
 
       - name: Install apt-get dependencies
-        uses: awalsh128/cache-apt-pkgs-action@v1.2.4
+        uses: awalsh128/cache-apt-pkgs-action@v1.3.0
         with:
           packages: graphviz texlive liblua5.2-0 libclang1-9 libclang-cpp9
           version: 3.0

.github/workflows/code_snippets.yml

@@ -31,7 +31,7 @@ jobs:
           lfs: true
 
       - name: Install OpenCL
-        uses: awalsh128/cache-apt-pkgs-action@v1.2.4
+        uses: awalsh128/cache-apt-pkgs-action@v1.3.0
         if: runner.os == 'Linux'
         with:
           packages: ocl-icd-opencl-dev opencl-headers

.gitmodules

@@ -66,3 +66,6 @@
 [submodule "thirdparty/flatbuffers/flatbuffers"]
 	path = thirdparty/flatbuffers/flatbuffers
 	url = https://github.com/google/flatbuffers.git
+[submodule "thirdparty/snappy"]
+	path = thirdparty/snappy
+	url = https://github.com/google/snappy.git

CMakeLists.txt

@@ -17,6 +17,10 @@ else()
     endif()
 endif()
 
+if(POLICY CMP0091)
+    cmake_policy(SET CMP0091 NEW) # Enables use of MSVC_RUNTIME_LIBRARY
+endif()
+
 project(OpenVINO DESCRIPTION "OpenVINO toolkit")
 
 find_package(IEDevScripts REQUIRED

cmake/dependencies.cmake

@@ -97,10 +97,10 @@ function(ov_download_tbb)
     if(WIN32 AND X86_64)
         # TODO: add target_path to be platform specific as well, to avoid following if
         RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_WIN "tbb2020_617e9a71_win.zip"
+                ARCHIVE_WIN "oneapi-tbb-2021.2.1-win.zip"
                 TARGET_PATH "${TEMP}/tbb"
                 ENVIRONMENT "TBBROOT"
-                SHA256 "01cac3cc48705bd52b83a6e1fa1ed95c708928be76160f5b9c5c37f954d56df4"
+                SHA256 "d81591673bd7d3d9454054642f8ef799e1fdddc7b4cee810a95e6130eb7323d4"
                 USE_NEW_LOCATION TRUE)
     elseif(ANDROID AND X86_64)
         RESOLVE_DEPENDENCY(TBB
@@ -110,10 +110,10 @@ function(ov_download_tbb)
                 SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
     elseif(LINUX AND X86_64)
         RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_LIN "tbb2020_617e9a71_lin_strip.tgz"
+                ARCHIVE_LIN "oneapi-tbb-2021.2.1-lin.tgz"
                 TARGET_PATH "${TEMP}/tbb"
                 ENVIRONMENT "TBBROOT"
-                SHA256 "e7a38f68059fb36de8b59d40b283a849f26275e34a58d2acadfdb84d49e31b9b"
+                SHA256 "0a56f73baaa40d72e06949ea6d593ae63a19f7580ce71c08287c1f59d2e5b988"
                 USE_NEW_LOCATION TRUE)
     elseif(YOCTO_AARCH64)
         RESOLVE_DEPENDENCY(TBB
@@ -123,10 +123,10 @@ function(ov_download_tbb)
                 SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
     elseif(APPLE AND X86_64)
         RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_MAC "tbb2020_617e9a71_mac.tgz"
+                ARCHIVE_MAC "oneapi-tbb-2021.2.1-mac.tgz"
                 TARGET_PATH "${TEMP}/tbb"
                 ENVIRONMENT "TBBROOT"
-                SHA256 "67a44b695bef3348416eaf5bf2baca2b1401576c0e09c394304eba1e0eee96cd"
+                SHA256 "c57ce4b97116cd3093c33e6dcc147fb1bbb9678d0ee6c61a506b2bfe773232cb"
                 USE_NEW_LOCATION TRUE)
     else()
         message(WARNING "Prebuilt TBB is not available on current platform")
@@ -184,10 +184,11 @@ function(ov_download_tbbbind_2_5)
                 USE_NEW_LOCATION TRUE)
     elseif(LINUX AND X86_64)
         RESOLVE_DEPENDENCY(TBBBIND_2_5
-                ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz"
+                ARCHIVE_LIN "tbbbind_2_5_static_lin_v3.tgz"
                 TARGET_PATH "${TEMP}/tbbbind_2_5"
                 ENVIRONMENT "TBBBIND_2_5_ROOT"
-                SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4")
+                SHA256 "d39deb262c06981b5e2d2e3c593e9fc9be62ce4feb91dd4e648e92753659a6b3"
+                USE_NEW_LOCATION TRUE)
     else()
         # TMP: for Apple Silicon TBB does not provide TBBBind
         if(NOT (APPLE AND AARCH64))

cmake/developer_package/check_python_requirements.py

@@ -0,0 +1,52 @@
+import pkg_resources
+import re
+import os
+
+
+def check_python_requirements(requirements_path: str) -> None:
+    """
+    Checks if the requirements defined in `requirements_path` are installed
+    in the active Python environment, while also taking constraints.txt files
+    into account.
+    """
+
+    constraints = {}
+    constraints_path = None
+    requirements = []
+
+    # read requirements and find constraints file
+    with open(requirements_path) as f:
+        raw_requirements = f.readlines()
+    for line in raw_requirements:
+        if line.startswith("-c"):
+            constraints_path = os.path.join(os.path.dirname(requirements_path), line.split(' ')[1][:-1])
+
+    # read constraints if they exist
+    if constraints_path:
+        with open(constraints_path) as f:
+            raw_constraints = f.readlines()
+        for line in raw_constraints:
+            if line.startswith("#") or line=="\n":
+                continue
+            line = line.replace("\n", "")
+            package, delimiter, constraint = re.split("(~|=|<|>|;)", line, maxsplit=1)
+            if constraints.get(package) is None:
+                constraints[package] = [delimiter + constraint]
+            else:
+                constraints[package].extend([delimiter + constraint])
+        for line in raw_requirements:
+            if line.startswith(("#", "-c")):
+                continue
+            line = line.replace("\n", "")
+            if re.search("\W", line):
+                requirements.append(line)
+            else:
+                constraint = constraints.get(line)
+                if constraint:
+                    for marker in constraint: 
+                        requirements.append(line+marker)
+                else:
+                    requirements.append(line)
+    else:
+        requirements = raw_requirements
+    pkg_resources.require(requirements)