[README.md] change latest release to 2021.3

* Assign/ReadValue, LowLatency and StateAPI clarifications

* Apply suggestions from code review: spelling mistakes

Co-authored-by: Anastasiya Ageeva <anastasiya.ageeva@intel.com>

* fixed wording

* cherry-pick missing commit to release branch: low latency documentation

* Resolve review remarks

Co-authored-by: Anastasiya Ageeva <anastasiya.ageeva@intel.com>
Co-authored-by: Svetlana Dolinina <svetlana.a.dolinina@intel.com>

.ci/azure/analyze_gtest_log.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 """

.ci/azure/android_arm64.yml

@@ -1,143 +0,0 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
-resources:
-  repositories:
-  - repository: openvino_contrib
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/openvino_contrib
-
-jobs:
-- job: android_arm64
-  # About 150% of total time
-  timeoutInMinutes: 120
-
-  pool:
-    name: LIN_VMSS_VENV_F16S_U20_WU2
-
-  variables:
-    system.debug: true
-    VSTS_HTTP_RETRY: 5
-    VSTS_HTTP_TIMEOUT: 200
-    BUILD_TYPE: Release
-    OPENVINO_REPO_DIR: $(Build.Repository.LocalPath)
-    OPENVINO_CONTRIB_REPO_DIR: $(OPENVINO_REPO_DIR)/../openvino_contrib
-    WORK_DIR: $(Pipeline.Workspace)/_w
-    BUILD_DIR: $(WORK_DIR)/build
-    ANDROID_TOOLS: $(WORK_DIR)/android_tools
-    ANDROID_SDK_VERSION: 29
-    ANDROID_ABI_CONFIG: arm64-v8a
-    TMP_DIR: /mnt/tmp
-    SHARE_DIR: /mount/cinfsshare/onnxtestdata
-    CCACHE_DIR: $(SHARE_DIR)/ccache/master/android_arm64
-
-  steps:
-  - script: |
-      curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
-      whoami
-      uname -a
-      echo Python3 info ; which python3 ; python3 --version
-      echo Python info ; which python ; python --version
-      echo Java info ; which java ; java -version
-      echo gcc info ; which gcc ; gcc --version
-      echo cmake info ; which cmake ; cmake --version
-      lsb_release
-      env
-      cat /proc/cpuinfo
-      cat /proc/meminfo
-      cat /etc/fstab
-      vmstat -s
-      df
-      lsblk -o NAME,HCTL,SIZE,MOUNTPOINT | grep -i "sd"
-      free -h
-    displayName: 'System information'
-
-  - script: |
-      rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
-      rm -rf $(BUILD_DIR) ; mkdir $(BUILD_DIR)
-      rm -rf $(ANDROID_TOOLS) ; mkdir $(ANDROID_TOOLS)
-      sudo rm -rf $(TMP_DIR) ; sudo mkdir $(TMP_DIR) ; sudo chmod 777 -R $(TMP_DIR)
-      sudo mkdir -p $(SHARE_DIR)
-      sudo apt --assume-yes update && sudo apt --assume-yes install nfs-common
-      sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(SHARE_DIR) -o vers=4,minorversion=1,sec=sys
-      mkdir -p $(CCACHE_DIR)
-    displayName: 'Make dir'
-
-  - checkout: self
-    clean: true
-    lfs: false
-    submodules: recursive
-    path: openvino
-
-  - checkout: openvino_contrib
-    clean: true
-    lfs: false
-    submodules: recursive
-    path: openvino_contrib
-
-  - script: |
-      set -e
-      $(OPENVINO_REPO_DIR)/install_build_dependencies.sh
-      # Move into contrib install_build_dependencies.sh
-      sudo apt --assume-yes install scons crossbuild-essential-arm64 libprotoc-dev protobuf-compiler default-jdk
-      # Speed up build
-      wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
-      unzip ninja-linux.zip
-      sudo cp -v ninja /usr/local/bin/
-      # Install Android SDK, NDK and TOOLS
-      wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
-      unzip commandlinetools-linux-7583922_latest.zip
-      yes | ./cmdline-tools/bin/sdkmanager --sdk_root=$(ANDROID_TOOLS) --licenses
-      ./cmdline-tools/bin/sdkmanager --sdk_root=$(ANDROID_TOOLS) --install "ndk-bundle" "platform-tools" "platforms;android-$(ANDROID_SDK_VERSION)"
-    workingDirectory: $(WORK_DIR)
-    displayName: 'Install dependencies'
-
-  - task: CMake@1
-    inputs:
-      cmakeArgs: >
-        -GNinja
-        -DVERBOSE_BUILD=ON
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-        -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_TOOLS)/ndk-bundle/build/cmake/android.toolchain.cmake
-        -DANDROID_ABI=$(ANDROID_ABI_CONFIG)
-        -DANDROID_STL=c++_shared
-        -DANDROID_PLATFORM=$(ANDROID_SDK_VERSION)
-        -DENABLE_OPENCV=OFF
-        -DENABLE_TESTS=ON
-        -DENABLE_SAMPLES=ON
-        -DENABLE_INTEL_MYRIAD=OFF
-        -DBUILD_java_api=ON
-        -DTHREADING=SEQ
-        -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
-        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        -DCMAKE_C_COMPILER_LAUNCHER=ccache
-        $(OPENVINO_REPO_DIR)
-      workingDirectory: $(BUILD_DIR)
-
-  - script: ls -alR $(OPENVINO_REPO_DIR)/temp/
-    displayName: 'List temp SDKs'
-
-  - script: ccache --zero-stats --max-size=50G --show-config
-    displayName: 'Clean ccache stats'
-
-  - script: |
-      export CCACHE_DIR=$(CCACHE_DIR)
-      export CCACHE_TEMPDIR=$(TMP_DIR)/ccache
-      export CCACHE_BASEDIR=$(Pipeline.Workspace)
-      export CCACHE_MAXSIZE=50G
-      ninja
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Build Android ARM64'
-
-  - script: ccache --show-stats
-    displayName: 'Show ccache stats'
-
-  - script: ls -alR $(OPENVINO_REPO_DIR)/bin/
-    displayName: 'List binary files'

.ci/azure/ci_utils/onnxruntime/skip_tests

@@ -1,6 +0,0 @@
-TransposeOpTest.NHWC2NCHW
-TransposeOpTest.NCHW2NHWC
-TransposeOpTest.TwoDim_int16
-GatherOpTest.Gather_axis1_indices2d_int16
-SoftmaxOperator.ThreeDimsAxis1
-SoftmaxOperator.ThreeDimsAxis0

.ci/azure/ci_utils/onnxruntime/version

@@ -1 +0,0 @@
-rel-1.8.1

.ci/azure/linux.yml

@@ -1,62 +1,39 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
 resources:
   repositories:
   - repository: openvino_contrib
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/openvino_contrib
+    ref: releases/2021/3
 
   - repository: testdata
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
+    ref: releases/2021/3
 
 jobs:
 - job: Lin
-  strategy:
-    matrix:
-      # Dynamic:
-      #   CMAKE_BUILD_SHARED_LIBS: 'ON'
-      #   PYTHON_STATIC_ARGS:
-      Static:
-        CMAKE_BUILD_SHARED_LIBS: 'OFF'
-        PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin"
-    maxParallel: 2
-
   # About 150% of total time
-  timeoutInMinutes: 120
+  timeoutInMinutes: 90
 
   pool:
-    name: LIN_VMSS_VENV_F16S_U20_WU2
+    name: LIN_VMSS_VENV_F16S_WU2
 
   variables:
     system.debug: true
     VSTS_HTTP_RETRY: 5
     VSTS_HTTP_TIMEOUT: 200
+    WORKERS_NUMBER: 16
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
     MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
-    BUILD_SAMPLES_DIR: $(WORK_DIR)/build_samples
-    BUILD_LAYER_TESTS_DIR: $(WORK_DIR)/build_layer_tests
-    BUILD_SAMPLES_TESTS_DIR: $(WORK_DIR)/build_samples_tests
+    BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE)
     INSTALL_DIR: $(WORK_DIR)/install_pkg
-    INSTALL_TEST_DIR: $(INSTALL_DIR)/tests
-    LAYER_TESTS_DIR: $(INSTALL_TEST_DIR)/layer_tests
-    SETUPVARS: $(INSTALL_DIR)/setupvars.sh
-    TMP_DIR: /mnt/tmp
-    SHARE_DIR: /mount/cinfsshare/onnxtestdata
-    CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux
+    SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
 
   steps:
   - script: |
@@ -67,7 +44,6 @@ jobs:
       echo Python info ; which python ; python --version
       echo Java info ; which java ; java -version
       echo gcc info ; which gcc ; gcc --version
-      echo cmake info ; which cmake ; cmake --version
       lsb_release
       env
       cat /proc/cpuinfo
@@ -77,20 +53,13 @@ jobs:
       df
       lsblk -o NAME,HCTL,SIZE,MOUNTPOINT | grep -i "sd"
       free -h
-      echo TargetBranch: $(System.PullRequest.TargetBranch)
-      echo SourceBranch: $(Build.SourceBranch)
     displayName: 'System info'
 
   - script: |
-      set -e
       rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
       rm -rf $(BUILD_DIR) ; mkdir $(BUILD_DIR)
-      rm -rf $(BUILD_SAMPLES_DIR) ; mkdir $(BUILD_SAMPLES_DIR)
-      sudo rm -rf $(TMP_DIR) ; sudo mkdir $(TMP_DIR) ; sudo chmod 777 -R $(TMP_DIR)
-      sudo mkdir -p $(SHARE_DIR)
-      sudo apt --assume-yes update && sudo apt --assume-yes install nfs-common
-      sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(SHARE_DIR) -o vers=4,minorversion=1,sec=sys
-      mkdir -p $(CCACHE_DIR)
+      echo TargetBranch: $(System.PullRequest.TargetBranch)
+      echo SourceBranch: $(Build.SourceBranch)
     displayName: 'Make dir'
 
   - checkout: self
@@ -105,26 +74,18 @@ jobs:
     submodules: recursive
     path: openvino_contrib
 
+  - checkout: testdata
+    clean: true
+    lfs: true
+    path: testdata
+
   - script: |
-      set -e
-      $(REPO_DIR)/install_build_dependencies.sh
-      # Move jdk into contrib
-      sudo apt --assume-yes install openjdk-11-jdk
-      # For opencv-python: python3-setuptools and pip upgrade
-      python3 -m pip install --upgrade pip
-      python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt
-      python3 -m pip install -r $(REPO_DIR)/src/bindings/python/wheel/requirements-dev.txt
+      sudo apt --assume-yes install libusb-1.0-0-dev
+      python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/requirements.txt
       # For running Python API tests
-      python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements-dev.txt
-      # For running Paddle frontend unit tests
-      python3 -m pip install -r $(REPO_DIR)/src/core/tests/frontend/paddle/requirements_dev.txt
-      # For running ONNX frontend unit tests
-      python3 -m pip install -r $(REPO_DIR)/src/core/tests/requirements_test_onnx.txt
-      # For MO unit tests
-      python3 -m pip install -r $(REPO_DIR)/tools/mo/requirements.txt
-      python3 -m pip install -r $(REPO_DIR)/tools/mo/requirements_dev.txt
+      python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/src/requirements-dev.txt
       # Speed up build
-      wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
+      wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip
       unzip ninja-linux.zip
       sudo cp -v ninja /usr/local/bin/
       # Speed up tests
@@ -132,227 +93,103 @@ jobs:
     workingDirectory: $(WORK_DIR)
     displayName: 'Install dependencies'
 
-    # Should be after 'Install dependencies' because Git lfs is not installed
-  - checkout: testdata
-    clean: true
-    lfs: true
-    path: testdata
-
   - task: CMake@1
     inputs:
       # CMake must get Python 3.x version by default
       cmakeArgs: >
         -GNinja
         -DVERBOSE_BUILD=ON
+        -DENABLE_TEMPLATE_PLUGIN=ON
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DENABLE_PYTHON=ON
-        -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS)
-        -DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS)
-        -DPYTHON_EXECUTABLE=/usr/bin/python3.8
-        -DENABLE_WHEEL=ON
+        -DPYTHON_EXECUTABLE=/usr/bin/python3.6
         -DENABLE_TESTS=ON
-        -DENABLE_OV_ONNX_FRONTEND=ON
         -DENABLE_FASTER_BUILD=ON
-        -DENABLE_STRICT_DEPENDENCIES=OFF
-        -DENABLE_REQUIREMENTS_INSTALL=OFF
         -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
-        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        -DCMAKE_C_COMPILER_LAUNCHER=ccache
         $(REPO_DIR)
       workingDirectory: $(BUILD_DIR)
 
-  - script: ls -alR $(REPO_DIR)/temp/
-    displayName: 'List temp SDKs'
-
-  - script: ccache --zero-stats --max-size=50G --show-config
-    displayName: 'Clean ccache stats'
-
-  - script: |
-      export CCACHE_DIR=$(CCACHE_DIR)
-      export CCACHE_TEMPDIR=$(TMP_DIR)/ccache
-      export CCACHE_BASEDIR=$(Pipeline.Workspace)
-      export CCACHE_MAXSIZE=50G
-      ninja
+  - script: ninja
     workingDirectory: $(BUILD_DIR)
     displayName: 'Build Lin'
 
-  - script: ccache --show-stats
-    displayName: 'Show ccache stats'
-
   - script: ls -alR $(REPO_DIR)/bin/
-    displayName: 'List bin files'
+    displayName: 'List files'
 
   - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
     workingDirectory: $(BUILD_DIR)
     displayName: 'Install'
 
-  - task: CMake@1
-    inputs:
-      cmakeArgs: >
-        -GNinja
-        $(REPO_DIR)/tests/layer_tests
-      workingDirectory: $(BUILD_LAYER_TESTS_DIR)
-
-  - script: ninja
-    workingDirectory: $(BUILD_LAYER_TESTS_DIR)
-    displayName: 'Build Layer Tests'
-
-  - script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
-    workingDirectory: $(BUILD_LAYER_TESTS_DIR)
-    displayName: 'Install Layer Tests'
-
-  - script: ls -alR $(INSTALL_DIR)
-    displayName: 'List install files'
-
-  - script: python3 -m pip install openvino-dev --find-links=$(INSTALL_DIR)/tools
-    displayName: 'Install wheels'
-
-  - script: |
-      set -e
-      mkdir -p $(INSTALL_DIR)/opencv/
-      cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake
-      cp -R $(REPO_DIR)/temp/opencv_4.5.2_ubuntu20/opencv/* $(INSTALL_DIR)/opencv/
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Install tests'
-
-  - script: ls -alR $(INSTALL_DIR)
-    displayName: 'List install files'
-
-  - script: $(INSTALL_DIR)/samples/cpp/build_samples.sh -i $(INSTALL_DIR)
-    workingDirectory: $(BUILD_SAMPLES_DIR)
-    displayName: 'Build cpp samples'
+  - script: $(BIN_DIR)/unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU* --gtest_output=xml:TEST-NGraphUT.xml
+    displayName: 'nGraph UT'
     continueOnError: false
 
-  - script: $(INSTALL_DIR)/samples/c/build_samples.sh -i $(INSTALL_DIR)
-    workingDirectory: $(BUILD_SAMPLES_DIR)
-    displayName: 'Build c samples'
-    continueOnError: false
-
-  - script: rm -fr $(BUILD_DIR)
-    displayName: 'Clean build dir'
-    continueOnError: false
-
-    # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time
-  - script: |
-      export DATA_PATH=$(MODELS_PATH)
-      export MODELS_PATH=$(MODELS_PATH)
-      . $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_TEST_DIR)/pyngraph $(PYTHON_STATIC_ARGS) --junitxml=TEST-Pyngraph.xml --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_zoo_models.py --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_backend.py
-    displayName: 'nGraph and IE Python Bindings Tests'
-    continueOnError: false
-
-    # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time
-  - script: |
-      export DATA_PATH=$(MODELS_PATH)
-      export MODELS_PATH=$(MODELS_PATH)
-      . $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_TEST_DIR)/pyopenvino $(PYTHON_STATIC_ARGS) --junitxml=TEST-Pyngraph.xml --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_utils/test_utils.py --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_zoo_models.py --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_backend.py
-    displayName: 'Python API 2.0 Tests'
-    continueOnError: false
-
-  - script: |
-      export MO_ROOT=$(INSTALL_DIR)/tools/mo
-      . $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_DIR)/tests/mo/unit_tests --junitxml=TEST-ModelOptimizer.xml
-    displayName: 'Model Optimizer UT'
-    continueOnError: false
-
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ov_core_unit_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:TEST-NGraphUT.xml
-    workingDirectory: $(INSTALL_TEST_DIR)
-    displayName: 'OV Core UT'
-    continueOnError: false
-
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:TEST-Paddle.xml
-    displayName: 'Paddle Frontend UT'
-    continueOnError: false
-
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/tensorflow_tests --gtest_print_time=1 --gtest_output=xml:TEST-Tensorflow.xml
-    displayName: 'Tensorflow Frontend UT'
-    continueOnError: false
-
-    # . $(SETUPVARS) && python3 $(WORK_DIR)/gtest-parallel/gtest_parallel.py $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --workers=16 --dump_json_test_results=InferenceEngineUnitTests.json --gtest_filter=*smoke* -- --gtest_print_time=1
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:TEST-InferenceEngineUnitTests.xml
+  - script: $(BIN_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:TEST-InferenceEngineUnitTests.xml
     displayName: 'IE UT old'
     continueOnError: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieUnitTests --gtest_output=xml:TEST-ieUnitTests.xml
+  - script: $(BIN_DIR)/ieUnitTests --gtest_output=xml:TEST-ieUnitTests.xml
     displayName: 'IE UT'
     continueOnError: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/cpuUnitTests --gtest_output=xml:TEST-cpuUnitTests.xml
+  - script: $(BIN_DIR)/cpuUnitTests --gtest_output=xml:TEST-cpuUnitTests.xml
     displayName: 'CPU UT'
     continueOnError: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/gnaUnitTests --gtest_output=xml:TEST-gnaUnitTests.xml
+  - script: $(BIN_DIR)/gnaUnitTests --gtest_output=xml:TEST-gnaUnitTests.xml
     displayName: 'GNA UT'
     continueOnError: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/vpuUnitTests --gtest_output=xml:TEST-vpuUnitTests.xml
+  - script: $(BIN_DIR)/vpuUnitTests --gtest_output=xml:TEST-vpuUnitTests.xml
     displayName: 'VPU UT'
     continueOnError: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieMultiPluginUnitTests --gtest_output=xml:TEST-ieMultiPluginUnitTests.xml
-    displayName: 'MULTI UT'
-    continueOnError: false
-
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/onnxImporterUnitTests --gtest_output=xml:TEST-onnxImporterUnitTests.xml
+  - script: $(BIN_DIR)/onnxImporterUnitTests --gtest_output=xml:TEST-onnxImporterUnitTests.xml
     displayName: 'ONNX Importer UT'
     continueOnError: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieFuncTests --gtest_output=xml:TEST-ieFuncTests.xml
+  - script: $(BIN_DIR)/ieFuncTests --gtest_output=xml:TEST-ieFuncTests.xml
     displayName: 'IE FuncTests'
     continueOnError: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ov_template_func_tests --gtest_filter=*smoke* --gtest_output=xml:TEST-templateFuncTests.xml
+  - script: $(BIN_DIR)/templateFuncTests --gtest_filter=*smoke* --gtest_output=xml:TEST-templateFuncTests.xml
     displayName: 'TEMPLATE FuncTests'
     continueOnError: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/cpuFuncTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:TEST-cpuFuncTests.xml
+  - script: $(BIN_DIR)/cpuFuncTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:TEST-cpuFuncTests.xml
     displayName: 'CPU FuncTests'
     continueOnError: false
-    condition: eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF')
+
+  - script: $(BIN_DIR)/MklDnnBehaviorTests --gtest_output=xml:TEST-MklDnnBehaviorTests.xml
+    displayName: 'MklDnnBehaviorTests'
+    continueOnError: false
 
   - script: |
       export DATA_PATH=$(MODELS_PATH)
       export MODELS_PATH=$(MODELS_PATH)
-      . $(SETUPVARS) && $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
+      python3 $(WORK_DIR)/gtest-parallel/gtest-parallel $(BIN_DIR)/MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=*smoke* -- --gtest_print_time=1
+    workingDirectory: $(WORK_DIR)
+    displayName: 'MklDnnFunctionalTests'
+    continueOnError: false
+
+  - script: |
+      export DATA_PATH=$(MODELS_PATH)
+      export MODELS_PATH=$(MODELS_PATH)
+      $(BIN_DIR)/InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
     displayName: 'IE CAPITests'
     continueOnError: false
 
-  - task: CMake@1
-    inputs:
-      cmakeArgs: >
-        -GNinja
-        $(REPO_DIR)/tests/samples_tests
-      workingDirectory: $(BUILD_SAMPLES_TESTS_DIR)
-
-  - script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
-    workingDirectory: $(BUILD_SAMPLES_TESTS_DIR)
-    displayName: 'Install Samples Tests'
-
   - script: |
-      python3 -m pip install -r $(INSTALL_DIR)/tests/smoke_tests/requirements.txt
-    workingDirectory: $(INSTALL_DIR)
-    displayName: 'Install dependencies for samples smoke tests'
-    continueOnError: false
-
-  - script: |
-      export PATH=$HOME/.local/bin:$PATH
-      export IE_APP_PATH=$(INSTALL_DIR)/samples_bin
-      export IE_APP_PYTHON_PATH=$(INSTALL_DIR)/samples/python/
-      export SHARE=$(INSTALL_DIR)/tests/smoke_tests/samples_smoke_tests_data/
-      export WORKSPACE=$(INSTALL_DIR)
-      . $(SETUPVARS) && python3 -m pytest $(INSTALL_DIR)/tests/smoke_tests/  --env_conf $(INSTALL_DIR)/tests/smoke_tests/env_config.yml -s --junitxml=$(BUILD_DIR)/TEST-SamplesSmokeTests.xml
-    workingDirectory: $(INSTALL_DIR)/samples_bin
-    displayName: 'Samples Smoke Tests'
-    continueOnError: false
-
-  - script: |
-      . $(SETUPVARS)
-      python3 -m pip install -r requirements.txt
-      export MO_ROOT=$(INSTALL_DIR)/tools/mo
-      export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH
-      python3 -m pytest tensorflow_tests/test_tf_Roll.py --ir_version=10 --junitxml=TEST-tf_Roll.xmlTEST
-    workingDirectory: $(LAYER_TESTS_DIR)
-    displayName: 'Layer Tests'
+      export DATA_PATH=$(MODELS_PATH)
+      export MODELS_PATH=$(MODELS_PATH)
+      export LD_LIBRARY_PATH=$(BIN_DIR)/lib
+      export PYTHONPATH=$(BIN_DIR)/lib/python_api/python3.6
+      env
+      cd $(REPO_DIR)/inference-engine/ie_bridges/python/tests
+      pytest pytest --junitxml=TEST-PythonAPI.xml
+    displayName: 'Python API Tests'
     continueOnError: false
+    enabled: false
 
   - task: PublishTestResults@2
     condition: always()

.ci/azure/linux_arm64.yml

@@ -1,156 +0,0 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
-resources:
-  repositories:
-  - repository: openvino_contrib
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/openvino_contrib
-
-jobs:
-- job: linux_arm64
-  # About 150% of total time
-  timeoutInMinutes: 120
-
-  pool:
-    name: LIN_VMSS_VENV_F16S_U20_WU2
-
-  variables:
-    system.debug: true
-    VSTS_HTTP_RETRY: 5
-    VSTS_HTTP_TIMEOUT: 200
-    BUILD_TYPE: Release
-    OPENVINO_REPO_DIR: $(Build.Repository.LocalPath)
-    OPENVINO_CONTRIB_REPO_DIR: $(OPENVINO_REPO_DIR)/../openvino_contrib
-    OPENCV_REPO_DIR: $(OPENVINO_REPO_DIR)/../opencv
-    WORK_DIR: $(Pipeline.Workspace)/_w
-    BUILD_DIR: $(WORK_DIR)/build
-    BUILD_DIR_OPENCV: $(WORK_DIR)/build_opencv
-    TMP_DIR: /mnt/tmp
-    SHARE_DIR: /mount/cinfsshare/onnxtestdata
-    CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux_arm64
-
-  steps:
-  - script: |
-      curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
-      whoami
-      uname -a
-      echo Python3 info ; which python3 ; python3 --version
-      echo Python info ; which python ; python --version
-      echo Java info ; which java ; java -version
-      echo gcc info ; which gcc ; gcc --version
-      echo cmake info ; which cmake ; cmake --version
-      lsb_release
-      env
-      cat /proc/cpuinfo
-      cat /proc/meminfo
-      cat /etc/fstab
-      vmstat -s
-      df
-      lsblk -o NAME,HCTL,SIZE,MOUNTPOINT | grep -i "sd"
-      free -h
-    displayName: 'System information'
-
-  - script: |
-      rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
-      rm -rf $(BUILD_DIR) ; mkdir $(BUILD_DIR)
-      sudo rm -rf $(TMP_DIR) ; sudo mkdir $(TMP_DIR) ; sudo chmod 777 -R $(TMP_DIR)
-      sudo mkdir -p $(SHARE_DIR)
-      sudo apt --assume-yes update && sudo apt --assume-yes install nfs-common
-      sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(SHARE_DIR) -o vers=4,minorversion=1,sec=sys
-      mkdir -p $(CCACHE_DIR)
-    displayName: 'Make directory'
-
-  - checkout: self
-    clean: true
-    lfs: false
-    submodules: recursive
-    path: openvino
-
-  - checkout: openvino_contrib
-    clean: true
-    lfs: false
-    submodules: recursive
-    path: openvino_contrib
-
-  - script: |
-      set -e
-      $(OPENVINO_REPO_DIR)/install_build_dependencies.sh
-      # Move into contrib install_build_dependencies.sh
-      sudo apt --assume-yes install scons crossbuild-essential-arm64 libprotoc-dev protobuf-compiler
-      # OpenCV should provide install_build_dependencies.sh as well
-      # Move into resources
-      git clone https://github.com/opencv/opencv.git --depth 1 $(OPENCV_REPO_DIR)
-      # Speed up build
-      wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
-      unzip ninja-linux.zip
-      sudo cp -v ninja /usr/local/bin/
-    workingDirectory: $(WORK_DIR)
-    displayName: 'Install dependencies'
-
-  - task: CMake@1
-    inputs:
-      cmakeArgs: >
-        -GNinja
-        -DVERBOSE_BUILD=ON
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-        -DBUILD_LIST=imgcodecs,videoio,highgui
-        -DCMAKE_TOOLCHAIN_FILE=$(OPENCV_REPO_DIR)/platforms/linux/aarch64-gnu.toolchain.cmake
-        $(OPENCV_REPO_DIR)
-      workingDirectory: $(BUILD_DIR_OPENCV)
-
-  - script: ninja
-    workingDirectory: $(BUILD_DIR_OPENCV)
-    displayName: 'Build OpenCV Linux ARM64'
-
-  - script: ninja install
-    workingDirectory: $(BUILD_DIR_OPENCV)
-    displayName: 'Install OpenCV Linux ARM64'
-
-  - task: CMake@1
-    inputs:
-      cmakeArgs: >
-        -GNinja
-        -DVERBOSE_BUILD=ON
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-        -DCMAKE_TOOLCHAIN_FILE=$(OPENVINO_REPO_DIR)/cmake/arm64.toolchain.cmake
-        -DOpenCV_DIR=$(BUILD_DIR_OPENCV)/install/lib/cmake/opencv4
-        -DENABLE_OPENCV=OFF
-        -DENABLE_TESTS=ON
-        -DENABLE_SAMPLES=ON
-        -DBUILD_java_api=OFF
-        -DENABLE_INTEL_MYRIAD=OFF
-        -DTHREADING=SEQ
-        -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
-        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        -DCMAKE_C_COMPILER_LAUNCHER=ccache
-        $(OPENVINO_REPO_DIR)
-      workingDirectory: $(BUILD_DIR)
-
-  - script: ls -alR $(OPENVINO_REPO_DIR)/temp/
-    displayName: 'List temp SDKs'
-
-  - script: ccache --zero-stats --max-size=50G --show-config
-    displayName: 'Clean ccache stats'
-
-  - script: |
-      export CCACHE_DIR=$(CCACHE_DIR)
-      export CCACHE_TEMPDIR=$(TMP_DIR)/ccache
-      export CCACHE_BASEDIR=$(Pipeline.Workspace)
-      export CCACHE_MAXSIZE=50G
-      ninja
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Build Linux ARM64'
-
-  - script: ccache --show-stats
-    displayName: 'Show ccache stats'
-
-  - script: ls -alR $(OPENVINO_REPO_DIR)/bin/
-    displayName: 'List binary files'

.ci/azure/linux_conditional_compilation.yml

@@ -1,32 +1,25 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
 jobs:
 - job: LinCC
   # About 150% of total time
   timeoutInMinutes: 90
 
   pool:
-    name: LIN_VMSS_VENV_F16S_U20_WU2
+    name: LIN_VMSS_VENV_F16S_WU2
 
   variables:
     system.debug: true
     VSTS_HTTP_RETRY: 5
     VSTS_HTTP_TIMEOUT: 200
+    WORKERS_NUMBER: 16
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
     MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
+    BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE)
     INSTALL_DIR: $(WORK_DIR)/install_pkg
-    SETUPVARS: $(INSTALL_DIR)/setupvars.sh
+    SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
 
   steps:
   - script: |
@@ -37,7 +30,6 @@ jobs:
       echo Python info ; which python ; python --version
       echo Java info ; which java ; java -version
       echo gcc info ; which gcc ; gcc --version
-      echo cmake info ; which cmake ; cmake --version
       lsb_release
       env
       cat /proc/cpuinfo
@@ -61,11 +53,10 @@ jobs:
     path: openvino
 
   - script: |
-      set -e
-      $(REPO_DIR)/install_build_dependencies.sh
-      python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt
+      sudo apt --assume-yes install libusb-1.0-0-dev
+      python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/requirements.txt
       # Speed up build
-      wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
+      wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip
       unzip ninja-linux.zip
       sudo cp -v ninja /usr/local/bin/
     workingDirectory: $(WORK_DIR)
@@ -85,14 +76,12 @@ jobs:
 
   - script: ninja
     workingDirectory: $(BUILD_DIR)
-    displayName: 'Build LinCC'
+    displayName: 'Build'
 
   - script: ls -alR $(REPO_DIR)/bin/
-    displayName: 'List bin files'
+    displayName: 'List files'
 
   - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
     workingDirectory: $(BUILD_DIR)
     displayName: 'Install'
 
-  - script: ls -alR $(INSTALL_DIR)
-    displayName: 'List install files'

.ci/azure/linux_coverity.yml

@@ -1,124 +0,0 @@
-resources:
-  repositories:
-  - repository: openvino_contrib
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/openvino_contrib
-
-jobs:
-- job: Lin
-  # About 150% of total time
-  timeoutInMinutes: 90
-
-  pool:
-    name: LIN_VMSS_VENV_F16S_U20_WU2
-
-  variables:
-    system.debug: true
-    VSTS_HTTP_RETRY: 5
-    VSTS_HTTP_TIMEOUT: 200
-    BUILD_TYPE: Release
-    REPO_DIR: $(Build.Repository.LocalPath)
-    OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
-    WORK_DIR: $(Pipeline.Workspace)/_w
-    BUILD_DIR: $(WORK_DIR)/build
-    BUILD_SAMPLES_DIR: $(WORK_DIR)/build_samples
-    INSTALL_DIR: $(WORK_DIR)/install_pkg
-    SETUPVARS: $(INSTALL_DIR)/setupvars.sh
-
-  steps:
-  - script: |
-      curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
-      whoami
-      uname -a
-      echo Python3 info ; which python3 ; python3 --version
-      echo Python info ; which python ; python --version
-      echo Java info ; which java ; java -version
-      echo gcc info ; which gcc ; gcc --version
-      echo cmake info ; which cmake ; cmake --version
-      lsb_release
-      env
-      cat /proc/cpuinfo
-      cat /proc/meminfo
-      cat /etc/fstab
-      vmstat -s
-      df
-      lsblk -o NAME,HCTL,SIZE,MOUNTPOINT | grep -i "sd"
-      free -h
-    displayName: 'System info'
-
-  - script: |
-      rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
-      rm -rf $(BUILD_DIR) ; mkdir $(BUILD_DIR)
-      rm -rf $(BUILD_SAMPLES_DIR) ; mkdir $(BUILD_SAMPLES_DIR)
-    displayName: 'Make dir'
-
-  - checkout: self
-    clean: true
-    lfs: false
-    submodules: recursive
-    path: openvino
-
-  - checkout: openvino_contrib
-    clean: true
-    lfs: false
-    submodules: recursive
-    path: openvino_contrib
-
-  - script: |
-      set -e
-      $(REPO_DIR)/install_build_dependencies.sh
-      # Move jdk into contrib
-      sudo apt --assume-yes install openjdk-11-jdk
-      # Speed up build
-      wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
-      unzip ninja-linux.zip
-      sudo cp -v ninja /usr/local/bin/
-    workingDirectory: $(WORK_DIR)
-    displayName: 'Install dependencies'
-
-  - task: CMake@1
-    inputs:
-      # Coverity has too many PARSE_ERROR errors with ENABLE_FASTER_BUILD=ON. Disabling FASTER_BUILD.
-      cmakeArgs: >
-        -GNinja
-        -DVERBOSE_BUILD=ON
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-        -DENABLE_FASTER_BUILD=OFF
-        -DENABLE_STRICT_DEPENDENCIES=OFF
-        -DENABLE_REQUIREMENTS_INSTALL=OFF
-        -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
-        $(REPO_DIR)
-      workingDirectory: $(BUILD_DIR)
-
-  - script: ls -alR $(REPO_DIR)/temp/
-    displayName: 'List temp SDKs'
-
-  - script: |
-        set -e
-        wget https://scan.coverity.com/download/linux64 --post-data "token=$(COVERITY_TOKEN)&project=openvino" -O coverity_tool.tgz
-        tar xvf coverity_tool.tgz
-        rm coverity_tool.tgz
-    workingDirectory: $(WORK_DIR)
-    displayName: 'Install coverity tool'
-
-  - script: $(WORK_DIR)/cov-analysis*/bin/cov-build --dir $(BUILD_DIR)/cov-int ninja
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Build Lin with Coverity'
-
-  - script: ls -alR $(REPO_DIR)/bin/
-    displayName: 'List bin files'
-
-  - script: tar -C $(BUILD_DIR) -czvf openvino.tgz cov-int
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Pack cov-int folder for submission'
-
-  - script: |
-        curl --form token=$(COVERITY_TOKEN) \
-          --form email=$(COVERITY_USER) \
-          --form file=@openvino.tgz \
-          --form version="$(Build.SourceVersion)" \
-          --form description="https://github.com/openvinotoolkit/openvino/runs/$(Build.BuildNumber)" \
-          https://scan.coverity.com/builds?project=openvino
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Submit for analysis'

.ci/azure/linux_lohika.yml

@@ -1,80 +0,0 @@
-#resources:
-#  repositories:
-#  - repository: testdata
-#    type: github
-#    endpoint: openvinotoolkit
-#    name: openvinotoolkit/testdata
-
-jobs:
-- job: Lin_lohika
-  # About 150% of total time
-  timeoutInMinutes: 90
-
-  pool:
-    name: LIN_LOHIKA
-
-  variables:
-    system.debug: true
-#    VSTS_HTTP_RETRY: 5
-#    VSTS_HTTP_TIMEOUT: 200
-#    BUILD_TYPE: Release
-#    REPO_DIR: $(Build.Repository.LocalPath)
-#    MODELS_PATH: $(REPO_DIR)/../testdata
-#    WORK_DIR: $(Pipeline.Workspace)/_w
-#    BUILD_DIR: $(WORK_DIR)/build
-
-  steps:
-  - script: git -C ~/work/openvino fetch origin $(Build.SourceBranch)
-    displayName: fetch
-
-#  - checkout: self
-#    clean: true
-#    lfs: false
-#    submodules: recursive
-#    path: openvino
-
-  - checkout: none
-
-  - script: git -C ~/work/openvino checkout -m $(Build.SourceVersion) && git -C ~/work/openvino submodule update --init --recursive
-    displayName: checkout
-
-    # Should be after 'Install dependencies' because Git lfs is not installed
-#  - checkout: testdata
-#    clean: true
-#    lfs: true
-#    path: testdata
-
-  - script: env -C ~/work ./configreleasenolto.sh
-    displayName: CMake
-
-#  - task: CMake@1
-#    inputs:
-#      # CMake must get Python 3.x version by default
-#      cmakeArgs: >
-#        -GNinja
-#        -DVERBOSE_BUILD=ON
-#        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-#        -DENABLE_PYTHON=ON
-#        -DPYTHON_EXECUTABLE=/usr/bin/python3.8
-#        -DENABLE_WHEEL=ON
-#        -DENABLE_TESTS=ON
-#        -DENABLE_OV_ONNX_FRONTEND=ON
-#        -DENABLE_FASTER_BUILD=ON
-#        -DENABLE_STRICT_DEPENDENCIES=OFF
-#        -DENABLE_REQUIREMENTS_INSTALL=OFF
-#        -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
-#        $(REPO_DIR)
-#      workingDirectory: $(BUILD_DIR)
-
-  - script: >
-      env -C ~/work
-      ./buildreleasenolto.sh
-      libopenvino_gapi_preproc.so
-      openvino_intel_cpu_plugin
-      openvino_intel_gpu_plugin
-      clDNN_unit_tests64
-      gpuFuncTests
-    displayName: Build Lin
-
-  - script: ~/work/testreleasenolto.sh
-    displayName: cldnn tests

.ci/azure/linux_ngraph_onnx.yml

@@ -1,40 +1,22 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
 jobs:
-- job: OpenVINO_ONNX_CI
-  strategy:
-    matrix:
-      Release:
-        BUILD_TYPE: 'Release'
-        TOX_COMMAND: 'tox && tox -e zoo_models'
-      Debug:
-        BUILD_TYPE: 'Debug'
-        TOX_COMMAND: 'tox'
-    maxParallel: 2
+- job: nGraph_ONNX_Lin
 
   # About 300% of total time
   timeoutInMinutes: 90
 
   pool:
-    name: LIN_VMSS_VENV_ONNX_U20_WU2
+    name: LIN_VMSS_VENV_ONNX_WU2
 
   variables:
     system.debug: true
     VSTS_HTTP_RETRY: 5
     VSTS_HTTP_TIMEOUT: 200
+    WORKERS_NUMBER: 8
+    BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     WORK_DIR: $(Pipeline.Workspace)/_w
     MODELS_DIR: /mount/cinfsshare/onnxtestdata
     TMP_DIR: /mnt/tmp
-    ONNX_MODEL_ZOO_SHA: "d58213534f2a4d1c4b19ba62b3bb5f544353256e"
-
 
   steps:
   - script: |
@@ -45,7 +27,6 @@ jobs:
       echo Python info ; which python ; python --version
       echo Java info ; which java ; java -version
       echo gcc info ; which gcc ; gcc --version
-      echo cmake info ; which cmake ; cmake --version
       lsb_release
       env
       cat /proc/cpuinfo
@@ -59,10 +40,10 @@ jobs:
 
   - script: |
       rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
+      sudo rm -rf $(TMP_DIR) ; sudo mkdir $(TMP_DIR) ; sudo chmod 777 -R $(TMP_DIR)
       sudo mkdir -p $(MODELS_DIR)
-      sudo apt --assume-yes update && sudo apt --assume-yes install nfs-common
+      sudo apt --assume-yes install nfs-common
       sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(MODELS_DIR) -o vers=4,minorversion=1,sec=sys
-      mkdir -p $(MODELS_DIR)/models_data
     displayName: 'Make dirs'
 
   - checkout: self
@@ -71,23 +52,31 @@ jobs:
     submodules: recursive
     path: openvino
 
+  - script: docker build --tag=openvino-onnx-ci-image --file=.ci/openvino-onnx/Dockerfile .
+    displayName: 'Docker build'
+
+  - script: ngraph/python/tests/test_onnx/model_zoo_preprocess.sh -d $(TMP_DIR) -o
+    displayName: 'Get models'
+
   - script: |
-      set -e
-      sudo apt --assume-yes install git-lfs uidmap
-      curl -fsSL https://get.docker.com -o get-docker.sh
-      sudo sh get-docker.sh
-    workingDirectory: $(WORK_DIR)
-    displayName: 'Install dependencies'
+      ##wget -O "$(TMP_DIR)/msft.zip" https://onnxruntimetestdata.blob.core.windows.net/models/20191107.zip
+      ##unzip "$(TMP_DIR)/msft.zip" -d "$(MODELS_DIR)/msft"
+      #unzip "/mnt/onnxtestdata/models/20191107.zip" -d "$(MODELS_DIR)/msft"
+      #mv $(MODELS_DIR)/msft/opset9/LSTM_Seq_lens_unpacked/seq_lens_sorted $(MODELS_DIR)/msft/opset9/LSTM_Seq_lens_unpacked/test_data_set_0
+      #mv $(MODELS_DIR)/msft/opset9/LSTM_Seq_lens_unpacked/seq_lens_unsorted $(MODELS_DIR)/msft/opset9/LSTM_Seq_lens_unpacked/test_data_set_1
+    displayName: 'Get MSFT models'
+    enabled: false
 
-  - script: src/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d $(MODELS_DIR)/models_data -o -s "$(ONNX_MODEL_ZOO_SHA)"
-    displayName: 'Update models'
-    condition: ne(variables['BUILD_TYPE'], 'Debug')
+  - script: |
+      ls -alR $(MODELS_DIR)
+      ls -alR $(TMP_DIR)
+    displayName: 'List models'
+    enabled: false
 
-  - script: sudo docker build --tag=openvino-onnx-ci-image --file=.ci/openvino-onnx/Dockerfile --build-arg BUILD_TYPE=$(BUILD_TYPE) --build-arg PROTOBUF_LITE=$(PROTOBUF_LITE) .
-    displayName: 'Docker build $(BUILD_TYPE)'
-
-  - script: sudo fallocate -l 64G /swapfile ; sudo mkswap /swapfile ; sudo swapon /swapfile ; df ; free -h
+  - script: sudo fallocate -l 48G /swapfile ; sudo mkswap /swapfile ; sudo swapon /swapfile ; df ; free -h
     displayName: 'Create swap'
 
-  - script: sudo docker run --name openvino-onnx-ci-container --volume $(MODELS_DIR)/models_data/model_zoo/onnx_model_zoo_$(ONNX_MODEL_ZOO_SHA):/root/.onnx/model_zoo/onnx_model_zoo --volume $(MODELS_DIR)/msft:/root/.onnx/model_zoo/MSFT openvino-onnx-ci-image /bin/bash -c "$(TOX_COMMAND)"
-    displayName: 'Docker run $(BUILD_TYPE)'
+  - script: |
+      docker run --name openvino-onnx-ci-container --volume $(TMP_DIR)/model_zoo:/root/.onnx/model_zoo --volume $(MODELS_DIR)/msft:/root/.onnx/model_zoo/MSFT openvino-onnx-ci-image
+    displayName: 'Docker run'
+

.ci/azure/linux_onnxruntime.yml

@@ -1,162 +0,0 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
-jobs:
-- job: onnxruntime
-  timeoutInMinutes: 90
-
-  pool:
-    name: LIN_VMSS_VENV_ONNX_U20_WU2
-
-  variables:
-    system.debug: true
-    VSTS_HTTP_RETRY: 5
-    VSTS_HTTP_TIMEOUT: 200
-    BUILD_TYPE: Release
-    REPO_DIR: $(Build.Repository.LocalPath)
-    ONNXRUNTIME_REPO_DIR: $(REPO_DIR)/../onnxruntime
-    WORK_DIR: $(Pipeline.Workspace)/_w
-    MODELS_DIR: /mount/cinfsshare/onnxtestdata
-    TMP_DIR: /mnt/tmp
-    INSTALL_DIR: $(WORK_DIR)/install_pkg/openvino
-    BUILD_DIR: $(WORK_DIR)/build
-    ONNXRUNTIME_UTILS: $(REPO_DIR)/.ci/azure/ci_utils/onnxruntime
-    ONNXRUNTIME_BUILD_DIR: $(ONNXRUNTIME_REPO_DIR)/build
-
-  steps:
-  - script: |
-      curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
-      whoami
-      uname -a
-      echo Python3 info ; which python3 ; python3 --version
-      echo Python info ; which python ; python --version
-      echo Java info ; which java ; java -version
-      echo gcc info ; which gcc ; gcc --version
-      echo cmake info ; which cmake ; cmake --version
-      lsb_release
-      env
-      cat /proc/cpuinfo
-      cat /proc/meminfo
-      cat /etc/fstab
-      vmstat -s
-      df
-      lsblk -o NAME,HCTL,SIZE,MOUNTPOINT | grep -i "sd"
-      free -h
-    displayName: 'System info'
-
-  - script: |
-      rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
-      sudo rm -rf $(TMP_DIR) ; sudo mkdir $(TMP_DIR) ; sudo chmod 777 -R $(TMP_DIR)
-      sudo mkdir -p $(MODELS_DIR)
-      sudo apt --assume-yes update && sudo apt --assume-yes install nfs-common
-      sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(MODELS_DIR) -o vers=4,minorversion=1,sec=sys
-    displayName: 'Make dirs'
-
-  - checkout: self
-    clean: true
-    lfs: false
-    submodules: recursive
-    path: openvino
-
-  - script: |
-      branch=`tr -s '\n ' < $(ONNXRUNTIME_UTILS)/version`
-      git clone --branch $branch --single-branch --recursive https://github.com/microsoft/onnxruntime.git $(ONNXRUNTIME_REPO_DIR)
-    displayName: 'Clone onnxruntime'
-
-  - script: |
-      set -e
-      $(REPO_DIR)/install_build_dependencies.sh
-      python3 -m pip install --upgrade pip
-      python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt
-      # For running Python API tests
-      python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements-dev.txt
-      # Speed up build
-      wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
-      unzip ninja-linux.zip
-      sudo cp -v ninja /usr/local/bin/
-      # Speed up tests
-      git clone https://github.com/google/gtest-parallel.git
-    workingDirectory: $(WORK_DIR)
-    displayName: 'Install dependencies'
-
-  - task: CMake@1
-    inputs:
-      # CMake must get Python 3.x version by default
-      cmakeArgs: >
-        -GNinja
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-        -DENABLE_PYTHON=ON
-        -DPYTHON_EXECUTABLE=/usr/bin/python3.8
-        -DENABLE_INTEL_MYRIAD_COMMON=OFF
-        -DENABLE_INTEL_GNA=OFF
-        -DENABLE_OPENCV=OFF
-        -DENABLE_CPPLINT=OFF
-        -DENABLE_TESTS=OFF
-        -DENABLE_INTEL_CPU=ON
-        -DENABLE_INTEL_GPU=OFF
-        -DENABLE_PROFILING_ITT=OFF
-        -DENABLE_SAMPLES=OFF
-        -DENABLE_OV_ONNX_FRONTEND=ON
-        -DENABLE_OPENVINO_DEBUG=OFF
-        $(REPO_DIR)
-      workingDirectory: $(BUILD_DIR)
-
-  - script: ninja
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Build Lin ONNX'
-
-  - script: ls -alR $(REPO_DIR)/bin/
-    displayName: 'List bin files'
-
-  - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Install'
-
-  - script: |
-      source $(INSTALL_DIR)/setupvars.sh
-      CXXFLAGS="-Wno-error=deprecated-declarations" ./build.sh --config RelWithDebInfo --use_openvino CPU_FP32 --build_shared_lib --parallel --skip_tests --build_dir $(ONNXRUNTIME_BUILD_DIR)
-    workingDirectory: $(ONNXRUNTIME_REPO_DIR)
-    displayName: 'Build Lin ONNX Runtime'
-
-  - script: |
-      source $(INSTALL_DIR)/setupvars.sh
-      skip_tests=`tr -s '\n ' ':' < $(ONNXRUNTIME_UTILS)/skip_tests`
-      ./onnxruntime_test_all --gtest_filter=-$skip_tests
-    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
-    displayName: 'Run onnxruntime_test_all'
-
-  - script: |
-      source $(INSTALL_DIR)/setupvars.sh
-      ./onnxruntime_shared_lib_test
-    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
-    displayName: 'Run onnxruntime_shared_lib_test'
-
-  - script: |
-      source $(INSTALL_DIR)/setupvars.sh
-      ./onnxruntime_global_thread_pools_test
-    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
-    displayName: 'Run onnxruntime_global_thread_pools_test'
-
-  - script: |
-      source $(INSTALL_DIR)/setupvars.sh
-      ./onnxruntime_api_tests_without_env
-    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
-    displayName: 'Run onnxruntime_api_tests_without_env'
-
-  - script: |
-      source $(INSTALL_DIR)/setupvars.sh
-      ./onnx_test_runner "$(ONNXRUNTIME_REPO_DIR)/cmake/external/onnx/onnx/backend/test/data/pytorch-converted"
-    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
-    displayName: 'Run pytorch-converted tests'
-
-  - script: |
-      source $(INSTALL_DIR)/setupvars.sh
-      ./onnx_test_runner "$(ONNXRUNTIME_REPO_DIR)/cmake/external/onnx/onnx/backend/test/data/pytorch-operator"
-    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
-    displayName: 'Run pytorch-operator tests'

.ci/azure/mac.yml

@@ -1,23 +1,16 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
 resources:
   repositories:
   - repository: openvino_contrib
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/openvino_contrib
+    ref: releases/2021/3
 
   - repository: testdata
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
+    ref: releases/2021/3
 
 jobs:
 - job: Mac
@@ -31,27 +24,26 @@ jobs:
     system.debug: true
     VSTS_HTTP_RETRY: 5
     VSTS_HTTP_TIMEOUT: 200
+    WORKERS_NUMBER: 3
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
     MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
+    BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE)
     INSTALL_DIR: $(WORK_DIR)/install_pkg
-    INSTALL_TEST_DIR: $(INSTALL_DIR)/tests
-    SETUPVARS: $(INSTALL_DIR)/setupvars.sh
-    TMP_DIR: /tmp
-    CCACHE_DIR: $(WORK_DIR)/ccache/mac
+    SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
 
   steps:
   - script: |
       whoami
       uname -a
-      echo Python3 info ; which python3 ; python3 --version
-      echo Python info ; which python ; python --version
-      echo Java info ; which java ; java -version
-      echo gcc info ; which gcc ; gcc --version
-      echo cmake info ; which cmake ; cmake --version
+      which python3
+      python3 --version
+      which java
+      java -version
+      gcc --version
       xcrun --sdk macosx --show-sdk-version
       env
       sysctl -a
@@ -86,10 +78,8 @@ jobs:
   - script: |
       brew install cython
       brew install automake
-      python3 -m pip install -r $(REPO_DIR)/src/core/tests/requirements_test_onnx.txt
       # Speed up build
       brew install ninja
-      brew install ccache
       # Speed up tests
       git clone https://github.com/google/gtest-parallel.git
     workingDirectory: $(WORK_DIR)
@@ -99,110 +89,74 @@ jobs:
       export PATH="/usr/local/opt/cython/bin:$PATH"
       export CC=gcc
       export CXX=g++
-      cmake -GNinja -DVERBOSE_BUILD=ON -DENABLE_REQUIREMENTS_INSTALL=OFF -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_PYTHON=ON -DENABLE_TESTS=OFF -DENABLE_STRICT_DEPENDENCIES=OFF -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache $(REPO_DIR)
+      # Disable errors with Ninja
+      export CXXFLAGS="-Wno-error=unused-command-line-argument"
+      export CFLAGS="-Wno-error=unused-command-line-argument"
+      cmake -GNinja -DVERBOSE_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_PYTHON=ON -DENABLE_TESTS=ON -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules $(REPO_DIR)
     workingDirectory: $(BUILD_DIR)
     displayName: 'CMake'
 
-  - script: ls -alR $(REPO_DIR)/temp/
-    displayName: 'List temp SDKs'
-
-  - task: Cache@2
-    inputs:
-      key: 'ccache | "$(Agent.OS)"'
-      path: $(CCACHE_DIR)
-      restoreKeys: |
-        ccache | "$(Agent.OS)"
-    displayName: Cache
-
-  - script: ccache --zero-stats --max-size=10G --show-config
-    displayName: 'Clean ccache stats'
-
-  - script: |
-      export CCACHE_DIR=$(CCACHE_DIR)
-      export CCACHE_TEMPDIR=$(TMP_DIR)/ccache
-      export CCACHE_BASEDIR=$(Pipeline.Workspace)
-      export CCACHE_MAXSIZE=10G
-      ninja
+  - script: ninja
     workingDirectory: $(BUILD_DIR)
     displayName: 'Build Mac'
 
-  - script: ccache --show-stats
-    displayName: 'Show ccache stats'
-
   - script: ls -alR $(REPO_DIR)/bin/
-    displayName: 'List bin files'
+    displayName: 'List files'
 
   - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
     workingDirectory: $(BUILD_DIR)
     displayName: 'Install'
 
-  - script: ls -alR $(INSTALL_DIR)
-    displayName: 'List install files'
-
-  - script: |
-      set -e
-      mkdir -p $(INSTALL_DIR)/opencv/
-      cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake
-      cp -R $(REPO_DIR)/temp/opencv_4.5.2_osx/opencv/* $(INSTALL_DIR)/opencv/
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Install tests'
-
-  - script: ls -alR $(INSTALL_DIR)
-    displayName: 'List install files'
-
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ov_core_unit_tests --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU*:IE_CPU.onnx_model_sigmoid:IE_CPU/GRUSequenceOp.onnx_model_gru* --gtest_output=xml:TEST-NGraphUT.xml
-    workingDirectory: $(INSTALL_TEST_DIR)
-    displayName: 'OV Core UT'
+  - script: $(BIN_DIR)/unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU*:IE_CPU.onnx_model_sigmoid:IE_CPU/GRUSequenceOp.onnx_model_gru* --gtest_output=xml:TEST-NGraphUT.xml
+    displayName: 'nGraph UT'
     continueOnError: false
-    enabled: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_filter=-MKLDNNGraphStructureTests.TestNoRedundantReordersBeforeDWConvolution:TestConvolution/MKLDNNGraphConvolutionTests.TestsConvolution/0:TestConvolutionDefaultPrimitivesPriority/MKLDNNGraphConvolutionTests.TestsConvolution/0 --gtest_output=xml:TEST-InferenceEngineUnitTests.xml
+  - script: $(BIN_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_filter=-MKLDNNGraphStructureTests.TestNoRedundantReordersBeforeDWConvolution:TestConvolution/MKLDNNGraphConvolutionTests.TestsConvolution/0:TestConvolutionDefaultPrimitivesPriority/MKLDNNGraphConvolutionTests.TestsConvolution/0 --gtest_output=xml:TEST-InferenceEngineUnitTests.xml
     displayName: 'IE UT old'
     continueOnError: false
-    enabled: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieUnitTests --gtest_output=xml:TEST-ieUnitTests.xml
+  - script: $(BIN_DIR)/ieUnitTests --gtest_output=xml:TEST-ieUnitTests.xml
     displayName: 'IE UT'
     continueOnError: false
-    enabled: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/cpuUnitTests --gtest_output=xml:TEST-cpuUnitTests.xml
+  - script: $(BIN_DIR)/cpuUnitTests --gtest_output=xml:TEST-cpuUnitTests.xml
     displayName: 'CPU UT'
     continueOnError: false
-    enabled: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/vpuUnitTests --gtest_output=xml:TEST-vpuUnitTests.xml
+  - script: $(BIN_DIR)/vpuUnitTests --gtest_output=xml:TEST-vpuUnitTests.xml
     displayName: 'VPU UT'
     continueOnError: false
-    enabled: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/onnxImporterUnitTests --gtest_output=xml:TEST-onnxImporterUnitTests.xml
+  - script: $(BIN_DIR)/onnxImporterUnitTests --gtest_output=xml:TEST-onnxImporterUnitTests.xml
     displayName: 'ONNX Importer UT'
     continueOnError: false
-    enabled: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieMultiPluginUnitTests --gtest_output=xml:TEST-ieMultiPluginUnitTests.xml
-    displayName: 'MULTI UT'
-    continueOnError: false
-    enabled: false
-
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieFuncTests --gtest_output=xml:TEST-ieFuncTests.xml
+  - script: $(BIN_DIR)/ieFuncTests --gtest_output=xml:TEST-ieFuncTests.xml
     displayName: 'IE FuncTests'
     continueOnError: false
-    enabled: false
 
-  - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/cpuFuncTests --gtest_filter=*smoke*:-smoke_LPT/ReduceMinTransformation.CompareWithRefImpl/f32_Shape* --gtest_print_time=1 --gtest_output=xml:TEST-cpuFuncTests.xml
+  - script: $(BIN_DIR)/cpuFuncTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:TEST-cpuFuncTests.xml
     displayName: 'CPU FuncTests'
     continueOnError: false
-    enabled: false
+
+  - script: $(BIN_DIR)/MklDnnBehaviorTests --gtest_output=xml:TEST-MklDnnBehaviorTests.xml
+    displayName: 'MklDnnBehaviorTests'
+    continueOnError: false
 
   - script: |
       export DATA_PATH=$(MODELS_PATH)
       export MODELS_PATH=$(MODELS_PATH)
-      . $(SETUPVARS) && $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
+      python3 $(WORK_DIR)/gtest-parallel/gtest-parallel $(BIN_DIR)/MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=*smoke*:-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* -- --gtest_print_time=1
+    workingDirectory: $(WORK_DIR)
+    displayName: 'MklDnnFunctionalTests'
+    continueOnError: false
+
+  - script: |
+      export DATA_PATH=$(MODELS_PATH)
+      export MODELS_PATH=$(MODELS_PATH)
+      $(BIN_DIR)/InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
     displayName: 'IE CAPITests'
     continueOnError: false
-    enabled: false
 
   - task: PublishTestResults@2
     condition: always()

.ci/azure/windows.yml

@@ -1,69 +1,49 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
 resources:
   repositories:
   - repository: openvino_contrib
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/openvino_contrib
+    ref: releases/2021/3
 
   - repository: testdata
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
+    ref: releases/2021/3
 
 jobs:
 - job: Win
-  strategy:
-    matrix:
-      Static:
-        CMAKE_BUILD_SHARED_LIBS: 'OFF'
-    #  Dynamic:
-    #    CMAKE_BUILD_SHARED_LIBS: 'ON'
-    maxParallel: 2
-
   # About 150% of total time
-  timeoutInMinutes: 150
+  timeoutInMinutes: 120
 
   pool:
-    name: WIN_VMSS_VENV_D8S_WU2
+    name: WIN_VMSS_VENV_F8S_WU2
 
   variables:
     system.debug: true
     VSTS_HTTP_RETRY: 5
     VSTS_HTTP_TIMEOUT: 200
+    WORKERS_NUMBER: 8
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)\..\openvino_contrib
     MODELS_PATH: $(REPO_DIR)\..\testdata
     WORK_DIR: $(Pipeline.Workspace)\_w
-    BUILD_DIR: $(WORK_DIR)\build
-    BUILD_SAMPLES_DIR: $(WORK_DIR)\build_samples
-    BUILD_SAMPLES_TESTS_DIR: $(WORK_DIR)\build_samples_tests
+    BUILD_DIR: D:\build
+    BIN_DIR: $(REPO_DIR)\bin\intel64
     MSVS_VARS_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
     MSVC_COMPILER_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx64\x64\cl.exe
     INSTALL_DIR: $(WORK_DIR)\install_pkg
-    INSTALL_TEST_DIR: $(INSTALL_DIR)\tests
-    SETUPVARS: $(INSTALL_DIR)\setupvars.bat
+    SETUPVARS: $(INSTALL_DIR)\bin\setupvars.bat
     IB_DIR: C:\Program Files (x86)\IncrediBuild
     IB_TESTCONSOLE: $(IB_DIR)\IBTestConsole.exe
-    PYTHON_DIR: C:\hostedtoolcache\windows\Python\3.7.6\x64
-    CMAKE_VERSION: 3.21.0
-    CMAKE_CMD: $(WORK_DIR)\cmake-$(CMAKE_VERSION)-windows-x86_64\cmake-$(CMAKE_VERSION)-windows-x86_64\bin\cmake.exe
-    OV_CMAKE_TOOLCHAIN_FILE: $(REPO_DIR)\cmake\toolchains\mt.runtime.win32.toolchain.cmake
+    TEST_ENV_PATH: $(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.1\opencv\bin;$(IB_DIR);%PATH%
 
   steps:
   - script: |
       powershell -command "Invoke-RestMethod -Headers @{\"Metadata\"=\"true\"} -Method GET -Uri http://169.254.169.254/metadata/instance/compute?api-version=2019-06-01 | format-custom"
       where python3
-      python3 --version
       where python
       python --version
       where java
@@ -78,12 +58,10 @@ jobs:
   - script: |
       rd /Q /S $(WORK_DIR) & mkdir $(WORK_DIR)
       rd /Q /S $(BUILD_DIR) & mkdir $(BUILD_DIR)
-      rd /Q /S $(BUILD_SAMPLES_DIR) & mkdir $(BUILD_SAMPLES_DIR)
-      rd /Q /S $(BUILD_SAMPLES_TESTS_DIR) & mkdir $(BUILD_SAMPLES_TESTS_DIR)
     displayName: 'Make dir'
 
   - script: |
-      curl -O https://openvinoweb.z5.web.core.windows.net/incredibuild/install_ib_console.bat
+      certutil -urlcache -split -f https://incredibuilddiag1wu2.blob.core.windows.net/incredibuild/install_ib_console.bat install_ib_console.bat
       call install_ib_console.bat
     workingDirectory: $(WORK_DIR)
     displayName: 'Install IncrediBuild'
@@ -106,167 +84,112 @@ jobs:
     path: testdata
 
   - script: |
-      python -m pip install --upgrade pip
-      rem For running Python API tests
-      python -m pip install -r $(REPO_DIR)\src\bindings\python\src\compatibility\openvino\requirements-dev.txt
-      python -m pip install -r $(REPO_DIR)\src\bindings\python\wheel\requirements-dev.txt
-      rem For running Paddle frontend unit tests
-      python -m pip install -r $(REPO_DIR)\src\core\tests\frontend\paddle\requirements_dev.txt
-      rem For running ONNX frontend unit tests
-      python -m pip install -r $(REPO_DIR)\src\core\tests\requirements_test_onnx.txt
-      rem For MO unit tests
-      python -m pip install -r $(REPO_DIR)\tools\mo\requirements.txt
-      python -m pip install -r $(REPO_DIR)\tools\mo\requirements_dev.txt
-      rem Speed up build
-      powershell -command "Invoke-WebRequest https://github.com/Kitware/CMake/releases/download/v$(CMAKE_VERSION)/cmake-$(CMAKE_VERSION)-windows-x86_64.zip -OutFile cmake-$(CMAKE_VERSION)-windows-x86_64.zip"
-      powershell -command "Expand-Archive -Force cmake-$(CMAKE_VERSION)-windows-x86_64.zip"
-      powershell -command "Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip -OutFile ninja-win.zip"
+      certutil -urlcache -split -f https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip ninja-win.zip
       powershell -command "Expand-Archive -Force ninja-win.zip"
       git clone https://github.com/google/gtest-parallel.git
     workingDirectory: $(WORK_DIR)
     displayName: 'Install dependencies'
 
-  - powershell: |
-      Write-Host "##vso[task.setvariable variable=CMAKE_TOOLCHAIN_FILE]$(OV_CMAKE_TOOLCHAIN_FILE)"
-    condition: eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'ON')
-    displayName: "Set cmake toolchain"
-
   - script: |
       set PATH=$(WORK_DIR)\ninja-win;%PATH%
-      call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -G "Ninja Multi-Config" -DENABLE_WHEEL=ON -DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_GAPI_PREPROCESSING=$(CMAKE_BUILD_SHARED_LIBS) -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_REQUIREMENTS_INSTALL=OFF -DENABLE_FASTER_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" -DPYTHON_INCLUDE_DIR="C:\hostedtoolcache\windows\Python\3.7.6\x64\include" -DPYTHON_LIBRARY="C:\hostedtoolcache\windows\Python\3.7.6\x64\libs\python37.lib" -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR)
+      call "$(MSVS_VARS_PATH)" && cmake -GNinja -DENABLE_FASTER_BUILD=ON -DENABLE_TEMPLATE_PLUGIN=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR)
     workingDirectory: $(BUILD_DIR)
     displayName: 'CMake'
 
-  - script: dir $(REPO_DIR)\temp\ /s
-    displayName: 'List temp SDKs'
-
   - script: |
       set PATH=$(WORK_DIR)\ninja-win;%PATH%
-      call "$(MSVS_VARS_PATH)" && "C:\Program Files (x86)\IncrediBuild\BuildConsole.exe" /COMMAND="$(CMAKE_CMD) --build . --config Release"
+      call "$(MSVS_VARS_PATH)" && "C:\Program Files (x86)\IncrediBuild\BuildConsole.exe" /COMMAND="ninja"
     workingDirectory: $(BUILD_DIR)
-    displayName: 'Build Win - IB'
+    displayName: 'Build Win'
 
   - script: dir $(REPO_DIR)\bin\ /s
-    displayName: 'List bin files'
+    displayName: 'List files'
 
-  - script: $(CMAKE_CMD) -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
+  - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
     workingDirectory: $(BUILD_DIR)
     displayName: 'Install'
 
-  - script: dir $(INSTALL_DIR) /s
-    displayName: 'List install files'
-
-  - script: python -m pip install openvino-dev --find-links=$(INSTALL_DIR)\tools
-    displayName: 'Install Wheels'
-
-  - script: call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)"  $(REPO_DIR)\tests\samples_tests
-    workingDirectory: $(BUILD_SAMPLES_TESTS_DIR)
-    displayName: 'CMake'
-
-  - script: $(CMAKE_CMD) -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
-    workingDirectory: $(BUILD_SAMPLES_TESTS_DIR)
-    displayName: 'Install Samples Tests'
-
-  - script: $(CMAKE_CMD) -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake && xcopy $(REPO_DIR)\temp\opencv_4.5.2\opencv\* $(INSTALL_DIR)\opencv\ /e /h /y
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Install tests'
-
-  - script: dir $(INSTALL_DIR) /s
-    displayName: 'List install files'
-
-  - script: $(INSTALL_DIR)\samples\cpp\build_samples_msvc.bat -i $(INSTALL_DIR)
-    workingDirectory: $(BUILD_SAMPLES_DIR)
-    displayName: 'Build cpp samples'
-    continueOnError: false
-
-  - script: $(INSTALL_DIR)\samples\c\build_samples_msvc.bat -i $(INSTALL_DIR)
-    workingDirectory: $(BUILD_SAMPLES_DIR)
-    displayName: 'Build c samples'
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU* --gtest_output=xml:TEST-NGraphUT.xml
+    displayName: 'nGraph UT'
     continueOnError: false
 
   - script: |
-      python -m pip install -r $(INSTALL_DIR)\tests\smoke_tests\requirements.txt
-    workingDirectory: $(INSTALL_DIR)
-    displayName: 'Install dependencies for samples smoke tests'
-    continueOnError: false
+      set PATH=$(TEST_ENV_PATH)
+      "$(IB_TESTCONSOLE)" $(BIN_DIR)\InferenceEngineUnitTests.exe --gtest_output=xml:TEST-InferenceEngineUnitTests-IB.xml
+    displayName: 'IE UT old - IB'
 
   - script: |
-      call $(SETUPVARS) && set IE_APP_PATH=$(INSTALL_DIR)\samples_bin
-      set IE_APP_PYTHON_PATH=$(INSTALL_DIR)\samples\python\
-      set SHARE=$(INSTALL_DIR)\tests\smoke_tests\samples_smoke_tests_data\
-      set WORKSPACE=$(INSTALL_DIR)
-      python -m pytest $(INSTALL_DIR)\tests\smoke_tests\  --env_conf $(INSTALL_DIR)\tests\smoke_tests\env_config.yml -s --junitxml=TEST-SamplesSmokeTests.xml
-    workingDirectory: $(INSTALL_DIR)
-    displayName: 'Samples Smoke Tests'
-    condition: eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'ON')
-    continueOnError: false
-
-  - script: rd /Q /S $(BUILD_DIR)
-    displayName: 'Clean build dir'
-    continueOnError: false
-
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_core_unit_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:TEST-NGraphUT.xml
-    workingDirectory: $(INSTALL_TEST_DIR)
-    displayName: 'OV Core UT'
-    continueOnError: false
-
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\paddle_tests --gtest_print_time=1 --gtest_output=xml:TEST-Paddle.xml
-    displayName: 'Paddle Frontend UT'
-    continueOnError: false
-
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\tensorflow_tests --gtest_print_time=1 --gtest_output=xml:TEST-Tensorflow.xml
-    displayName: 'Tensorflow Frontend UT'
-    continueOnError: false
-
-    # set PATH=$(IB_DIR);%PATH%
-    # call $(SETUPVARS) && "$(IB_TESTCONSOLE)" $(INSTALL_TEST_DIR)\InferenceEngineUnitTests.exe --gtest_output=xml:TEST-InferenceEngineUnitTests-IB.xml
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\InferenceEngineUnitTests --gtest_output=xml:TEST-InferenceEngineUnitTests.xml
-    displayName: 'IE UT old'
-    continueOnError: false
-
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ieUnitTests --gtest_output=xml:TEST-ieUnitTests.xml
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\ieUnitTests --gtest_output=xml:TEST-ieUnitTests.xml
     displayName: 'IE UT'
     continueOnError: false
 
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\cpuUnitTests --gtest_output=xml:TEST-cpuUnitTests.xml
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\cpuUnitTests --gtest_output=xml:TEST-cpuUnitTests.xml
     displayName: 'CPU UT'
     continueOnError: false
 
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\gnaUnitTests --gtest_output=xml:TEST-gnaUnitTests.xml
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\gnaUnitTests --gtest_output=xml:TEST-gnaUnitTests.xml
     displayName: 'GNA UT'
     continueOnError: false
 
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\vpuUnitTests --gtest_output=xml:TEST-vpuUnitTests.xml
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\vpuUnitTests --gtest_output=xml:TEST-vpuUnitTests.xml
     displayName: 'VPU UT'
     continueOnError: false
 
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\onnxImporterUnitTests --gtest_output=xml:TEST-onnxImporterUnitTests.xml
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\onnxImporterUnitTests --gtest_output=xml:TEST-onnxImporterUnitTests.xml
     displayName: 'ONNX Importer UT'
     continueOnError: false
 
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ieMultiPluginUnitTests --gtest_output=xml:TEST-ieMultiPluginUnitTests.xml
-    displayName: 'MULTI UT'
-    continueOnError: false
-
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ieFuncTests --gtest_output=xml:TEST-ieFuncTests.xml
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\ieFuncTests --gtest_output=xml:TEST-ieFuncTests.xml
     displayName: 'IE FuncTests'
     continueOnError: false
 
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_template_func_tests --gtest_output=xml:TEST-templateFuncTests.xml
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\templateFuncTests --gtest_output=xml:TEST-templateFuncTests.xml
     displayName: 'TEMPLATE FuncTests'
     continueOnError: false
 
-    # set PATH=$(IB_DIR);%PATH%
-    # call $(SETUPVARS) && "$(IB_TESTCONSOLE)" $(INSTALL_TEST_DIR)\cpuFuncTests.exe --gtest_filter=*smoke*:-*CompareWithRefs/base_size=16_pre_nms_topn=100_post_nms_topn=100_nms_thresh=0.7_feat_stride=1_min_size=1_ratio*:*smoke_GRUSequenceCommonZeroClip/GRUSequenceTest.CompareWithRefs/mode=CONVERT_TO_TI_MAX_SEQ_LEN_CONST_seq_lengths* --gtest_output=xml:TEST-cpuFuncTests-IB.xml /testlevel=24
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\cpuFuncTests --gtest_filter=*smoke* --gtest_output=xml:TEST-cpuFuncTests.xml
-    displayName: 'CPU FuncTests'
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      "$(IB_TESTCONSOLE)" $(BIN_DIR)\cpuFuncTests.exe --gtest_filter=*smoke*:-*CompareWithRefs/base_size=16_pre_nms_topn=100_post_nms_topn=100_nms_thresh=0.7_feat_stride=1_min_size=1_ratio* --gtest_output=xml:TEST-cpuFuncTests-IB.xml /testlevel=24
+    displayName: 'CPU FuncTests - IB'
     continueOnError: false
-    condition: eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF')
 
   - script: |
+      set PATH=$(TEST_ENV_PATH)
+      $(BIN_DIR)\MklDnnBehaviorTests  --gtest_output=xml:TEST-MklDnnBehaviorTests.xml
+    displayName: 'MklDnnBehaviorTests'
+    continueOnError: false
+
+    # Add for gtest-parallel, it hangs now (CVS-33386)
+    #python $(WORK_DIR)\gtest-parallel\gtest-parallel $(BIN_DIR)\MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=*smoke* -- --gtest_print_time=1
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
       set DATA_PATH=$(MODELS_PATH)
       set MODELS_PATH=$(MODELS_PATH)
-      call $(SETUPVARS) && $(INSTALL_TEST_DIR)\InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
+      rem "$(IB_TESTCONSOLE)" $(BIN_DIR)\MklDnnFunctionalTests.exe --gtest_filter=*smoke* --gtest_output=xml:TEST-MklDnnFunctionalTests-IB.xml
+      $(BIN_DIR)\MklDnnFunctionalTests.exe --gtest_filter=*smoke* --gtest_output=xml:TEST-MklDnnFunctionalTests.xml
+    displayName: 'MklDnnFunctionalTests'
+    continueOnError: false
+
+  - script: |
+      set PATH=$(TEST_ENV_PATH)
+      set DATA_PATH=$(MODELS_PATH)
+      set MODELS_PATH=$(MODELS_PATH)
+      $(BIN_DIR)\InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
     displayName: 'IE CAPITests'
     continueOnError: false
 

.ci/azure/windows_conditional_compilation.yml

@@ -1,16 +1,7 @@
-trigger:
-  branches:
-    include:
-    - master
-    - releases/*
-  paths:
-    exclude:
-    - docs/*
-
 jobs:
 - job: WinCC
   # About 150% of total time
-  timeoutInMinutes: 60
+  timeoutInMinutes: 120
 
   pool:
     name: WIN_VMSS_VENV_F8S_WU2
@@ -19,22 +10,26 @@ jobs:
     system.debug: true
     VSTS_HTTP_RETRY: 5
     VSTS_HTTP_TIMEOUT: 200
+    WORKERS_NUMBER: 8
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)\..\openvino_contrib
     MODELS_PATH: $(REPO_DIR)\..\testdata
     WORK_DIR: $(Pipeline.Workspace)\_w
-    BUILD_DIR: $(WORK_DIR)\build
+    BUILD_DIR: D:\build
+    BIN_DIR: $(REPO_DIR)\bin\intel64
     MSVS_VARS_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
     MSVC_COMPILER_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx64\x64\cl.exe
     INSTALL_DIR: $(WORK_DIR)\install_pkg
-    SETUPVARS: $(INSTALL_DIR)\setupvars.bat
+    SETUPVARS: $(INSTALL_DIR)\bin\setupvars.bat
+    IB_DIR: C:\Program Files (x86)\IncrediBuild
+    IB_TESTCONSOLE: $(IB_DIR)\IBTestConsole.exe
+    TEST_ENV_PATH: $(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.1\opencv\bin;$(IB_DIR);%PATH%
 
   steps:
   - script: |
       powershell -command "Invoke-RestMethod -Headers @{\"Metadata\"=\"true\"} -Method GET -Uri http://169.254.169.254/metadata/instance/compute?api-version=2019-06-01 | format-custom"
       where python3
-      python3 --version
       where python
       python --version
       where java
@@ -51,6 +46,12 @@ jobs:
       rd /Q /S $(BUILD_DIR) & mkdir $(BUILD_DIR)
     displayName: 'Make dir'
 
+  - script: |
+      certutil -urlcache -split -f https://incredibuilddiag1wu2.blob.core.windows.net/incredibuild/install_ib_console.bat install_ib_console.bat
+      call install_ib_console.bat
+    workingDirectory: $(WORK_DIR)
+    displayName: 'Install IncrediBuild'
+
   - checkout: self
     clean: true
     lfs: false
@@ -58,8 +59,7 @@ jobs:
     path: openvino
 
   - script: |
-      rem Speed up build
-      powershell -command "Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip -OutFile ninja-win.zip"
+      certutil -urlcache -split -f https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip ninja-win.zip
       powershell -command "Expand-Archive -Force ninja-win.zip"
     workingDirectory: $(WORK_DIR)
     displayName: 'Install dependencies'
@@ -70,19 +70,20 @@ jobs:
     workingDirectory: $(BUILD_DIR)
     displayName: 'CMake'
 
-  - script: dir $(REPO_DIR)\temp\ /s
-    displayName: 'List temp SDKs'
-
-  - script: call "$(MSVS_VARS_PATH)" && $(WORK_DIR)\ninja-win\ninja
+  - script: |
+      set PATH=$(WORK_DIR)\ninja-win;%PATH%
+      call "$(MSVS_VARS_PATH)" && "C:\Program Files (x86)\IncrediBuild\BuildConsole.exe" /COMMAND="ninja"
     workingDirectory: $(BUILD_DIR)
-    displayName: 'Build Win CC'
+    displayName: 'Build Win'
 
   - script: dir $(REPO_DIR)\bin\ /s
-    displayName: 'List bin files'
+    displayName: 'List files'
 
   - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
     workingDirectory: $(BUILD_DIR)
     displayName: 'Install'
 
-  - script: dir $(INSTALL_DIR) /s
-    displayName: 'List install files'
+  - script: echo Stop IncrediBuild_Agent && net stop IncrediBuild_Agent
+    displayName: Stop IncrediBuild
+    continueOnError: true
+    enabled: false

.ci/openvino-onnx/Dockerfile

@@ -1,9 +1,6 @@
 FROM ubuntu:20.04
 
-LABEL version=2021.03.30.1
-
-# Build configuration arguments
-ARG BUILD_TYPE=Release
+LABEL version=2020.07.09.1
 
 ARG http_proxy
 ARG https_proxy
@@ -28,7 +25,6 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
         autoconf \
         automake \
         build-essential \
-        ninja-build \
         cmake \
         curl \
         git \
@@ -55,30 +51,31 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
 COPY . /openvino/
 WORKDIR /openvino/build
 RUN cmake .. \
-    -G Ninja \
-    -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-    -DENABLE_INTEL_MYRIAD_COMMON=OFF \
-    -DENABLE_INTEL_GNA=OFF \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DENABLE_VPU=OFF \
+    -DENABLE_GNA=OFF \
     -DENABLE_OPENCV=OFF \
     -DENABLE_CPPLINT=OFF \
-    -DENABLE_NCC_STYLE=OFF \
     -DENABLE_TESTS=OFF \
-    -DENABLE_INTEL_CPU=ON \
-    -DENABLE_INTEL_GPU=OFF \
+    -DENABLE_MKL_DNN=ON \
+    -DENABLE_CLDNN=OFF \
     -DENABLE_PROFILING_ITT=OFF \
     -DENABLE_SAMPLES=OFF \
+    -DENABLE_SPEECH_DEMO=OFF \
     -DENABLE_PYTHON=ON \
     -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DENABLE_OV_ONNX_FRONTEND=ON \
-    -DENABLE_OV_PADDLE_FRONTEND=OFF \
-    -DENABLE_OV_TF_FRONTEND=OFF \
-    -DENABLE_OPENVINO_DEBUG=OFF \
+    -DNGRAPH_ONNX_IMPORT_ENABLE=ON \
+    -DNGRAPH_INTERPRETER_ENABLE=ON \
+    -DNGRAPH_DEBUG_ENABLE=OFF \
+    -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON \
     -DCMAKE_INSTALL_PREFIX=/openvino/dist
-RUN ninja install
+RUN make -j $(nproc) install
 
 # Run tests via tox
-WORKDIR /openvino/src/bindings/python
-ENV OpenVINO_DIR=/openvino/dist/runtime/cmake
-ENV LD_LIBRARY_PATH=/openvino/dist/runtime/lib:/openvino/dist/runtime/3rdparty/tbb/lib
-ENV PYTHONPATH=/openvino/bin/intel64/${BUILD_TYPE}/lib/python_api/python3.8:${PYTHONPATH}
+WORKDIR /openvino/ngraph/python
+ENV NGRAPH_CPP_BUILD_PATH=/openvino/dist/deployment_tools/ngraph
+ENV LD_LIBRARY_PATH=/openvino/dist/deployment_tools/ngraph/lib
+ENV NGRAPH_ONNX_IMPORT_ENABLE=TRUE
+ENV PYTHONPATH=/openvino/bin/intel64/Release/lib/python_api/python3.8:${PYTHONPATH}
+RUN git clone --recursive https://github.com/pybind/pybind11.git -b v2.5.0 --depth 1
 CMD tox

.ci/openvino-onnx/Jenkinsfile

@@ -3,18 +3,12 @@
 
 DOCKER_CONTAINER_NAME= "openvino-onnx-ci-container"
 DOCKER_IMAGE_TAG = "openvino-onnx-ci-image"
-ONNX_MODEL_ZOO_SHA = "d58213534f2a4d1c4b19ba62b3bb5f544353256e"
-
-BACKEND_CONFIGURATIONS = [
-    [ name: "Release", build_type: "Release" ],
-    [ name: "Debug", build_type: "Debug" ],
-]
 
 // workaround for aborting previous builds on PR update
 @NonCPS
  def stopPreviousRunningBuilds() {
      def jobname = env.JOB_NAME
-     if (jobname.startsWith("onnx-ci/openvino onnx ci/openvino/PR")){
+     if (jobname.startsWith("onnx/openvino_ci/PR")){
          def buildnum = env.BUILD_NUMBER.toInteger()
          def job = Jenkins.instance.getItemByFullName(jobname)
          def job_newest = job.builds.first()
@@ -29,7 +23,7 @@ BACKEND_CONFIGURATIONS = [
 
  }
 
-def getGitPrInfo(String project, String workdir) {
+def getGitPrInfo(String project) {
     def gitPrInfo = [
         prAuthorEmail : "",
         commitAuthorEmail : "",
@@ -37,7 +31,7 @@ def getGitPrInfo(String project, String workdir) {
         commitSubject : ""
     ]
     try {
-        dir ("${workdir}/${project}") {
+        dir ("${WORKDIR}/${project}") {
             gitPrInfo.prAuthorEmail = sh (script: 'git log -1 --pretty="format:%ae" ', returnStdout: true).trim()
             gitPrInfo.commitAuthorEmail = sh (script: 'git log -1 --pretty="format:%ce" ', returnStdout: true).trim()
             gitPrInfo.commitSubject = sh (script: 'git log -1 --pretty="format:%H" ', returnStdout: true).trim()
@@ -70,144 +64,96 @@ def notifyByEmail(def gitPrInfo) {
     }
 }
 
-def gitSubmoduleUpdate(String repository_name, String workdir) {
-    dir ("${workdir}/${repository_name}") {
+def gitSubmoduleUpdate(String repository_name) {
+    dir ("${WORKDIR}/${repository_name}") {
         sh  label: "Init ${repository_name} submodules",
             script:
         """
             git submodule init && git submodule update \
                 --init \
                 --no-fetch \
-                --recursive
+                --recursive 
         """
     }
 }
 
-def prepare_repository(String workdir) {
-    dir("${workdir}") {
-        println "Preparing repository in directory: ${workdir}"
-        checkout scm
-        gitSubmoduleUpdate(PROJECT_NAME, workdir)
-    }
-}
-
 def updateModels() {
     sh """
-        ./src/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d ${HOME}/ONNX_CI/models_data -o -s ${ONNX_MODEL_ZOO_SHA}
+        ./ngraph/python/tests/test_onnx/model_zoo_preprocess.sh -d ${HOME}/ONNX_CI/data -o
     """
 }
 
-def get_docker_container_name(Map configuration){
-    println "RUN get_docker_container_name for ${configuration.name}"
-    String docker_container_name = "${DOCKER_CONTAINER_NAME}_${BUILD_NUMBER}_${env.CHANGE_ID}_${configuration.name}"
-    return docker_container_name
-}
-
-def buildDockerImage(Map configuration, String workdir) {
-    String docker_image_tag = "${DOCKER_IMAGE_TAG}_${BUILD_NUMBER}_${env.CHANGE_ID}_${configuration.name}".toLowerCase()
-    println "docker_image_tag: ${docker_image_tag}"
+def buildDockerImage() {
     updateModels()
     sh """
-        docker build --tag=${docker_image_tag} \
-        --build-arg BUILD_TYPE=${configuration.build_type} \
-        --file=.ci/openvino-onnx/Dockerfile \
-        --build-arg http_proxy=${HTTP_PROXY}  \
-        --build-arg https_proxy=${HTTPS_PROXY} .
+        docker build --tag=${DOCKER_IMAGE_TAG}  --file=.ci/openvino-onnx/Dockerfile \
+        --build-arg http_proxy=http://proxy-chain.intel.com:911/ \
+        --build-arg https_proxy=http://proxy-chain.intel.com:912/ .
     """
 }
 
-def runTests(Map configuration, String workdir) {
-    println "Run tests for ${configuration.name}"
-    String docker_image_tag = "${DOCKER_IMAGE_TAG}_${BUILD_NUMBER}_${env.CHANGE_ID}_${configuration.name}".toLowerCase()
-
-    String docker_container_name = get_docker_container_name(configuration)
-
-    // Run only basic unit tests in Debug configuration
-    if (configuration.build_type == "Debug") {
-        sh """
-            docker run --name ${docker_container_name} ${docker_image_tag}
-        """
-    }
-
-    // Run unit-tests AND large model tests by default
-    else {
-        sh """
-            docker run --name ${docker_container_name} \
-            --volume ${HOME}/ONNX_CI/models_data/model_zoo/onnx_model_zoo_${ONNX_MODEL_ZOO_SHA}:/root/.onnx/model_zoo/onnx_model_zoo \
-            --volume ${HOME}/ONNX_CI/data/model_zoo/MSFT:/root/.onnx/model_zoo/MSFT \
-            ${docker_image_tag} /bin/bash -c "tox && tox -e zoo_models"
-        """
-    }
+def runTests() {
+    sh """
+        docker run --name ${DOCKER_CONTAINER_NAME} \
+        --volume ${HOME}/ONNX_CI/data/model_zoo:/root/.onnx/model_zoo \
+        ${DOCKER_IMAGE_TAG}
+    """
 }
 
-def getConfigurationsMap() {
-    def configurationsMap = [:]
-    for (backend in BACKEND_CONFIGURATIONS) {
-        def configuration = backend.clone()
-        configurationsMap[configuration.name] = {
-            stage(configuration.name) { CONFIGURATION_WORKFLOW(configuration) }
-        }
-    }
-    return configurationsMap
-}
 
-CONFIGURATION_WORKFLOW = { configuration ->
-    node("OpenVINO") {
-        String workdir = "${HOME}/workspace/${BUILD_NUMBER}_${env.CHANGE_ID}_${configuration.name}"
-        try {
-            PROJECT_NAME = "openvino"
-            stage("Clone repository") {
-                    prepare_repository(workdir)
-            }
-            stage("Prepare Docker environment") {
-              dir("${workdir}") {
-                    buildDockerImage(configuration, workdir)
+pipeline {
+    agent {
+        label "OpenVino"
+    }
+    environment {
+        PROJECT_NAME = "openvino"
+        WORKDIR = "${WORKSPACE}/${BUILD_NUMBER}"
+    }
+    options {
+        skipDefaultCheckout true
+        timeout(activity: true, time: 60, unit: 'MINUTES')
+    }
+    stages {
+        stage("Clone repository") {
+            steps{
+                stopPreviousRunningBuilds()
+                dir("${WORKDIR}") {
+                    checkout scm
                 }
+                gitSubmoduleUpdate(PROJECT_NAME)
             }
-            stage("Run tests") {
-                timeout(time: 60, unit: 'MINUTES') {
-                    runTests(configuration, workdir)
+        }
+        stage("Prepare Docker environment") {
+            steps{
+              dir("${WORKDIR}") {
+                    buildDockerImage()
                 }
             }
         }
-        catch(e) {
-                // Set result to ABORTED if exception contains exit code of a process interrupted by SIGTERM
-                if ("$e".contains("143")) {
-                    currentBuild.result = "ABORTED"
-                } else {
-                    currentBuild.result = "FAILURE"
-                }
-                def gitPrInfo = getGitPrInfo(PROJECT_NAME, workdir)
+        stage("Run tests") {
+            options {
+                  timeout(time: 60, unit: 'MINUTES')
+              }
+            steps{
+                runTests()
+            }
+        }
+    }
+    post {
+        failure {
+            script {
+                gitPrInfo = getGitPrInfo(PROJECT_NAME)
                 notifyByEmail(gitPrInfo)
+            }
         }
-        finally {
-            stage("Cleanup") {
-                String docker_container_name = get_docker_container_name(configuration)
+        cleanup {
+            dir("${WORKDIR}") {
+                deleteDir()
                 sh """
-                    docker rm -f ${docker_container_name}
-                    rm -rf ${workdir}
+                    docker image prune -f
+                    docker rm -f ${DOCKER_CONTAINER_NAME}
                 """
             }
         }
     }
 }
-
-pipeline {
-    agent none
-    options {
-        skipDefaultCheckout true
-        timeout(activity: true, time: 120, unit: 'MINUTES')
-    }
-    stages {
-        stage('Parallel CI') {
-            steps {
-                stopPreviousRunningBuilds()
-                script {
-                    parallelStagesMap = getConfigurationsMap()
-                    parallel parallelStagesMap
-                }
-            }
-
-        }
-    }
-}

.ci/openvino-onnx/watchdog/src/git_wrapper.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

.ci/openvino-onnx/watchdog/src/jenkins_wrapper.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 import requests

.ci/openvino-onnx/watchdog/src/main.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 import argparse

.ci/openvino-onnx/watchdog/src/ms_teams_communicator.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 import requests

.ci/openvino-onnx/watchdog/src/watchdog.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 import datetime
@@ -486,7 +486,7 @@ class Watchdog:
             self._queue_message(message, message_severity='warning', pr=pr)
         elif build_delta > _BUILD_DURATION_THRESHOLD:
             # CI job take too long, possibly froze - communicate failure
-            message = ('ONNX CI job build #{}, for PR #{} started, '
+            message = ('ONNX CI job build #{}, for PR #{} started,'
                        'but did not finish in designated time of {} '
                        'minutes!'.format(build_number, pr_number,
                                          str(_BUILD_DURATION_THRESHOLD.seconds / 60)))

.ci/pot/Jenkinsfile

@@ -1,14 +0,0 @@
-#!groovy
-
-
-properties([
-    parameters([
-        string(defaultValue: '',
-               description: 'Pipeline shared library version (branch/tag/commit). Determined automatically if empty',
-               name: 'library_version')
-    ])
-])
-
-loadOpenVinoLibrary {
-    potEntrypoint(this)
-}

.gitattributes

@@ -2,6 +2,7 @@
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
 * text=auto
+
 ###############################################################################
 # Set default behavior for command prompt diff.
 #
@@ -10,7 +11,9 @@
 # Note: This is only used by command line
 ###############################################################################
 #*.cs     diff=csharp
+
 *.py text eol=lf
+
 ###############################################################################
 # Set the merge driver for project and solution files
 #
@@ -33,6 +36,7 @@
 #*.modelproj merge=binary
 #*.sqlproj   merge=binary
 #*.wwaproj   merge=binary
+
 ###############################################################################
 # behavior for image files
 #
@@ -41,6 +45,7 @@
 #*.jpg   binary
 #*.png   binary
 #*.gif   binary
+
 ###############################################################################
 # diff behavior for common document formats
 # 
@@ -58,21 +63,9 @@
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
 *.PNG filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.jpg filter=lfs diff=lfs merge=lfs -text
 *.gif filter=lfs diff=lfs merge=lfs -text
 *.vsdx filter=lfs diff=lfs merge=lfs -text
-*.bmp filter=lfs diff=lfs merge=lfs -text
-
-#POT attributes
-tools/pot/tests/data/test_cases_refs/* filter=lfs diff=lfs merge=lfs -text
-tools/pot/tests/data/models/*/* filter=lfs diff=lfs merge=lfs -text
-tools/pot/tests/data/reference_models/* filter=lfs diff=lfs merge=lfs -text
-tools/pot/tests/data/video/* filter=lfs diff=lfs merge=lfs -text
-tools/pot/tests/data/reference_fake_quantize_conf/* filter=lfs diff=lfs merge=lfs -text
-/tools/pot/tests/** -pot_package
-/tools/pot/tools/auxilary/** -pot_package
-/tools/pot/tools/run_series_experiments.py -pot_package
-/tools/pot/.pylintrc -pot_package
-/tools/pot/README_dev.md -pot_package

.github/ISSUE_TEMPLATE/bug.md

@@ -47,7 +47,7 @@ assignees: ''
  - [ ] I checked the problem with documentation, FAQ, open issues, Stack Overflow, etc and have not found solution
    <!--
    Places to check:
-   * OpenVINO documentation: https://docs.openvino.ai/
+   * OpenVINO documentation: https://docs.openvinotoolkit.org/
    * OpenVINO forum: https://community.intel.com/t5/Intel-Distribution-of-OpenVINO/bd-p/distribution-openvino-toolkit
    * OpenVINO issue tracker: https://github.com/openvinotoolkit/openvino/issues?q=is%3Aissue
    * Stack Overflow branch: https://stackoverflow.com/questions/tagged/openvino

.github/dependabot.yml

@@ -2,17 +2,16 @@
 
 version: 2
 updates:
-  # Enable version updates for Python API
+  # Enable version updates for nGraph Python API
   - package-ecosystem: pip
-    directory: "/src/bindings/python"
+    directory: "/ngraph/python"
     schedule:
       interval: weekly
       day: monday
       time: "13:00"
-    open-pull-requests-limit: 0
+    open-pull-requests-limit: 10
     reviewers:
-      - jiwaszki
-      - akuporos
+      - postrational
     labels:
       - "category: dependencies"
       

.github/github_org_control/check_org.py

@@ -1,139 +0,0 @@
-# Copyright (C) 2018-2021 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-"""
-Check GitHub organization and invite members
-"""
-
-# pylint: disable=fixme,no-member,too-many-locals
-
-import sys
-from pathlib import Path
-from argparse import ArgumentParser
-
-sys.path.append(str(Path(__file__).resolve().parents[1]))
-from github_org_control.configs import Config
-from github_org_control.github_api import GithubOrgApi, get_dev_emails, print_users
-from github_org_control.ldap_api import LdapApi, print_user_info, InfoLevel
-
-
-def remove_members(gh_api, cfg_emails, org_emails, dev_emails, org_emails_no_in_ldap):
-    """Checks and remove members"""
-    print(
-        f"\n{'=' * 10} Check accounts below and remove from the GitHub organization or "
-        f"configuration {'=' * 10}"
-    )
-
-    cfg_emails_no_in_org = sorted(cfg_emails.difference(org_emails))
-    print(
-        f"\nCfg developer emails - absent in GitHub organization {len(cfg_emails_no_in_org)}:",
-        "; ".join(cfg_emails_no_in_org),
-    )
-
-    non_member_ignored_logins = set(Config().IGNORE_LOGINS).difference(
-        set(gh_api.org_members_by_login.keys())
-    )
-    print(
-        f"\nIgnored logins - absent in GitHub organization {len(non_member_ignored_logins)}:\n",
-        "\n".join(non_member_ignored_logins),
-    )
-
-    org_emails_no_in_dev = sorted(org_emails.difference(dev_emails))
-    print(
-        f"\nOrg member emails - absent in cfg and LDAP PDLs {len(org_emails_no_in_dev)}:",
-        "; ".join(org_emails_no_in_dev),
-    )
-
-    print(
-        f"\nOrg member emails - absent in LDAP at all {len(org_emails_no_in_ldap)}:",
-        "; ".join(sorted(org_emails_no_in_ldap)),
-    )
-
-    print("\nOrg members - no real name:")
-    members_to_fix_name = sorted(gh_api.members_to_fix_name, key=lambda member: member.email)
-    print_users(members_to_fix_name)
-    print(
-        "\nOrg member emails - no real name:",
-        "; ".join([member.email.lower() for member in members_to_fix_name]),
-    )
-
-    print("\nOrg members - no Intel emails:")
-    print_users(gh_api.members_to_remove)
-
-    gh_api.remove_users(org_emails_no_in_ldap | gh_api.members_to_remove)
-
-
-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("--teams", action="store_true", help="Check GitHub teams")
-    arg_parser.add_argument("--no-ldap", action="store_true", help="Don't use LDAP info")
-    args, unknown_args = arg_parser.parse_known_args()
-
-    Config(args.cfg_file, unknown_args)
-    gh_api = GithubOrgApi()
-
-    if args.teams:
-        gh_api.get_org_teams()
-        return
-
-    cfg_emails = get_dev_emails()
-    print(f"\nCfg developer emails {len(cfg_emails)}:", "; ".join(sorted(cfg_emails)))
-
-    dev_emails = set()
-    dev_emails.update(cfg_emails)
-
-    if not args.no_ldap:
-        ldap_api = LdapApi()
-        ldap_emails = ldap_api.get_user_emails()
-        dev_emails.update(ldap_emails)
-        print(f"\nLDAP developer emails {len(ldap_emails)}:", "; ".join(sorted(ldap_emails)))
-
-        cfg_emails_no_in_ldap = ldap_api.get_absent_emails(cfg_emails)
-        print(
-            f"\nCfg developer emails - absent in LDAP at all {len(cfg_emails_no_in_ldap)}:",
-            "; ".join(sorted(cfg_emails_no_in_ldap)),
-        )
-
-        cfg_ldap_inters = cfg_emails.intersection(ldap_emails)
-        print(
-            f"\nCfg developer emails - present in LDAP developers {len(cfg_ldap_inters)}:",
-            "; ".join(sorted(cfg_ldap_inters)),
-        )
-
-    org_emails = gh_api.get_org_emails()
-    print(f"\nOrg emails {len(org_emails)}:", "; ".join(sorted(org_emails)))
-
-    org_emails_no_in_ldap = set()
-    if not args.no_ldap:
-        org_ldap_diff = org_emails.difference(ldap_emails)
-        print(
-            f"\nOrg member emails - absent in LDAP developers {len(org_ldap_diff)}:",
-            "; ".join(sorted(org_ldap_diff)),
-        )
-
-        for email in org_ldap_diff:
-            user_info = ldap_api.get_user_info_by_email(email)
-            if user_info:
-                print_user_info(user_info, InfoLevel.PDL)
-            else:
-                org_emails_no_in_ldap.add(email)
-
-    org_pendig_invitation_emails = gh_api.get_org_invitation_emails()
-    invite_emails = dev_emails.difference(org_emails).difference(org_pendig_invitation_emails)
-    print(f"\nInvite emails {len(invite_emails)}:", "; ".join(sorted(invite_emails)))
-
-    valid_github_users = gh_api.get_valid_github_users(invite_emails)
-    gh_api.invite_users(valid_github_users)
-
-    remove_members(gh_api, cfg_emails, org_emails, dev_emails, org_emails_no_in_ldap)
-
-
-if __name__ == "__main__":
-    main()

.github/github_org_control/check_pr.py

@@ -1,261 +0,0 @@
-# Copyright (C) 2018-2021 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-"""
-Check GitHub PRs and set labels by type and categories, e.g. 'ExternalPR', 'category: ci'
-"""
-
-# pylint: disable=fixme,no-member
-
-import re
-import sys
-import datetime
-from enum import Enum
-from pathlib import Path
-from argparse import ArgumentParser
-
-sys.path.append(str(Path(__file__).resolve().parents[1]))
-from github_org_control import github_api
-from github_org_control.configs import Config
-
-
-class PrType(Enum):
-    """Constants for type of GitHub pull request by author membership"""
-
-    EXTERNAL = "ExternalPR"
-    INTEL = "ExternalIntelPR"
-    ORG = "OpenvinoPR"
-    BAD = "BadPR"
-
-
-def get_pr_labels(pull):
-    """Gets PR labels as set"""
-    pr_lables = set()
-    for label in pull.labels:
-        pr_lables.add(label.name)
-    return pr_lables
-
-
-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)
-    # set_labels() should accept list but fails with empty "AssertionError:"
-    pull.set_labels(labels)
-
-
-def add_pr_labels(pull, labels):
-    """Adds PR labels"""
-    if not labels or Config().DRY_RUN:
-        return
-    print("Add PR labels:", labels)
-    for label in labels:
-        pull.add_to_labels(label)
-
-
-def get_pr_type_by_labels(pull):
-    """Gets PR type using labels"""
-    pr_lables = get_pr_labels(pull)
-    pr_types = set(type.value for type in PrType)
-    pr_types_labels = pr_lables & pr_types
-    if not pr_types_labels:
-        return None
-    if len(pr_types_labels) > 1:
-        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")
-    re_label = re_compile_label.match(team_name)
-    if re_label:
-        return f"category: {re_label.group(1).strip()}"
-    return None
-
-
-def get_label_by_team_name_map(team_name):
-    """Generates label by PR reviwer team name using config map"""
-    return Config().TEAM_TO_LABEL.get(team_name)
-
-
-def get_category_labels(pull):
-    """Gets list of category labels by all PR reviwer teams"""
-    labels = []
-    pr_lables = get_pr_labels(pull)
-    for reviewer_team in pull.get_review_requests()[1]:
-        reviewer_label = get_label_by_team_name_map(reviewer_team.name)
-        if reviewer_label and reviewer_label not in pr_lables:
-            labels.append(reviewer_label)
-    return labels
-
-
-def get_pr_info_str(pull):
-    """Gets info about PR using a few workarounds"""
-    pr_title = pull.title.encode("ASCII", "ignore").decode()
-
-    # 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)}"
-    )
-
-
-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 or "").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_author_email = (commit.raw_data["commit"]["author"]["email"] or "").lower()
-        commit_committer_email = (commit.raw_data["commit"]["committer"]["email"] or "").lower()
-        print("    Commit author email:", commit_author_email)
-        print("    Commit committer email:", commit_committer_email)
-        if not github_api.is_valid_user(commit.author):
-            print(
-                "    ERROR: User with the commit author email is absent in GitHub:",
-                commit.raw_data["commit"]["author"]["name"],
-            )
-            wrong_commits.add(commit.sha)
-        if not github_api.is_valid_user(commit.committer):
-            print(
-                "    ERROR: User with the commit committer email is absent in GitHub:",
-                commit.raw_data["commit"]["committer"]["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_author_email or pr_author_email != commit_committer_email:
-                print("    WARNING: Commit emails 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(
-        "--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)
-    gh_api = github_api.GithubOrgApi()
-
-    if args.pr:
-        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)
-
-    if args.newer:
-        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)}")
-            continue
-
-        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/github_org_control/config.json

@@ -1,45 +0,0 @@
-{
-    "GITHUB_TOKEN": "<Put token here or set as arg or as env variable>",
-    "GITHUB_ORGANIZATION": "openvinotoolkit",
-    "GITHUB_REPO": "openvino",
-    "IGNORE_LOGINS": [
-        "openvino-ci",
-        "openvino-pushbot",
-        "lab-nerval",
-        "lab-nerval-onnx-ci",
-        "onnx-watchdog-agent",
-        "workbench-ci-bot",
-        "openvino-pot-ci"
-    ],
-    "MAX_MEMBERS_TO_REMOVE": 15,
-    "EMAILS_FILE_PATH": "dev_emails-test.txt",
-    "PROXIES": {
-        "HTTP_PROXY": null,
-        "HTTPS_PROXY": null,
-        "NO_PROXY": "localhost,127.0.0.1,.intel.com"
-    },
-    "DRY_RUN": false,
-    "TEAM_TO_LABEL": {
-        "openvino-admins": "category: CI",
-        "openvino-maintainers": "category: IE common",
-        "openvino-docs-maintainers": "category: docs",
-        "openvino-ie-maintainers": "category: IE common",
-        "openvino-ie-cpu-maintainers": "category: CPU",
-        "openvino-ie-gna-maintainers": "category: GNA",
-        "openvino-ie-gpu-maintainers": "category: GPU",
-        "openvino-ie-lpt-maintainers": "category: LP transformations",
-        "openvino-ie-multi-maintainers": "category: MULTI",
-        "openvino-ie-python-api-maintainers": "category: python api",
-        "openvino-ie-template-maintainers": "category: TEMPLATE",
-        "openvino-ie-tests-maintainers": "category: IE Tests",
-        "openvino-ie-vpu-maintainers": "category: VPU",
-        "openvino-mo-maintainers": "category: MO",
-        "openvino-ngraph-maintainers": "category: nGraph",
-        "openvino-scripts-maintainers": "category: build",
-        "openvino-tests-maintainers": "category: IE Tests",
-        "openvino-tools-maintainers": "category: tools",
-        "openvino-pot-maintainers": "category: POT",
-        "openvino-configuration-mgmt": "category: dependency_changes",
-        "openvino-samples-maintainers": "category: samples"
-    }
-}

.github/github_org_control/configs.py

@@ -1,120 +0,0 @@
-# Copyright (C) 2018-2021 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-"""
-Configurations management
-"""
-
-# pylint: disable=fixme,broad-except
-
-import os
-import sys
-import ast
-import json
-from pathlib import Path
-
-
-if sys.hexversion < 0x3060000:
-    raise Exception("Python version must be >= 3.6")
-
-
-class ConfigException(Exception):
-    """Base configuration exception"""
-
-
-class Config:
-    """Configuration wrapper"""
-
-    _instance = None
-    _properties = None
-
-    default_cfg_path = Path(__file__).resolve().parent / "config.json"
-
-    def __new__(cls, *_args, **_kwargs):
-        if not Config._instance:
-            Config._instance = super(Config, cls).__new__(cls)
-        return Config._instance
-
-    def __init__(self, file_path=None, cli_args=None):
-        """
-        :param file_path: Path to json configuration file
-        :type file_path: String
-
-        :param args: List of argparse arguments with patterns: 'name=value' or 'name'
-        :type args: list
-        """
-        if Config._properties:
-            return
-
-        self._file_path = file_path or Config.default_cfg_path
-        self._cli_args = cli_args or []
-
-        self._json_cfg = {}
-        self._args = {}
-
-        self._load_cfg()
-        self._parse_cli_args()
-
-        Config._properties = {}
-        for name, value in self._json_cfg.items():
-            if hasattr(self, name):
-                raise ConfigException(f"Duplicating prosperity: {name}")
-            property_value = self._args.get(name) or os.getenv(name)
-            if property_value:
-                # Try to set prosperity_value as Python literal structures, e.g. DRY_RUN=False
-                try:
-                    property_value = ast.literal_eval(property_value)
-                except Exception:
-                    pass
-                if not isinstance(property_value, type(value)):
-                    raise ConfigException(f"Python type of {name} parameter must be {type(value)}")
-            else:
-                property_value = value
-            Config._properties[name] = property_value
-
-        self.set_proxy()
-
-    def __getattr__(self, attr_name):
-        if attr_name in self._properties:
-            return self._properties.get(attr_name)
-        raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{attr_name}'")
-
-    def _load_cfg(self):
-        """Load the json configuration file"""
-        try:
-            with open(self._file_path, encoding="utf-8") as conf:
-                self._json_cfg = json.load(conf)
-        except Exception as exc:
-            raise ConfigException("Failed to load configuration from:", self._file_path) from exc
-
-    def _parse_cli_args(self):
-        """Parse argparse arguments with patterns: 'name=value' or 'name'"""
-        for cli_arg in self._cli_args:
-            arg = cli_arg.split("=")
-            if arg[0] not in self._json_cfg:
-                raise ConfigException(f"Unsupported argument: {arg}")
-            self._args[arg[0]] = True if len(arg) == 1 else "=".join(arg[1:])
-
-    @property
-    def properties(self):
-        """Get all properties as Dict"""
-        return self._properties
-
-    def set_proxy(self):
-        """Set proxies"""
-        for proxy_name, url in self._properties["PROXIES"].items():
-            if url is not None:
-                print(f"Set proxy: {proxy_name}={url}")
-                os.environ[proxy_name] = url
-
-
-def _test():
-    """Test and debug"""
-    print("Config.default_cfg_path:", Config.default_cfg_path)
-    cfg = Config(cli_args=["DRY_RUN", 'PROXIES={"NO_PROXY": "localhost"}'])
-    print("Config.properties:", cfg.properties)
-    print("cfg.PROXIES:", cfg.PROXIES)
-
-
-if __name__ == "__main__":
-    _test()

.github/github_org_control/github_api.py

@@ -1,384 +0,0 @@
-# Copyright (C) 2018-2021 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-"""
-GitHub API for controlling organization
-"""
-
-# pylint: disable=fixme,no-member
-
-import re
-import sys
-import time
-import typing
-from pathlib import Path
-
-from github import Github, GithubException, RateLimitExceededException, IncompletableObject
-from github.PaginatedList import PaginatedList
-
-sys.path.append(str(Path(__file__).resolve().parents[1]))
-from github_org_control.configs import Config
-
-
-class GithubApiException(Exception):
-    """Base GitHub API exception"""
-
-
-def is_valid_user(user):
-    """Checks that user is valid github.Github object"""
-    try:
-        return user and user.login
-    except IncompletableObject:
-        return False
-
-
-def is_user_ignored(user):
-    """Checks that user should be ignored"""
-    if is_valid_user(user) and user.login.lower() not in Config().IGNORE_LOGINS:
-        return False
-    return True
-
-
-def is_valid_name(name):
-    """Checks that GitHub user's name is valid"""
-    return name and len(name) >= 3 and " " in name
-
-
-def is_intel_email(email):
-    """Checks that email is valid Intel email"""
-    return email and len(email) > 10 and " " not in email and email.lower().endswith("@intel.com")
-
-
-def is_intel_company(company):
-    """Checks that company contains intel"""
-    return company and "intel" in company.lower()
-
-
-def is_valid_intel_user(user):
-    """Checks that user is valid GitHub and Intel user"""
-    try:
-        return is_valid_user(user) and is_valid_name(user.name) and is_intel_email(user.email)
-    except IncompletableObject:
-        return False
-
-
-def print_users(users):
-    """Print list of users in different formats: list, set, PaginatedList"""
-    if isinstance(users, (list, set, PaginatedList)):
-        users_count = users.totalCount if isinstance(users, PaginatedList) else len(users)
-        print(f"GitHub users {users_count} (login - name - company - email - valid):")
-    else:
-        users = [users]
-    for user in users:
-        if not is_valid_user(user):
-            print("WRONG GitHub user: ???")
-            continue
-
-        try:
-            name = user.name
-        except IncompletableObject:
-            name = "???"
-
-        try:
-            company = user.company
-        except IncompletableObject:
-            company = "???"
-
-        try:
-            email = user.email
-        except IncompletableObject:
-            email = "???"
-
-        valid_check = "OK" if is_valid_intel_user(user) else "FIX"
-        if not is_intel_email(email):
-            valid_check += " email"
-        if not is_valid_name(name):
-            valid_check += " name"
-        print(f'{user.login} - "{name}" - "{company}" - {email} - {valid_check}')
-
-
-def get_dev_emails():
-    """
-    Read a file with developer emails. Supported email formats
-    first_name.last_name@intel.com
-    Import from Outlook: Last_name, First_name <first_name.last_name@intel.com>
-    """
-    re_email = re.compile(r".+<(.+)>")
-    emails = set()
-    cfg = Config()
-    with open(cfg.properties["EMAILS_FILE_PATH"]) as file_obj:
-        for line in file_obj:
-            line = line.strip().lower()
-            if not line or line.startswith("#"):
-                continue
-            re_outlook_email = re_email.match(line)
-            if re_outlook_email:
-                line = re_outlook_email.group(1).strip()
-            if not is_intel_email(line):
-                print(f'Wrong email in {cfg.properties["EMAILS_FILE_PATH"]}: {line}')
-                continue
-            emails.add(line)
-    return emails
-
-
-class GithubOrgApi:
-    """Common API for GitHub organization"""
-
-    def __init__(self):
-        self._cfg = Config()
-        self.github = Github(self._cfg.GITHUB_TOKEN)
-        self.github_org = self.github.get_organization(self._cfg.GITHUB_ORGANIZATION)
-        self.repo = self.github.get_repo(f"{self._cfg.GITHUB_ORGANIZATION}/{self._cfg.GITHUB_REPO}")
-        self.github_users_by_email = {}
-        self.org_members_by_login = {}
-        self.members_to_remove = set()
-        self.members_to_fix_name = set()
-
-    def is_org_user(self, user):
-        """Checks that user is a member of GitHub organization"""
-        if is_valid_user(user):
-            # user.get_organization_membership(self.github_org) doesn't work with org members
-            # permissions, GITHUB_TOKEN must be org owner now
-            return self.github_org.has_in_members(user)
-        return False
-
-    def get_org_emails(self):
-        """Gets and prints emails of all GitHub organization members"""
-        org_members = self.github_org.get_members()
-        org_emails = set()
-
-        print(f"\nOrg members {org_members.totalCount} (login - name - company - email - valid):")
-        for org_member in org_members:
-            self.org_members_by_login[org_member.login.lower()] = org_member
-            print_users(org_member)
-            if is_intel_email(org_member.email):
-                email = org_member.email.lower()
-                org_emails.add(email)
-                self.github_users_by_email[email] = org_member
-                if not is_valid_name(org_member.name):
-                    self.members_to_fix_name.add(org_member)
-            elif not is_user_ignored(org_member):
-                self.members_to_remove.add(org_member)
-
-        print("\nOrg members - no Intel emails:")
-        print_users(self.members_to_remove)
-
-        print("\nOrg members - no real name:")
-        print_users(self.members_to_fix_name)
-        print(
-            "\nOrg member emails - no real name:",
-            "; ".join([member.email.lower() for member in self.members_to_fix_name]),
-        )
-
-        return org_emails
-
-    def get_org_invitation_emails(self):
-        """Gets GitHub organization teams prints info"""
-        org_invitations = self.github_org.invitations()
-        org_invitation_emails = set()
-
-        print(
-            f"\nOrg invitations {org_invitations.totalCount} "
-            "(login - name - company - email - valid):"
-        )
-        for org_invitation in org_invitations:
-            print_users(org_invitation)
-            if is_user_ignored(org_invitation):
-                continue
-            if is_intel_email(org_invitation.email):
-                org_invitation_emails.add(org_invitation.email.lower())
-            else:
-                print("Strange org invitation:", org_invitation)
-
-        print(
-            f"\nOrg invitation emails {len(org_invitation_emails)}:",
-            "; ".join(org_invitation_emails),
-        )
-        return org_invitation_emails
-
-    def get_org_teams(self):
-        """Gets GitHub organization teams prints info"""
-        teams = []
-        org_teams = self.github_org.get_teams()
-        print("\nOrg teams count:", org_teams.totalCount)
-        for team in org_teams:
-            teams.append(team.name)
-            print(f"\nTeam: {team.name} - parent: {team.parent}")
-
-            repos = team.get_repos()
-            print("Repos:")
-            for repo in repos:
-                print(f"    {repo.name} -", team.get_repo_permission(repo))
-
-            team_maintainers = team.get_members(role="maintainer")
-            team_maintainer_logins = set()
-            for maintainer in team_maintainers:
-                team_maintainer_logins.add(maintainer.login)
-            team_members = team.get_members(role="member")
-            team_member_logins = set()
-            for member in team_members:
-                team_member_logins.add(member.login)
-            members = team.get_members(role="all")
-            member_emails = []
-            print("Members (role - login - name - company - email - valid):")
-            for user in members:
-                if user.login in team_maintainer_logins:
-                    print("    Maintainer - ", end="")
-                elif user.login in team_member_logins:
-                    print("    Member - ", end="")
-                else:
-                    # It is not possible to check child teams members
-                    print("    ??? - ", end="")
-                print_users(user)
-                if is_intel_email(user.email) and not is_user_ignored(user):
-                    member_emails.append(user.email.lower())
-            print(f"Intel emails {len(member_emails)}:", "; ".join(member_emails))
-        return teams
-
-    def get_github_user_by_email(self, email):
-        """Gets GitHub user by email"""
-        if email in self.github_users_by_email:
-            return self.github_users_by_email.get(email)
-
-        def search_users():
-            paginated_users = self.github.search_users(f"{email} in:email")
-            # Minimize the GitHub Rate Limit
-            users = []
-            for user in paginated_users:
-                users.append(user)
-            if len(users) == 1:
-                return users[0]
-            if len(users) == 0:
-                return None
-            raise GithubApiException(
-                f"ERROR: Found {len(users)} GitHub accounts with the same email {email}"
-            )
-
-        try:
-            user = search_users()
-        except RateLimitExceededException:
-            print("WARNING: RateLimitExceededException")
-            time.sleep(30)
-            user = search_users()
-        self.github_users_by_email[email] = user
-
-        return user
-
-    def get_valid_github_users(self, emails):
-        """Gets valid GitHub users by email and prints status"""
-        valid_users = set()
-        wrong_emails = set()
-        no_account_emails = set()
-        no_account_names = set()
-        print(f"\nGitHub users from {len(emails)} invite emails (email - status):")
-        for email in emails:
-            if not is_intel_email(email):
-                print(f"{email} - Non Intel email")
-                wrong_emails.add(email)
-                continue
-
-            # You can make up to 30 requests per minute; https://developer.github.com/v3/search/
-            time.sleep(2)
-            user = self.get_github_user_by_email(email)
-
-            if not user:
-                print(f"{email} - No valid GitHub account")
-                no_account_emails.add(email)
-                continue
-
-            if user.email and user.email.lower() == email:
-                if is_valid_name(user.name):
-                    print(f"{email} - OK")
-                    valid_users.add(user)
-                else:
-                    print(f"{email} - No valid name in GitHub account: ", end="")
-                    print_users(user)
-                    no_account_names.add(email)
-            else:
-                print(f"{email} - Non public or wrong email in GitHub account: ", end="")
-                print_users(user)
-                no_account_emails.add(email)
-
-        print("\nValid users:")
-        print_users(valid_users)
-
-        print(f"\nWrong emails {len(wrong_emails)}:", "; ".join(wrong_emails))
-
-        print(
-            f"\nIntel emails - No valid GitHub account {len(no_account_emails)}:",
-            "; ".join(no_account_emails),
-        )
-
-        print(
-            f"\nIntel emails - No valid name in GitHub account {len(no_account_names)}:",
-            "; ".join(no_account_names),
-        )
-        return valid_users
-
-    def invite_users(self, users):
-        """Invites users to GitHub organization and prints status"""
-        if not isinstance(users, typing.Iterable):
-            users = [users]
-        print(f"\nInvite {len(users)} users:")
-
-        for user in users:
-            if isinstance(user, str):
-                print(f"Email: {user}")
-                self.github_org.invite_user(email=user)
-            else:
-                print(f'{user.login} - "{user.name}" - {user.email} - ', end="")
-                try:
-                    if is_user_ignored(user):
-                        print("Ignored")
-                        continue
-                    if self._cfg.DRY_RUN:
-                        print("Dry run")
-                        continue
-                    self.github_org.invite_user(user=user)
-                    print("OK")
-                except GithubException as exc:
-                    print(f'FAIL: {exc.data["errors"][0]["message"]}')
-
-    def remove_users(self, users):
-        """Removes users from GitHub organization"""
-        if not isinstance(users, typing.Iterable):
-            users = [users]
-        print(f"\nRemove {len(users)} users:")
-
-        dry_run = self._cfg.DRY_RUN
-        if not dry_run and len(users) > self._cfg.MAX_MEMBERS_TO_REMOVE:
-            print(
-                "WARNING: Review is required for removing members more than "
-                f"{self._cfg.MAX_MEMBERS_TO_REMOVE}"
-            )
-            # TODO: Add notification
-            dry_run = True
-
-        for user in users:
-            member = self.get_github_user_by_email(user) if isinstance(user, str) else user
-            print(f'{member.login} - "{member.name}" - {member.email} - ', end="")
-            try:
-                if is_user_ignored(member):
-                    print("Ignored")
-                    continue
-                if dry_run:
-                    print("Dry run")
-                    continue
-                self.github_org.remove_from_membership(member)
-                print("OK")
-            except GithubException as exc:
-                print(f'FAIL: {exc.data["errors"][0]["message"]}')
-
-
-def _test():
-    """Test and debug"""
-    Config(cli_args=["DRY_RUN=True"])
-    dev_emails = get_dev_emails()
-    print("dev_emails:", dev_emails)
-
-    gh_api = GithubOrgApi()
-    gh_api.get_org_emails()
-
-
-if __name__ == "__main__":
-    _test()

.github/github_org_control/ldap_api.py

@@ -1,247 +0,0 @@
-# Copyright (C) 2018-2021 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-"""
-Gets info about users and groups via LDAP
-"""
-
-# pylint: disable=fixme,no-member
-
-import sys
-from enum import Enum
-from pathlib import Path
-
-from ldap3 import Server, Connection, ALL, SUBTREE
-
-sys.path.append(str(Path(__file__).resolve().parents[1]))
-from github_org_control.configs import Config
-
-
-class LdapApiException(Exception):
-    """Base LDAP API exception"""
-
-
-class InfoLevel(Enum):
-    """Constants for printing user info from LDAP"""
-
-    PDL = "PDL"  # Public Distribution List (group of e-mail addresses)
-    FULL = "Full"
-
-
-def print_user_info(info, info_level=None):
-    """Pretty-print of a user info data structure (dict). info_level is the InfoLevel Enum"""
-    if not info or not info.get("mail"):
-        raise LdapApiException("ERROR: No info or absent mail")
-
-    def get_membership():
-        if info_level == InfoLevel.PDL:
-            membership_info = "  PDLs:"
-        elif info_level == InfoLevel.FULL:
-            membership_info = "  memberOf :"
-        else:
-            return ""
-        # Grouping groups by purpose
-        if info_level == InfoLevel.PDL:
-            sort_key = lambda i: i.split(",", 1)[0].lower()
-        else:
-            sort_key = lambda i: i.split(",", 1)[1] + i.split(",", 1)[0].lower()
-        for item in sorted(info["memberOf"], key=sort_key):
-            if info_level == InfoLevel.PDL and "OU=Delegated" not in item:
-                continue
-            membership_info += f"\n    {item}"
-        return membership_info
-
-    try:
-        text_info = (
-            f'\n{info["cn"]} <{info["mail"]}>; {info["sAMAccountName"]}; {info["employeeID"]}'
-            f'\n  Org group: {info["intelSuperGroupDescr"]} ({info["intelSuperGroupShortName"]}) /'
-            f' {info["intelGroupDescr"]} ({info["intelGroupShortName"]}) /'
-            f' {info["intelDivisionDescr"]} ({info["intelDivisionShortName"]}) /'
-            f' {info["intelOrgUnitDescr"]}'
-            f'\n  Manager: {info.get("manager")}'
-            f'\n  Location: {info["intelRegionCode"]} / {info["co"]} / {info["intelSiteCode"]} /'
-            f' {info["intelBldgCode"]} ({info.get("intelSiteName")}) /'
-            f' {info["physicalDeliveryOfficeName"]}'
-            f'\n  Other: {info["employeeType"]} | {info["intelExportCountryGroup"]} |'
-            f' {info["whenCreated"]} | {info["intelCostCenterDescr"]} | {info["jobDescription"]}'
-        )
-    except Exception as exc:
-        raise LdapApiException(
-            f'ERROR: Failed to get info about "{info["mail"]}". '
-            f"Exception occurred:\n{repr(exc)}"
-        ) from exc
-    print(text_info)
-
-    membership = get_membership()
-    if info_level == InfoLevel.PDL and membership:
-        print(membership)
-    elif info_level == InfoLevel.FULL:
-        for key in sorted(info):
-            if isinstance(info[key], list):
-                if key == "memberOf":
-                    print(membership)
-                else:
-                    print(f"  {key} :")
-                    for item in info[key]:
-                        print("   ", item)
-            else:
-                print(f"  {key} : {info[key]}")
-
-
-class LdapApi:
-    """LDAP API for getting user info and emails"""
-
-    _binary_blobs = ["thumbnailPhoto", "msExchUMSpokenName", "msExchBlockedSendersHash"]
-    _check_existing = [
-        "intelExportCountryGroup",
-        "physicalDeliveryOfficeName",
-        "intelSuperGroupShortName",
-        "intelGroupShortName",
-        "intelDivisionShortName",
-    ]
-
-    null = "<null>"
-
-    def __init__(self):
-        self._cfg = Config()
-        self.server = Server(self._cfg.LDAP_SERVER, get_info=ALL)
-        self.connection = Connection(
-            self.server, user=self._cfg.LDAP_USER, password=self._cfg.LDAP_PASSWORD, auto_bind=True
-        )
-        self.connection.bind()
-
-    def get_user_emails(self, groups=None):
-        """Gets emails of LDAP groups and sub-groups"""
-        print("\nGet emails from LDAP groups:")
-        processed_ldap_members = {}
-
-        def process_group_members(member, parent_group):
-            if member in processed_ldap_members:
-                processed_ldap_members[member]["parent_groups"].append(parent_group)
-                print(
-                    "\nWARNING: Ignore LDAP member to avoid duplication and recursive cycling "
-                    f"of PDLs: {member}\n    "
-                    f'email: {processed_ldap_members[member].get("email")}\n    parent_groups:'
-                )
-                for group in processed_ldap_members[member].get("parent_groups", []):
-                    print(7 * " ", group)
-
-                return
-            processed_ldap_members[member] = {"email": None, "parent_groups": [parent_group]}
-
-            # AD moves terminated users to the boneyard OU in case the user returns,
-            # so it can be reactivated with little effort.
-            # After 30 days it is removed and the unix personality becomes unlinked.
-            if "OU=Boneyard" in member:
-                return
-            self.connection.search(
-                member, r"(objectClass=*)", SUBTREE, attributes=["cn", "member", "mail"]
-            )
-
-            # print(self.connection.entries)
-            if not self.connection.response:
-                raise LdapApiException(f"ERROR: empty response. LDAP member: {member}")
-
-            # Check that the member is worker.
-            # The response can contain several items, but the first item is valid only
-            if "OU=Workers" in member:
-                if self.connection.response[0]["attributes"]["mail"]:
-                    processed_ldap_members[member]["email"] = self.connection.response[0][
-                        "attributes"
-                    ]["mail"].lower()
-                    return
-                raise LdapApiException(
-                    f"ERROR: no mail. LDAP worker: {member}\n" f"{self.connection.entries}"
-                )
-
-            if len(self.connection.response) > 1:
-                raise LdapApiException(
-                    f"ERROR: multiple responses for {member}: "
-                    f"{len(self.connection.response)}\n"
-                    f"{self.connection.entries}"
-                )
-
-            if self.connection.response[0]["attributes"]["member"]:
-                for group_member in self.connection.response[0]["attributes"]["member"]:
-                    process_group_members(group_member, member)
-            else:
-                print(f"\nERROR: no members in LDAP group: {member}\n{self.connection.entries}")
-
-        for group in groups or self._cfg.LDAP_PDLs:
-            print("\nProcess ROOT LDAP group:", group)
-            process_group_members(group, "ROOT")
-        return {
-            member.get("email") for member in processed_ldap_members.values() if member.get("email")
-        }
-
-    def _get_user_info(self, query):
-        """Gets user info from LDAP as dict matching key and values pairs from query"""
-        query_filter = "".join(f"({key}={value})" for key, value in query.items())
-
-        for domain in self._cfg.LDAP_DOMAINS:
-            search_base = f"OU=Workers,DC={domain},DC=corp,DC=intel,DC=com"
-            self.connection.search(
-                search_base,
-                f"(&(objectcategory=person)(objectclass=user)(intelflags=1){query_filter})",
-                SUBTREE,
-                attributes=["*"],
-            )
-
-            if self.connection.response:
-                if len(self.connection.response) > 1:
-                    raise LdapApiException(
-                        f"ERROR: multiple responses for {query_filter}: "
-                        f"{len(self.connection.response)}\n"
-                        f"{self.connection.entries}"
-                    )
-                info = self.connection.response[0]["attributes"]
-
-                # remove long binary blobs
-                for blob in LdapApi._binary_blobs:
-                    info[blob] = b""
-                for key in LdapApi._check_existing:
-                    if not info.get(key):
-                        info[key] = LdapApi.null
-                return info
-        return {}
-
-    def get_user_info_by_idsid(self, idsid):
-        """Gets user info from LDAP as dict using account name for searching"""
-        return self._get_user_info({"sAMAccountName": idsid})
-
-    def get_user_info_by_name(self, name):
-        """Gets user info from LDAP as dict using common name for searching"""
-        return self._get_user_info({"cn": name})
-
-    def get_user_info_by_email(self, email):
-        """Gets user info from LDAP as dict using emails for searching"""
-        return self._get_user_info({"mail": email})
-
-    def get_absent_emails(self, emails):
-        """Checks users by email in LDAP and returns absent emails"""
-        absent_emails = set()
-        for email in emails:
-            if not self.get_user_info_by_email(email):
-                absent_emails.add(email)
-        return absent_emails
-
-
-def _test():
-    """Test and debug"""
-    ldap = LdapApi()
-
-    emails = ldap.get_user_emails()
-    print(f'\nLDAP emails count: {len(emails)}\n{"; ".join(emails)}')
-
-    emails = ["foo@intel.com"]
-
-    for email in emails:
-        info = ldap.get_user_info_by_email(email)
-        if info:
-            print_user_info(info, InfoLevel.PDL)
-        else:
-            print(f"\n{email} - not found")
-
-
-if __name__ == "__main__":
-    _test()

.github/github_org_control/requirements-dev.txt

@@ -1 +0,0 @@
-pylint==2.11.1

.github/github_org_control/requirements.txt

@@ -1,2 +0,0 @@
-PyGithub==1.55
-ldap3==2.7

.github/org_control/check_org.py

@@ -0,0 +1,51 @@
+# Copyright (C) 2020 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+Check GitHub organization and invite members
+"""
+
+# pylint: disable=fixme,no-member
+
+from argparse import ArgumentParser
+
+import github_api
+from configs import Config
+
+
+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("--teams", action="store_true", help="Check GitHub teams")
+    args, unknown_args = arg_parser.parse_known_args()
+
+    Config(args.cfg_file, unknown_args)
+    gh_api = github_api.GithubOrgApi()
+
+    if args.teams:
+        gh_api.get_org_teams()
+    else:
+        dev_emails = github_api.get_dev_emails()
+        print(f'\nDeveloper emails {len(dev_emails)}:', '; '.join(dev_emails))
+
+        org_emails = gh_api.get_org_emails()
+        print(f'\nOrg emails {len(org_emails)}:', '; '.join(org_emails))
+
+        org_pendig_invitation_emails = gh_api.get_org_invitation_emails()
+
+        invite_emails = dev_emails.difference(org_emails).difference(org_pendig_invitation_emails)
+        print(f'\nInvite emails {len(invite_emails)}:', '; '.join(invite_emails))
+
+        no_in_dev_emails = org_emails.difference(dev_emails)
+        print(f'\nOrg members - no in developers list {len(no_in_dev_emails)}:',
+              '; '.join(no_in_dev_emails))
+
+        valid_github_users = gh_api.get_valid_github_users(invite_emails)
+
+        gh_api.invite_users(valid_github_users)
+
+
+if __name__ == '__main__':
+    main()

.github/org_control/check_pr.py

@@ -0,0 +1,149 @@
+# Copyright (C) 2020 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+Check GitHub PRs and set labels by type and categories, e.g. 'ExternalPR', 'category: ci'
+"""
+
+# pylint: disable=fixme,no-member
+
+import re
+import datetime
+from argparse import ArgumentParser
+from enum import Enum
+
+import github_api
+from configs import Config
+
+
+class PrType(Enum):
+    """Constants for type of GitHub pull request by author membership"""
+    EXTERNAL = 'ExternalPR'
+    INTEL = 'ExternalIntelPR'
+    ORG = 'OpenvinoPR'
+    BAD = 'BadPR'
+
+
+def get_pr_labels(pull):
+    """Gets PR labels as set"""
+    pr_lables = set()
+    for label in pull.labels:
+        pr_lables.add(label.name)
+    return pr_lables
+
+
+def set_pr_labels(pull, labels):
+    """Sets PR labels"""
+    if not labels or Config().DRY_RUN:
+        return
+    print(f'Set PR labels:', labels)
+    pull.set_labels(labels)
+
+
+def get_pr_type_by_labels(pull):
+    """Gets PR type using labels"""
+    pr_lables = get_pr_labels(pull)
+    pr_types = set(type.value for type in PrType)
+    pr_types_labels = pr_lables & pr_types
+    if not pr_types_labels:
+        return None
+    if len(pr_types_labels) > 1:
+        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')
+    re_label = re_compile_label.match(team_name)
+    if re_label:
+        return f'category: {re_label.group(1).strip()}'
+    return None
+
+
+def get_label_by_team_name_map(team_name):
+    """Generates label by PR reviwer team name using config map"""
+    return Config().TEAM_TO_LABEL.get(team_name)
+
+
+def get_category_labels(pull):
+    """Gets list of category labels by all PR reviwer teams"""
+    labels = []
+    pr_lables = get_pr_labels(pull)
+    for reviewer_team in pull.get_review_requests()[1]:
+        reviewer_label = get_label_by_team_name_map(reviewer_team.name)
+        if reviewer_label and reviewer_label not in pr_lables:
+            labels.append(reviewer_label)
+    return labels
+
+
+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")
+    args, unknown_args = arg_parser.parse_known_args()
+
+    Config(args.cfg_file, unknown_args)
+    gh_api = github_api.GithubOrgApi()
+
+    if args.pr:
+        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)
+
+    if args.newer:
+        pr_created_after = datetime.datetime.now() - datetime.timedelta(minutes=int(args.newer))
+        print('PRs created after:', pr_created_after)
+    non_org_intel_pr_users = set()
+    non_org_pr_users = set()
+    for pull in pulls:
+        if args.newer and pull.created_at <= pr_created_after:
+            print(f'\nIGNORE: {pull} - Created: {pull.created_at}')
+            continue
+        pr_lables = get_pr_labels(pull)
+        pr_type_by_labels = get_pr_type_by_labels(pull)
+        set_labels = []
+        print(f'\n{pull} - Created: {pull.created_at} - Labels: {pr_lables} -',
+              f'Type: {pr_type_by_labels}', 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)
+                set_labels.append(PrType.INTEL.value)
+        else:
+            print(f' - 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)
+                set_labels.append(PrType.EXTERNAL.value)
+
+        set_labels += get_category_labels(pull)
+        set_pr_labels(pull, set_labels)
+
+    print(f'\nNon org user with Intel email or company:')
+    github_api.print_users(non_org_intel_pr_users)
+    print(f'\nNon org user with NO Intel email or company:')
+    github_api.print_users(non_org_pr_users)
+
+
+if __name__ == '__main__':
+    main()

.github/org_control/config.json

@@ -0,0 +1,36 @@
+{
+    "GITHUB_TOKEN": "<Put token here or set as arg or as env variable>",
+    "GITHUB_ORGANIZATION": "openvinotoolkit",
+    "GITHUB_REPO": "openvino",
+    "IGNORE_LOGINS": [
+        "openvino-ci",
+        "openvino-pushbot",
+        "lab-nerval",
+        "lab-nerval-onnx-ci"
+    ],
+    "EMAILS_FILE_PATH": "dev_emails-test.txt",
+    "PROXIES": {
+        "HTTP_PROXY": null,
+        "HTTPS_PROXY": null,
+        "NO_PROXY": "localhost,127.0.0.1,.intel.com"
+    },
+    "DRY_RUN": false,
+    "TEAM_TO_LABEL": {
+        "openvino-admins": "category: CI",
+        "openvino-maintainers": "category: IE common",
+        "openvino-docs-maintainers": "category: docs",
+        "openvino-ie-maintainers": "category: IE common",
+        "openvino-ie-cpu-maintainers": "category: CPU",
+        "openvino-ie-gna-maintainers": "category: GNA",
+        "openvino-ie-gpu-maintainers": "category: GPU",
+        "openvino-ie-lpt-maintainers": "category: LP transformations",
+        "openvino-ie-multi-maintainers": "category: MULTI",
+        "openvino-ie-python-api-maintainers": "category: python api",
+        "openvino-ie-tests-maintainers": "category: IE Tests",
+        "openvino-ie-vpu-maintainers": "category: VPU",
+        "openvino-mo-maintainers": "category: MO",
+        "openvino-ngraph-maintainers": "category: nGraph",
+        "openvino-tests-maintainers": "category: IE Tests",
+        "openvino-tools-maintainers": "category: tools"
+    }
+}

.github/org_control/configs.py

@@ -0,0 +1,113 @@
+# Copyright (C) 2020 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+Configurations management
+"""
+
+# pylint: disable=fixme,broad-except
+
+import os
+import sys
+import ast
+import json
+from pathlib import Path
+
+
+if sys.hexversion < 0x3060000:
+    raise Exception('Python version must be >= 3.6')
+
+
+class ConfigException(Exception):
+    """Base configuration exception"""
+
+
+class Config:
+    """Configuration wrapper"""
+    _instance = None
+    properties = None
+    default_cfg_path = Path(__file__).resolve().parent / 'config.json'
+
+    def __new__(cls, *_args, **_kwargs):
+        if not Config._instance:
+            Config._instance = super(Config, cls).__new__(cls)
+        return Config._instance
+
+    def __init__(self, file_path=None, cli_args=None):
+        """
+        :param file_path: Path to json configuration file
+        :type file_path: String
+
+        :param args: List of argparse arguments with patterns: 'name=value' or 'name'
+        :type args: list
+        """
+        if Config.properties:
+            return
+
+        self._file_path = file_path or Config.default_cfg_path
+        self._cli_args = cli_args or []
+
+        self._json_cfg = {}
+        self._args = {}
+
+        self._load_cfg()
+        self._parse_cli_args()
+
+        Config.properties = {}
+        for name, value in self._json_cfg.items():
+            if hasattr(self, name):
+                raise ConfigException(f'Duplicating prosperity: {name}')
+            prosperity_value = self._args.get(name) or os.getenv(name)
+            if prosperity_value:
+                # Try to set prosperity_value as Python literal structures, e.g. DRY_RUN=False
+                try:
+                    prosperity_value = ast.literal_eval(prosperity_value)
+                except Exception:
+                    pass
+                if not isinstance(prosperity_value, type(value)):
+                    raise ConfigException(f'Python type of {name} parameter must be {type(value)}')
+            else:
+                prosperity_value = value
+            setattr(self, name, prosperity_value)
+            Config.properties[name] = prosperity_value
+
+        self.set_proxy()
+
+    def _load_cfg(self):
+        """Load the json configuration file"""
+        try:
+            with open(self._file_path) as conf:
+                self._json_cfg = json.load(conf)
+        except:
+            print('Failed to load configuration from:', self._file_path)
+            raise
+
+    def _parse_cli_args(self):
+        """Parse argparse arguments with patterns: 'name=value' or 'name'"""
+        for cli_arg in self._cli_args:
+            arg = cli_arg.split('=')
+            if arg[0] not in self._json_cfg:
+                raise ConfigException(f'Unsupported argument: {arg}')
+            self._args[arg[0]] = True if len(arg) == 1 else '='.join(arg[1:])
+
+    def get_properties(self):
+        """Get all properties as Dict"""
+        return self.properties
+
+    def set_proxy(self):
+        """Set proxies"""
+        for proxy_name, url in self.properties['PROXIES'].items():
+            if url is not None:
+                print(f'Set proxy: {proxy_name}={url}')
+                os.environ[proxy_name] = url
+
+
+def _test():
+    """Test and debug"""
+    print('Config.default_cfg_path:', Config.default_cfg_path)
+    cfg = Config(cli_args=['DRY_RUN=True'])
+    print('Config.properties:', cfg.get_properties())
+
+
+if __name__ == '__main__':
+    _test()

.github/org_control/github_api.py

@@ -0,0 +1,287 @@
+# Copyright (C) 2020 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+GitHub API for controlling organization
+"""
+
+# pylint: disable=fixme,no-member
+
+import re
+import time
+
+from github import Github, GithubException, RateLimitExceededException, IncompletableObject
+from github import UnknownObjectException
+from github.PaginatedList import PaginatedList
+
+from configs import Config
+
+
+def is_valid_user(user):
+    """Checks that user is valid github.Github object"""
+    try:
+        return user and user.login
+    except IncompletableObject:
+        return False
+
+
+def is_user_ignored(user):
+    """Checks that user should be ignored"""
+    cfg = Config()
+    if is_valid_user(user) and user.login.lower() not in cfg.properties['IGNORE_LOGINS']:
+        return False
+    return True
+
+
+def is_valid_name(name):
+    """Checks that GitHub user's name is valid"""
+    return name and len(name) >= 3 and ' ' in name
+
+
+def is_intel_email(email):
+    """Checks that email is valid Intel email"""
+    return email and len(email) > 10 and ' ' not in email and email.lower().endswith('@intel.com')
+
+
+def is_intel_company(company):
+    """Checks that company contains intel"""
+    return company and 'intel' in company.lower()
+
+
+def is_valid_intel_user(user):
+    """Checks that user is valid GitHub and Intel user"""
+    return is_valid_user(user) and (is_valid_name(user.name) and is_intel_email(user.email) or
+                                    is_user_ignored(user))
+
+
+def print_users(users):
+    """Print list of users in different formats: list, set, PaginatedList"""
+    if isinstance(users, (list, set, PaginatedList)):
+        users_count = users.totalCount if isinstance(users, PaginatedList) else len(users)
+        print(f'\nGitHub users {users_count} (login - name - company - email - valid):')
+    else:
+        users = [users]
+    for user in users:
+        if not is_valid_user(user):
+            print('WRONG GitHub user: ???')
+            continue
+        valid_check = 'OK' if is_valid_intel_user(user) else 'FIX'
+        if not is_intel_email(user.email):
+            valid_check += ' email'
+        if not is_valid_name(user.name):
+            valid_check += ' name'
+        print(f'{user.login} - "{user.name}" - "{user.company}" - {user.email} - {valid_check}')
+
+
+def get_dev_emails():
+    """
+    Read a file with developer emails. Supported email formats
+    first_name.last_name@intel.com
+    Import from Outlook: Last_name, First_name <first_name.last_name@intel.com>
+    """
+    re_email = re.compile(r'.+<(.+)>')
+    emails = set()
+    cfg = Config()
+    with open(cfg.properties['EMAILS_FILE_PATH']) as file_obj:
+        for line in file_obj:
+            line = line.strip().lower()
+            if not line or line.startswith('#'):
+                continue
+            re_outlook_email = re_email.match(line)
+            if re_outlook_email:
+                line = re_outlook_email.group(1).strip()
+            if not is_intel_email(line):
+                print(f'Wrong email in {cfg.properties["EMAILS_FILE_PATH"]}: {line}')
+                continue
+            emails.add(line)
+    return emails
+
+
+class GithubOrgApi:
+    """Common API for GitHub organization"""
+
+    def __init__(self):
+        self._cfg = Config()
+        self.github = Github(self._cfg.GITHUB_TOKEN)
+        self.github_org = self.github.get_organization(self._cfg.GITHUB_ORGANIZATION)
+        self.repo = self.github.get_repo(f'{self._cfg.GITHUB_ORGANIZATION}/'
+                                         f'{self._cfg.GITHUB_REPO}')
+
+    def is_org_user(self, user):
+        """Checks that user is a member of GitHub organization"""
+        if is_valid_user(user):
+            try:
+                membership = user.get_organization_membership(self.github_org)
+                # membership.role can be 'member' or 'admin'
+                if membership.state == 'active' and membership.role:
+                    return True
+            except UnknownObjectException:
+                pass
+        return False
+
+    def get_org_emails(self):
+        """Gets and prints all emails of GitHub organization members"""
+        org_members = self.github_org.get_members()
+        org_emails = set()
+        org_members_fix = set()
+        org_emails_fix_name = set()
+        org_logins_fix_intel_email = set()
+
+        print(f'\nOrg members {org_members.totalCount} (login - name - company - email - valid):')
+        for org_member in org_members:
+            print_users(org_member)
+            if is_user_ignored(org_member):
+                continue
+            if is_intel_email(org_member.email):
+                org_emails.add(org_member.email.lower())
+                if not is_valid_name(org_member.name):
+                    org_members_fix.add(org_member)
+                    org_emails_fix_name.add(org_member.email.lower())
+            else:
+                org_members_fix.add(org_member)
+                org_logins_fix_intel_email.add(org_member.login.lower())
+
+        print_users(org_members_fix)
+        print(f'\nOrg members - no Intel emails {len(org_logins_fix_intel_email)}:',
+              '; '.join(org_logins_fix_intel_email))
+        print(f'\nOrg members - no real name {len(org_emails_fix_name)}:',
+              '; '.join(org_emails_fix_name))
+        return org_emails
+
+    def get_org_invitation_emails(self):
+        """Gets GitHub organization teams prints info"""
+        org_invitations = self.github_org.invitations()
+        org_invitation_emails = set()
+
+        print(f'\nOrg invitations {org_invitations.totalCount} (login - name - email - valid):')
+        for org_invitation in org_invitations:
+            # TODO: investigate GithubException while access to user name and enable print_users()
+            # github.GithubException.IncompletableObject: 400 "Returned object contains no URL"
+            #print_users(org_invitation)
+            print(f'{org_invitation.login} - ??? - {org_invitation.email} - ???')
+            if is_user_ignored(org_invitation):
+                continue
+            if is_intel_email(org_invitation.email):
+                org_invitation_emails.add(org_invitation.email.lower())
+            else:
+                print('Strange org invitation:', org_invitation)
+
+        print(f'\nOrg invitation emails {len(org_invitation_emails)}:',
+              '; '.join(org_invitation_emails))
+        return org_invitation_emails
+
+    def get_org_teams(self):
+        """Gets GitHub organization teams prints info"""
+        teams = []
+        org_teams = self.github_org.get_teams()
+        print('\nOrg teams count:', org_teams.totalCount)
+        for team in org_teams:
+            teams.append(team.name)
+            print(f'\nTeam: {team.name} - parent: {team.parent}')
+
+            repos = team.get_repos()
+            print('Repos:')
+            for repo in repos:
+                print(f'    {repo.name} -', team.get_repo_permission(repo))
+
+            team_maintainers = team.get_members(role='maintainer')
+            team_maintainer_logins = set()
+            for maintainer in team_maintainers:
+                team_maintainer_logins.add(maintainer.login)
+            team_members = team.get_members(role='member')
+            team_member_logins = set()
+            for member in team_members:
+                team_member_logins.add(member.login)
+            members = team.get_members(role='all')
+            member_emails = []
+            print('Members (role - login - name - company - email - valid):')
+            for user in members:
+                if user.login in team_maintainer_logins:
+                    print('    Maintainer - ', end='')
+                elif user.login in team_member_logins:
+                    print('    Member - ', end='')
+                else:
+                    # It is not possible to check child teams members
+                    print('    ??? - ', end='')
+                print_users(user)
+                if is_intel_email(user.email) and not is_user_ignored(user):
+                    member_emails.append(user.email.lower())
+            print(f'Intel emails {len(member_emails)}:', '; '.join(member_emails))
+        return teams
+
+    def get_valid_github_users(self, emails):
+        """Gets valid GitHub users by email and prints status"""
+        valid_users = set()
+        no_account_emails = set()
+        print(f'\nGitHub users from {len(emails)} invite emails (email - status):')
+        for email in emails:
+            if not is_intel_email(email):
+                print(f'{email} - Non Intel email')
+                continue
+
+            # You can make up to 30 requests per minute; https://developer.github.com/v3/search/
+            # Sleep 2.4 sec is about 25 requests per minute
+            time.sleep(2.4)
+            try:
+                users = self.github.search_users(f'{email} in:email')
+            except RateLimitExceededException:
+                time.sleep(5)
+                users = self.github.search_users(f'{email} in:email')
+
+            if users.totalCount == 0:
+                print(f'{email} - No valid GitHub account')
+                no_account_emails.add(email)
+                continue
+            if users.totalCount > 1:
+                print(f'{email} - Found {users.totalCount} GitHub accounts')
+            for user in users:
+                if user.email and user.email.lower() == email:
+                    print(f'{email} - OK')
+                    valid_users.add(user)
+                else:
+                    print(f'{email} - Non public or wrong email - login: {user.login} - '
+                          f'email: {user.email}')
+        print('Valid users count:', len(valid_users))
+        print_users(valid_users)
+        print(f'\nIntel emails - No valid GitHub account {len(no_account_emails)}:',
+              '; '.join(no_account_emails))
+        return valid_users
+
+    def invite_users(self, users):
+        """Invites users and prints status"""
+        if isinstance(users, (list, set)):
+            print(f'\nInvite {len(users)} users:')
+        else:
+            users = [users]
+
+        for user in users:
+            if isinstance(user, str):
+                print(f'Email: {user}')
+                self.github_org.invite_user(email=user)
+            else:
+                print(f'{user.login} - "{user.name}" - {user.email} - ', end='')
+                try:
+                    if is_user_ignored(user):
+                        print('Ignored')
+                        continue
+                    if not self._cfg.DRY_RUN:
+                        self.github_org.invite_user(user=user)
+                        print('OK')
+                    else:
+                        print('Dry run')
+                except GithubException as exc:
+                    print(f'FAIL: {exc.data["errors"][0]["message"]}')
+
+
+def _test():
+    """Test and debug"""
+    Config(cli_args=['DRY_RUN=True'])
+    dev_emails = get_dev_emails()
+    print('dev_emails:', dev_emails)
+
+    gh_api = GithubOrgApi()
+    gh_api.get_org_emails()
+
+
+if __name__ == '__main__':
+    _test()

.github/org_control/requirements.txt

@@ -0,0 +1 @@
+PyGithub==1.51

.github/org_control/requirements_dev.txt

@@ -0,0 +1 @@
+pylint==2.3.0

.github/workflows/build_doc.yml

@@ -3,7 +3,6 @@ on: [push, pull_request]
 
 jobs:
   Build_Doc:
-    if: github.repository == 'openvinotoolkit/openvino'
     runs-on: ubuntu-20.04
     steps:
       - name: Clone OpenVINO
@@ -14,25 +13,14 @@ jobs:
 
       - name: Install dependencies
         run: |
-          set -e
-          # install doc dependencies
-          sudo apt update
           sudo apt --assume-yes install libusb-1.0-0-dev graphviz texlive
-          cd docs
-          python -m pip install -r requirements.txt --user
-          cd openvino_sphinx_theme
-          python setup.py install --user
-          cd ../..
-          # install doxyrest
-          wget https://github.com/vovkos/doxyrest/releases/download/doxyrest-2.1.3/doxyrest-2.1.3-linux-amd64.tar.xz
-          tar -xf doxyrest-2.1.3-linux-amd64.tar.xz
-          echo "$(pwd)/doxyrest-2.1.3-linux-amd64/bin/" >> $GITHUB_PATH
+          python3 -m pip install lxml
           # install doxygen
           mkdir doxygen
           cd doxygen
           git clone https://github.com/doxygen/doxygen.git
           cd doxygen
-          git checkout Release_1_9_2
+          git checkout Release_1_9_1
           mkdir build
           cd build
           cmake ..
@@ -43,55 +31,14 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DENABLE_DOCS=ON -DENABLE_PYTHON=ON -DNGRAPH_PYTHON_BUILD_ENABLE=ON -DCMAKE_BUILD_TYPE=Release ..
+          cmake -DENABLE_DOCS=ON ..
 
       - name: Build doc
-        run: |
-          cmake --build . --target sphinx_docs -j8
+        run: cmake --build . --target openvino_docs
         working-directory: build
-      
-      - name: Archive HTML
-        run: |
-          zip -r openvino_html.zip _build
-        working-directory: build/docs
-      
-      - name: Run Pytest
-        run: |
-          pytest --doxygen="./build/docs/doxygen.log" \
-                 --include_pot \
-                 --sphinx="./build/docs/sphinx.log" \
-                 --suppress-warnings="./docs/suppress_warnings.txt" \
-                 --confcutdir="./docs/scripts/tests/" \
-                 --html="./build/docs/_artifacts/doc-generation.html" \
-                 --doxygen-strip="$(pwd)" \
-                 --sphinx-strip="$(pwd)/build/docs/rst" \
-                 --doxygen-xfail="./docs/doxygen-xfail.txt" \
-                 --self-contained-html ./docs/scripts/tests/test_docs.py
 
-      - name: 'Upload test results'
-        if: always()
+      - name: 'Upload doc'
         uses: actions/upload-artifact@v2
         with:
-          name: openvino_doc_pytest
-          path: build/docs/_artifacts/
-      
-      - name: 'Upload doxygen.log'
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: doxygen_log
-          path: build/docs/doxygen.log
-
-      - name: 'Upload sphinx.log'
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: sphinx_log
-          path: build/docs/sphinx.log
-
-      - name: 'Upload html'
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: openvino_html
-          path: build/docs/openvino_html.zip
+          name: openvino_doc
+          path: build/docs/html/

.github/workflows/check_pr_commits.yml

@@ -1,17 +0,0 @@
-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/github_org_control/requirements.txt
-
-      - name: PR commits
-        run: python3 ./.github/github_org_control/check_pr.py --pr=${{ github.event.number }} --check-commits DRY_RUN
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/code_style.yml

@@ -2,50 +2,42 @@ name: Code Style
 on: [push, pull_request]
 
 jobs:
-  clang-format:
-    runs-on: ubuntu-20.04
+  nGraph:
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
 
-      - name: Install clang-format-9
-        run: |
-          sudo apt update
-          sudo apt --assume-yes install clang-format-9
+      - name: Install clang-format-3.9
+        run: sudo apt --assume-yes install clang-format-3.9
 
       - name: Install dependencies
         run: |
-          sudo apt update
           sudo apt --assume-yes install libusb-1.0-0-dev
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r ./src/bindings/python/src/compatibility/openvino/requirements.txt
-          # Add for -DENABLE_PYTHON=ON, no cython
-          python3 -m pip install -r ./src/bindings/python/src/compatibility/openvino/requirements-dev.txt
+          python3 -m pip install -r ./inference-engine/ie_bridges/python/requirements.txt
 
-      # Run cmake with -DENABLE_PROFILING_ITT=ON -DSELECTIVE_BUILD=COLLECT in order to enable codestyle check for ITT collector
       - name: CMake
         run: |
           mkdir build
           cd build
-          cmake -DENABLE_PYTHON=ON -DENABLE_TESTS=ON -DENABLE_PROFILING_ITT=ON -DSELECTIVE_BUILD=COLLECT ..
+          cmake ..
 
       - name: Check code style
-        run: cmake --build . --target clang_format_check_all -j8
+        run: make style-check
         working-directory: build
 
       - name: Create code style diff
         if: failure()
         run: |
-          cmake --build . --target clang_format_fix_all -j8
-          git diff > code_style_diff.diff
-        working-directory: build
+          ngraph/maint/apply-code-format.sh
+          git diff >ngraph_code_style_diff.patch
 
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: code_style_diff
-          path: build/code_style_diff.diff
+          name: ngraph_code_style_diff
+          path: ngraph_code_style_diff.patch
 
   ShellCheck:
     runs-on: ubuntu-18.04
@@ -55,45 +47,19 @@ jobs:
           submodules: recursive
 
       - name: Install ShellCheck
-        run: |
-          sudo apt update
-          sudo apt --assume-yes install shellcheck
+        run: sudo apt --assume-yes install shellcheck
 
       - name: Install dependencies
-        run: python3 -m pip install -r ./src/bindings/python/src/compatibility/openvino/requirements.txt
+        run: |
+          sudo apt --assume-yes install libusb-1.0-0-dev
+          python3 -m pip install -r ./inference-engine/ie_bridges/python/requirements.txt
 
       - name: CMake
         run: |
           mkdir build
           cd build
-          cmake -DENABLE_INTEL_MYRIAD_COMMON=OFF ..
+          cmake ..
 
       - name: ShellCheck
-        run: cmake --build . --target ie_shellcheck -j8
-        working-directory: build
-
-  NamingConventionCheck:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - name: Install Clang dependency
-        run: |
-          sudo apt update
-          sudo apt --assume-yes remove clang-7 clang-8 clang-9 clang-10 clang-11
-          sudo apt --assume-yes install libclang-12-dev
-
-      - name: Install Python-based dependencies
-        run: python3 -m pip install -r cmake/developer_package/ncc_naming_style/requirements_dev.txt
-
-      - name: CMake
-        run: |
-          mkdir build
-          cd build
-          cmake -DENABLE_INTEL_MYRIAD_COMMON=OFF ..
-
-      - name: Naming convention check
-        run: cmake --build . --target ncc_all -j8
+        run: make ie_shellcheck
         working-directory: build

.github/workflows/mo.yml

@@ -2,10 +2,10 @@ name: MO
 on:
   push:
     paths:
-      - 'openvino/tools/mo/**'
+      - 'model-optimizer/**'
   pull_request:
     paths:
-      - 'openvino/tools/mo/**'
+      - 'model-optimizer/**'
 
 jobs:
   Pylint-UT:
@@ -24,7 +24,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('openvino/tools/mo/requirements*.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('model-optimizer/requirements*.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
             ${{ runner.os }}-
@@ -41,13 +41,12 @@ jobs:
           pip install -r requirements.txt
           pip install -r requirements_dev.txt
           # requrements for CMake
-          sudo apt update
           sudo apt --assume-yes install libusb-1.0-0-dev
-        working-directory: openvino/tools/mo
+        working-directory: model-optimizer
 
       - name: Pylint
-        run: pylint -d C,R,W openvino/tools/mo/ openvino/tools/mo/mo.py
-        working-directory: openvino/tools/mo
+        run: pylint -d C,R,W mo/ mo.py extensions/
+        working-directory: model-optimizer
 
       - name: CMake
         run: |
@@ -62,4 +61,33 @@ jobs:
           env
           mkdir ../mo-ut-logs
           python3 -m xmlrunner discover -p *_test.py --output=../mo-ut-logs
-        working-directory: openvino/tools/mo
+        working-directory: model-optimizer
+  
+  build_wheel:
+    name: Build Python wheel
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install wheel setuptools
+          python3 -m pip install tensorflow==2.3.0
+      
+      - name: Build
+        run: |
+          python3 setup.py sdist bdist_wheel
+        working-directory: model-optimizer
+      
+      - name: Test
+        run: |
+          wget -q http://download.tensorflow.org/models/mobilenet_v1_2018_08_02/mobilenet_v1_1.0_224.tgz
+          tar -xf mobilenet_v1_1.0_224.tgz
+          python3 -m pip install model-optimizer/dist/*.whl
+          python3 -c "import sys, subprocess, mo_tf; subprocess.run([sys.executable, mo_tf.__file__, '--input_model', 'mobilenet_v1_1.0_224_frozen.pb', '--input_shape', '[1,224,224,3]'], check=True)"
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: mo_wheel
+          path: "model-optimizer/dist/*.whl"

.github/workflows/py_checks.yml

@@ -1,77 +0,0 @@
-name: IE Python Checks
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - 'src/bindings/python/**'
-      - 'samples/python/**'
-  pull_request:
-    paths:
-      - 'src/bindings/python/**'
-      - 'samples/python/**'
-jobs:
-  linters:
-    runs-on: ubuntu-18.04
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.6'
-      - name: Install dependencies
-        run: python -m pip install -r src/bindings/python/src/compatibility/openvino/requirements_dev.txt
-      - name: Run Flake on samples
-        run: python -m flake8 ./ --config=setup.cfg
-        working-directory: samples/python
-      - name: Create code style diff for samples
-        if: failure()
-        run: |
-          python -m black -l 160 -S ./
-          git diff > samples_diff.diff
-        working-directory: samples/python
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: samples_diff
-          path: samples_diff.diff
-      - name: Run Flake on src
-        run: python -m flake8 ./ --config=setup.cfg
-        working-directory: src/bindings/python/src/compatibility/openvino
-      - name: Create code style diff for Python src
-        if: failure()
-        run: |
-          python -m black -l 160 -S ./
-          git diff > src_diff.diff
-        working-directory: src/bindings/python/src/compatibility/openvino
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: src_diff
-          path: src_diff.diff
-      - name: Run Flake on wheel
-        run: python -m flake8 ./ --config=../setup.cfg
-        working-directory: src/bindings/python/wheel
-      - name: Create code style diff for wheel
-        if: failure()
-        run: |
-          python -m black -l 160 -S ./
-          git diff > wheel_diff.diff
-        working-directory: src/bindings/python/wheel
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: wheel_diff
-          path: wheel_diff.diff
-      
-      - name: Run MyPy
-        run: python -m mypy ./ --config-file ./setup.cfg
-        working-directory: src/bindings/python/src/compatibility/openvino
-      - name: Run Bandit
-        run: python -m bandit -r ./ -f screen
-        working-directory: src/bindings/python/src/compatibility/openvino
-
-      

.gitignore

@@ -1,10 +1,7 @@
 # build/artifact dirs
 _*
-# but ensure we don't skip __init__.py and __main__.py
+# but ensure we don't skip __init__.py
 !__init__.py
-!__main__.py
-# and sphinx documentation folders
-!docs/_*
 
 # developer tools
 *.idea
@@ -22,8 +19,8 @@ doc/
 !ngraph/doc
 docs/build_documentation/work_dir/
 inference-engine/plugins/
+inference-engine/temp
 inference-engine/report
-temp/
 .repo/
 docs/template_plugin/html/
 CMakeLists.txt.user
@@ -49,14 +46,26 @@ __pycache__
 *pylint_report_comments.txt
 
 # Artifacts
-/tools/mo/*.bin
-/tools/mo/*.xml
-/tools/mo/*.json
-/tools/mo/*.so
-/tools/mo/*.txt
-/tools/mo/*.pb
-/tools/mo/*.pbtxt
-/tools/mo/!CMakeLists.txt
-/tools/mo/*.mapping
-/tools/mo/*.dat
-/tools/mo/*.svg
+/model-optimizer/*.bin
+/model-optimizer/*.xml
+/model-optimizer/*.json
+/model-optimizer/*.so
+/model-optimizer/*.txt
+/model-optimizer/*.pb
+/model-optimizer/*.pbtxt
+/model-optimizer/!CMakeLists.txt
+/model-optimizer/*.mapping
+/model-optimizer/*.dat
+/model-optimizer/*.svg
+
+# ngraph
+ngraph/src/CPackConfig.cmake
+ngraph/src/CPackSourceConfig.cmake
+ngraph/src/VERSION
+ngraph/src/gtest/
+ngraph/src/json/
+ngraph/src/ngraphConfig.cmake
+ngraph/src/ngraphConfigVersion.cmake
+ngraph/src/protobuf/
+ngraph/src/src/
+ngraph/src/test/

.gitmodules

@@ -1,69 +1,20 @@
-[submodule "src/plugins/intel_cpu/thirdparty/mkl-dnn"]
-	path = src/plugins/intel_cpu/thirdparty/mkl-dnn
+[submodule "inference-engine/thirdparty/ade"]
+	path = inference-engine/thirdparty/ade
+	url = https://github.com/opencv/ade.git
+	ignore = dirty
+[submodule "inference-engine/thirdparty/mkl-dnn"]
+	path = inference-engine/thirdparty/mkl-dnn
 	url = https://github.com/openvinotoolkit/oneDNN.git
 	ignore = dirty
+[submodule "inference-engine/tests/ie_test_utils/common_test_utils/gtest"]
+	path = inference-engine/tests/ie_test_utils/common_test_utils/gtest
+	url = https://github.com/openvinotoolkit/googletest.git
+	ignore = dirty
+[submodule "inference-engine/samples/thirdparty/gflags"]
+	path = inference-engine/samples/thirdparty/gflags
+	url = https://github.com/gflags/gflags.git
+	ignore = dirty
 [submodule "thirdparty/xbyak"]
 	path = thirdparty/xbyak
 	url = https://github.com/herumi/xbyak.git
 	ignore = dirty
-[submodule "thirdparty/zlib/zlib"]
-	path = thirdparty/zlib/zlib
-	url = https://github.com/madler/zlib.git
-	ignore = dirty
-[submodule "thirdparty/pugixml"]
-	path = thirdparty/pugixml
-	url = https://github.com/zeux/pugixml.git
-	ignore = dirty
-[submodule "thirdparty/ade"]
-	path = thirdparty/ade
-	url = https://github.com/opencv/ade.git
-	ignore = dirty
-[submodule "thirdparty/gflags/gflags"]
-	path = thirdparty/gflags/gflags
-	url = https://github.com/gflags/gflags.git
-	ignore = dirty
-[submodule "thirdparty/gtest/gtest"]
-	path = thirdparty/gtest/gtest
-	url = https://github.com/openvinotoolkit/googletest.git
-	ignore = dirty
-[submodule "thirdparty/ocl/icd_loader"]
-	path = thirdparty/ocl/icd_loader
-	url = https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
-	ignore = dirty
-[submodule "thirdparty/ocl/cl_headers"]
-	path = thirdparty/ocl/cl_headers
-	url = https://github.com/KhronosGroup/OpenCL-Headers.git
-	ignore = dirty
-[submodule "thirdparty/ocl/clhpp_headers"]
-	path = thirdparty/ocl/clhpp_headers
-	url = https://github.com/KhronosGroup/OpenCL-CLHPP.git
-	ignore = dirty
-[submodule "thirdparty/onnx"]
-	path = thirdparty/onnx/onnx
-	url = https://github.com/onnx/onnx.git
-[submodule "thirdparty/protobuf"]
-	path = thirdparty/protobuf/protobuf
-	url = https://github.com/protocolbuffers/protobuf.git
-[submodule "src/bindings/python/thirdparty/pybind11"]
-	path = src/bindings/python/thirdparty/pybind11
-	url = https://github.com/pybind/pybind11.git
-[submodule "thirdparty/ittapi/ittapi"]
-	path = thirdparty/ittapi/ittapi
-	url = https://github.com/intel/ittapi.git
-[submodule "ncc"]
-	path = cmake/developer_package/ncc_naming_style/ncc
-	url = https://github.com/nithinn/ncc.git
-[submodule "thirdparty/onednn_gpu"]
-	path = src/plugins/intel_gpu/thirdparty/onednn_gpu
-	url = https://github.com/oneapi-src/oneDNN.git
-[submodule "tools/pot/thirdparty/open_model_zoo"]
-	path = thirdparty/open_model_zoo
-	url = https://github.com/openvinotoolkit/open_model_zoo.git
-[submodule "thirdparty/json/nlohmann_json"]
-	path = thirdparty/json/nlohmann_json
-	url = https://github.com/nlohmann/json.git
-	shallow = true
-[submodule "thirdparty/json/nlohmann_json_schema_validator"]
-	path = thirdparty/json/nlohmann_json_schema_validator
-	url = https://github.com/pboettch/json-schema-validator.git
-	shallow = true

CMakeLists.txt

@@ -1,22 +1,16 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(DEFINED BUILD_SHARED_LIBS AND NOT BUILD_SHARED_LIBS)
-    # 'target_link_libraries' does not work correctly when called from
-    # different directly where 'add_library' is called: CMake generates
-    # incorrect OpenVINOConfig.cmake in this case
-    cmake_minimum_required(VERSION 3.17)
-else()
-    cmake_minimum_required(VERSION 3.13)
-endif()
+cmake_minimum_required(VERSION 3.13)
 
-project(OpenVINO DESCRIPTION "OpenVINO toolkit")
+project(OpenVINO)
 
-set(IE_MAIN_SOURCE_DIR ${OpenVINO_SOURCE_DIR}/inference-engine)
+set(OpenVINO_MAIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(IE_MAIN_SOURCE_DIR ${OpenVINO_MAIN_SOURCE_DIR}/inference-engine)
 
 find_package(IEDevScripts REQUIRED
-             PATHS "${OpenVINO_SOURCE_DIR}/cmake/developer_package"
+             PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
              NO_CMAKE_FIND_ROOT_PATH
              NO_DEFAULT_PATH)
 
@@ -26,37 +20,97 @@ include(cmake/features.cmake)
 # These options are shared with 3rdparty plugins by means of developer package
 include(cmake/dependencies.cmake)
 
-if(ENABLE_COVERAGE)
-    include(cmake/coverage.cmake)
-endif()
-
 # resolving dependencies for the project
 message (STATUS "PROJECT ............................... " ${PROJECT_NAME})
-message (STATUS "CMAKE_VERSION ......................... " ${CMAKE_VERSION})
 message (STATUS "CMAKE_BINARY_DIR ...................... " ${CMAKE_BINARY_DIR})
-message (STATUS "CMAKE_SOURCE_DIR ...................... " ${CMAKE_SOURCE_DIR})
-message (STATUS "OpenVINO_SOURCE_DIR ................... " ${OpenVINO_SOURCE_DIR})
-message (STATUS "OpenVINO_BINARY_DIR ................... " ${OpenVINO_BINARY_DIR})
+message (STATUS "OpenVINO_MAIN_SOURCE_DIR .............. " ${OpenVINO_MAIN_SOURCE_DIR})
+message (STATUS "IE_MAIN_SOURCE_DIR .................... " ${IE_MAIN_SOURCE_DIR})
 message (STATUS "CMAKE_GENERATOR ....................... " ${CMAKE_GENERATOR})
 message (STATUS "CMAKE_C_COMPILER_ID ................... " ${CMAKE_C_COMPILER_ID})
-message (STATUS "CMAKE_CXX_COMPILER_ID ................. " ${CMAKE_CXX_COMPILER_ID})
 message (STATUS "CMAKE_BUILD_TYPE ...................... " ${CMAKE_BUILD_TYPE})
-message (STATUS "CMAKE_TOOLCHAIN_FILE .................. " ${CMAKE_TOOLCHAIN_FILE})
 
 # remove file with exported developer targets to force its regeneration
-file(REMOVE "${CMAKE_BINARY_DIR}/ngraphTargets.cmake")
-file(REMOVE "${CMAKE_BINARY_DIR}/InferenceEngineTargets.cmake")
-file(REMOVE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")
+file(REMOVE "${CMAKE_BINARY_DIR}/inference_engine_targets.cmake")
 foreach(component IN LISTS openvino_export_components)
     file(REMOVE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
     unset(${component} CACHE)
 endforeach()
-unset(openvino_export_components CACHE)
 
 #
 # Build
 #
 
+function(build_ngraph)
+    function(ngraph_set option value)
+        if(NOT DEFINED ${option})
+            set(${option} ${value} CACHE BOOL "" FORCE)
+        endif()
+    endfunction()
+
+    if (ENABLE_SANITIZER)
+        ngraph_set(NGRAPH_ADDRESS_SANITIZER ON)
+    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)
+    else()
+        ngraph_set(NGRAPH_UNIT_TEST_ENABLE OFF)
+    endif()
+
+    if(NOT (ANDROID OR WINDOWS_STORE OR (MSVC AND (ARM OR AARCH64)) ))
+        ngraph_set(NGRAPH_ONNX_IMPORT_ENABLE ON)
+    else()
+        ngraph_set(NGRAPH_ONNX_IMPORT_ENABLE OFF)
+    endif()
+    ngraph_set(NGRAPH_INTERPRETER_ENABLE ON)
+
+    if(TREAT_WARNING_AS_ERROR)
+        ngraph_set(NGRAPH_WARNINGS_AS_ERRORS ON)
+    else()
+        ngraph_set(NGRAPH_WARNINGS_AS_ERRORS OFF)
+    endif()
+
+    if(ENABLE_SANITIZER)
+        ngraph_set(NGRAPH_ADDRESS_SANITIZER_ENABLE ON)
+    else()
+        ngraph_set(NGRAPH_ADDRESS_SANITIZER_ENABLE OFF)
+    endif()
+
+    if(ENABLE_THREAD_SANITIZER)
+        ngraph_set(NGRAPH_THREAD_SANITIZER_ENABLE ON)
+    else()
+        ngraph_set(NGRAPH_THREAD_SANITIZER_ENABLE OFF)
+    endif()
+
+    if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
+        ie_add_compiler_flags(-Wno-error=uninitialized -Wno-error=literal-conversion)
+    elseif(UNIX)
+        ie_add_compiler_flags(-Wno-error=maybe-uninitialized -Wno-error=return-type)
+    endif()
+
+    # WA for GCC 7.0
+    if (UNIX)
+        ie_add_compiler_flags(-Wno-error=return-type -Wno-undef)
+    elseif(WIN32)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4308 /wd4146 /wd4703 /wd4244 /wd4819")
+    endif()
+
+    if(ENABLE_LTO)
+        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON)
+    endif()
+
+    ie_cpack_add_component(ngraph)
+
+    set(SDL_cmake_included ON)
+    set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/")
+    add_subdirectory(ngraph)
+    set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE)
+    set(NGRAPH_REF_LIBRARIES ngraph_reference PARENT_SCOPE)
+endfunction()
+
 function(openvino_developer_export_targets)
     cmake_parse_arguments(EXPORT "" "COMPONENT" "TARGETS" ${ARGN})
 
@@ -89,25 +143,74 @@ function(openvino_developer_export_targets)
         "A list of OpenVINO exported components" FORCE)
 endfunction()
 
-# add target with processed tests model zoo
-include(cmake/test_model_zoo.cmake)
-
 add_subdirectory(thirdparty)
-add_subdirectory(src)
-add_subdirectory(samples)
-
-# Enable interpreter backend
-if (ENABLE_TESTS OR ENABLE_TEMPLATE)
-    add_subdirectory(docs/template_plugin/backend)
-endif()
-include(cmake/extra_modules.cmake)
+add_subdirectory(openvino)
+build_ngraph()
+add_subdirectory(inference-engine)
+add_subdirectory(model-optimizer)
 add_subdirectory(docs)
-add_subdirectory(tools)
-add_subdirectory(scripts)
-add_subdirectory(licensing)
 
 #
-# CPack
+# Shellcheck
 #
 
+ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
+                      SKIP "${OpenVINO_MAIN_SOURCE_DIR}/bin"
+                           "${OpenVINO_MAIN_SOURCE_DIR}/build"
+                           "${OpenVINO_MAIN_SOURCE_DIR}/thirdparty"
+                           "${IE_MAIN_SOURCE_DIR}/tests/ie_test_utils/common_test_utils/gtest"
+                           "${IE_MAIN_SOURCE_DIR}/samples/thirdparty"
+                           "${IE_MAIN_SOURCE_DIR}/thirdparty"
+                           "${IE_MAIN_SOURCE_DIR}/temp"
+                           # TODO fix and enable back:
+                           "${OpenVINO_MAIN_SOURCE_DIR}/scripts/install_dependencies"
+                           "${OpenVINO_MAIN_SOURCE_DIR}/scripts/demo"
+                           "${OpenVINO_MAIN_SOURCE_DIR}/ngraph"
+                           "${IE_MAIN_SOURCE_DIR}/scripts")
+
+#
+# cpack
+#
+
+# install setupvars
+
+ie_cpack_add_component(setupvars REQUIRED)
+
+if(UNIX)
+    install(PROGRAMS scripts/setupvars/setupvars.sh
+            DESTINATION bin
+            COMPONENT setupvars)
+elseif(WIN32)
+    install(PROGRAMS scripts/setupvars/setupvars.bat
+            DESTINATION bin
+            COMPONENT setupvars)
+endif()
+
+# install install_dependencies
+
+if(UNIX)
+    ie_cpack_add_component(install_dependencies REQUIRED)
+    install(DIRECTORY scripts/install_dependencies/
+            DESTINATION install_dependencies
+            COMPONENT install_dependencies)
+endif()
+
+# install files for demo
+
+ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core)
+
+if(UNIX)
+    install(DIRECTORY scripts/demo/
+            DESTINATION deployment_tools/demo
+            COMPONENT demo_scripts
+            USE_SOURCE_PERMISSIONS
+            PATTERN *.bat EXCLUDE)
+elseif(WIN32)
+    install(DIRECTORY scripts/demo/
+            DESTINATION deployment_tools/demo
+            COMPONENT demo_scripts
+            USE_SOURCE_PERMISSIONS
+            PATTERN *.sh EXCLUDE)
+endif()
+
 ie_cpack(${IE_CPACK_COMPONENTS_ALL})

CODEOWNERS

@@ -6,82 +6,70 @@ CODEOWNERS  @openvinotoolkit/openvino-admins @openvinotoolkit/openvino-maintaine
 
 # CI:
 Jenkinsfile  @openvinotoolkit/openvino-admins
+azure-pipelines.yml  @openvinotoolkit/openvino-admins
 /.github/  @openvinotoolkit/openvino-admins
 /.ci/  @openvinotoolkit/openvino-admins
 
-# OpenVINO Samples:
-/samples/  @openvinotoolkit/openvino-samples-maintainers
-
-# OpenVINO Scripts:
-/scripts/  @openvinotoolkit/openvino-scripts-maintainers
-
 # QA Tests:
 /tests/  @openvinotoolkit/openvino-tests-maintainers
 
-# Tools:
-/tools/  @openvinotoolkit/openvino-tools-maintainers
-
-# Model Optimizer:
-/tools/mo/  @openvinotoolkit/openvino-mo-maintainers
-
-# POT:
-/tools/pot/  @openvinotoolkit/openvino-pot-maintainers
+# OpenVINO Scripts
+/scripts/ @openvinotoolkit/openvino-admins @openvinotoolkit/openvino-scripts-maintainers
 
 # IE Core:
 /inference-engine/  @openvinotoolkit/openvino-ie-maintainers
-/src/bindings/python/ @openvinotoolkit/openvino-ie-python-api-maintainers
-/src/common/transformations/  @GlebKazantaev @ilyachur
-/src/common/legacy/  @openvinotoolkit/openvino-ngraph-maintainers
-/src/common/  @openvinotoolkit/openvino-ie-maintainers
-/src/core/  @openvinotoolkit/openvino-ngraph-maintainers
-/src/frontends/  @openvinotoolkit/openvino-ngraph-maintainers
-/src/tests_deprecated/readers/  @openvinotoolkit/openvino-ngraph-maintainers
+/inference-engine/ie_bridges/python @openvinotoolkit/openvino-ie-python-api-maintainers
+/inference-engine/src/transformations/  @GlebKazantaev @ilyachur
+/inference-engine/src/legacy_api/  @openvinotoolkit/openvino-ngraph-maintainers
+/inference-engine/src/readers/  @openvinotoolkit/openvino-ngraph-maintainers
 
 # IE CPU:
-/src/plugins/intel_cpu/  @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers
-/src/common/low_precision_transformations/  @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers
-/src/plugins/intel_cpu/thirdparty/mkl-dnn/  @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers
+/inference-engine/src/mkldnn_plugin/  @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers
+/inference-engine/src/low_precision_transformations/  @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers
+/inference-engine/thirdparty/mkl-dnn/  @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers
 
 # IE GPU:
-/src/inference/include/ie/gpu/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
-/src/inference/include/ie/cldnn/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
-/src/inference/include/openvino/runtime/intel_gpu/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
-/src/plugins/intel_gpu/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
+/inference-engine/src/cldnn_engine/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
+/inference-engine/include/gpu/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
+/inference-engine/include/cldnn/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
+/inference-engine/thirdparty/clDNN/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
 
 # IE VPU:
-/src/plugins/intel_myriad  @openvinotoolkit/openvino-ie-vpu-maintainers
-/src/inference/include/ie/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers
-/src/tests_deprecated/unit/engines/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
-/src/tests_deprecated/functional/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
-/src/tests_deprecated/behavior/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
-/src/tests/functional/plugin/myriad/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
-/src/tests/unit/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
-/src/tests/unit/engines/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/src/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers
+/inference-engine/include/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers
+/inference-engine/thirdparty/movidius/  @openvinotoolkit/openvino-ie-vpu-maintainers
+/inference-engine/tests_deprecated/unit/engines/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/tests_deprecated/functional/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/tests_deprecated/behavior/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/tests/functional/plugin/myriad/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/tests/unit/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/tests/unit/engines/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/tools/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers
 /inference-engine/scripts/run_tests_myriad_multistick.sh  @openvinotoolkit/openvino-ie-vpu-maintainers
 
 # IE GNA:
-/src/plugins/intel_gna/  @openvinotoolkit/openvino-ie-gna-maintainers
-/src/inference/include/ie/gna/  @openvinotoolkit/openvino-ie-gna-maintainers
+/inference-engine/src/gna_plugin/  @openvinotoolkit/openvino-ie-gna-maintainers
+/inference-engine/include/gna/  @openvinotoolkit/openvino-ie-gna-maintainers
 
-# IE Auto (MULTI) plugin:
-/src/plugins/auto/  @openvinotoolkit/openvino-ie-auto-multi-maintainers
-/src/inference/include/ie/multi-device/  @openvinotoolkit/openvino-ie-auto-multi-maintainers
-
-# IE Paddle frontend:
-/src/frontends/paddle/  @openvinotoolkit/openvino-ie-paddle-maintainers
+# IE MULTI:
+/inference-engine/src/multi_device/  @openvinotoolkit/openvino-ie-multi-maintainers
+/inference-engine/include/multi-device/  @openvinotoolkit/openvino-ie-multi-maintainers
 
 # IE Tests:
-/src/tests/  @openvinotoolkit/openvino-ie-tests-maintainers
-/src/tests_deprecated/  @openvinotoolkit/openvino-ie-tests-maintainers
-/src/tests/functional/inference_engine/ngraph_reader/  @openvinotoolkit/openvino-ie-tests-maintainers @openvinotoolkit/openvino-ngraph-maintainers
-/src/tests/functional/inference_engine/transformations/  @openvinotoolkit/openvino-ie-tests-maintainers @openvinotoolkit/openvino-ngraph-maintainers
+/inference-engine/tests/  @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/tests_deprecated/  @openvinotoolkit/openvino-ie-tests-maintainers
+/inference-engine/tests/functional/inference_engine/ngraph_reader/  @openvinotoolkit/openvino-ie-tests-maintainers @openvinotoolkit/openvino-ngraph-maintainers
+/inference-engine/tests/functional/inference_engine/transformations/  @openvinotoolkit/openvino-ie-tests-maintainers @openvinotoolkit/openvino-ngraph-maintainers
 
-# Documentation:
+# MO:
+/model-optimizer/  @openvinotoolkit/openvino-mo-maintainers
+
+# nGraph:
+/ngraph/  @openvinotoolkit/openvino-ngraph-maintainers
+
+# Tools
+/tools/  @openvinotoolkit/openvino-tools-maintainers
+
+# Documentation
 /docs/  @openvinotoolkit/openvino-docs-maintainers
-/docs/template_plugin/  @openvinotoolkit/openvino-ie-template-maintainers
 *.md  @openvinotoolkit/openvino-docs-maintainers
-
-# Control 3d party dependencies
-**/*requirements*.*  @openvino-configuration-mgmt
-**/setup.py  @openvino-configuration-mgmt
-/scripts/install_dependencies/  @openvino-configuration-mgmt

CONTRIBUTING.md

@@ -1,68 +0,0 @@
-# How to contribute to the OpenVINO repository
-
-We suppose that you are an enthusiastic coder, want to contribute some code. For that purpose OpenVINO project now has a repository on the GitHub, to simplify everybody's life! All the bug fixes, new functionality, new tutorials etc. should be submitted via the GitHub's mechanism of pull requests.
-
-If you are not familiar with the mechanism - do not worry, it's very simple. Keep reading.
-
-## Before you start contributing you should
-
--   Make sure you agree to contribute your code under  [OpenVINO (Apache 2.0)](https://github.com/openvinotoolkit/openvino/blob/master/LICENSE)  license.
--   If you are submitting a new module, you should go into  [openvino_contrib](https://github.com/openvinotoolkit/openvino_contrib)  repository by default.
--   If you are going to fix a bug, check that it's still exists. This can be done by building the latest  [releases/2020/3](https://github.com/openvinotoolkit/openvino/tree/releases/2020/3)  branch (LTS release) or the latest master branch, and make sure that the error is still reproducible there. We do not fix bugs that only affect older non-LTS releases like 2020.2 for example (more details about  [branching strategy](https://github.com/openvinotoolkit/openvino/wiki/Branches))
--   Make sure that nobody beat you into fixing or reporting the issue by doing a search on the  [Github OpenVINO issues](https://github.com/openvinotoolkit/openvino/issues)  page, and making sure that there isn't someone working on it. In the latter case you might provide support or suggestion in the issue or in the linked pull request.
--   If you have a question about the software, then this is  **NOT**  the right place. You should open up a question at the  [OpenVINO forum](https://community.intel.com/t5/Intel-Distribution-of-OpenVINO/bd-p/distribution-openvino-toolkit). In order to post a decent question from the start, feel free to read the official forum guidelines.
-
-Before you open up anything on the OpenVINO GitHub page, be sure that you are at the right place with your problem.
-
-## "Fork & Pull Request model" for code contribution
-
-### [](https://github.com/openvinotoolkit/openvino/wiki/Contribute#the-instruction-in-brief)The instruction in brief
-
--   Register at GitHub. Create your fork of OpenVINO repository  [https://github.com/openvinotoolkit/openvino](https://github.com/openvinotoolkit/openvino)  (see  [https://help.github.com/articles/fork-a-repo](https://help.github.com/articles/fork-a-repo)  for details).
--   Install Git.
-    -   Set your user name and email address in a Git configuration according to GitHub account (see  [https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup)  for details).
--   Choose a task for yourself. It could be a bugfix or some new code.
--   Choose a base branch for your work. More details about branches and policies are here:  [Branches](https://github.com/openvinotoolkit/openvino/wiki/Branches)
--   Clone your fork to your computer.
--   Create a new branch (with a meaningful name) from the base branch you chose.
--   Modify / add the code following our  [Coding Style Guide](https://github.com/openvinotoolkit/openvino/wiki/CodingStyleGuideLines)  and  [Documentation guidelines](https://github.com/openvinotoolkit/openvino/wiki/CodingStyleGuideLinesDocumentation).
--   If you want to add a new sample, please look at this  [Guide for contributing to C++/C/Python IE samples](https://github.com/openvinotoolkit/openvino/wiki/SampleContribute)
--   Run testsuite locally:
-    -   execute each test binary from the artifacts directory, e.g.  `<source dir>/bin/intel64/Release/ieFuncTests`
--   If you contribute to the documentation and want to add a new guide:
-    -   Create a new markdown file in an appropriate folder.
-    -   **REQUIRED:**  The document title must contain a document label in a form:  `{#openvino_docs_<name>}`. For example:  `Deep Learning Network Intermediate Representation and Operation Sets in OpenVINO™ {#openvino_docs_MO_DG_IR_and_opsets}`.
-    -   Add your file to the documentation structure. Open the documentation structure file  [`docs/doxygen/ie_docs.xml`](https://github.com/openvinotoolkit/openvino/blob/master/docs/doxygen/ie_docs.xml)  and add your file path to the appropriate section.
--   When you are done, make sure that your branch is to date with latest state of the branch you want to contribute to (e.g.  `git fetch upstream && git merge upstream/master`), push your branch to your GitHub fork; then create a pull request from your branch to the base branch (see  [https://help.github.com/articles/using-pull-requests](https://help.github.com/articles/using-pull-requests)  for details).
-
-## Making a good pull request
-
-Following these guidelines will increase the likelihood of your pull request being accepted:
-
--   Before pushing your PR to the repository, make sure that it builds perfectly fine on your local system.
--   Add enough information, like a meaningful title, the reason why you made the commit and a link to the issue page if you opened one for this PR.
--   Scope your PR to one issue. Before submitting, make sure the diff contains no unrelated changes. If you want to cover more than one issue, submit your changes for each as separate pull requests.
--   If you have added new functionality, you should update/create the relevant documentation, as well as add tests for it to the testsuite.
--   Try not to include "oops" commits - ones that just fix an error in the previous commit. If you have those, then before submitting  [squash](https://github.com/openvinotoolkit/openvino/wiki/Contribute#https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits)  those fixes directly into the commits where they belong.
--   Make sure to choose the right base branch and to follow the  [Coding Style Guide](https://github.com/openvinotoolkit/openvino/wiki/CodingStyleGuideLines)  for your code or  [Documentation guidelines](https://github.com/openvinotoolkit/openvino/wiki/CodingStyleGuideLinesDocumentation)  you are changing documentation files.
--   Make sure to add test for new functionality or test that reproduces fixed bug with related test data. Please do not add extra images or videos, if some of existing media files are suitable.
-
-## Testing and merging pull requests
-
--   Your pull request will be automatically tested by OpenVINO's precommit (testing status are automatically reported as "green" or "red" circles in precommit steps on PR's page). If any builders have failed, you should fix the issue. To rerun the automatic builds just push changes to your branch on GitHub. No need to close pull request and open a new one!
--   Once all the builders are "green", one of OpenVINO developers will review your code. Reviewer could ask you to modify your pull request. Please provide timely response for reviewers (within weeks, not months), otherwise you submission could be postponed or even rejected.
-
-## PR review good practices
-
--   Originator is responsible for driving the review of changes and should ping reviewers periodically.
--   Originator should close comments from the Reviewer when it is resolved. The Reviewer may re-open the comment if he does not agree with the resolution.
--   Originator should request re-review from the Reviewer when all comments are resolved by pushing the button in the “Reviewers” section.
--   If it is still WIP and you want to check CI test results early then use  _Draft_  PR.
--   Do  **NOT**  rewrite history (push -f) once you converted draft PR into regular one, add new commits instead. Looking at diffs makes review easier.
--   Write meaningful description of commits resulting from review.  _"Addressing review comments"_  is  **NOT**  a good description! Having a quick look at good descriptions can tell you much what is going on in PR without a need to go through all of resolved comments.
-
-## Merging PR
-
-As soon as the reviewer is fine with the pull request and Precommit likes your code and shows "green" status, the "Approved" review status is put, which signals OpenVINO maintainers that they can merge your pull request.
-
-© Copyright 2018-2022, OpenVINO team

Jenkinsfile

@@ -13,7 +13,6 @@ properties([
                name: 'library_version')
     ])
 ])
-
 loadOpenVinoLibrary {
     entrypoint(this)
 }

README.md

@@ -1,34 +1,34 @@
 # OpenVINO™ Toolkit
-[![Stable release](https://img.shields.io/badge/version-2021.4.2-green.svg)](https://github.com/openvinotoolkit/openvino/releases/tag/2021.4.2)
+[![Stable release](https://img.shields.io/badge/version-2021.3-green.svg)](https://github.com/openvinotoolkit/openvino/releases/tag/2021.3)
 [![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE)
 ![GitHub branch checks state](https://img.shields.io/github/checks-status/openvinotoolkit/openvino/master?label=GitHub%20checks)
 ![Azure DevOps builds (branch)](https://img.shields.io/azure-devops/build/openvinoci/b2bab62f-ab2f-4871-a538-86ea1be7d20f/13?label=Public%20CI)
-[![PyPI Downloads](https://pepy.tech/badge/openvino)](https://pepy.tech/project/openvino)
 
 This toolkit allows developers to deploy pre-trained deep learning models
-through a high-level OpenVINO™ Runtime C++ and Python APIs integrated with application logic.
+through a high-level C++ Inference Engine API integrated with application logic.
 
-This open source version includes several components: namely [Model Optimizer], [OpenVINO™ Runtime], [Post-Training Optimization Tool], as well as CPU, GPU, MYRIAD, multi device and heterogeneous plugins to accelerate deep learning inferencing on Intel® CPUs and Intel® Processor Graphics.
+This open source version includes several components: namely [Model Optimizer], [nGraph] and
+[Inference Engine], as well as CPU, GPU, MYRIAD, multi device and heterogeneous plugins to accelerate deep learning inferencing on Intel® CPUs and Intel® Processor Graphics.
 It supports pre-trained models from the [Open Model Zoo], along with 100+ open
-source and public models in popular formats such as TensorFlow, ONNX, PaddlePaddle, MXNet, Caffe, Kaldi.
+source and public models in popular formats such as Caffe\*, TensorFlow\*,
+MXNet\* and ONNX\*.
 
-## Repository components
-* [OpenVINO™ Runtime]
+## Repository components:
+* [Inference Engine]
+* [nGraph]
 * [Model Optimizer]
-* [Post-Training Optimization Tool]
-
 
 ## License
 Deep Learning Deployment Toolkit is licensed under [Apache License Version 2.0](LICENSE).
 By contributing to the project, you agree to the license and copyright terms therein
 and release your contribution under these terms.
 
-## Resources
-* Docs: https://docs.openvino.ai/
+## Resources:
+* Docs: https://docs.openvinotoolkit.org/
 * Wiki: https://github.com/openvinotoolkit/openvino/wiki
 * Issue tracking: https://github.com/openvinotoolkit/openvino/issues
 * Storage: https://storage.openvinotoolkit.org/
-* Additional OpenVINO™ toolkit modules: https://github.com/openvinotoolkit/openvino_contrib
+* Additional OpenVINO™ modules: https://github.com/openvinotoolkit/openvino_contrib
 * [Intel® Distribution of OpenVINO™ toolkit Product Page](https://software.intel.com/content/www/us/en/develop/tools/openvino-toolkit.html)
 * [Intel® Distribution of OpenVINO™ toolkit Release Notes](https://software.intel.com/en-us/articles/OpenVINO-RelNotes)
 
@@ -42,9 +42,8 @@ Please report questions, issues and suggestions using:
 ---
 \* Other names and brands may be claimed as the property of others.
 
-[Open Model Zoo]:https://github.com/openvinotoolkit/open_model_zoo
-[OpenVINO™ Runtime]:https://docs.openvino.ai/latest/openvino_docs_OV_Runtime_User_Guide.html
-[Model Optimizer]:https://docs.openvino.ai/latest/openvino_docs_MO_DG_Deep_Learning_Model_Optimizer_DevGuide.html
-[Post-Training Optimization Tool]:https://docs.openvino.ai/latest/pot_README.html
+[Open Model Zoo]:https://github.com/opencv/open_model_zoo
+[Inference Engine]:https://software.intel.com/en-us/articles/OpenVINO-InferEngine
+[Model Optimizer]:https://software.intel.com/en-us/articles/OpenVINO-ModelOptimizer
 [tag on StackOverflow]:https://stackoverflow.com/search?q=%23openvino
-
+[nGraph]:https://docs.openvinotoolkit.org/latest/openvino_docs_nGraph_DG_DevGuide.html

cmake/arm.toolchain.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/arm64.toolchain.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/coverage.cmake

@@ -1,93 +0,0 @@
-# Copyright (C) 2018-2022 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set(OV_COVERAGE_BASE_DIRECTORY "${OpenVINO_SOURCE_DIR}")
-
-ie_coverage_clean(REPOSITORY "openvino"
-                  DIRECTORY "${OV_COVERAGE_GCDA_DATA_DIRECTORY}")
-ie_coverage_capture(INFO_FILE "openvino"
-                    BASE_DIRECTORY "${OV_COVERAGE_BASE_DIRECTORY}"
-                    DIRECTORY "${OV_COVERAGE_GCDA_DATA_DIRECTORY}")
-
-# Generate reports
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "inference"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/inference/*")
-
-ie_coverage_genhtml(INFO_FILE "inference"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "legacy"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/common/legacy/*")
-ie_coverage_genhtml(INFO_FILE "legacy"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "hetero_plugin"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/hetero/*")
-ie_coverage_genhtml(INFO_FILE "hetero_plugin"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "auto_plugin"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/auto/*")
-ie_coverage_genhtml(INFO_FILE "auto_plugin"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "preprocessing"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}src/common/preprocessing/*")
-ie_coverage_genhtml(INFO_FILE "preprocessing"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "transformations"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/common/transformations/*")
-ie_coverage_genhtml(INFO_FILE "transformations"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "snippets"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/common/snippets/*")
-ie_coverage_genhtml(INFO_FILE "snippets"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "low_precision_transformations"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/common/low_precision_transformations/*")
-ie_coverage_genhtml(INFO_FILE "low_precision_transformations"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "template_plugin"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/docs/template_plugin/*")
-ie_coverage_genhtml(INFO_FILE "template_plugin"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-if(ENABLE_INTEL_CPU)
-    ie_coverage_extract(INPUT "openvino" OUTPUT "intel_cpu_plugin"
-                        PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/intel_cpu/*")
-    ie_coverage_genhtml(INFO_FILE "intel_cpu_plugin"
-                        PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-endif()
-
-if (ENABLE_INTEL_GPU)
-    ie_coverage_extract(INPUT "openvino" OUTPUT "intel_gpu_plugin"
-                        PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/intel_gpu/*")
-    ie_coverage_genhtml(INFO_FILE "intel_gpu_plugin"
-                        PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-endif()
-
-if(ENABLE_INTEL_GNA)
-    ie_coverage_extract(INPUT "openvino" OUTPUT "intel_gna_plugin"
-                        PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/intel_gna/*")
-    ie_coverage_genhtml(INFO_FILE "intel_gna_plugin"
-                        PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-endif()
-
-ie_coverage_extract(INPUT "openvino" OUTPUT "core"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/core/*")
-ie_coverage_genhtml(INFO_FILE "core"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
-if(ENABLE_OV_ONNX_FRONTEND)
-    ie_coverage_extract(INPUT "openvino" OUTPUT "onnx"
-        PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/frontends/onnx/*"
-        "${OV_COVERAGE_BASE_DIRECTORY}/src/frontends/onnx/*")
-    ie_coverage_genhtml(INFO_FILE "onnx"
-        PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-endif()

cmake/dependencies.cmake

@@ -1,45 +1,22 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
-cmake_policy(SET CMP0054 NEW)
-
-# TODO: fix it
-set_temp_directory(TEMP "${CMAKE_SOURCE_DIR}")
-
-if(ENABLE_SAME_BRANCH_FOR_MODELS)
-    branchName(MODELS_BRANCH)
-else()
-    set(MODELS_BRANCH "master")
-endif()
-
-if(ENABLE_DATA)
-    add_models_repo(${ENABLE_DATA} "data:https://github.com/openvinotoolkit/testdata.git")
-    set(MODELS_PATH "${TEMP}/models/src/data")
-    set(DATA_PATH "${MODELS_PATH}")
-endif()
-
-message(STATUS "MODELS_PATH=" ${MODELS_PATH})
-
-fetch_models_and_validation_set()
-
-if(COMMAND get_linux_name)
-    get_linux_name(LINUX_OS_NAME)
-endif()
+set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
 
 if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-    set(protoc_version "3.18.2")
+    set(protoc_version "3.7.1")
 
     RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
         ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
         TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
-        SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21"
+        SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8"
     )
     debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
 
     reset_deps_cache(SYSTEM_PROTOC)
 
-    find_host_program(
+    find_program(
         SYSTEM_PROTOC
         NAMES protoc
         PATHS "${SYSTEM_PROTOC_ROOT}/bin"
@@ -50,262 +27,3 @@ if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_
 
     update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
 endif()
-
-if(ENABLE_INTEL_MYRIAD)
-    include(${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/myriad_dependencies.cmake)
-endif()
-
-## Intel OMP package
-if(THREADING STREQUAL "OMP")
-    reset_deps_cache(OMP)
-    if(WIN32 AND X86_64)
-        RESOLVE_DEPENDENCY(OMP
-                ARCHIVE_WIN "iomp.zip"
-                TARGET_PATH "${TEMP}/omp"
-                ENVIRONMENT "OMP"
-                VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*"
-                SHA256 "62c68646747fb10f19b53217cb04a1e10ff93606f992e6b35eb8c31187c68fbf")
-    elseif(LINUX AND X86_64)
-        RESOLVE_DEPENDENCY(OMP
-                ARCHIVE_LIN "iomp.tgz"
-                TARGET_PATH "${TEMP}/omp"
-                ENVIRONMENT "OMP"
-                VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*"
-                SHA256 "7832b16d82513ee880d97c27c7626f9525ebd678decf6a8fe6c38550f73227d9")
-    elseif(APPLE AND X86_64)
-        RESOLVE_DEPENDENCY(OMP
-                ARCHIVE_MAC "iomp_20190130_mac.tgz"
-                TARGET_PATH "${TEMP}/omp"
-                ENVIRONMENT "OMP"
-                VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*"
-                SHA256 "591ea4a7e08bbe0062648916f42bded71d24c27f00af30a8f31a29b5878ea0cc")
-    else()
-        message(FATAL_ERROR "Intel OMP is not available on current platform")
-    endif()
-    update_deps_cache(OMP "${OMP}" "Path to OMP root folder")
-    debug_message(STATUS "intel_omp=" ${OMP})
-
-    ie_cpack_add_component(omp REQUIRED)
-    file(GLOB_RECURSE source_list "${OMP}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
-    install(FILES ${source_list}
-            DESTINATION "runtime/3rdparty/omp/lib"
-            COMPONENT omp)
-endif()
-
-## TBB package
-if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
-    reset_deps_cache(TBBROOT TBB_DIR)
-
-    if(DEFINED ENV{THIRDPARTY_SERVER_PATH})
-        set(IE_PATH_TO_DEPS "$ENV{THIRDPARTY_SERVER_PATH}")
-    elseif(DEFINED THIRDPARTY_SERVER_PATH)
-        set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}")
-    endif()
-
-    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_20200415_win.zip"
-                TARGET_PATH "${TEMP}/tbb"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
-        if(ENABLE_TBBBIND_2_5)
-            RESOLVE_DEPENDENCY(TBBBIND_2_5
-                    ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip"
-                    TARGET_PATH "${TEMP}/tbbbind_2_5"
-                    ENVIRONMENT "TBBBIND_2_5_ROOT"
-                    SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1")
-        else()
-            message(WARNING "prebuilt TBBBIND_2_5 is not available.
-    Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure")
-        endif()
-    elseif(ANDROID)  # Should be before LINUX due LINUX is detected as well
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
-                TARGET_PATH "${TEMP}/tbb"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
-    elseif(LINUX AND X86_64)
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
-                TARGET_PATH "${TEMP}/tbb"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
-        if(ENABLE_TBBBIND_2_5)
-            RESOLVE_DEPENDENCY(TBBBIND_2_5
-                    ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz"
-                    TARGET_PATH "${TEMP}/tbbbind_2_5"
-                    ENVIRONMENT "TBBBIND_2_5_ROOT"
-                    SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4")
-        else()
-            message(WARNING "prebuilt TBBBIND_2_5 is not available.
-    Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure")
-        endif()
-    elseif(LINUX AND AARCH64)
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
-                TARGET_PATH "${TEMP}/tbb_yocto"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
-    elseif(APPLE AND X86_64)
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
-                TARGET_PATH "${TEMP}/tbb"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
-    else()
-        message(FATAL_ERROR "TBB is not available on current platform")
-    endif()
-
-    update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
-    if(EXISTS "${TBBROOT}/lib/cmake/TBB/TBBConfig.cmake")
-        # oneTBB case
-        update_deps_cache(TBB_DIR "${TBB}/lib/cmake/TBB" "Path to TBB cmake folder")
-    else()
-        update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder")
-    endif()
-
-    update_deps_cache(TBBBIND_2_5_DIR "${TBBBIND_2_5}/cmake" "Path to TBBBIND_2_5 cmake folder")
-    debug_message(STATUS "tbb=" ${TBB})
-
-    if(DEFINED IE_PATH_TO_DEPS)
-        unset(IE_PATH_TO_DEPS)
-    endif()
-endif()
-
-## OpenCV
-if(ENABLE_OPENCV)
-    reset_deps_cache(OpenCV_DIR)
-
-    set(OPENCV_VERSION "4.5.2")
-    set(OPENCV_BUILD "076")
-    set(OPENCV_BUILD_YOCTO "772")
-
-    if(AARCH64)
-        if(DEFINED ENV{THIRDPARTY_SERVER_PATH})
-            set(IE_PATH_TO_DEPS "$ENV{THIRDPARTY_SERVER_PATH}")
-        elseif(DEFINED THIRDPARTY_SERVER_PATH)
-            set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}")
-        else()
-            message(WARNING "OpenCV is not found!")
-        endif()
-
-        if(DEFINED IE_PATH_TO_DEPS)
-            set(OPENCV_SUFFIX "yocto_kmb")
-            set(OPENCV_BUILD "${OPENCV_BUILD_YOCTO}")
-
-            RESOLVE_DEPENDENCY(OPENCV
-                    ARCHIVE_LIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_${OPENCV_SUFFIX}.txz"
-                    TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_${OPENCV_SUFFIX}/opencv"
-                    ENVIRONMENT "OpenCV_DIR"
-                    VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*"
-                    SHA256 "23c250796ad5fc9db810e1680ccdb32c45dc0e50cace5e0f02b30faf652fe343")
-
-            unset(IE_PATH_TO_DEPS)
-        endif()
-    else()
-        if(WIN32 AND X86_64)
-            RESOLVE_DEPENDENCY(OPENCV
-                    ARCHIVE_WIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}.txz"
-                    TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}/opencv"
-                    ENVIRONMENT "OpenCV_DIR"
-                    VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*"
-                    SHA256 "a14f872e6b63b6ac12c7ff47fa49e578d14c14433b57f5d85ab5dd48a079938c")
-        elseif(APPLE AND X86_64)
-            RESOLVE_DEPENDENCY(OPENCV
-                    ARCHIVE_MAC "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_osx.txz"
-                    TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_osx/opencv"
-                    ENVIRONMENT "OpenCV_DIR"
-                    VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*"
-                    SHA256 "3e162f96e86cba8836618134831d9cf76df0438778b3e27e261dedad9254c514")
-        elseif(LINUX)
-            if(AARCH64)
-                set(OPENCV_SUFFIX "yocto_kmb")
-                set(OPENCV_BUILD "${OPENCV_BUILD_YOCTO}")
-            elseif(ARM)
-                set(OPENCV_SUFFIX "debian9arm")
-                set(OPENCV_HASH "4274f8c40b17215f4049096b524e4a330519f3e76813c5a3639b69c48633d34e")
-            elseif((LINUX_OS_NAME STREQUAL "CentOS 7" OR
-                     CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") AND X86_64)
-                set(OPENCV_SUFFIX "centos7")
-                set(OPENCV_HASH "5fa76985c84fe7c64531682ef0b272510c51ac0d0565622514edf1c88b33404a")
-            elseif(LINUX_OS_NAME MATCHES "CentOS 8" AND X86_64)
-                set(OPENCV_SUFFIX "centos8")
-                set(OPENCV_HASH "db087dfd412eedb8161636ec083ada85ff278109948d1d62a06b0f52e1f04202")
-            elseif(LINUX_OS_NAME STREQUAL "Ubuntu 16.04" AND X86_64)
-                set(OPENCV_SUFFIX "ubuntu16")
-                set(OPENCV_HASH "cd46831b4d8d1c0891d8d22ff5b2670d0a465a8a8285243059659a50ceeae2c3")
-            elseif(LINUX_OS_NAME STREQUAL "Ubuntu 18.04" AND X86_64)
-                set(OPENCV_SUFFIX "ubuntu18")
-                set(OPENCV_HASH "db087dfd412eedb8161636ec083ada85ff278109948d1d62a06b0f52e1f04202")
-            elseif((LINUX_OS_NAME STREQUAL "Ubuntu 20.04" OR LINUX_OS_NAME STREQUAL "LinuxMint 20.1") AND X86_64)
-                set(OPENCV_SUFFIX "ubuntu20")
-                set(OPENCV_HASH "2fe7bbc40e1186eb8d099822038cae2821abf617ac7a16fadf98f377c723e268")
-            elseif(NOT DEFINED OpenCV_DIR AND NOT DEFINED ENV{OpenCV_DIR})
-                message(FATAL_ERROR "OpenCV is not available on current platform (${LINUX_OS_NAME})")
-            endif()
-            RESOLVE_DEPENDENCY(OPENCV
-                    ARCHIVE_LIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_${OPENCV_SUFFIX}.txz"
-                    TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_${OPENCV_SUFFIX}/opencv"
-                    ENVIRONMENT "OpenCV_DIR"
-                    VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*"
-                    SHA256 ${OPENCV_HASH})
-        endif()
-    endif()
-
-    if(ANDROID)
-        set(ocv_cmake_path "${OPENCV}/sdk/native/jni/")
-    else()
-        set(ocv_cmake_path "${OPENCV}/cmake")
-    endif()
-
-    update_deps_cache(OpenCV_DIR "${ocv_cmake_path}" "Path to OpenCV package folder")
-    debug_message(STATUS "opencv=" ${OPENCV})
-else()
-    reset_deps_cache(OpenCV_DIR)
-endif()
-
-include(${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake)
-
-if(ENABLE_INTEL_GNA)
-    reset_deps_cache(
-            GNA_EXT_DIR
-            GNA_PLATFORM_DIR
-            GNA_KERNEL_LIB_NAME
-            GNA_LIBS_LIST
-            GNA_LIB_DIR
-            libGNA_INCLUDE_DIRS
-            libGNA_LIBRARIES_BASE_PATH)
-        set(GNA_VERSION "03.00.00.1455.0")
-        set(GNA_HASH "99891696269d8fa10116c96e6b7bda4362736881f0df8df8b56c751ee18e5820")
-
-        set(FILES_TO_EXTRACT_LIST gna_${GNA_VERSION}/include)
-        if(WIN32)
-            LIST(APPEND FILES_TO_EXTRACT_LIST gna_${GNA_VERSION}/win64)
-        else()
-            LIST(APPEND FILES_TO_EXTRACT_LIST gna_${GNA_VERSION}/linux)
-        endif()
-
-        RESOLVE_DEPENDENCY(GNA_EXT_DIR
-                ARCHIVE_UNIFIED "GNA/GNA_${GNA_VERSION}.zip"
-                TARGET_PATH "${TEMP}/gna_${GNA_VERSION}"
-                VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+.[0-9]+).*"
-                FILES_TO_EXTRACT FILES_TO_EXTRACT_LIST
-                SHA256 ${GNA_HASH})
-    update_deps_cache(GNA_EXT_DIR "${GNA_EXT_DIR}" "Path to GNA root folder")
-    debug_message(STATUS "gna=" ${GNA_EXT_DIR})
-
-    if (WIN32)
-        set(GNA_PLATFORM_DIR win64 CACHE STRING "" FORCE)
-    elseif (UNIX)
-        set(GNA_PLATFORM_DIR linux CACHE STRING "" FORCE)
-    else ()
-        message(FATAL_ERROR "GNA not supported on this platform, only linux, and windows")
-    endif ()
-    set(GNA_LIB_DIR x64 CACHE STRING "" FORCE)
-    set(GNA_PATH ${GNA_EXT_DIR}/${GNA_PLATFORM_DIR}/${GNA_LIB_DIR} CACHE STRING "" FORCE)
-
-    if(NOT BUILD_SHARED_LIBS)
-        list(APPEND PATH_VARS "GNA_PATH")
-    endif()
-endif()

cmake/developer_package/FindTBB.cmake

@@ -0,0 +1,33 @@
+# Copyright (C) 2020 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+########################################################################
+#
+#  Perform search of TBB package corresponding with specified search order.
+#
+#  TBBROOT var is set into external package path or has a default value
+#  with IE own version of TBB. Search order is next:
+#   1) ${TBBROOT}/cmake
+#   2) ${TBBROOT} with IE own version of TBBConfig.cmake (actual for TBB < 2017.7)
+#
+
+## Path to IE own version of TBBConfig.cmake old TBB version without cmake config.
+if(APPLE)
+    set(IE_OWN_TBB_CONFIG tbb/mac)
+elseif(UNIX)
+    set(IE_OWN_TBB_CONFIG tbb/lnx)
+elseif(WIN)
+    set(IE_OWN_TBB_CONFIG tbb/win)
+else()
+    unset(IE_OWN_TBB_CONFIG)
+endif()
+
+find_package(TBB
+    CONFIG
+    PATHS ${TBBROOT}/cmake
+          ${IEDevScripts_DIR}/${IE_OWN_TBB_CONFIG}
+    NO_DEFAULT_PATH
+)
+
+find_package_handle_standard_args(TBB CONFIG_MODE)

cmake/developer_package/IEDevScriptsConfig.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -14,13 +14,7 @@ set(CMAKE_MODULE_PATH "${IEDevScripts_DIR}")
 function(set_ci_build_number)
     set(repo_root "${CMAKE_SOURCE_DIR}")
     include(version)
-    foreach(var CI_BUILD_NUMBER IE_VERSION IE_VERSION_BUILD
-                IE_VERSION_MAJOR IE_VERSION_MINOR IE_VERSION_PATCH)
-        if(NOT DEFINED ${var})
-            message(FATAL_ERROR "${var} version component is not defined")
-        endif()
-        set(${var} "${${var}}" PARENT_SCOPE)
-    endforeach()
+    set(CI_BUILD_NUMBER "${CI_BUILD_NUMBER}" PARENT_SCOPE)
 endfunction()
 
 set_ci_build_number()
@@ -50,12 +44,12 @@ endif()
 #
 
 function(set_temp_directory temp_variable source_tree_dir)
-    if(DEFINED OV_TEMP)
-        message(STATUS "OV_TEMP cmake variable is set : ${OV_TEMP}")
-        file(TO_CMAKE_PATH ${OV_TEMP} temp)
-    elseif (DEFINED ENV{DL_SDK_TEMP} AND NOT $ENV{DL_SDK_TEMP} STREQUAL "")
+    if (DEFINED ENV{DL_SDK_TEMP} AND NOT $ENV{DL_SDK_TEMP} STREQUAL "")
         message(STATUS "DL_SDK_TEMP environment is set : $ENV{DL_SDK_TEMP}")
         file(TO_CMAKE_PATH $ENV{DL_SDK_TEMP} temp)
+        if (ENABLE_ALTERNATIVE_TEMP)
+            set(ALTERNATIVE_PATH ${source_tree_dir}/temp)
+        endif()
     else ()
         set(temp ${source_tree_dir}/temp)
     endif()
@@ -106,11 +100,17 @@ else()
     set(BIN_FOLDER "bin/${ARCH_FOLDER}")
 endif()
 
-set(CMAKE_BUILD_TYPE "Release" CACHE STRING "CMake build type")
-set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Release;Debug;RelWithDebInfo;MinSizeRel")
-if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$")
-    set(CMAKE_DEFAULT_BUILD_TYPE "Release" CACHE STRING "CMake default build type")
+if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
+    message(STATUS "CMAKE_BUILD_TYPE not defined, 'Release' will be used")
+    set(CMAKE_BUILD_TYPE "Release")
+else()
+    set(RELEASE_TYPES "Debug" "Release" "RelWithDebInfo" "MinSizeRel")
+    list(FIND RELEASE_TYPES ${CMAKE_BUILD_TYPE} INDEX_FOUND)
+    if (INDEX_FOUND EQUAL -1)
+        message(FATAL_ERROR "CMAKE_BUILD_TYPE must be one of Debug, Release, RelWithDebInfo, or MinSizeRel")
+    endif()
 endif()
+message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 
 if(USE_BUILD_TYPE_SUBFOLDER)
     set(BIN_FOLDER "${BIN_FOLDER}/${CMAKE_BUILD_TYPE}")
@@ -118,10 +118,10 @@ endif()
 
 # allow to override default OUTPUT_ROOT root
 if(NOT DEFINED OUTPUT_ROOT)
-    if(NOT DEFINED OpenVINO_SOURCE_DIR)
-        message(FATAL_ERROR "OpenVINO_SOURCE_DIR is not defined")
+    if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
+        message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined")
     endif()
-    set(OUTPUT_ROOT ${OpenVINO_SOURCE_DIR})
+    set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
 endif()
 
 # Enable postfixes for Debug/Release builds
@@ -146,8 +146,8 @@ endif()
 set(CMAKE_DEBUG_POSTFIX ${IE_DEBUG_POSTFIX})
 set(CMAKE_RELEASE_POSTFIX ${IE_RELEASE_POSTFIX})
 
-# Support CMake multi-configuration for Visual Studio / Ninja or Xcode build
-if (OV_GENERATOR_MULTI_CONFIG)
+if (MSVC OR CMAKE_GENERATOR STREQUAL "Xcode")
+    # Support CMake multiconfiguration for Visual Studio or Xcode build
     set(IE_BUILD_POSTFIX $<$<CONFIG:Debug>:${IE_DEBUG_POSTFIX}>$<$<CONFIG:Release>:${IE_RELEASE_POSTFIX}>)
 else ()
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -156,24 +156,19 @@ else ()
         set(IE_BUILD_POSTFIX ${IE_RELEASE_POSTFIX})
     endif()
 endif()
+
 add_definitions(-DIE_BUILD_POSTFIX=\"${IE_BUILD_POSTFIX}\")
 
-macro(ov_set_if_not_defined var value)
-    if(NOT DEFINED ${var})
-        set(${var} ${value})
-    endif()
-endmacro()
-
 if(NOT UNIX)
-    ov_set_if_not_defined(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
-    ov_set_if_not_defined(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
 else()
-    ov_set_if_not_defined(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/lib)
-    ov_set_if_not_defined(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/lib)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/lib)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/lib)
 endif()
-ov_set_if_not_defined(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
-ov_set_if_not_defined(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
-ov_set_if_not_defined(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
+set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
+set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
 
 if(APPLE)
     set(CMAKE_MACOSX_RPATH ON)
@@ -189,9 +184,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # Enable CMAKE_<LANG>_COMPILER_ID AppleClang
 set(CMAKE_POLICY_DEFAULT_CMP0025 NEW)
 
-set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "Don't warn about obsolete cmake versions in 3rdparty")
-set(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION ON CACHE BOOL "Warn about absolute paths in destination")
-
 # LTO
 
 if(ENABLE_LTO)
@@ -210,20 +202,6 @@ endif()
 
 # General flags
 
-macro(ov_install_static_lib target comp)
-    if(NOT BUILD_SHARED_LIBS)
-        get_target_property(target_type ${target} TYPE)
-        if(${target_type} STREQUAL "STATIC_LIBRARY")
-            set_target_properties(${target} PROPERTIES EXCLUDE_FROM_ALL FALSE)
-        endif()
-        install(TARGETS ${target} EXPORT OpenVINOTargets
-                ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ${comp} ${ARGN})
-    endif()
-endmacro()
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-
 include(compile_flags/sdl)
 include(compile_flags/os_flags)
 include(compile_flags/sanitizer)
@@ -238,9 +216,7 @@ include(api_validator/api_validator)
 
 include(vs_version/vs_version)
 include(plugins/plugins)
-include(frontends/frontends)
 include(add_ie_target)
-include(CMakePackageConfigHelpers)
 
 if(ENABLE_FUZZING)
     enable_fuzzing()
@@ -249,12 +225,6 @@ endif()
 # macro to mark target as conditionally compiled
 
 function(ie_mark_target_as_cc TARGET_NAME)
-    set(cc_library openvino::conditional_compilation)
-    if(TARGET IE::conditional_compilation)
-        set(cc_library IE::conditional_compilation)
-    endif()
-    target_link_libraries(${TARGET_NAME} PRIVATE ${cc_library})
-
     if(NOT (SELECTIVE_BUILD STREQUAL "ON"))
         return()
     endif()
@@ -267,56 +237,10 @@ function(ie_mark_target_as_cc TARGET_NAME)
     set_source_files_properties(${sources} PROPERTIES OBJECT_DEPENDS ${GENERATED_HEADER})
 endfunction()
 
-function(ov_mark_target_as_cc)
-    ie_mark_target_as_cc(${ARGN})
-endfunction()
-
-# check python package
-
-function(ie_check_pip_package full_name message_type)
-    find_package(PythonInterp 3 REQUIRED)
-
-    get_filename_component(PYTHON_EXEC_DIR ${PYTHON_EXECUTABLE} DIRECTORY)
-
-    # extract version if any
-    if(full_name MATCHES "^([a-z_]+)[~=<>!]*(.*)$")
-        set(name ${CMAKE_MATCH_1})
-        set(req_version ${CMAKE_MATCH_2})
-    else()
-        set(name ${full_name})
-    endif()
-
-    execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} -m pip show ${name}
-        WORKING_DIRECTORY ${PYTHON_EXEC_DIR}
-        RESULT_VARIABLE PIP_EXIT_CODE
-        OUTPUT_VARIABLE output)
-
-    if(NOT PIP_EXIT_CODE EQUAL 0)
-        set(${name}_FOUND OFF PARENT_SCOPE)
-        message(${message_type} "${name} package is not installed. Please use \"${PYTHON_EXECUTABLE} -m pip install ${full_name}\".")
-    else()
-        if(req_version)
-            string(REGEX MATCH "Version: ([0-9]+\.?[0-9]*\.?[0-9]*)\n" installed_version "${output}")
-            if(installed_version)
-                set(installed_version "${CMAKE_MATCH_1}")
-            endif()
-
-            if(NOT req_version STREQUAL installed_version)
-                message(${message_type} "${name} package is installed, but may have different version (${installed_version}). "
-                    "Please use \"${PYTHON_EXECUTABLE} -m pip install ${full_name}\".")
-            endif()
-        else()
-            set(${name}_FOUND ON PARENT_SCOPE)
-        endif()
-    endif()
-endfunction()
-
 # Code style utils
 
 include(cpplint/cpplint)
 include(clang_format/clang_format)
-include(ncc_naming_style/ncc_naming_style)
 
 # Restore state
 set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH})

cmake/developer_package/TBBConfig.cmake

@@ -1,35 +0,0 @@
-# Copyright (C) 2018-2022 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-########################################################################
-#
-#  Perform search of TBB package corresponding with specified search order.
-#
-#  TBBROOT var is set into external package path or has a default value
-#  with IE own version of TBB. Search order is next:
-#   1) ${TBBROOT}/cmake
-#   2) ${TBBROOT} with IE own version of TBBConfig.cmake (actual for TBB < 2017.7)
-#
-
-# Path to IE own version of TBBConfig.cmake old TBB version without cmake config.
-if(APPLE)
-    set(IE_OWN_TBB_CONFIG tbb/mac)
-elseif(UNIX)
-    set(IE_OWN_TBB_CONFIG tbb/lnx)
-elseif(WIN)
-    set(IE_OWN_TBB_CONFIG tbb/win)
-else()
-    unset(IE_OWN_TBB_CONFIG)
-endif()
-
-find_package(TBB
-    CONFIG
-    PATHS ${TBBROOT}/cmake
-          ${TBBROOT}/lib/cmake/TBB # oneTBB case
-          ${IEDevScripts_DIR}/${IE_OWN_TBB_CONFIG}
-    NO_CMAKE_FIND_ROOT_PATH
-    NO_DEFAULT_PATH
-)
-
-find_package_handle_standard_args(TBB CONFIG_MODE)

cmake/developer_package/add_ie_target.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -19,10 +19,11 @@ addIeTarget(
         ${SDL_INCLUDES}
         /some/specific/path
    LINK_LIBRARIES
-        link_dependencies
+        ie::important_plugin
+   EXPORT_DEPENDENCIES
+        dependency_lib_to_export
    DEPENDENCIES
         dependencies
-        ie::important_plugin
    OBJECT_FILES
         object libraries
 )
@@ -30,7 +31,6 @@ addIeTarget(
 function(addIeTarget)
     set(options
         ADD_CPPLINT                   # Enables code style checks for the target
-        ADD_CLANG_FORMAT              # Enables code style checks for the target
         )
     set(oneValueRequiredArgs
         TYPE # type of target, SHARED|STATIC|EXECUTABLE. SHARED and STATIC correspond to add_library, EXECUTABLE to add_executable
@@ -50,6 +50,7 @@ function(addIeTarget)
         EXCLUDED_SOURCE_PATHS         # list of paths excluded from the global recursive search of source files
         LINK_LIBRARIES_WHOLE_ARCHIVE  # list of static libraries to link, each object file should be used and not discarded
         LINK_FLAGS                    # list of extra commands to linker
+        EXPORT_DEPENDENCIES           # list of the dependencies to be exported with the target through the developer package
         )
     cmake_parse_arguments(ARG "${options}" "${oneValueRequiredArgs};${oneValueOptionalArgs}" "${multiValueArgs}" ${ARGN} )
 
@@ -118,23 +119,16 @@ function(addIeTarget)
         # code style
         add_cpplint_target(${ARG_NAME}_cpplint FOR_TARGETS ${ARG_NAME})
     endif()
-    if (ARG_ADD_CLANG_FORMAT)
-        # code style
-        add_clang_format_target(${ARG_NAME}_clang FOR_TARGETS ${ARG_NAME})
-    endif()
     if (ARG_DEVELOPER_PACKAGE)
         # developer package
         openvino_developer_export_targets(COMPONENT ${ARG_DEVELOPER_PACKAGE}
-                                          TARGETS ${ARG_NAME})
+                                          TARGETS ${ARG_NAME} ${ARG_EXPORT_DEPENDENCIES})
     endif()
     if(WIN32)
         # Provide default compile pdb name equal to target name
         set_target_properties(${ARG_NAME} PROPERTIES COMPILE_PDB_NAME ${ARG_NAME})
     endif()
-endfunction()
 
-function(ov_add_target)
-    addIeTarget(${ARGV})
 endfunction()
 
 #[[
@@ -151,27 +145,14 @@ function(addIeTargetTest)
         NAME
         )
     set(oneValueOptionalArgs
-        COMPONENT
         )
     set(multiValueArgs
         LABELS
         )
     cmake_parse_arguments(ARG "${options}" "${oneValueRequiredArgs};${oneValueOptionalArgs}" "${multiValueArgs}" ${ARGN} )
-    if (NOT DEFINED ARG_COMPONENT)
-        set(ARG_COMPONENT tests)
-    endif()
 
     addIeTarget(TYPE EXECUTABLE NAME ${ARG_NAME} ${ARG_UNPARSED_ARGUMENTS})
 
     add_test(NAME ${ARG_NAME} COMMAND ${ARG_NAME})
     set_property(TEST ${ARG_NAME} PROPERTY LABELS ${ARG_LABELS})
-
-    install(TARGETS ${ARG_NAME}
-            RUNTIME DESTINATION tests
-            COMPONENT ${ARG_COMPONENT}
-            EXCLUDE_FROM_ALL)
-endfunction()
-
-function(ov_add_test_target)
-    addIeTargetTest(${ARGV})
 endfunction()

cmake/developer_package/api_validator/api_validator.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -50,13 +50,7 @@ endfunction()
 
 set(VALIDATED_LIBRARIES "" CACHE INTERNAL "")
 
-function(_ov_add_api_validator_post_build_step)
-    if(NOT BUILD_SHARED_LIBS)
-        # since _ov_add_api_validator_post_build_step
-        # is currently run only on shared libraries, we have nothing to test
-        return()
-    endif()
-
+function(_ie_add_api_validator_post_build_step)
     set(UWP_API_VALIDATOR_APIS "${PROGRAMFILES}/Windows Kits/10/build/universalDDIs/x64/UniversalDDIs.xml")
     set(UWP_API_VALIDATOR_EXCLUSION "${UWP_SDK_PATH}/BinaryExclusionlist.xml")
 
@@ -79,20 +73,8 @@ function(_ov_add_api_validator_post_build_step)
     _ie_add_api_validator_post_build_step_recursive(TARGET ${API_VALIDATOR_TARGET})
 
     # remove targets which were tested before
-    foreach(target IN LISTS API_VALIDATOR_TARGETS)
-        list(FIND VALIDATED_LIBRARIES ${target} index)
-        if (NOT index EQUAL -1)
-            list(APPEND VALIDATED_TARGETS ${target})
-        endif()
-        if(TARGET "${target}")
-            get_target_property(orig_target ${target} ALIASED_TARGET)
-            list(FIND VALIDATED_LIBRARIES ${orig_target} index)
-            if (NOT index EQUAL -1)
-                list(APPEND VALIDATED_TARGETS ${target})
-            endif()
-        endif()
-    endforeach()
-    foreach(item IN LISTS VALIDATED_TARGETS)
+
+    foreach(item IN LISTS VALIDATED_LIBRARIES)
         list(REMOVE_ITEM API_VALIDATOR_TARGETS ${item})
     endforeach()
 
@@ -106,12 +88,9 @@ function(_ov_add_api_validator_post_build_step)
 
     macro(api_validator_get_target_name)
         get_target_property(IS_IMPORTED ${target} IMPORTED)
-        get_target_property(orig_target ${target} ALIASED_TARGET)
         if(IS_IMPORTED)
-            get_target_property(target_location ${target} LOCATION)
+            get_target_property(target_location ${target} LOCATION)  
             get_filename_component(target_name "${target_location}" NAME_WE)
-        elseif(TARGET "${orig_target}")
-            set(target_name ${orig_target})
         else()
             set(target_name ${target})
         endif()
@@ -119,14 +98,10 @@ function(_ov_add_api_validator_post_build_step)
 
     foreach(target IN LISTS API_VALIDATOR_TARGETS)
         api_validator_get_target_name()
-        if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21 AND OV_GENERATOR_MULTI_CONFIG)
-            set(output_file "${CMAKE_BINARY_DIR}/api_validator/$<CONFIG>/${target_name}.txt")
-        else()
-            set(output_file "${CMAKE_BINARY_DIR}/api_validator/${target_name}.txt")
-        endif()
+        set(output_file "${CMAKE_BINARY_DIR}/api_validator/${target_name}.txt")
 
         add_custom_command(TARGET ${API_VALIDATOR_TARGET} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} --config $<CONFIG>
+            COMMAND ${CMAKE_COMMAND}
                 -D UWP_API_VALIDATOR=${UWP_API_VALIDATOR}
                 -D UWP_API_VALIDATOR_TARGET=$<TARGET_FILE:${target}>
                 -D UWP_API_VALIDATOR_APIS=${UWP_API_VALIDATOR_APIS}
@@ -149,5 +124,5 @@ endfunction()
 # ie_add_api_validator_post_build_step(TARGET <name>)
 #
 macro(ie_add_api_validator_post_build_step)
-    _ov_add_api_validator_post_build_step(${ARGV})
+    _ie_add_api_validator_post_build_step(${ARGV})
 endmacro()

cmake/developer_package/api_validator/api_validator_run.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/clang_format/clang_format.cmake

@@ -1,29 +1,25 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
-
-if(ENABLE_CLANG_FORMAT)
+if (ENABLE_CLANG_FORMAT)
     set(CLANG_FORMAT_FILENAME clang-format-9 clang-format)
-    find_host_program(CLANG_FORMAT NAMES ${CLANG_FORMAT_FILENAME} PATHS ENV PATH)
-    if(CLANG_FORMAT)
+    find_program(CLANG_FORMAT NAMES ${CLANG_FORMAT_FILENAME} PATHS ENV PATH)
+    if (CLANG_FORMAT)
         execute_process(COMMAND ${CLANG_FORMAT} ${CMAKE_CURRENT_SOURCE_DIR} ARGS --version OUTPUT_VARIABLE CLANG_VERSION)
-        if(NOT CLANG_VERSION OR CLANG_VERSION STREQUAL "")
+        if (NOT CLANG_VERSION OR CLANG_VERSION STREQUAL "")
             message(WARNING "Supported clang-format version is 9!")
             set(ENABLE_CLANG_FORMAT OFF)
         else()
             string(REGEX REPLACE "[^0-9]+([0-9]+)\\..*" "\\1" CLANG_FORMAT_MAJOR_VERSION ${CLANG_VERSION})
-            if(NOT ${CLANG_FORMAT_MAJOR_VERSION} EQUAL "9")
+            if (NOT ${CLANG_FORMAT_MAJOR_VERSION} EQUAL "9")
                 message(WARNING "Supported clang-format version is 9!")
                 set(ENABLE_CLANG_FORMAT OFF)
             endif()
         endif()
-    else()
-        message(WARNING "Supported clang-format version is not found!")
-        set(ENABLE_CLANG_FORMAT OFF)
     endif()
 endif()
 
-if(ENABLE_CLANG_FORMAT AND NOT TARGET clang_format_check_all)
+if(ENABLE_CLANG_FORMAT)
     add_custom_target(clang_format_check_all)
     add_custom_target(clang_format_fix_all)
     set_target_properties(clang_format_check_all clang_format_fix_all

cmake/developer_package/clang_format/clang_format_check.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -7,11 +7,12 @@ file(REMOVE "${OUTPUT_FILE}")
 execute_process(COMMAND ${CLANG_FORMAT} -style=file -output-replacements-xml ${INPUT_FILE}
     OUTPUT_VARIABLE STYLE_CHECK_RESULT
     )
-
+# Display the cpplint output to console (to parse it form IDE)
+message("${output}")
 file(WRITE "${OUTPUT_FILE}" "${STYLE_CHECK_RESULT}")
 
 if(NOT SKIP_RETURN_CODE)
     if("${STYLE_CHECK_RESULT}" MATCHES ".*<replacement .*")
-        message(FATAL_ERROR "[clang-format] Code style check failed for: ${INPUT_FILE}")
+        message(FATAL_ERROR "[clang-format] Code style check failed for : ${INPUT_FILE}")
     endif()
 endif()

cmake/developer_package/clang_format/clang_format_fix.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/compile_flags/fuzzing.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/compile_flags/os_flags.cmake

@@ -1,9 +1,8 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
 include(ProcessorCount)
-include(CheckCXXCompilerFlag)
 
 #
 # Disables deprecated warnings generation
@@ -28,8 +27,6 @@ macro(disable_deprecated_warnings)
         message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${ie_c_cxx_deprecated}")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${ie_c_cxx_deprecated}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ie_c_cxx_deprecated}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ie_c_cxx_deprecated}")
 endmacro()
@@ -41,12 +38,9 @@ endmacro()
 macro(ie_deprecated_no_errors)
     if(WIN32)
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(ie_c_cxx_deprecated_no_errors "/Qdiag-warning:1478,1786")
+            set(ie_c_cxx_deprecated "/Qdiag-warning:1478,1786")
         elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            # show 4996 only for /w4
-            set(ie_c_cxx_deprecated_no_errors "/wd4996")
-            # WA for VPUX plugin
-            set(ie_c_cxx_deprecated_no_errors "${ie_c_cxx_deprecated_no_errors} /wd4146 /wd4703")
+            set(ie_c_cxx_deprecated "/wd4996")
         endif()
     else()
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
@@ -60,8 +54,6 @@ macro(ie_deprecated_no_errors)
         endif()
     endif()
 
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${ie_c_cxx_deprecated_no_errors}")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${ie_c_cxx_deprecated_no_errors}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ie_c_cxx_deprecated_no_errors}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ie_c_cxx_deprecated_no_errors}")
 endmacro()
@@ -74,15 +66,15 @@ function(ie_sse42_optimization_flags flags)
         if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
             # No such option for MSVC 2019
         elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} /QxSSE4.2 PARENT_SCOPE)
+            set(${flags} "/arch:SSE4.2 /QxSSE4.2" PARENT_SCOPE)
         else()
             message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
         endif()
     else()
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} -xSSE4.2 PARENT_SCOPE)
+            set(${flags} "-msse4.2 -xSSE4.2" PARENT_SCOPE)
         else()
-            set(${flags} -msse4.2 PARENT_SCOPE)
+            set(${flags} "-msse4.2" PARENT_SCOPE)
         endif()
     endif()
 endfunction()
@@ -93,17 +85,17 @@ endfunction()
 function(ie_avx2_optimization_flags flags)
     if(WIN32)
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} /QxCORE-AVX2 PARENT_SCOPE)
+            set(${flags} "/QxCORE-AVX2" PARENT_SCOPE)
         elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            set(${flags} /arch:AVX2 PARENT_SCOPE)
+            set(${flags} "/arch:AVX2" PARENT_SCOPE)
         else()
             message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
         endif()
     else()
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} -xCORE-AVX2 PARENT_SCOPE)
+            set(${flags} "-march=core-avx2 -xCORE-AVX2 -mtune=core-avx2" PARENT_SCOPE)
         else()
-            set(${flags} -mavx2 -mfma PARENT_SCOPE)
+            set(${flags} "-mavx2 -mfma" PARENT_SCOPE)
         endif()
     endif()
 endfunction()
@@ -115,21 +107,21 @@ endfunction()
 function(ie_avx512_optimization_flags flags)
     if(WIN32)
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} /QxCOMMON-AVX512 PARENT_SCOPE)
+            set(${flags} "/QxCOMMON-AVX512" PARENT_SCOPE)
         elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            set(${flags} /arch:AVX512 PARENT_SCOPE)
+            set(${flags} "/arch:AVX512" PARENT_SCOPE)
         else()
             message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
         endif()
     else()
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} -xCOMMON-AVX512 PARENT_SCOPE)
+            set(${flags} "-xCOMMON-AVX512" PARENT_SCOPE)
         endif()
         if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set(${flags} -mavx512f -mfma PARENT_SCOPE)
+            set(${flags} "-mavx512f -mfma" PARENT_SCOPE)
         endif()
         if(CMAKE_CXX_COMPILER_ID MATCHES "^(Clang|AppleClang)$")
-            set(${flags} -mavx512f -mfma PARENT_SCOPE)
+            set(${flags} "-mavx512f -mfma" PARENT_SCOPE)
         endif()
     endif()
 endfunction()
@@ -141,41 +133,23 @@ function(ie_arm_neon_optimization_flags flags)
         # nothing
     elseif(ANDROID)
         if(ANDROID_ABI STREQUAL "arm64-v8a")
-            set(${flags} -mfpu=neon PARENT_SCOPE)
+            set(${flags} "-mfpu=neon" PARENT_SCOPE)
         elseif(ANDROID_ABI STREQUAL "armeabi-v7a-hard with NEON")
-            set(${flags} -march=armv7-a -mfloat-abi=hard -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=neon PARENT_SCOPE)
+            set(${flags} "-march=armv7-a -mfloat-abi=hard -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=neon" PARENT_SCOPE)
         elseif((ANDROID_ABI STREQUAL "armeabi-v7a with NEON") OR
                (ANDROID_ABI STREQUAL "armeabi-v7a" AND
                 DEFINED CMAKE_ANDROID_ARM_NEON AND CMAKE_ANDROID_ARM_NEON))
-            set(${flags} -march=armv7-a -mfloat-abi=softfp -mfpu=neon PARENT_SCOPE)
+            set(${flags} "-march=armv7-a -mfloat-abi=softfp -mfpu=neon" PARENT_SCOPE)
         endif()
     else()
         if(AARCH64)
-            set(${flags} -O2 -ftree-vectorize PARENT_SCOPE)
+            set(${flags} "-O2 -ftree-vectorize" PARENT_SCOPE)
         elseif(ARM)
-            set(${flags} -mfpu=neon PARENT_SCOPE)
+            set(${flags} "-mfpu=neon" PARENT_SCOPE)
         endif()
     endif()
 endfunction()
 
-#
-# Disables all warnings for 3rd party targets
-#
-function(ov_disable_all_warnings)
-    foreach(target IN LISTS ARGN)
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            target_compile_options(${target} PRIVATE /WX-)
-        elseif(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
-            target_compile_options(${target} PRIVATE -w)
-        elseif(UNIX AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            # 193: zero used for undefined preprocessing identifier "XXX"
-            # 1011: missing return statement at end of non-void function "XXX"
-            # 2415: variable "xxx" of static storage duration was declared but never referenced
-            target_compile_options(${target} PRIVATE -diag-disable=warn,193,1011,2415)
-        endif()
-    endforeach()
-endfunction()
-
 #
 # Enables Link Time Optimization compilation
 #
@@ -193,10 +167,6 @@ macro(ie_add_compiler_flags)
     endforeach()
 endmacro()
 
-function(ov_add_compiler_flags)
-    ie_add_compiler_flags(${ARGN})
-endfunction()
-
 #
 # Forced includes certain header file to all target source files
 #
@@ -213,6 +183,7 @@ endfunction()
 #
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 # to allows to override CMAKE_CXX_STANDARD from command line
 if(NOT DEFINED CMAKE_CXX_STANDARD)
@@ -240,16 +211,6 @@ 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
@@ -314,27 +275,23 @@ else()
     ie_add_compiler_flags(-Wreturn-type)
     ie_add_compiler_flags(-Wunused-variable)
 
+    # Disable noisy warnings
+
     if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         ie_add_compiler_flags(-Wswitch)
     elseif(UNIX)
         ie_add_compiler_flags(-Wuninitialized -Winit-self)
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-            ie_add_compiler_flags(-Winconsistent-missing-override
-                                  -Wstring-plus-int)
+            ie_add_compiler_flags(-Wno-error=switch)
         else()
             ie_add_compiler_flags(-Wmaybe-uninitialized)
-            check_cxx_compiler_flag("-Wsuggest-override" SUGGEST_OVERRIDE_SUPPORTED)
-            if(SUGGEST_OVERRIDE_SUPPORTED)
-                set(CMAKE_CXX_FLAGS "-Wsuggest-override ${CMAKE_CXX_FLAGS}")
-            endif()
         endif()
     endif()
 
-    # Disable noisy warnings
-
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-        # 177: function "XXX" was declared but never referenced
-        ie_add_compiler_flags(-diag-disable=remark,177,2196)
+        ie_add_compiler_flags(-diag-disable=remark)
+        # noisy warnings from Intel Compiler 19.1.1.217 20200306
+        ie_add_compiler_flags(-diag-disable=2196)
     endif()
 
     # Linker flags
@@ -346,30 +303,5 @@ else()
     elseif(LINUX)
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--exclude-libs,ALL")
         set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--gc-sections -Wl,--exclude-libs,ALL")
-        if(NOT ENABLE_FUZZING)
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--exclude-libs,ALL")
-        endif()
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
     endif()
 endif()
-
-# Links provided libraries and include their INTERFACE_INCLUDE_DIRECTORIES as SYSTEM
-function(link_system_libraries TARGET_NAME)
-    set(MODE PRIVATE)
-
-    foreach(arg IN LISTS ARGN)
-        if(arg MATCHES "(PRIVATE|PUBLIC|INTERFACE)")
-            set(MODE ${arg})
-        else()
-            if(TARGET "${arg}")
-                target_include_directories(${TARGET_NAME}
-                    SYSTEM ${MODE}
-                        $<TARGET_PROPERTY:${arg},INTERFACE_INCLUDE_DIRECTORIES>
-                        $<TARGET_PROPERTY:${arg},INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
-                )
-            endif()
-
-            target_link_libraries(${TARGET_NAME} ${MODE} ${arg})
-        endif()
-    endforeach()
-endfunction()

cmake/developer_package/compile_flags/sanitizer.cmake

@@ -1,88 +1,31 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
 include(CheckCXXCompilerFlag)
 
+if (ENABLE_SANITIZER OR ENABLE_THREAD_SANITIZER)
+    # This is workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/16609.
+    # It ensures pthread is searched without ASAN linking.
+    # Line bellow must be before adding -fsanitize=address or -fsanitize=thread to
+    # build options for the trick to work.
+    find_package(Threads REQUIRED)
+endif()
+
 if (ENABLE_SANITIZER)
-    if (WIN32)
-        check_cxx_compiler_flag("/fsanitize=address" SANITIZE_ADDRESS_SUPPORTED)
-        if (SANITIZE_ADDRESS_SUPPORTED)
-            set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} /fsanitize=address")
-        else()
-            message(FATAL_ERROR "Address sanitizer is not supported by current compiler.\n"
-            "Please, check requirements:\n"
-            "https://github.com/openvinotoolkit/openvino/wiki/AddressSanitizer-and-LeakSanitizer")
-        endif()
-    else()
-        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fsanitize=address")
-        check_cxx_compiler_flag("-fsanitize-recover=address" SANITIZE_RECOVER_ADDRESS_SUPPORTED)
-        if (SANITIZE_RECOVER_ADDRESS_SUPPORTED)
-            set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fsanitize-recover=address")
-        endif()
-        set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -fsanitize=address")
-    endif()
-endif()
-
-if (ENABLE_UB_SANITIZER)
-    if (WIN32)
-        message(FATAL_ERROR "UndefinedBehavior sanitizer is not supported in Windows")
-    endif()
-    
-    # TODO: Remove -fno-sanitize=null as thirdparty/ocl/clhpp_headers UBSAN compatibility resolved:
-    # https://github.com/KhronosGroup/OpenCL-CLHPP/issues/17
-    # Mute -fsanitize=function Indirect call of a function through a function pointer of the wrong type.
-    #   Sample cases:
-    #       call to function GetAPIVersion through pointer to incorrect function type 'void *(*)()'
-    # Mute -fsanitize=alignment Use of a misaligned pointer or creation of a misaligned reference. Also sanitizes assume_aligned-like attributes.
-    #   Sample cases:
-    #       VPU_FixedMaxHeapTest.DefaultConstructor test case load of misaligned address 0x62000000187f for type 'const DataType', which requires 4 byte alignment
-    # Mute -fsanitize=bool Load of a bool value which is neither true nor false.
-    #   Samples cases:
-    #       ie_c_api_version.apiVersion test case load of value 32, which is not a valid value for type 'bool'
-    # Mute -fsanitize=enum Load of a value of an enumerated type which is not in the range of representable values for that enumerated type.
-    #   Samples cases:
-    #       load of value 4294967295, which is not a valid value for type 'const (anonymous namespace)::onnx::Field'
-    set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fsanitize=undefined -fno-sanitize=null -fno-sanitize=alignment -fno-sanitize=bool -fno-sanitize=enum")
-    if(OV_COMPILER_IS_CLANG)
-        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fno-sanitize=function")
+    set(SANITIZER_COMPILER_FLAGS "-g -fsanitize=address -fno-omit-frame-pointer")
+    CHECK_CXX_COMPILER_FLAG("-fsanitize-recover=address" SANITIZE_RECOVER_SUPPORTED)
+    if (SANITIZE_RECOVER_SUPPORTED)
+        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fsanitize-recover=address")
     endif()
 
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        # TODO: Remove -Wno-maybe-uninitialized after CVS-61143 fix
-        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -Wno-maybe-uninitialized")
-    endif()
-    check_cxx_compiler_flag("-fsanitize-recover=undefined" SANITIZE_RECOVER_UNDEFINED_SUPPORTED)
-    if (SANITIZE_RECOVER_UNDEFINED_SUPPORTED)
-        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fsanitize-recover=undefined")
-    endif()
-
-    set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -fsanitize=undefined")
-endif()
-
-if (ENABLE_THREAD_SANITIZER)
-    set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fsanitize=thread")
-    set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -fsanitize=thread")
-endif()
-
-# common sanitizer options
-if (DEFINED SANITIZER_COMPILER_FLAGS)
-    # ensure symbols are present
-    if (NOT WIN32)
-        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -g -fno-omit-frame-pointer")
-        if(NOT OV_COMPILER_IS_CLANG)
-            # GPU plugin tests compilation is slow with -fvar-tracking-assignments on GCC.
-            # Clang has no var-tracking-assignments.
-            set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fno-var-tracking-assignments")
-        endif()
-        # prevent unloading libraries at runtime, so sanitizer can resolve their symbols
-        set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -Wl,-z,nodelete")
-
-        if(OV_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
+    set(SANITIZER_LINKER_FLAGS "-fsanitize=address")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -fuse-ld=gold")
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$" AND NOT WIN32)
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
             set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -fuse-ld=lld")
         endif()
-    else()
-        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} /Oy-")
     endif()
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_COMPILER_FLAGS}")
@@ -90,4 +33,21 @@ if (DEFINED SANITIZER_COMPILER_FLAGS)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SANITIZER_LINKER_FLAGS}")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${SANITIZER_LINKER_FLAGS}")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZER_LINKER_FLAGS}")
-endif()
+endif()
+
+if (ENABLE_THREAD_SANITIZER)
+    set(SANITIZER_COMPILER_FLAGS "-g -fsanitize=thread -fno-omit-frame-pointer")
+    set(SANITIZER_LINKER_FLAGS "-fsanitize=thread")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$" AND NOT WIN32)
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
+            set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -fuse-ld=lld")
+        else()
+            set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -static-libsan")
+        endif()
+    endif()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_COMPILER_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_COMPILER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SANITIZER_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${SANITIZER_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZER_LINKER_FLAGS}")
+endif()

cmake/developer_package/compile_flags/sdl.cmake

@@ -1,48 +1,50 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(UNIX)
-    set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -Wformat -Wformat-security")
-    if (NOT ENABLE_SANITIZER)
-        # ASan does not support fortification https://github.com/google/sanitizers/issues/247
-        set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
-    endif()
-    if(NOT APPLE)
-        set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -pie")
-    endif()
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
+    if(UNIX)
+        set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -Wformat -Wformat-security")
+        if (NOT ENABLE_SANITIZER)
+            # ASan does not support fortification https://github.com/google/sanitizers/issues/247
+            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+        endif()
+        if(NOT APPLE)
+            set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -pie")
+        endif()
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        set(IE_LINKER_FLAGS "${IE_LINKER_FLAGS} -z noexecstack -z relro -z now")
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+            set(IE_LINKER_FLAGS "${IE_LINKER_FLAGS} -z noexecstack -z relro -z now")
+            if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+                set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-all")
+            else()
+                set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-strong")
+            endif()
+            if (NOT ENABLE_SANITIZER)
+                set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -s")
+            endif()
+        elseif(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
             set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-all")
-        else()
+        elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+            if (NOT ENABLE_SANITIZER)
+                set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -Wl,--strip-all")
+            endif()
             set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-strong")
+            set(IE_LINKER_FLAGS "${IE_LINKER_FLAGS} -z noexecstack -z relro -z now")
         endif()
-        if (NOT ENABLE_SANITIZER)
-            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -s")
+    else()
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} /sdl")
         endif()
-    elseif(OV_COMPILER_IS_CLANG)
-        set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-all")
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-        if (NOT ENABLE_SANITIZER)
-            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -Wl,--strip-all")
+        set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} /guard:cf")
+        if(ENABLE_INTEGRITYCHECK)
+            set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /INTEGRITYCHECK")
         endif()
-        set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-strong")
-        set(IE_LINKER_FLAGS "${IE_LINKER_FLAGS} -z noexecstack -z relro -z now")
     endif()
-else()
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} /sdl")
-    endif()
-    set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} /guard:cf")
-    if(ENABLE_INTEGRITYCHECK)
-        set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /INTEGRITYCHECK")
-    endif()
-endif()
 
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${IE_C_CXX_FLAGS}")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${IE_C_CXX_FLAGS}")
-set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${IE_LINKER_FLAGS}")
-set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${IE_LINKER_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${IE_LINKER_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IE_C_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IE_C_CXX_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${IE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${IE_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${IE_LINKER_FLAGS}")
+endif()

cmake/developer_package/coverage/coverage.cmake

@@ -1,9 +1,7 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set(OV_COVERAGE_GCDA_DATA_DIRECTORY "${CMAKE_BINARY_DIR}")
-
 if(NOT TARGET ie_coverage_clean)
     add_custom_target(ie_coverage_clean)
     set_target_properties(ie_coverage_clean PROPERTIES FOLDER coverage)

cmake/developer_package/coverage/coverage_clean.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/coverage/coverage_merge.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/cpplint/cpplint.cmake

@@ -1,17 +1,17 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
 if(ENABLE_CPPLINT)
-    find_package(PythonInterp 3 QUIET)
+    find_package(Python3 COMPONENTS Interpreter)
 
-    if(NOT PYTHONINTERP_FOUND)
+    if(NOT Python3_Interpreter_FOUND)
         message(WARNING "Python3 interpreter was not found (required for cpplint check)")
         set(ENABLE_CPPLINT OFF)
     endif()
 endif()
 
-if(ENABLE_CPPLINT AND NOT TARGET cpplint_all)
+if(ENABLE_CPPLINT)
     add_custom_target(cpplint_all ALL)
     set_target_properties(cpplint_all PROPERTIES FOLDER cpplint)
     set(CPPLINT_ALL_OUTPUT_FILES "" CACHE INTERNAL "All cpplint output files")
@@ -68,7 +68,6 @@ 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_html.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/cpplint/cpplint_merge.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/cpplint/cpplint_run.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -25,7 +25,7 @@ set(FILTER "${DEFAULT_FILTER}${CUSTOM_FILTER}")
 
 execute_process(
     COMMAND
-        "${PYTHON_EXECUTABLE}"
+        python3
         "${CPPLINT_SCRIPT}"
         "--linelength=160"
         "--counting=detailed"

cmake/developer_package/cpplint/cpplint_to_cppcheck_xml.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/cross_compile/cross_compiled_disp_gen.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -10,7 +10,7 @@
 #   XARCH_FUNC_NAME -- name of function to dispatch
 #   XARCH_NAMESPACES -- full namespace used to keep ODR
 #   XARCH_DISP_FILE -- dispatcher file name to generate
-#   XARCH_SET -- set of ARCH supported by dispatcher. semicolon-delimited
+#   XARCH_SET -- set of ARCH supported by dispatcher. space delimited
 #
 # =================================================================
 
@@ -24,6 +24,7 @@ function(_generate_dispatcher)
     _find_signature_in_file(${XARCH_API_HEADER} ${XARCH_FUNC_NAME} SIGNATURE)
     _generate_call_line_from_signature("${SIGNATURE}" CALL_LINE)
 
+    string(REPLACE " " ";" XARCH_SET "${XARCH_SET}")
     string(REPLACE "::" ";" XARCH_NAMESPACES "${XARCH_NAMESPACES}")
 
     list(GET XARCH_NAMESPACES -1 XARCH_CURRENT_NAMESPACE)

cmake/developer_package/cross_compile/cross_compiled_disp_gen_options.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/cross_compile/cross_compiled_func.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -13,10 +13,10 @@ set(_ACCEPTED_ARCHS_AVX512F "^(ANY|SSE42|AVX|AVX2|AVX512F)$")
 
 ## Arch specific definitions
 set(_DEFINE_ANY      "")
-set(_DEFINE_SSE42    "HAVE_SSE42"   ${_DEFINE_ANY})
-set(_DEFINE_AVX      "HAVE_AVX"     ${_DEFINE_SSE42})
-set(_DEFINE_AVX2     "HAVE_AVX2"    ${_DEFINE_AVX})
-set(_DEFINE_AVX512F  "HAVE_AVX512F" ${_DEFINE_AVX2})
+set(_DEFINE_SSE42    "-DHAVE_SSE42"   ${_DEFINE_ANY})
+set(_DEFINE_AVX      "-DHAVE_AVX"     ${_DEFINE_SSE42})
+set(_DEFINE_AVX2     "-DHAVE_AVX2"    ${_DEFINE_AVX})
+set(_DEFINE_AVX512F  "-DHAVE_AVX512F" ${_DEFINE_AVX2})
 
 ## Arch specific compile options
 ie_avx512_optimization_flags(_FLAGS_AVX512F)
@@ -117,25 +117,21 @@ function(_clone_source_to_target TARGET SOURCE ARCH_SET)
                         ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}
                         ${CMAKE_CURRENT_BINARY_DIR}/${ARCH_SOURCE}
                 DEPENDS ${SOURCE}
-                VERBATIM
                 )
 
-        set_property(SOURCE ${ARCH_SOURCE} APPEND_STRING PROPERTY COMPILE_OPTIONS
-                "${_FLAGS_${_arch}}")
-
-        set_property(SOURCE ${ARCH_SOURCE} APPEND PROPERTY COMPILE_DEFINITIONS
+        set(_ARCH_SPECIFIC_FLAGS
                 ${_DEFINE_${_arch}}
-                "XARCH=${_arch}" ## to replace XARCH with direct ARCH name
+                ${_FLAGS_${_arch}}
+                "-DXARCH=${_arch}"  ## to replace XARCH with direct ARCH name
+                "-I${CMAKE_CURRENT_SOURCE_DIR}/${ARCH_INCLUDE_DIR}"  ## To make valid #include "some.hpp"
                 )
 
-        ## To make `#include "some.hpp"` valid
-        set_property(SOURCE ${ARCH_SOURCE} APPEND PROPERTY INCLUDE_DIRECTORIES
-                "${CMAKE_CURRENT_SOURCE_DIR}/${ARCH_INCLUDE_DIR}")
+        _add_source_compile_flags(${ARCH_SOURCE} ${_ARCH_SPECIFIC_FLAGS})
 
         list(APPEND _ARCH_SOURCES ${ARCH_SOURCE})
     endforeach()
 
-    target_sources(${TARGET} PRIVATE ${_ARCH_SOURCES})
+    _add_source_to_target(${TARGET} ${_ARCH_SOURCES})
 endfunction()
 
 
@@ -150,27 +146,26 @@ function(_add_dispatcher_to_target TARGET HEADER FUNC_NAME NAMESPACE ARCH_SET)
     set(DISPATCHER_SOURCE     "cross-compiled/${DISPATCHER_NAME}_disp.cpp")
     set(DISPATCHER_OPT_HOLDER "cross-compiled/${DISPATCHER_NAME}_holder.txt")
 
+    set(_GEN_ARGS_LIST
+            -DXARCH_FUNC_NAME="${X_NAME}"
+            -DXARCH_NAMESPACES="${NAMESPACE}"
+            -DXARCH_API_HEADER="${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}"
+            -DXARCH_DISP_FILE="${CMAKE_CURRENT_BINARY_DIR}/${DISPATCHER_SOURCE}"
+            -DXARCH_SET="${ARCH_SET}"
+    )
     configure_file(${DISPATCHER_GEN_OPTIONS_HOLDER} ${DISPATCHER_OPT_HOLDER})
 
     add_custom_command(
             OUTPUT  ${DISPATCHER_SOURCE}
-            COMMAND ${CMAKE_COMMAND}
-                    -D "XARCH_FUNC_NAME=${X_NAME}"
-                    -D "XARCH_NAMESPACES=${NAMESPACE}"
-                    -D "XARCH_API_HEADER=${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}"
-                    -D "XARCH_DISP_FILE=${CMAKE_CURRENT_BINARY_DIR}/${DISPATCHER_SOURCE}"
-                    -D "XARCH_SET=${ARCH_SET}"
+            COMMAND ${CMAKE_COMMAND} ${_GEN_ARGS_LIST}
                     -P ${DISPATCHER_GEN_SCRIPT}
             DEPENDS ${HEADER}
                     ${DISPATCHER_GEN_SCRIPT}
                     ${CMAKE_CURRENT_BINARY_DIR}/${DISPATCHER_OPT_HOLDER} ## Just to make run dependency on args value
-            VERBATIM
     )
 
-    set_property(SOURCE ${DISPATCHER_SOURCE} APPEND PROPERTY INCLUDE_DIRECTORIES
-            "${CMAKE_CURRENT_SOURCE_DIR}/${DISPATCHER_INCLUDE_DIR}")
-
-    target_sources(${TARGET} PRIVATE ${DISPATCHER_SOURCE})
+    _add_source_compile_flags(${DISPATCHER_SOURCE} "-I${DISPATCHER_INCLUDE_DIR}")
+    _add_source_to_target(${TARGET} ${DISPATCHER_SOURCE})
 endfunction()
 
 #######################################
@@ -204,3 +199,29 @@ function(_remove_source_from_target TARGET SOURCE_FILE)
             PROPERTIES
             SOURCES "${ORIGINAL_SOURCES}")
 endfunction()
+
+function(_add_source_to_target TARGET)
+    get_target_property(ORIGINAL_SOURCES ${TARGET} SOURCES)
+
+    list(APPEND ORIGINAL_SOURCES ${ARGN})
+
+    set_target_properties(${TARGET}
+            PROPERTIES
+            SOURCES "${ORIGINAL_SOURCES}")
+endfunction()
+
+function(_add_source_compile_flags SOURCE)
+    get_source_file_property(ORIGINAL_FLAGS  ${SOURCE} COMPILE_FLAGS)
+
+    ## Empty list of COMPILE_FLAGS represented as NOTFOUND
+    if(NOT ORIGINAL_FLAGS)
+        set(ORIGINAL_FLAGS "")
+    endif()
+
+    string(REPLACE ";" " " NEW_FLAGS "${ARGN}")
+    string(APPEND ORIGINAL_FLAGS " " ${NEW_FLAGS})
+
+    set_source_files_properties(${SOURCE}
+            PROPERTIES
+            COMPILE_FLAGS "${ORIGINAL_FLAGS}")
+endfunction()

cmake/developer_package/debug.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -15,3 +15,59 @@ function(clean_message type)
     message (FATAL_ERROR)
   endif()  
 endfunction()
+
+file(REMOVE ${CMAKE_BINARY_DIR}/ld_library_rpath_64.txt)
+
+# log relative path to shared library that has to be used in LD_LIBRARY_PATH
+function (log_rpath_remove_top component component_remove_top lib lib_remove_top)
+  
+  set(top_lib_dir ${${component}})
+  set(lib_dir ${lib})
+
+#  debug_message(STATUS "LIB-IN=${lib} ")
+#  debug_message(STATUS "TOPLIB-IN=${top_lib_dir} ")
+  get_filename_component(top_lib_dir "${${component}}" DIRECTORY)
+
+  if (${component_remove_top} AND ${component})
+  else()
+    get_filename_component(add_name "${${component}}" NAME)
+    set(top_lib_dir "${top_lib_dir}/${add_name}")
+  endif()
+  if (${lib_remove_top} AND lib)
+    get_filename_component(lib_dir ${lib} DIRECTORY)
+  endif()
+
+  string (REPLACE "//" "/" top_lib_dir "${top_lib_dir}")
+  string (REPLACE "//" "/" lib_dir "${lib_dir}")
+
+  string (REPLACE "\\\\" "/" top_lib_dir "${top_lib_dir}")
+  string (REPLACE "\\\\" "/" lib_dir "${lib_dir}")
+
+#  debug_message(STATUS "LIB-OUT=${lib_dir}")
+#  debug_message(STATUS "TOPLIB-OUT=${top_lib_dir}")
+
+  if (WIN32)
+    string (TOLOWER "${top_lib_dir}" top_lib_dir)
+    string (TOLOWER "${lib_dir}" lib_dir)
+  endif()
+
+  string (REPLACE "${top_lib_dir}" "" component_dir "${lib_dir}")
+
+  set(RPATH_INFO "${component}=${component_dir}")
+  debug_message(STATUS "LD_LIBRARY_RPATH: ${RPATH_INFO}")
+  file(APPEND ${CMAKE_BINARY_DIR}/ld_library_rpath_64.txt "${RPATH_INFO}\n")
+endfunction()
+
+function (log_rpath_from_dir component lib_dir)
+  log_rpath_remove_top("${component}" TRUE "${lib_dir}" FALSE)
+endfunction()
+
+function (log_rpath component lib_path)
+  log_rpath_remove_top(${component} TRUE ${lib_path} TRUE)
+endfunction()
+
+# Just wrapping of the original message() function to make this macro known during IE build.
+# This macro is redefined (with additional checks) within the InferenceEngineConfig.cmake file.
+macro(ext_message TRACE_LEVEL)
+    message(${TRACE_LEVEL} "${ARGN}")
+endmacro()

cmake/developer_package/download/dependency_solver.cmake

@@ -1,10 +1,10 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
 include (download/download)
 
-function (resolve_archive_dependency VAR COMPONENT ARCHIVE ARCHIVE_UNIFIED ARCHIVE_WIN ARCHIVE_LIN ARCHIVE_MAC ARCHIVE_ANDROID TARGET_PATH FOLDER ENVIRONMENT SHA256 FILES_TO_EXTRACT)
+function (resolve_archive_dependency VAR COMPONENT ARCHIVE ARCHIVE_UNIFIED ARCHIVE_WIN ARCHIVE_LIN ARCHIVE_MAC ARCHIVE_ANDROID TARGET_PATH FOLDER ENVIRONMENT SHA256)
   if (ENVIRONMENT AND (DEFINED ${ENVIRONMENT} OR DEFINED ENV{${ENVIRONMENT}}))
     set(HAS_ENV "TRUE")
   endif()
@@ -12,9 +12,9 @@ function (resolve_archive_dependency VAR COMPONENT ARCHIVE ARCHIVE_UNIFIED ARCHI
   if (NOT DEFINED HAS_ENV)
     if (ARCHIVE)
       #TODO: check whether this is platform specific binary with same name per or it is in common folder
-      DownloadAndExtract(${COMPONENT} ${ARCHIVE} ${TARGET_PATH} result_path ${FOLDER} ${SHA256} ${FILES_TO_EXTRACT})
+      DownloadAndExtract(${COMPONENT} ${ARCHIVE} ${TARGET_PATH} result_path ${FOLDER} ${SHA256})
     else()
-      DownloadAndExtractPlatformSpecific(${COMPONENT} ${ARCHIVE_UNIFIED} ${ARCHIVE_WIN} ${ARCHIVE_LIN} ${ARCHIVE_MAC} ${ARCHIVE_ANDROID} ${TARGET_PATH} result_path ${FOLDER} ${SHA256} ${FILES_TO_EXTRACT})
+      DownloadAndExtractPlatformSpecific(${COMPONENT} ${ARCHIVE_UNIFIED} ${ARCHIVE_WIN} ${ARCHIVE_LIN} ${ARCHIVE_MAC} ${ARCHIVE_ANDROID} ${TARGET_PATH} result_path  ${FOLDER} ${SHA256})
     endif()
 
     set (${VAR} ${result_path} PARENT_SCOPE)
@@ -25,8 +25,15 @@ function (resolve_archive_dependency VAR COMPONENT ARCHIVE ARCHIVE_UNIFIED ARCHI
       set (${VAR} $ENV{${ENVIRONMENT}} PARENT_SCOPE)
     endif ()
   endif()
+
 endfunction(resolve_archive_dependency)
 
+function(resolve_pull_request GITHUB_PULL_REQUEST TARGET_PATH)
+    get_filename_component(FILE_NAME ${GITHUB_PULL_REQUEST} NAME)
+    set (PATCH_URL "")
+    DownloadAndApply("${PATCH_URL}/${GITHUB_PULL_REQUEST}" "${IE_MAIN_SOURCE_DIR}/${TARGET_PATH}/${FILE_NAME}")
+endfunction(resolve_pull_request)
+
 function(extract_version_from_filename filename regex version)
     string(REGEX MATCH ${regex} match ${filename})
 
@@ -44,8 +51,10 @@ function(read_version archive regex version_var)
 endfunction(read_version)
 
 function (RESOLVE_DEPENDENCY NAME_OF_CMAKE_VAR)
+
   list(REMOVE_AT ARGV 0)
-  set(SUPPORTED_ARGS FOLDER ARCHIVE ARCHIVE_UNIFIED ARCHIVE_WIN ARCHIVE_LIN ARCHIVE_MAC ARCHIVE_ANDROID TARGET_PATH ENVIRONMENT VERSION_REGEX SHA256 FILES_TO_EXTRACT)
+  set(SUPPORTED_ARGS FOLDER ARCHIVE ARCHIVE_UNIFIED ARCHIVE_WIN ARCHIVE_LIN ARCHIVE_MAC ARCHIVE_ANDROID TARGET_PATH ENVIRONMENT GITHUB_PULL_REQUEST VERSION_REGEX SHA256)
+
 
   #unnecessary vars
   foreach(arg ${ARGV})
@@ -107,9 +116,6 @@ function (RESOLVE_DEPENDENCY NAME_OF_CMAKE_VAR)
     message(FATAL_ERROR "SHA is not specified for: " ${NAME_OF_CMAKE_VAR})
   endif()
 
-  if (NOT DEFINED FILES_TO_EXTRACT)
-    set (FILES_TO_EXTRACT FALSE)
-  endif()
 
   #for each dependency type have to do separate things
   if (ARCHIVE_WIN OR ARCHIVE_LIN OR ARCHIVE_MAC OR ARCHIVE_ANDROID OR ARCHIVE OR ARCHIVE_UNIFIED)
@@ -117,7 +123,7 @@ function (RESOLVE_DEPENDENCY NAME_OF_CMAKE_VAR)
       message(FATAL_ERROR "TARGET_PATH should be defined for every dependency")
     endif()
 
-    resolve_archive_dependency(RESULT ${NAME_OF_CMAKE_VAR} ${ARCHIVE} ${ARCHIVE_UNIFIED} ${ARCHIVE_WIN} ${ARCHIVE_LIN} ${ARCHIVE_MAC} ${ARCHIVE_ANDROID} ${TARGET_PATH} ${FOLDER} ${ENVIRONMENT} ${SHA256} ${FILES_TO_EXTRACT})
+    resolve_archive_dependency(RESULT ${NAME_OF_CMAKE_VAR} ${ARCHIVE} ${ARCHIVE_UNIFIED} ${ARCHIVE_WIN} ${ARCHIVE_LIN} ${ARCHIVE_MAC} ${ARCHIVE_ANDROID} ${TARGET_PATH} ${FOLDER} ${ENVIRONMENT} ${SHA256})
     set(${NAME_OF_CMAKE_VAR} ${RESULT} PARENT_SCOPE)
     if (VERSION_REGEX)
         GetNameAndUrlToDownload(archive RELATIVE_URL ${ARCHIVE_UNIFIED} ${ARCHIVE_WIN} ${ARCHIVE_LIN} ${ARCHIVE_MAC} ${ARCHIVE_ANDROID})
@@ -125,8 +131,11 @@ function (RESOLVE_DEPENDENCY NAME_OF_CMAKE_VAR)
             read_version(${archive} ${VERSION_REGEX} "${NAME_OF_CMAKE_VAR}_VERSION")
         endif()
     endif()
+
+  elseif (DEFINED GITHUB_PULL_REQUEST)
+    resolve_pull_request(${GITHUB_PULL_REQUEST} ${TARGET_PATH})
   else()
-    message(FATAL_ERROR "Dependency of unknowntype, SHOULD set one of ARCHIVE_WIN, ARCHIVE, ARCHIVE_LIN, ARCHIVE_MAC, ARCHIVE_ANDROID")
+    message(FATAL_ERROR "Dependency of unknowntype, SHOULD set one of ARCHIVE_WIN, ARCHIVE, ARCHIVE_LIN, ARCHIVE_MAC, ARCHIVE_ANDROID, GITHUB_PULL_REQUEST")
   endif()
 
 endfunction(RESOLVE_DEPENDENCY)

cmake/developer_package/download/download.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/download/download_and_apply.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/download/download_and_check.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/download/download_and_extract.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -42,26 +42,25 @@ function (DownloadAndExtractPlatformSpecific
   unpacked_path
   result_path
   folder
-  sha256
-  files_to_extract)
+  sha256)
 
   GetNameAndUrlToDownload(archive_name RELATIVE_URL ${archive_name_unified} ${archive_name_win} ${archive_name_lin} ${archive_name_mac} ${archive_name_android} )
   if (NOT archive_name OR NOT RELATIVE_URL)
     return()
   endif()
-  CheckOrDownloadAndExtract(${component} ${RELATIVE_URL} ${archive_name} ${unpacked_path} result_path2 ${folder} TRUE FALSE TRUE ${sha256} ${files_to_extract})
+  CheckOrDownloadAndExtract(${component} ${RELATIVE_URL} ${archive_name} ${unpacked_path} result_path2 ${folder} TRUE FALSE TRUE ${sha256})
   set (${result_path} ${result_path2} PARENT_SCOPE)
 
 endfunction(DownloadAndExtractPlatformSpecific)
 
 #download from common folder
-function (DownloadAndExtract component archive_name unpacked_path result_path folder sha256 files_to_extract)
+function (DownloadAndExtract component archive_name unpacked_path result_path folder sha256)
   set (RELATIVE_URL  "${archive_name}")
   set(fattal TRUE)
-  CheckOrDownloadAndExtract(${component} ${RELATIVE_URL} ${archive_name} ${unpacked_path} result_path2 ${folder} ${fattal} result TRUE ${sha256} ${files_to_extract})
+  CheckOrDownloadAndExtract(${component} ${RELATIVE_URL} ${archive_name} ${unpacked_path} result_path2 ${folder} ${fattal} result TRUE ${sha256})
 
   if (NOT ${result})
-    DownloadAndExtractPlatformSpecific(${component} ${archive_name} ${archive_name} ${archive_name} ${unpacked_path} ${result_path2} ${folder} ${sha256} ${files_to_extract})
+    DownloadAndExtractPlatformSpecific(${component} ${archive_name} ${archive_name} ${archive_name} ${unpacked_path} ${result_path2} ${folder})
   endif()
 
   set (${result_path} ${result_path2} PARENT_SCOPE)
@@ -69,7 +68,7 @@ function (DownloadAndExtract component archive_name unpacked_path result_path fo
 endfunction(DownloadAndExtract)
 
 
-function (DownloadAndExtractInternal URL archive_path  unpacked_path folder fattal resultExt sha256 files_to_extract)
+function (DownloadAndExtractInternal URL archive_path  unpacked_path folder fattal resultExt sha256)
   set (status "ON")
   DownloadAndCheck(${URL} ${archive_path} ${fattal} result1 ${sha256})
   if ("${result1}" STREQUAL "ARCHIVE_DOWNLOAD_FAIL")
@@ -84,17 +83,17 @@ function (DownloadAndExtractInternal URL archive_path  unpacked_path folder fatt
   endif()
 
   if("${status}" STREQUAL "ON")
-    ExtractWithVersion(${URL} ${archive_path} ${unpacked_path} ${folder} result ${files_to_extract})
+    ExtractWithVersion(${URL} ${archive_path} ${unpacked_path} ${folder} result)
   endif()
 
   set (${resultExt} ${status} PARENT_SCOPE)
 
 endfunction(DownloadAndExtractInternal)
 
-function (ExtractWithVersion URL archive_path unpacked_path folder result files_to_extract)
+function (ExtractWithVersion URL archive_path unpacked_path folder result)
 
-  debug_message("ExtractWithVersion : ${archive_path} : ${unpacked_path} : ${folder} : ${files_to_extract}")
-  extract(${archive_path} ${unpacked_path} ${folder} ${files_to_extract} status)
+  debug_message("ExtractWithVersion : ${archive_path} : ${unpacked_path}")
+  extract(${archive_path} ${unpacked_path} ${folder} status)
   #dont need archive actually after unpacking
   file(REMOVE_RECURSE "${archive_path}")
   if (${status})
@@ -107,20 +106,20 @@ function (ExtractWithVersion URL archive_path unpacked_path folder result files_
   set (${result} ${status} PARENT_SCOPE)
 endfunction (ExtractWithVersion)
 
-function (DownloadOrExtractInternal URL archive_path unpacked_path folder fattal resultExt sha256 files_to_extract)
+function (DownloadOrExtractInternal URL archive_path unpacked_path folder fattal resultExt sha256)
   debug_message("checking wether archive downloaded : ${archive_path}")
   set (downloadStatus "NOTOK")
   if (NOT EXISTS ${archive_path})
-    DownloadAndExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} result ${sha256} ${files_to_extract})
+    DownloadAndExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} result ${sha256})
     if (${result})
       set (downloadStatus "OK")
     endif()
   else()
 
     if (ENABLE_UNSAFE_LOCATIONS)
-      ExtractWithVersion(${URL} ${archive_path} ${unpacked_path} ${folder} result ${files_to_extract})
+      ExtractWithVersion(${URL} ${archive_path} ${unpacked_path} ${folder} result)
       if(NOT ${result})
-        DownloadAndExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} result ${sha256} ${files_to_extract})
+        DownloadAndExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} result ${sha256})
         if (${result})
           set (downloadStatus "OK")
         endif()
@@ -128,7 +127,7 @@ function (DownloadOrExtractInternal URL archive_path unpacked_path folder fattal
     else()
       debug_message("archive found on FS : ${archive_path}, however we cannot check it's checksum and think that it is invalid")
       file(REMOVE_RECURSE "${archive_path}")
-      DownloadAndExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} result ${sha256} ${files_to_extract})
+      DownloadAndExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} result ${sha256})
       if (${result})
         set (downloadStatus "OK")
       endif()
@@ -146,7 +145,9 @@ function (DownloadOrExtractInternal URL archive_path unpacked_path folder fattal
 
 endfunction(DownloadOrExtractInternal)
 
-function (CheckOrDownloadAndExtract component RELATIVE_URL archive_name unpacked_path result_path folder fattal resultExt use_alternatives sha256 files_to_extract)
+file(REMOVE ${CMAKE_BINARY_DIR}/dependencies_64.txt)
+
+function (CheckOrDownloadAndExtract component RELATIVE_URL archive_name unpacked_path result_path folder fattal resultExt use_alternatives sha256)
   set (archive_path ${TEMP}/download/${archive_name})
   set (status "ON")
 
@@ -162,17 +163,18 @@ function (CheckOrDownloadAndExtract component RELATIVE_URL archive_name unpacked
   if (${use_alternatives})
     set(DEP_INFO "${component}=${URL}")
     debug_message (STATUS "DEPENDENCY_URL: ${DEP_INFO}")
+    file(APPEND ${CMAKE_BINARY_DIR}/dependencies_64.txt "${DEP_INFO}\n")
   endif()
 
   debug_message ("checking that unpacked directory exist: ${unpacked_path}")
 
   if (NOT EXISTS ${unpacked_path})
-    DownloadOrExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} status ${sha256} ${files_to_extract})
+    DownloadOrExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} status ${sha256})
   else(NOT EXISTS ${unpacked_path})
     #path exists, so we would like to check what was unpacked version
     set (version_file ${unpacked_path}/ie_dependency.info)
 
-    if (NOT EXISTS ${version_file})
+    if (NOT EXISTS ${version_file} AND NOT ${ENABLE_ALTERNATIVE_TEMP})
       clean_message(FATAL_ERROR "error: Dependency doesn't contain version file. Please select actions: \n"
         "if you are not sure about your FS dependency - remove it : \n"
         "\trm -rf ${unpacked_path}\n"
@@ -198,12 +200,12 @@ function (CheckOrDownloadAndExtract component RELATIVE_URL archive_name unpacked
         string(REPLACE ${TEMP} ${ALTERNATIVE_PATH} archive_path ${archive_path})
 
         debug_message("dependency different: use local path for fetching updated version: ${alternative_path}")
-        CheckOrDownloadAndExtract(${component} ${RELATIVE_URL} ${archive_name} ${unpacked_path} ${result_path} ${folder} ${fattal} ${resultExt} FALSE ${sha256} ${files_to_extract})
+        CheckOrDownloadAndExtract(${component} ${RELATIVE_URL} ${archive_name} ${unpacked_path} ${result_path} ${folder} ${fattal} ${resultExt} FALSE ${sha256})
 
       else()
         debug_message("dependency updated: download it again")
         file(REMOVE_RECURSE "${unpacked_path}")
-        DownloadOrExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} status ${sha256} ${files_to_extract})
+        DownloadOrExtractInternal(${URL} ${archive_path} ${unpacked_path} ${folder} ${fattal} status ${sha256})
       endif()
     endif ()
    endif()

cmake/developer_package/download/extract.cmake

@@ -1,8 +1,8 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
-function (extract archive_path unpacked_path folder files_to_extract result)
+function (extract archive_path unpacked_path folder result)
   # Slurped from a generated extract-TARGET.cmake file.
     get_filename_component(unpacked_dir ${unpacked_path} DIRECTORY)
 
@@ -24,24 +24,20 @@ function (extract archive_path unpacked_path folder files_to_extract result)
       message("unpacked_dir= ${unpacked_dir}")      
     endif()
 
-    string(REGEX REPLACE ";" " " list_files_to_extract "${${files_to_extract}}")
-    message(STATUS "extracting... [tar xfz] ${list_files_to_extract}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xfz ${archive_path} ${${files_to_extract}}
+    message(STATUS "extracting... [tar xfz]")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xfz ${archive_path} 
       WORKING_DIRECTORY ${unpacked_dir}
       RESULT_VARIABLE rv
       ERROR_VARIABLE err)
 
-    if (NOT (rv EQUAL 0))
+    if (NOT (err STREQUAL ""))
       message(STATUS "error: extract of '${archive_path}' failed: ${err}")
       #invalid archive
       file(REMOVE_RECURSE "${unpacked_path}")
       file(REMOVE_RECURSE "${archive_path}")
       set(${result} 0 PARENT_SCOPE)
     else()
-      if (NOT (err STREQUAL ""))
-         message(STATUS "${err}")
-      endif()
       set(${result} 1 PARENT_SCOPE)
     endif()
 
-endfunction (extract)
+endfunction (extract)

cmake/developer_package/faster_build.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/features.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -11,21 +11,19 @@ ie_dependent_option (ENABLE_LTO "Enable Link Time Optimization" OFF "LINUX;NOT C
 
 ie_option (OS_FOLDER "create OS dedicated folder in output" OFF)
 
-if(OV_GENERATOR_MULTI_CONFIG)
-    ie_option(USE_BUILD_TYPE_SUBFOLDER "Create dedicated sub-folder per build type for output binaries" OFF)
-else()
+if(UNIX)
     ie_option(USE_BUILD_TYPE_SUBFOLDER "Create dedicated sub-folder per build type for output binaries" ON)
+else()
+    ie_option(USE_BUILD_TYPE_SUBFOLDER "Create dedicated sub-folder per build type for output binaries" OFF)
 endif()
 
 # FIXME: ARM cross-compiler generates several "false positive" warnings regarding __builtin_memcpy buffer overflow
 ie_dependent_option (TREAT_WARNING_AS_ERROR "Treat build warnings as errors" ON "X86 OR X86_64" OFF)
 
-ie_dependent_option (ENABLE_INTEGRITYCHECK "build DLLs with /INTEGRITYCHECK flag" OFF "CMAKE_CXX_COMPILER_ID STREQUAL MSVC" OFF)
+ie_option (ENABLE_INTEGRITYCHECK "build DLLs with /INTEGRITYCHECK flag" OFF)
 
 ie_option (ENABLE_SANITIZER "enable checking memory errors via AddressSanitizer" OFF)
 
-ie_option (ENABLE_UB_SANITIZER "enable UndefinedBahavior sanitizer" OFF)
-
 ie_option (ENABLE_THREAD_SANITIZER "enable checking data races via ThreadSanitizer" OFF)
 
 ie_dependent_option (ENABLE_COVERAGE "enable code coverage" OFF "CMAKE_CXX_COMPILER_ID STREQUAL GNU" OFF)
@@ -44,19 +42,23 @@ ie_option (BUILD_SHARED_LIBS "Build as a shared library" ON)
 
 ie_dependent_option (ENABLE_FASTER_BUILD "Enable build features (PCH, UNITY) to speed up build time" OFF "CMAKE_VERSION VERSION_GREATER_EQUAL 3.16" OFF)
 
-ie_dependent_option (ENABLE_CPPLINT "Enable cpplint checks during the build" ON "UNIX;NOT ANDROID" OFF)
+if(NOT DEFINED ENABLE_CPPLINT)
+	ie_dependent_option (ENABLE_CPPLINT "Enable cpplint checks during the build" ON "UNIX;NOT ANDROID" OFF)
+endif()
 
-ie_dependent_option (ENABLE_CPPLINT_REPORT "Build cpplint report instead of failing the build" OFF "ENABLE_CPPLINT" OFF)
+if(NOT DEFINED ENABLE_CPPLINT_REPORT)
+	ie_dependent_option (ENABLE_CPPLINT_REPORT "Build cpplint report instead of failing the build" OFF "ENABLE_CPPLINT" OFF)
+endif()
 
-ie_dependent_option (ENABLE_CLANG_FORMAT "Enable clang-format checks during the build" ON "UNIX;NOT ANDROID" OFF)
-
-ie_dependent_option (ENABLE_NCC_STYLE "Enable ncc style check" ON "UNIX;NOT ANDROID" OFF)
+ie_option (ENABLE_CLANG_FORMAT "Enable clang-format checks during the build" ON)
 
 ie_option (VERBOSE_BUILD "shows extra information about build" OFF)
 
 ie_option (ENABLE_UNSAFE_LOCATIONS "skip check for MD5 for dependency" OFF)
 
-ie_dependent_option (ENABLE_FUZZING "instrument build for fuzzing" OFF "OV_COMPILER_IS_CLANG; NOT WIN32" OFF)
+ie_option (ENABLE_ALTERNATIVE_TEMP "in case of dependency conflict, to avoid modification in master, use local copy of dependency" ON)
+
+ie_dependent_option (ENABLE_FUZZING "instrument build for fuzzing" OFF "CMAKE_CXX_COMPILER_ID MATCHES ^(Apple)?Clang$; NOT WIN32" OFF)
 
 #
 # Check features

cmake/developer_package/frontends/create_frontends_hpp.cmake

@@ -1,34 +0,0 @@
-# Copyright (C) 2018-2022 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-foreach(var OV_FRONTENDS_HPP_HEADER_IN OV_FRONTENDS_HPP_HEADER FRONTEND_NAMES)
-    if(NOT DEFINED ${var})
-        message(FATAL_ERROR "${var} is required, but not defined")
-    endif()
-endforeach()
-
-# configure variables
-
-set(OV_FRONTEND_DECLARATIONS "")
-set(OV_FRONTEND_MAP_DEFINITION "    FrontendsStaticRegistry registry = {")
-
-foreach(frontend IN LISTS FRONTEND_NAMES)
-    # common
-    set(_OV_FRONTEND_DATA_FUNC "GetFrontEndData${frontend}")
-    set(_OV_VERSION_FUNC "GetAPIVersion${frontend}")
-
-    # declarations
-    set(OV_FRONTEND_DECLARATIONS "${OV_FRONTEND_DECLARATIONS}
-ov::frontend::FrontEndVersion ${_OV_VERSION_FUNC}();
-void* ${_OV_FRONTEND_DATA_FUNC}();")
-
-    set(OV_FRONTEND_MAP_DEFINITION "${OV_FRONTEND_MAP_DEFINITION}
-        { Value { ${_OV_FRONTEND_DATA_FUNC}, ${_OV_VERSION_FUNC} } },")
-endforeach()
-
-set(OV_FRONTEND_MAP_DEFINITION "${OV_FRONTEND_MAP_DEFINITION}
-    };
-    return registry;")
-
-configure_file("${OV_FRONTENDS_HPP_HEADER_IN}" "${OV_FRONTENDS_HPP_HEADER}" @ONLY)

cmake/developer_package/frontends/frontends.cmake

@@ -1,248 +0,0 @@
-# Copyright (C) 2018-2022 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set(FRONTEND_INSTALL_INCLUDE "runtime/include/")
-set(FRONTEND_NAME_PREFIX "openvino_")
-set(FRONTEND_NAME_SUFFIX "_frontend")
-
-set(FRONTEND_NAMES "" CACHE INTERNAL "")
-
-if(NOT TARGET ov_frontends)
-    add_custom_target(ov_frontends)
-endif()
-
-#
-# ov_target_link_frontends(<TARGET_NAME>)
-#
-function(ov_target_link_frontends TARGET_NAME)
-    if(BUILD_SHARED_LIBS)
-        return()
-    endif()
-
-    foreach(name IN LISTS FRONTEND_NAMES)
-        set(frontend_target_name "${FRONTEND_NAME_PREFIX}${name}${FRONTEND_NAME_SUFFIX}")
-        target_link_libraries(${TARGET_NAME} PRIVATE ${frontend_target_name})
-    endforeach()
-endfunction()
-
-#
-# ov_generate_frontends_hpp()
-#
-function(ov_generate_frontends_hpp)
-    if(BUILD_SHARED_LIBS)
-        return()
-    endif()
-
-    # add frontends to libraries including ov_frontends.hpp
-    ov_target_link_frontends(openvino)
-
-    set(ov_frontends_hpp "${CMAKE_BINARY_DIR}/src/frontends/common/src/ov_frontends.hpp")
-    set(frontends_hpp_in "${IEDevScripts_DIR}/frontends/ov_frontends.hpp.in")
-
-    add_custom_command(OUTPUT "${ov_frontends_hpp}"
-                       COMMAND
-                        "${CMAKE_COMMAND}"
-                        -D "OV_FRONTENDS_HPP_HEADER_IN=${frontends_hpp_in}"
-                        -D "OV_FRONTENDS_HPP_HEADER=${ov_frontends_hpp}"
-                        -D "FRONTEND_NAMES=${FRONTEND_NAMES}"
-                        -P "${IEDevScripts_DIR}/frontends/create_frontends_hpp.cmake"
-                       DEPENDS
-                         "${frontends_hpp_in}"
-                         "${IEDevScripts_DIR}/frontends/create_frontends_hpp.cmake"
-                       COMMENT
-                         "Generate ov_frontends.hpp for static build"
-                       VERBATIM)
-
-    # for some reason dependency on source files does not work
-    # so, we have to use explicit target and make it dependency for frontend_common
-    add_custom_target(_ov_frontends_hpp DEPENDS ${ov_frontends_hpp})
-    add_dependencies(frontend_common_obj _ov_frontends_hpp)
-
-    # add dependency for object files
-    get_target_property(sources frontend_common_obj SOURCES)
-    foreach(source IN LISTS sources)
-        if("${source}" MATCHES "\\$\\<TARGET_OBJECTS\\:([A-Za-z0-9_]*)\\>")
-            # object library
-            set(obj_library ${CMAKE_MATCH_1})
-            get_target_property(obj_sources ${obj_library} SOURCES)
-            list(APPEND all_sources ${obj_sources})
-        else()
-            # usual source
-            list(APPEND all_sources ${source})
-        endif()
-    endforeach()
-
-    # add dependency on header file generation for all inference_engine source files
-    set_source_files_properties(${all_sources} PROPERTIES OBJECT_DEPENDS ${ov_frontends_hpp})
-endfunction()
-
-unset(protobuf_lite_installed CACHE)
-unset(protobuf_installed CACHE)
-
-#
-# ov_add_frontend(NAME <IR|ONNX|...>
-#                 FILEDESCRIPTION <description>
-#                 [LINKABLE_FRONTEND]
-#                 [SKIP_INSTALL]
-#                 [PROTOBUF_LITE]
-#                 [LINK_LIBRARIES <lib1 lib2 ...>])
-#
-macro(ov_add_frontend)
-    set(options LINKABLE_FRONTEND SHUTDOWN_PROTOBUF PROTOBUF_LITE SKIP_NCC_STYLE SKIP_INSTALL)
-    set(oneValueArgs NAME FILEDESCRIPTION)
-    set(multiValueArgs LINK_LIBRARIES PROTO_FILES)
-    cmake_parse_arguments(OV_FRONTEND "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    foreach(prop NAME FILEDESCRIPTION)
-        if(NOT DEFINED OV_FRONTEND_${prop})
-            message(FATAL_ERROR "Frontend ${prop} property is not defined")
-        endif()
-    endforeach()
-
-    set(TARGET_NAME "${FRONTEND_NAME_PREFIX}${OV_FRONTEND_NAME}${FRONTEND_NAME_SUFFIX}")
-
-    list(APPEND FRONTEND_NAMES ${OV_FRONTEND_NAME})
-    set(FRONTEND_NAMES "${FRONTEND_NAMES}" CACHE INTERNAL "" FORCE)
-
-    file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
-    file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
-    file(GLOB_RECURSE LIBRARY_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
-
-    set(${TARGET_NAME}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-    # Create named folders for the sources within the .vcproj
-    # Empty name lists them directly under the .vcproj
-
-    source_group("src" FILES ${LIBRARY_SRC})
-    source_group("include" FILES ${LIBRARY_HEADERS})
-    source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS})
-
-    # Generate protobuf file on build time for each '.proto' file in src/proto
-    file(GLOB proto_files ${CMAKE_CURRENT_SOURCE_DIR}/src/proto/*.proto)
-
-    foreach(INFILE IN LISTS proto_files)
-        get_filename_component(FILE_DIR ${INFILE} DIRECTORY)
-        get_filename_component(FILE_WE ${INFILE} NAME_WE)
-        set(OUTPUT_PB_SRC ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.pb.cc)
-        set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.pb.h)
-        set(GENERATED_PROTO ${INFILE})
-        add_custom_command(
-                OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}"
-                COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${FILE_DIR} ${FILE_WE}.proto
-                DEPENDS ${PROTOC_EXECUTABLE} ${GENERATED_PROTO}
-                COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${GENERATED_PROTO}"
-                VERBATIM
-                COMMAND_EXPAND_LISTS)
-        list(APPEND PROTO_SRCS "${OUTPUT_PB_SRC}")
-        list(APPEND PROTO_HDRS "${OUTPUT_PB_HEADER}")
-    endforeach()
-
-    # Disable all warnings for generated code
-    set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS} PROPERTIES COMPILE_OPTIONS -w GENERATED TRUE)
-
-    # Create library
-    add_library(${TARGET_NAME} ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS} ${PROTO_SRCS} ${PROTO_HDRS})
-
-    if(OV_FRONTEND_LINKABLE_FRONTEND)
-        # create beautiful alias
-        add_library(openvino::frontend::${OV_FRONTEND_NAME} ALIAS ${TARGET_NAME})
-    endif()
-
-    # Shutdown protobuf when unloading the front dynamic library
-    if(OV_FRONTEND_SHUTDOWN_PROTOBUF AND BUILD_SHARED_LIBS)
-        target_link_libraries(${TARGET_NAME} PRIVATE ov_protobuf_shutdown)
-    endif()
-
-    if(NOT BUILD_SHARED_LIBS)
-        # override default function names
-        target_compile_definitions(${TARGET_NAME} PRIVATE
-            "-DGetFrontEndData=GetFrontEndData${OV_FRONTEND_NAME}"
-            "-DGetAPIVersion=GetAPIVersion${OV_FRONTEND_NAME}")
-    endif()
-
-    if(OV_FRONTEND_SKIP_NCC_STYLE)
-        # frontend's CMakeLists.txt must define its own custom 'ov_ncc_naming_style' step
-    else()
-        ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}
-                            SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include"
-                            ADDITIONAL_INCLUDE_DIRECTORIES
-                                $<TARGET_PROPERTY:frontend_common::static,INTERFACE_INCLUDE_DIRECTORIES>)
-    endif()
-
-    target_include_directories(${TARGET_NAME}
-            PUBLIC
-                $<BUILD_INTERFACE:${${TARGET_NAME}_INCLUDE_DIR}>
-            PRIVATE
-                ${CMAKE_CURRENT_SOURCE_DIR}/src
-                ${CMAKE_CURRENT_BINARY_DIR})
-
-    ie_add_vs_version_file(NAME ${TARGET_NAME}
-                           FILEDESCRIPTION ${OV_FRONTEND_FILEDESCRIPTION})
-
-    ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
-
-    target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime)
-    target_link_libraries(${TARGET_NAME} PRIVATE ${OV_FRONTEND_LINK_LIBRARIES})
-
-    # WA for TF frontends which always requires protobuf (not protobuf-lite)
-    # if TF FE is built in static mode, use protobuf for all other FEs
-    if(FORCE_FRONTENDS_USE_PROTOBUF)
-        set(OV_FRONTEND_PROTOBUF_LITE OFF)
-    endif()
-
-    if(proto_files)
-        if(OV_FRONTEND_PROTOBUF_LITE)
-            if(NOT protobuf_lite_installed)
-                ov_install_static_lib(${Protobuf_LITE_LIBRARIES} core)
-                set(protobuf_lite_installed ON CACHE INTERNAL "" FORCE)
-            endif()
-            link_system_libraries(${TARGET_NAME} PRIVATE ${Protobuf_LITE_LIBRARIES})
-        else()
-            if(NOT protobuf_installed)
-                ov_install_static_lib(${Protobuf_LIBRARIES} core)
-                set(protobuf_installed ON CACHE INTERNAL "" FORCE)
-            endif()
-            link_system_libraries(${TARGET_NAME} PRIVATE ${Protobuf_LIBRARIES})
-        endif()
-
-        # prptobuf generated code emits -Wsuggest-override error
-        if(SUGGEST_OVERRIDE_SUPPORTED)
-            target_compile_options(${TARGET_NAME} PRIVATE -Wno-suggest-override)
-        endif()
-    endif()
-
-    add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}
-                            EXCLUDE_PATTERNS ${PROTO_SRCS} ${PROTO_HDRS})
-
-    add_dependencies(ov_frontends ${TARGET_NAME})
-
-    if(NOT OV_FRONTEND_SKIP_INSTALL)
-        if(BUILD_SHARED_LIBS)
-            if(OV_FRONTEND_LINKABLE_FRONTEND)
-                set(export_set EXPORT OpenVINOTargets)
-            endif()
-            install(TARGETS ${TARGET_NAME} ${export_set}
-                    RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
-                    ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
-                    LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
-        else()
-            ov_install_static_lib(${TARGET_NAME} core)
-        endif()
-
-        if(OV_FRONTEND_LINKABLE_FRONTEND)
-            # install -dev part
-            install(DIRECTORY ${${TARGET_NAME}_INCLUDE_DIR}/openvino
-                    DESTINATION ${FRONTEND_INSTALL_INCLUDE}/
-                    COMPONENT core_dev
-                    FILES_MATCHING PATTERN "*.hpp")
-
-            set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME frontend::${OV_FRONTEND_NAME})
-            export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
-                   APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")
-        endif()
-    else()
-        # skipped frontend has to be installed in static libraries case
-        ov_install_static_lib(${TARGET_NAME} core)
-    endif()
-endmacro()

cmake/developer_package/frontends/ov_frontends.hpp.in

@@ -1,27 +0,0 @@
-// Copyright (C) 2018-2022 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#pragma once
-
-#include "openvino/frontend/frontend.hpp"
-
-@OV_FRONTEND_DECLARATIONS@
-
-namespace {
-
-using GetFrontEndDataFunc = void*();
-using GetAPIVersionFunc = ov::frontend::FrontEndVersion();
-
-struct Value {
-    GetFrontEndDataFunc* m_dataFunc;
-    GetAPIVersionFunc* m_versionFunc;
-};
-
-using FrontendsStaticRegistry = std::vector<Value>;
-
-const FrontendsStaticRegistry getStaticFrontendsRegistry() {
-@OV_FRONTEND_MAP_DEFINITION@
-}
-
-} // namespace

cmake/developer_package/linux_name.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/message.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

cmake/developer_package/models.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -30,7 +30,6 @@ function(add_lfs_repo name prefix url tag)
         return()
     endif()
 
-    include(ExternalProject)
     ExternalProject_Add(${name}
         PREFIX ${prefix}
         GIT_REPOSITORY ${url}

cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake

@@ -1,153 +0,0 @@
-# Copyright (C) 2018-2022 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-if(NOT COMMAND ie_check_pip_package)
-    message(FATAL_ERROR "ncc_naming_style.cmake must be included after ie_check_pip_package")
-endif()
-
-set(ncc_style_dir "${IEDevScripts_DIR}/ncc_naming_style")
-set(ncc_style_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/ncc_naming_style")
-
-# try to find_package(Clang QUIET)
-# ClangConfig.cmake contains bug that if libclang-XX-dev is not
-# installed, then find_package fails with errors even in QUIET mode
-configure_file("${ncc_style_dir}/try_find_clang.cmake"
-               "${ncc_style_bin_dir}/source/CMakeLists.txt" COPYONLY)
-execute_process(
-    COMMAND
-        "${CMAKE_COMMAND}" -S "${ncc_style_bin_dir}/source"
-                           -B "${ncc_style_bin_dir}/build"
-    RESULT_VARIABLE clang_find_result
-    OUTPUT_VARIABLE output_var
-    ERROR_VARIABLE error_var)
-
-if(NOT clang_find_result EQUAL "0")
-    message(WARNING "Please, install libclang-[N]-dev package (required for ncc naming style check)")
-    message(WARNING "find_package(Clang) output: ${output_var}")
-    message(WARNING "find_package(Clang) error: ${error_var}")
-    set(ENABLE_NCC_STYLE OFF)
-endif()
-
-# Since we were able to find_package(Clang) in a separate process
-# let's try to find in current process
-if(ENABLE_NCC_STYLE)
-    find_host_package(Clang QUIET)
-    if(Clang_FOUND AND TARGET libclang)
-        get_target_property(libclang_location libclang LOCATION)
-        message(STATUS "Found libclang: ${libclang_location}")
-    else()
-        message(WARNING "libclang is not found (required for ncc naming style check)")
-        set(ENABLE_NCC_STYLE OFF)
-    endif()
-endif()
-
-# find python3
-
-find_package(PythonInterp 3 QUIET)
-if(NOT PYTHONINTERP_FOUND)
-    message(WARNING "Python3 interpreter was not found (required for ncc naming style check)")
-    set(ENABLE_NCC_STYLE OFF)
-endif()
-
-# check python requirements_dev.txt
-
-set(ncc_script_py "${ncc_style_dir}/ncc/ncc.py")
-
-if(NOT EXISTS ${ncc_script_py})
-    message(WARNING "ncc.py is not downloaded via submodule")
-    set(ENABLE_NCC_STYLE OFF)
-endif()
-
-if(ENABLE_NCC_STYLE)
-    set(req_file "${ncc_style_dir}/requirements_dev.txt")
-    file(STRINGS ${req_file} req_lines)
-
-    foreach(req IN LISTS req_lines)
-        ie_check_pip_package(${req} STATUS)
-    endforeach()
-endif()
-
-# create high-level target
-
-if(ENABLE_NCC_STYLE AND NOT TARGET ncc_all)
-    add_custom_target(ncc_all ALL)
-    set_target_properties(ncc_all PROPERTIES FOLDER ncc_naming_style)
-endif()
-
-#
-# ov_ncc_naming_style(FOR_TARGET target_name
-#                     SOURCE_DIRECTORY dir
-#                     [ADDITIONAL_INCLUDE_DIRECTORIES dir1 dir2 ..]
-#                     [DEFINITIONS def1 def2 ..])
-#
-# FOR_TARGET - name of the target
-# SOURCE_DIRECTORY - directory to check sources from
-# ADDITIONAL_INCLUDE_DIRECTORIES - additional include directories used in checked headers
-# DEFINITIONS - additional definitions passed to preprocessor stage
-#
-function(ov_ncc_naming_style)
-    if(NOT ENABLE_NCC_STYLE)
-        return()
-    endif()
-
-    cmake_parse_arguments(NCC_STYLE "FAIL"
-        "FOR_TARGET;SOURCE_DIRECTORY" "ADDITIONAL_INCLUDE_DIRECTORIES;DEFINITIONS" ${ARGN})
-
-    foreach(var FOR_TARGET SOURCE_DIRECTORY)
-        if(NOT DEFINED NCC_STYLE_${var})
-            message(FATAL_ERROR "${var} is not defined in ov_ncc_naming_style function")
-        endif()
-    endforeach()
-
-    file(GLOB_RECURSE sources
-         RELATIVE "${NCC_STYLE_SOURCE_DIRECTORY}"
-         "${NCC_STYLE_SOURCE_DIRECTORY}/*.hpp"
-         "${NCC_STYLE_SOURCE_DIRECTORY}/*.cpp")
-
-    list(APPEND NCC_STYLE_ADDITIONAL_INCLUDE_DIRECTORIES "${NCC_STYLE_SOURCE_DIRECTORY}")
-
-    foreach(source IN LISTS sources)
-        set(output_file "${ncc_style_bin_dir}/${source}.ncc_style")
-        set(full_source_path "${NCC_STYLE_SOURCE_DIRECTORY}/${source}")
-
-        add_custom_command(
-            OUTPUT
-                ${output_file}
-            COMMAND
-                "${CMAKE_COMMAND}"
-                -D "PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
-                -D "NCC_PY_SCRIPT=${ncc_script_py}"
-                -D "INPUT_FILE=${full_source_path}"
-                -D "OUTPUT_FILE=${output_file}"
-                -D "DEFINITIONS=${NCC_STYLE_DEFINITIONS}"
-                -D "CLANG_LIB_PATH=${libclang_location}"
-                -D "STYLE_FILE=${ncc_style_dir}/openvino.style"
-                -D "ADDITIONAL_INCLUDE_DIRECTORIES=${NCC_STYLE_ADDITIONAL_INCLUDE_DIRECTORIES}"
-                -D "EXPECTED_FAIL=${NCC_STYLE_FAIL}"
-                -P "${ncc_style_dir}/ncc_run.cmake"
-            DEPENDS
-                "${full_source_path}"
-                "${ncc_style_dir}/openvino.style"
-                "${ncc_script_py}"
-                "${ncc_style_dir}/ncc_run.cmake"
-            COMMENT
-                "[ncc naming style] ${source}"
-            VERBATIM)
-        list(APPEND output_files ${output_file})
-    endforeach()
-
-    set(ncc_target ${NCC_STYLE_FOR_TARGET}_ncc_check)
-    add_custom_target(${ncc_target}
-        DEPENDS ${output_files}
-        COMMENT "[ncc naming style] ${NCC_STYLE_FOR_TARGET}")
-
-    add_dependencies(${NCC_STYLE_FOR_TARGET} ${ncc_target})
-    add_dependencies(ncc_all ${ncc_target})
-endfunction()
-
-if(TARGET ncc_all)
-    ov_ncc_naming_style(FOR_TARGET ncc_all
-                        SOURCE_DIRECTORY "${ncc_style_dir}/self_check"
-                        FAIL)
-endif()

cmake/developer_package/ncc_naming_style/ncc_run.cmake

@@ -1,45 +0,0 @@
-# Copyright (C) 2018-2022 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-foreach(var NCC_PY_SCRIPT PYTHON_EXECUTABLE OUTPUT_FILE DEFINITIONS EXPECTED_FAIL
-    INPUT_FILE ADDITIONAL_INCLUDE_DIRECTORIES STYLE_FILE CLANG_LIB_PATH)
-    if(NOT DEFINED ${var})
-        message(FATAL_ERROR "${var} is not defined for ncc_run.cmake")
-    endif()
-endforeach()
-
-file(REMOVE "${OUTPUT_FILE}")
-
-if(DEFINITIONS)
-    set(defs --definition ${DEFINITIONS})
-endif()
-
-execute_process(
-    COMMAND
-        "${PYTHON_EXECUTABLE}"
-        "${NCC_PY_SCRIPT}"
-        --path ${INPUT_FILE}
-        --style ${STYLE_FILE}
-        --clang-lib ${CLANG_LIB_PATH}
-        ${defs}
-        --include ${ADDITIONAL_INCLUDE_DIRECTORIES}
-    RESULT_VARIABLE result
-    OUTPUT_VARIABLE output
-    ERROR_VARIABLE output)
-
-file(WRITE "${OUTPUT_FILE}" "${output}")
-
-if(NOT result EQUAL "0")
-    set(failed ON)
-endif()
-
-if(EXPECTED_FAIL AND NOT failed)
-    message(FATAL_ERROR "[ncc self check] Self check is not failed for ${INPUT_FILE}")
-endif()
-
-if(failed AND NOT EXPECTED_FAIL)
-    # Display the output to console (to parse it form IDE)
-    message("${output}")
-    message(FATAL_ERROR  "[ncc naming style] Naming style check failed for ${INPUT_FILE}")
-endif()