[DOCS] 23.0 selector tool remove (#21315)

* Revert "[Core] fix Memory Leak caused by create/inference request consequently in separate thread (#18868) (#19191)"

This reverts commit b0394cc3e4.

* Install local wheel packages instead of PYPI ones (#19031)

* Try to use --no-index when install python packages

* Apply suggestions from code review

* Update .ci/azure/linux.yml

* Try to use conan.lock file (#19709)

* Fixed NCC style check (#20121)

---------

Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
Co-authored-by: Alina Kladieva <alina.kladieva@intel.com>

.ci/azure/android_arm64.yml

@@ -31,14 +31,6 @@ pr:
     - 'tools/*'
     - 'tests/layer_tests/*'
 
-resources:
-  repositories:
-  - repository: openvino_contrib
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/openvino_contrib
-    ref: master
-
 variables:
   - group: github
 
@@ -56,7 +48,6 @@ jobs:
     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
@@ -66,7 +57,7 @@ jobs:
     SHARE_DIR: /mount/cinfsshare/onnxtestdata
     CCACHE_DIR: $(SHARE_DIR)/ccache/master/android_arm64
     LD_LIBRARY_PATH: $(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/lib
-    OV_PYTHON_VERSION: 3.10.10 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
+    OV_PYTHON_VERSION: 3.11.2 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
 
   steps:
   - task: UsePythonVersion@0
@@ -76,7 +67,7 @@ jobs:
       disableDownloadFromRegistry: false
       architecture: 'x64'
       githubToken: $(auth_token)
-    displayName: Setup Python 3.10
+    displayName: Setup Python 3.11
     name: setupPython
   - bash: |
       #!/bin/bash
@@ -118,16 +109,9 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
-  - checkout: openvino_contrib
-    clean: 'true'
-    fetchDepth: '1'
-    submodules: 'true'
-    path: openvino_contrib
-
   - script: |
       set -e
       sudo -E $(OPENVINO_REPO_DIR)/install_build_dependencies.sh
@@ -149,18 +133,14 @@ jobs:
   - task: CMake@1
     inputs:
       cmakeArgs: >
-        -GNinja
+        -G "Ninja Multi-Config"
         -DCMAKE_VERBOSE_MAKEFILE=ON
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_TOOLS)/ndk-bundle/build/cmake/android.toolchain.cmake
         -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
         -DANDROID_ABI=$(ANDROID_ABI_CONFIG)
         -DANDROID_STL=c++_shared
         -DANDROID_PLATFORM=$(ANDROID_SDK_VERSION)
         -DENABLE_TESTS=ON
-        -DBUILD_java_api=ON
-        -DBUILD_nvidia_plugin=OFF
-        -DOPENVINO_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
         -DCMAKE_CXX_LINKER_LAUNCHER=ccache
         -DCMAKE_C_LINKER_LAUNCHER=ccache
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache

.ci/azure/ci_utils/onnxruntime/version

@@ -1 +1 @@
-rel-1.8.1
+rel-1.14.0

.ci/azure/linux.yml

@@ -32,13 +32,13 @@ resources:
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/openvino_contrib
-    ref: master
+    ref: releases/2023/0
 
   - repository: testdata
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
-    ref: master
+    ref: releases/2023/0
 
 variables:
   - group: github
@@ -71,7 +71,7 @@ jobs:
     maxParallel: '2'
 
   # About 150% of total time
-  timeoutInMinutes: '120'
+  timeoutInMinutes: '180'
 
   pool:
     name: LIN_VMSS_VENV_F16S_U20_WU2
@@ -100,17 +100,17 @@ jobs:
     BUILD_PYTHON: $(WORK_DIR)/build_python
     INSTALL_PYTHON: $(INSTALL_OPENVINO)/extras/python
     LD_LIBRARY_PATH: $(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/lib
-    OV_PYTHON_VERSION: 3.10.10 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
+    OV_PYTHON_VERSION: 3.11.2 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
 
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '$(OV_PYTHON_VERSION)' # Setting only major & minor version will download latest release from GH repo example 3.10 will be 3.10.10. 
+      versionSpec: '$(OV_PYTHON_VERSION)' # Setting only major & minor version will download latest release from GH repo example 3.10 will be 3.10.10.
       addToPath: true
       disableDownloadFromRegistry: false
       architecture: 'x64'
       githubToken: $(auth_token)
-    displayName: Setup Python 3.10
+    displayName: Setup Python 3.11
     name: setupPython
   - bash: |
       #!/bin/bash
@@ -151,13 +151,11 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
   - checkout: openvino_contrib
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino_contrib
 
@@ -165,7 +163,7 @@ jobs:
       set -e
       sudo -E $(REPO_DIR)/install_build_dependencies.sh
       # Move jdk into contrib
-      # 'clang' compiler is to check that samples can be built using it
+      # 'clang' compiler is used as a default compiler
       sudo apt --assume-yes install openjdk-11-jdk libbz2-dev clang
       # For Python API
       python3 -m pip install --upgrade pip
@@ -174,7 +172,8 @@ jobs:
       # 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/frontends/paddle/tests/requirements.txt
+      # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
+      #python3 -m pip install -r $(REPO_DIR)/src/frontends/paddle/tests/requirements.txt
       # For running ONNX frontend unit tests
       python3 -m pip install -r $(REPO_DIR)/src/frontends/onnx/tests/requirements.txt
       # For running TensorFlow frontend unit tests
@@ -219,7 +218,6 @@ jobs:
     # Should be after 'Install dependencies' because Git lfs is not installed
   - checkout: testdata
     clean: 'true'
-    fetchDepth: '1'
     lfs: 'true'
     path: testdata
 
@@ -239,10 +237,15 @@ jobs:
         -DENABLE_FASTER_BUILD=ON
         -DENABLE_STRICT_DEPENDENCIES=OFF
         -DOPENVINO_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
+        -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose"
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         -DCMAKE_C_COMPILER_LAUNCHER=ccache
         -DCMAKE_CXX_LINKER_LAUNCHER=ccache
         -DCMAKE_C_LINKER_LAUNCHER=ccache
+        -DCMAKE_CXX_COMPILER=clang++
+        -DCMAKE_C_COMPILER=clang
+        -DENABLE_SYSTEM_SNAPPY=ON
+        -DENABLE_SYSTEM_TBB=ON
         -DCPACK_GENERATOR=$(CMAKE_CPACK_GENERATOR)
         -DBUILD_nvidia_plugin=OFF
         -S $(REPO_DIR)
@@ -290,7 +293,10 @@ jobs:
   - script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_LAYER_TESTS_DIR)/cmake_install.cmake
     displayName: 'Install Layer Tests'
 
-  - script: python3 -m pip install openvino-dev --find-links=$(INSTALL_DIR)/tools
+  - script: |
+      set -e
+      python3 -m pip install $(INSTALL_DIR)/tools/openvino-*
+      python3 -m pip install $(INSTALL_DIR)/tools/openvino_dev-*
     displayName: 'Install python wheels'
 
   - script: |
@@ -303,7 +309,7 @@ jobs:
 
     # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time
   - script: |
-      export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1910/linux/x64:$(LD_LIBRARY_PATH)
+      export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.05.00.2116/linux/x64:$(LD_LIBRARY_PATH)
       python3 -m pytest -s $(INSTALL_TEST_DIR)/pyngraph $(PYTHON_STATIC_ARGS) \
         --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \
         --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_zoo_models.py \
@@ -313,7 +319,7 @@ jobs:
     # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time
   - script: |
       # For python imports to import pybind_mock_frontend
-      export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1910/linux/x64:$(LD_LIBRARY_PATH)
+      export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.05.00.2116/linux/x64:$(LD_LIBRARY_PATH)
       export PYTHONPATH=$(INSTALL_TEST_DIR):$(INSTALL_DIR)/python/python3.8:$PYTHONPATH
       python3 -m pytest -sv $(INSTALL_TEST_DIR)/pyopenvino $(PYTHON_STATIC_ARGS) \
         --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \
@@ -323,7 +329,7 @@ jobs:
     displayName: 'Python API 2.0 Tests'
 
   - script: |
-      export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1910/linux/x64:$(LD_LIBRARY_PATH)
+      export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.05.00.2116/linux/x64:$(LD_LIBRARY_PATH)
       python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml
     displayName: 'Model Optimizer UT'
 
@@ -361,10 +367,10 @@ jobs:
     displayName: 'List install files'
 
   - script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR) -b $(BUILD_DIR)/cpp_samples
-    displayName: 'Build cpp samples'
+    displayName: 'Build cpp samples - gcc'
 
   - script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -b $(BUILD_DIR)/cpp_samples_clang
-    env: 
+    env:
       CC: clang
       CXX: clang++
     displayName: 'Build cpp samples - clang'
@@ -389,17 +395,16 @@ jobs:
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_conditional_compilation_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ConditionalCompilation.xml
     displayName: 'Conditional Compilation Tests'
 
-  - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-PaddleTests.xml
-    displayName: 'Paddle Tests'
-
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_ir_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-IRFrontend.xml
     displayName: 'IR Frontend Tests'
 
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_onnx_frontend_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ONNXFrontend.xml
     displayName: 'ONNX Frontend Tests'
 
+  # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml
     displayName: 'Paddle Frontend UT'
+    enabled: 'false'
 
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml
     displayName: 'TensorFlow Frontend Unit Tests'
@@ -430,10 +435,14 @@ jobs:
 
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_gna_unit_tests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ov_gna_unit_tests.xml
     displayName: 'GNA UT'
+    enabled: 'false' # TODO: fix
 
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ieMultiPluginUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieMultiPluginUnitTests.xml
     displayName: 'MULTI UT'
 
+  - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_auto_batch_unit_tests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ov_auto_batch_unit_tests.xml
+    displayName: 'AutoBatch UT'
+
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_template_func_tests --gtest_filter=*smoke* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-templateFuncTests.xml
     displayName: 'TEMPLATE FuncTests'
 
@@ -443,16 +452,10 @@ jobs:
 
   - script: |
       $(RUN_PREFIX) $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineCAPITests.xml
-    env:
-      DATA_PATH: $(MODELS_PATH)
-      MODELS_PATH: $(MODELS_PATH)
     displayName: 'IE CAPITests'
 
   - script: |
       $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_capi_test --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ov_capi_test.xml
-    env:
-      DATA_PATH: $(MODELS_PATH)
-      MODELS_PATH: $(MODELS_PATH)
     displayName: 'OV CAPITests'
 
   - task: CMake@1
@@ -527,22 +530,9 @@ jobs:
       python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt
       export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH
       export TEST_DEVICE=CPU
-      $(RUN_PREFIX) python3 -m pytest $(LAYER_TESTS_DIR)/mo_python_api_tests/test_mo_convert_complex_params.py --ir_version=11 --junitxml=./TEST-test_mo_convert_complex_params.xmlTEST
-    displayName: 'MO Python API Tests - Complex Python params'
+      $(RUN_PREFIX) python3 -m pytest $(LAYER_TESTS_DIR)/mo_python_api_tests/  --junitxml=./TEST-test_mo_convert.xmlTEST
+    displayName: 'MO Python API Tests'
 
-  - script: |
-      python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt
-      export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH
-      export TEST_DEVICE=CPU
-      $(RUN_PREFIX) python3 -m pytest $(LAYER_TESTS_DIR)/mo_python_api_tests/test_mo_convert_tf.py --ir_version=11 --junitxml=./TEST-test_mo_convert_tf.xmlTEST
-    displayName: 'MO Python API Tests - Import TF model from memory'
-
-  - script: |
-      python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt
-      export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH
-      export TEST_DEVICE=CPU
-      $(RUN_PREFIX) python3 -m pytest $(LAYER_TESTS_DIR)/mo_python_api_tests/test_mo_convert_pytorch.py --ir_version=11 --junitxml=./TEST-test_mo_convert_pytorch.xmlTEST
-    displayName: 'MO Python API Tests - Import PyTorch model from memory'
 
   - script: |
       python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt

.ci/azure/linux_arm64.yml

@@ -31,14 +31,6 @@ pr:
     - 'tools/*'
     - 'tests/layer_tests/*'
 
-resources:
-  repositories:
-  - repository: openvino_contrib
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/openvino_contrib
-    ref: master
-
 variables:
   - group: github
 
@@ -54,34 +46,18 @@ jobs:
     system.debug: true
     VSTS_HTTP_RETRY: 5
     VSTS_HTTP_TIMEOUT: 200
-    PYTHON_ARM_VERSION: "3.10.6"
-    PYTHON_EXEC: "python3.10"
     OPENVINO_ARCH: 'aarch64'
     NUM_PROC: 1
     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
-    ONETBB_REPO_DIR: $(OPENVINO_CONTRIB_REPO_DIR)/../oneTBB
-    BUILD_PYTHON: $(WORK_DIR)/build_python
-    BUILD_OPENCV: $(WORK_DIR)/build_opencv
-    BUILD_ONETBB: $(WORK_DIR)/build_onetbb
     BUILD_OPENVINO: $(WORK_DIR)/build
-    BUILD_OPENVINO_PYTHON: $(WORK_DIR)/build_python
-    CROSSENV_DIR: $(WORK_DIR)/cross_env
     INSTALL_OPENVINO: $(WORK_DIR)/install_openvino
-    INSTALL_PYTHON: $(INSTALL_OPENVINO)/extras/python
-    INSTALL_ONETBB: $(WORK_DIR)/build/extras/oneTBB
-    INSTALL_ONETBB_PACKAGE: $(INSTALL_OPENVINO)/extras/oneTBB
-    INSTALL_OPENCV: $(INSTALL_OPENVINO)/extras/opencv
     WORK_DIR: $(Pipeline.Workspace)/_w
     SHARE_DIR: /mount/cinfsshare/onnxtestdata
     TMP_DIR: /mnt/tmp
     OPENVINO_CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux_arm64
-    OPENCV_CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux_arm64_opencv
-    ONETBB_CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux_arm64_onetbb
     LD_LIBRARY_PATH: $(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/lib
-    OV_PYTHON_VERSION: 3.10.10 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
+    OV_PYTHON_VERSION: 3.11.2 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
 
   steps:
   - task: UsePythonVersion@0
@@ -91,7 +67,7 @@ jobs:
       disableDownloadFromRegistry: false
       architecture: 'x64'
       githubToken: $(auth_token)
-    displayName: Setup Python 3.10
+    displayName: Setup Python 3.11
     name: setupPython
   - bash: |
       #!/bin/bash
@@ -121,95 +97,89 @@ jobs:
 
   - script: |
       rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
-      mkdir -p $(BUILD_ONETBB) $(BUILD_OPENCV) $(BUILD_OPENVINO) $(BUILD_OPENVINO_PYTHON) $(BUILD_PYTHON)
-      mkdir -p $(INSTALL_ONETBB) $(INSTALL_ONETBB_PACKAGE) $(INSTALL_OPENVINO) $(INSTALL_PYTHON) $(INSTALL_OPENCV)
+      mkdir -p $(BUILD_OPENVINO)
+      mkdir -p $(INSTALL_OPENVINO)
       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 $(OPENVINO_CCACHE_DIR)
-      mkdir -p $(OPENCV_CCACHE_DIR)
-      mkdir -p $(ONETBB_CCACHE_DIR)
     displayName: 'Make directories'
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
-    submodules: 'true'
     path: openvino
 
-  - checkout: openvino_contrib
-    clean: 'true'
-    fetchDepth: '1'
-    submodules: 'true'
-    path: openvino_contrib
-
   - script: |
       set -e
-      sudo -E $(OPENVINO_REPO_DIR)/install_build_dependencies.sh
-      $(OPENVINO_CONTRIB_REPO_DIR)/modules/arm_plugin/scripts/install_build_dependencies.sh
       python3 -m pip install --upgrade pip
       python3 -m pip install -r $(OPENVINO_REPO_DIR)/src/bindings/python/requirements.txt
       python3 -m pip install -r $(OPENVINO_REPO_DIR)/src/bindings/python/wheel/requirements-dev.txt
-    env:
-      CCACHE_TEMPDIR: $(TMP_DIR)/ccache
-      CCACHE_BASEDIR: $(Pipeline.Workspace)
-      CCACHE_MAXSIZE: 50G
-      USE_CCACHE: 1
-      OPENCV_CCACHE_DIR: $(OPENCV_CCACHE_DIR)
-      ONETBB_CCACHE_DIR: $(ONETBB_CCACHE_DIR)
-      PYTHON_ARM_VERSION: $(PYTHON_ARM_VERSION)
-      NUM_PROC: $(NUM_PROC)
-      BUILD_PYTHON: $(BUILD_PYTHON)
-      WORK_DIR: $(WORK_DIR)
-      INSTALL_PYTHON: $(INSTALL_PYTHON)
-      BUILD_TYPE: $(BUILD_TYPE)
-      OPENVINO_REPO_DIR: $(OPENVINO_REPO_DIR)
-      BUILD_ONETBB: $(BUILD_ONETBB)
-      INSTALL_ONETBB: $(INSTALL_ONETBB)
-      INSTALL_OPENCV: $(INSTALL_OPENCV)
-      PYTHON_EXEC: $(PYTHON_EXEC)
-      ONETBB_REPO_DIR: $(ONETBB_REPO_DIR)
-      OPENCV_REPO_DIR: $(OPENCV_REPO_DIR)
-      BUILD_OPENCV: $(BUILD_OPENCV)
-      INSTALL_OPENVINO: $(INSTALL_OPENVINO)
+      # install dependencies needed to build CPU plugin for ARM
+      sudo -E apt --assume-yes install scons crossbuild-essential-arm64
+      # generic dependencies
+      sudo -E apt --assume-yes install cmake ccache
+      # Speed up build
+      sudo -E apt -y --no-install-recommends install unzip
+      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/
     displayName: 'Install dependencies'
 
   - script: |
-      set -e
-      /usr/local/bin/$(PYTHON_EXEC) -m pip install -U pip
-      /usr/local/bin/$(PYTHON_EXEC) -m pip install crossenv
-      /usr/local/bin/$(PYTHON_EXEC) -m crossenv $(INSTALL_PYTHON)/bin/$(PYTHON_EXEC) $(CROSSENV_DIR)
-      source $(CROSSENV_DIR)/bin/activate
-      build-pip3 install -U pip install -r $(OPENVINO_REPO_DIR)/src/bindings/python/wheel/requirements-dev.txt
-      cross-pip3 install -U pip install -r $(OPENVINO_REPO_DIR)/src/bindings/python/wheel/requirements-dev.txt
-    displayName: 'Create crossenv'
+      git submodule update --init -- $(OPENVINO_REPO_DIR)/src/plugins
+      git submodule update --init -- $(OPENVINO_REPO_DIR)/thirdparty/gtest
+    displayName: 'Init submodules for non Conan dependencies'
 
-  - task: CMake@1
-    inputs:
-      cmakeArgs: >
-        -GNinja
-        -DCMAKE_VERBOSE_MAKEFILE=ON
-        -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
-        -DOpenCV_DIR=$(INSTALL_OPENCV)/cmake
-        -DENABLE_PYTHON=OFF
-        -DENABLE_TESTS=ON
-        -DENABLE_DATA=OFF
-        -DCMAKE_TOOLCHAIN_FILE=$(OPENVINO_REPO_DIR)/cmake/arm64.toolchain.cmake
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-        -DTHREADING=TBB
-        -DTBB_DIR=$(INSTALL_ONETBB)/lib/cmake/TBB
-        -DCMAKE_VERBOSE_MAKEFILE=ON
-        -DOPENVINO_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules/arm_plugin
-        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        -DCMAKE_C_COMPILER_LAUNCHER=ccache
-        -DCMAKE_CXX_LINKER_LAUNCHER=ccache
-        -DCMAKE_C_LINKER_LAUNCHER=ccache
-        -DARM_COMPUTE_SCONS_JOBS=$(NUM_PROC)
-        -DCMAKE_INSTALL_PREFIX=$(INSTALL_OPENVINO)
-        -S $(OPENVINO_REPO_DIR)
+  - script: |
+      python3 -m pip install conan
+      # generate build profile
+      conan profile detect
+      # generate host profile for linux_arm64
+      echo "include(default)" > $(BUILD_OPENVINO)/linux_arm64
+      echo "[buildenv]" >> $(BUILD_OPENVINO)/linux_arm64
+      echo "CC=aarch64-linux-gnu-gcc" >> $(BUILD_OPENVINO)/linux_arm64
+      echo "CXX=aarch64-linux-gnu-g++" >> $(BUILD_OPENVINO)/linux_arm64
+      # install OpenVINO dependencies
+      export CMAKE_CXX_COMPILER_LAUNCHER=ccache
+      export CMAKE_C_COMPILER_LAUNCHER=ccache
+      conan install $(OPENVINO_REPO_DIR)/conanfile.txt \
+        -pr:h $(BUILD_OPENVINO)/linux_arm64 \
+        -s:h arch=armv8 \
+        -of $(BUILD_OPENVINO) \
+        -b missing
+    env:
+      CCACHE_DIR: $(OPENVINO_CCACHE_DIR)
+      CCACHE_TEMPDIR: $(TMP_DIR)/ccache
+      CCACHE_BASEDIR: $(Pipeline.Workspace)
+      CCACHE_MAXSIZE: 50G
+    displayName: 'Install conan and dependencies'
+
+  - script: |
+      source $(BUILD_OPENVINO)/conanbuild.sh
+      cmake \
+        -G Ninja \
+        -DCMAKE_VERBOSE_MAKEFILE=ON \
+        -DBUILD_SHARED_LIBS=ON \
+        -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
+        -DENABLE_CPPLINT=OFF \
+        -DENABLE_PYTHON=OFF \
+        -DENABLE_TESTS=ON \
+        -DENABLE_DATA=OFF \
+        -DENABLE_SYSTEM_TBB=ON \
+        -DENABLE_SYSTEM_PROTOBUF=ON \
+        -DENABLE_SYSTEM_SNAPPY=ON \
+        -DENABLE_SYSTEM_PUGIXML=ON \
+        -DCMAKE_TOOLCHAIN_FILE=$(BUILD_OPENVINO)/conan_toolchain.cmake \
+        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+        -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+        -DARM_COMPUTE_SCONS_JOBS=$(NUM_PROC) \
+        -DCMAKE_INSTALL_PREFIX=$(INSTALL_OPENVINO) \
+        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
+        -S $(OPENVINO_REPO_DIR) \
         -B $(BUILD_OPENVINO)
-    displayName: 'CMake OpenVINO ARM plugin'
+      source $(BUILD_OPENVINO)/deactivate_conanbuild.sh
+    displayName: 'CMake configure'
 
   - script: cmake --build $(BUILD_OPENVINO) --parallel --config $(BUILD_TYPE)
     env:
@@ -217,38 +187,13 @@ jobs:
       CCACHE_TEMPDIR: $(TMP_DIR)/ccache
       CCACHE_BASEDIR: $(Pipeline.Workspace)
       CCACHE_MAXSIZE: 50G
-    displayName: 'Build OpenVINO ARM plugin'
+    displayName: 'Build OpenVINO Runtime'
 
   - script: cmake --build $(BUILD_OPENVINO) --parallel --config $(BUILD_TYPE) --target install
-    displayName: 'Install OpenVINO ARM plugin'
-
-  - script: |
-      source $(CROSSENV_DIR)/bin/activate
-      cmake \
-        -GNinja \
-        -DENABLE_PYTHON=ON \
-        -DENABLE_WHEEL=ON \
-        -DCMAKE_TOOLCHAIN_FILE=$(OPENVINO_REPO_DIR)/cmake/arm64.toolchain.cmake \
-        -DOpenVINODeveloperPackage_DIR=$(BUILD_OPENVINO) \
-        -DCMAKE_INSTALL_PREFIX=$(INSTALL_OPENVINO) \
-        -S $(OPENVINO_REPO_DIR)/src/bindings/python \
-        -B $(BUILD_OPENVINO_PYTHON)
-      deactivate
-    displayName: 'CMake OpenVINO python binding'
-
-  - script: cmake --build $(BUILD_OPENVINO_PYTHON) --parallel --config $(BUILD_TYPE)
-    env:
-      CCACHE_DIR: $(OPENVINO_CCACHE_DIR)
-      CCACHE_TEMPDIR: $(TMP_DIR)/ccache
-      CCACHE_BASEDIR: $(Pipeline.Workspace)
-      CCACHE_MAXSIZE: 50G
-    displayName: 'Build OpenVINO python binding'
-
-  - script: cmake --build $(BUILD_OPENVINO_PYTHON) --parallel --target install
-    displayName: 'Install OpenVINO python binding'
+    displayName: 'Install OpenVINO Runtime'
 
   - task: PublishBuildArtifacts@1
     inputs:
       PathtoPublish: $(Build.ArtifactStagingDirectory)
       ArtifactName: 'openvino_aarch64_linux'
-    displayName: 'Publish OpenVINO AArch64 linux package'
+    displayName: 'Publish OpenVINO Runtime for ARM'

.ci/azure/linux_conditional_compilation.yml

@@ -35,6 +35,7 @@ resources:
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
+    ref: releases/2023/0
 
 variables:
   - group: github
@@ -59,7 +60,7 @@ jobs:
     INSTALL_DIR: $(WORK_DIR)/install_pkg
     SETUPVARS: $(INSTALL_DIR)/setupvars.sh
     LD_LIBRARY_PATH: $(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/lib
-    OV_PYTHON_VERSION: 3.10.10 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
+    OV_PYTHON_VERSION: 3.11.2 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
 
   steps:
   - task: UsePythonVersion@0
@@ -69,7 +70,7 @@ jobs:
       disableDownloadFromRegistry: false
       architecture: 'x64'
       githubToken: $(auth_token)
-    displayName: Setup Python 3.10
+    displayName: Setup Python 3.11
     name: setupPython
   - bash: |
       #!/bin/bash
@@ -102,7 +103,6 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
@@ -118,19 +118,17 @@ jobs:
 
   - checkout: testdata
     clean: 'true'
-    fetchDepth: '1'
     lfs: 'true'
     path: testdata
 
   - task: CMake@1
     inputs:
       cmakeArgs: >
-        -GNinja
+        -G "Ninja Multi-Config"
         -DENABLE_CPPLINT=OFF
         -DENABLE_GAPI_PREPROCESSING=OFF
         -DCMAKE_VERBOSE_MAKEFILE=ON
         -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DENABLE_FASTER_BUILD=ON
         -DENABLE_PROFILING_ITT=ON
         -DSELECTIVE_BUILD=COLLECT
@@ -154,11 +152,10 @@ jobs:
   - task: CMake@1
     inputs:
       cmakeArgs: >
-        -GNinja
         -DSELECTIVE_BUILD=ON
         -DSELECTIVE_BUILD_STAT=$(BUILD_DIR)/*.csv
-        -S $(REPO_DIR)
         -B $(BUILD_DIR)
+        -S $(REPO_DIR)
     displayName: 'CMake CC ON'
 
   - script: cmake --build $(BUILD_DIR) --parallel --config $(BUILD_TYPE) --target openvino_intel_cpu_plugin openvino_ir_frontend

.ci/azure/linux_coverity.yml

@@ -4,7 +4,7 @@ resources:
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/openvino_contrib
-    ref: master
+    ref: releases/2023/0
 
 variables:
   - group: github
@@ -33,7 +33,7 @@ jobs:
     SHARE_DIR: /mount/cinfsshare/onnxtestdata
     CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux_coverity
     LD_LIBRARY_PATH: $(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/lib
-    OV_PYTHON_VERSION: 3.10.10 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
+    OV_PYTHON_VERSION: 3.11.2 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
 
   steps:
   - task: UsePythonVersion@0
@@ -43,7 +43,7 @@ jobs:
       disableDownloadFromRegistry: false
       architecture: 'x64'
       githubToken: $(auth_token)
-    displayName: Setup Python 3.10
+    displayName: Setup Python 3.11
     name: setupPython
   - bash: |
       #!/bin/bash
@@ -82,13 +82,11 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
   - checkout: openvino_contrib
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino_contrib
 
@@ -108,10 +106,9 @@ jobs:
     inputs:
       # Coverity has too many PARSE_ERROR errors with ENABLE_FASTER_BUILD=ON. Disabling FASTER_BUILD.
       cmakeArgs: >
-        -GNinja
+        -G "Ninja Multi-Config"
         -DENABLE_CPPLINT=OFF
         -DCMAKE_VERBOSE_MAKEFILE=ON
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DENABLE_FASTER_BUILD=OFF
         -DENABLE_STRICT_DEPENDENCIES=OFF
         -DBUILD_nvidia_plugin=OFF

.ci/azure/linux_cuda.yml

@@ -42,11 +42,13 @@ resources:
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/openvino_contrib
+    ref: releases/2023/0
 
   - repository: testdata
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
+    ref: releases/2023/0
 
 jobs:
 - job: CUDAPlugin_Lin
@@ -100,13 +102,11 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
   - checkout: openvino_contrib
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino_contrib
 
@@ -129,7 +129,7 @@ jobs:
           python3 -m pip install -r /root/repos/openvino/src/bindings/python/requirements.txt &&
           cmake -GNinja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
-            -DDENABLE_CPPLINT=OFF \
+            -DENABLE_CPPLINT=OFF \
             -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
             -DOPENVINO_EXTRA_MODULES=/root/repos/openvino_contrib/modules/nvidia_plugin \
             -DENABLE_INTEL_CPU=OFF \

.ci/azure/linux_debian.yml

@@ -34,7 +34,7 @@ resources:
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
-    ref: master
+    ref: releases/2023/0
 
 jobs:
 - job: Lin_Debian
@@ -102,14 +102,13 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
   - script: |
       set -e
       sudo -E $(REPO_DIR)/install_build_dependencies.sh
-      # 'clang' compiler is to check that samples can be built using it
+      # 'clang' is used as a default compiler
       sudo apt --assume-yes install clang
       sudo apt --assume-yes install --no-install-recommends libopencv-imgproc-dev libopencv-imgcodecs-dev
       # For opencv-python: python3-setuptools and pip upgrade
@@ -143,7 +142,6 @@ jobs:
     # Should be after 'Install dependencies' because Git lfs is not installed
   - checkout: testdata
     clean: 'true'
-    fetchDepth: '1'
     lfs: 'true'
     path: testdata
 
@@ -161,6 +159,7 @@ jobs:
         -DENABLE_TESTS=ON
         -DENABLE_FASTER_BUILD=ON
         -DENABLE_STRICT_DEPENDENCIES=OFF
+        -DENABLE_SYSTEM_SNAPPY=ON
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         -DCMAKE_C_COMPILER_LAUNCHER=ccache
         -DCMAKE_CXX_LINKER_LAUNCHER=ccache
@@ -263,9 +262,9 @@ jobs:
       sudo apt-get install --no-install-recommends gnupg wget -y
       wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
       sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-      echo "deb https://apt.repos.intel.com/openvino/2022 focal main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2022.list
-      sudo apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/intel-openvino-2022.list
-      sudo apt-get install openvino -y || exit 1
+      echo "deb https://apt.repos.intel.com/openvino/2023 ubuntu20 main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2023.list
+      sudo apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/intel-openvino-2023.list
+      sudo apt-get install openvino-2023.0.1 -y || exit 1
       # install our local one and make sure the conflicts are resolved
       sudo apt-get install --no-install-recommends dpkg-dev -y
       rm -r _CPack_Packages
@@ -283,13 +282,13 @@ jobs:
     displayName: 'Clean build dir'
 
   - script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR)
-    displayName: 'Build cpp samples'
+    displayName: 'Build cpp samples - gcc'
 
   - script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR)
+    displayName: 'Build cpp samples - clang'
     env:
       CC: clang
       CXX: clang++
-    displayName: 'Build cpp samples - clang'
 
   - script: $(SAMPLES_INSTALL_DIR)/c/build_samples.sh -i $(INSTALL_DIR)
     displayName: 'Build c samples'
@@ -306,11 +305,12 @@ jobs:
       LD_LIBRARY_PATH: $(INSTALL_TEST_DIR)
     displayName: 'ONNX Frontend Tests'
 
-  - script: |
-      $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml
+  # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
+  - script: $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml
     env:
       LD_LIBRARY_PATH: $(INSTALL_TEST_DIR)
     displayName: 'Paddle Frontend UT'
+    enabled: 'false'
 
   - script: $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml
     env:

.ci/azure/linux_lohika.yml

@@ -4,7 +4,7 @@
 #    type: github
 #    endpoint: openvinotoolkit
 #    name: openvinotoolkit/testdata
-#    ref: master
+#    ref: releases/2023/0
 
 jobs:
 - job: Lin_lohika
@@ -30,7 +30,6 @@ jobs:
 
 #  - checkout: self
 #    clean: 'true'
-#    fetchDepth: '1'
 #    submodules: 'true'
 #    path: openvino
 
@@ -42,7 +41,6 @@ jobs:
     # Should be after 'Install dependencies' because Git lfs is not installed
 #  - checkout: testdata
 #    clean: 'true'
-#    fetchDepth: '1'
 #    submodules: 'true'
 #    lfs: 'true'
 #    path: testdata

.ci/azure/linux_ngraph_onnx.yml

@@ -91,7 +91,6 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 

.ci/azure/linux_onnxruntime.yml

@@ -56,7 +56,7 @@ jobs:
     ONNXRUNTIME_UTILS: $(REPO_DIR)/.ci/azure/ci_utils/onnxruntime
     ONNXRUNTIME_BUILD_DIR: $(ONNXRUNTIME_REPO_DIR)/build
     LD_LIBRARY_PATH: $(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/lib
-    OV_PYTHON_VERSION: 3.10.10 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
+    OV_PYTHON_VERSION: 3.11.2 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache
 
   steps:
   - task: UsePythonVersion@0
@@ -66,7 +66,7 @@ jobs:
       disableDownloadFromRegistry: false
       architecture: 'x64'
       githubToken: $(auth_token)
-    displayName: Setup Python 3.10
+    displayName: Setup Python 3.11
     name: setupPython
   - bash: |
       #!/bin/bash
@@ -101,7 +101,6 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
@@ -171,7 +170,7 @@ jobs:
 
   - script: |
       source $(INSTALL_DIR)/setupvars.sh
-      ./onnxruntime_shared_lib_test
+      ./onnxruntime_shared_lib_test --gtest_filter=-CApiTest.test_custom_op_openvino_wrapper_library
     workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
     displayName: 'Run onnxruntime_shared_lib_test'
 

.ci/azure/mac.yml

@@ -35,13 +35,13 @@ resources:
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/openvino_contrib
-    ref: master
+    ref: releases/2023/0
 
   - repository: testdata
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
-    ref: master
+    ref: releases/2023/0
 
 variables:
   - group: github
@@ -73,11 +73,11 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11.2'
       addToPath: true
       architecture: 'x64'
       githubToken: $(auth_token)
-    displayName: Setup Python 3.10
+    displayName: Setup Python 3.11
     name: setupPython
 
   - script: |
@@ -100,26 +100,19 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
   - checkout: openvino_contrib
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino_contrib
 
   - checkout: testdata
     clean: 'true'
-    fetchDepth: '1'
     lfs: 'true'
     path: testdata
 
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.10'
-
   - script: |
       brew install cython
       brew install automake
@@ -130,7 +123,8 @@ jobs:
 
   - script: |
       export PATH="/usr/local/opt/cython/bin:$PATH"
-      cmake -GNinja \
+      cmake \
+        -G Ninja \
         -DENABLE_CPPLINT=OFF \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
@@ -143,9 +137,6 @@ jobs:
         -DBUILD_nvidia_plugin=OFF \
         -S $(REPO_DIR) \
         -B $(BUILD_DIR)
-    env:
-      CC: gcc
-      CXX: g++
     displayName: 'CMake OpenVINO'
 
   - script: ls -alR $(REPO_DIR)/temp/

.ci/azure/windows.yml

@@ -32,13 +32,13 @@ resources:
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/openvino_contrib
-    ref: master
+    ref: releases/2023/0
 
   - repository: testdata
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
-    ref: master
+    ref: releases/2023/0
 
 jobs:
 - job: Win
@@ -73,7 +73,7 @@ jobs:
     INSTALL_DIR: $(WORK_DIR)\install_pkg
     INSTALL_TEST_DIR: $(INSTALL_DIR)\tests
     SETUPVARS: $(INSTALL_DIR)\setupvars.bat
-    PYTHON_DIR: C:\hostedtoolcache\windows\Python\3.10.7\x64
+    PYTHON_DIR: C:\hostedtoolcache\windows\Python\3.11.2\x64
     CMAKE_VERSION: 3.24.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
@@ -84,26 +84,26 @@ jobs:
   - script: |
       rd /Q /S $(WORK_DIR) & mkdir $(WORK_DIR)
       rd /Q /S $(BUILD_DIR) & mkdir $(BUILD_DIR)
-      rd /Q /S $(WORK_DIR) & mkdir C:\hostedtoolcache\windows\Python\3.10.7
-      rd /Q /S $(BUILD_DIR) & mkdir C:\hostedtoolcache\windows\Python\3.10.7\x64
+      rd /Q /S $(WORK_DIR) & mkdir C:\hostedtoolcache\windows\Python\3.11.2
+      rd /Q /S $(BUILD_DIR) & mkdir C:\hostedtoolcache\windows\Python\3.11.2\x64
       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://www.python.org/ftp/python/3.10.7/python-3.10.7-amd64.exe
+  - script: curl -O https://www.python.org/ftp/python/3.11.2/python-3.11.2-amd64.exe
     displayName: 'Download Python'
     workingDirectory: $(WORK_DIR)
 
   - script: |
-      python-3.10.7-amd64.exe /passive InstallAllUsers=0 Include_launcher=0 TargetDir=C:\hostedtoolcache\windows\Python\3.10.7\x64
-      cp C:\hostedtoolcache\windows\Python\3.8.2\x64.complete C:\hostedtoolcache\windows\Python\3.10.7\x64.complete
+      python-3.11.2-amd64.exe /passive InstallAllUsers=0 Include_launcher=0 TargetDir=C:\hostedtoolcache\windows\Python\3.11.2\x64
+      cp C:\hostedtoolcache\windows\Python\3.8.2\x64.complete C:\hostedtoolcache\windows\Python\3.11.2\x64.complete
     displayName: 'Install Python'
     workingDirectory: $(WORK_DIR)
 
   - task: UsePythonVersion@0
     displayName: 'Use Python'
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11.2'
       disableDownloadFromRegistry: true
 
   - script: |
@@ -122,19 +122,16 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
   - checkout: openvino_contrib
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino_contrib
 
   - checkout: testdata
     clean: 'true'
-    fetchDepth: '1'
     lfs: 'true'
     path: testdata
 
@@ -145,7 +142,8 @@ jobs:
       python -m pip install -r $(REPO_DIR)\src\bindings\python\wheel\requirements-dev.txt
       python -m pip install -r $(REPO_DIR)\src\bindings\python\requirements.txt
       rem For running Paddle frontend unit tests
-      python -m pip install -r $(REPO_DIR)\src\frontends\paddle\tests\requirements.txt
+      # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
+      #python -m pip install -r $(REPO_DIR)\src\frontends\paddle\tests\requirements.txt
       rem For running ONNX frontend unit tests
       python -m pip install -r $(REPO_DIR)\src\frontends\onnx\tests\requirements.txt
       rem For running TensorFlow frontend unit tests
@@ -168,20 +166,21 @@ jobs:
 
   - script: |
       set PATH=$(WORK_DIR)\ninja-win;%PATH%
-      call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -G "Ninja Multi-Config" ^
+      call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) ^
+        -G "Ninja Multi-Config" ^
         -DENABLE_CPPLINT=OFF ^
         -DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS) ^
         -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) ^
         -DENABLE_FASTER_BUILD=ON ^
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^
         -DENABLE_TESTS=ON ^
         -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ^
         -DENABLE_STRICT_DEPENDENCIES=OFF ^
         -DENABLE_PYTHON=ON ^
         -DBUILD_nvidia_plugin=OFF ^
-        -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.10.7\x64\python.exe" ^
-        -DPYTHON_INCLUDE_DIR="C:\hostedtoolcache\windows\Python\3.10.7\x64\include" ^
-        -DPYTHON_LIBRARY="C:\hostedtoolcache\windows\Python\3.10.7\x64\libs\python310.lib" ^
+        -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" ^
+        -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.11.2\x64\python.exe" ^
+        -DPYTHON_INCLUDE_DIR="C:\hostedtoolcache\windows\Python\3.11.2\x64\include" ^
+        -DPYTHON_LIBRARY="C:\hostedtoolcache\windows\Python\3.11.2\x64\libs\python311.lib" ^
         -DOPENVINO_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules ^
         -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" ^
         -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" ^
@@ -269,8 +268,9 @@ jobs:
   - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_onnx_frontend_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-ONNXFrontend.xml
     displayName: 'ONNX Frontend Tests'
 
-  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Paddle.xml
-    displayName: 'Paddle Frontend UT'
+  # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
+  #- script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Paddle.xml
+  #  displayName: 'Paddle Frontend UT'
 
   - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Tensorflow.xml
     displayName: 'TensorFlow Frontend Unit Tests'
@@ -305,6 +305,9 @@ jobs:
   - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ieMultiPluginUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-ieMultiPluginUnitTests.xml
     displayName: 'MULTI UT'
 
+  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_auto_batch_unit_tests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-ov_auto_batch_unit_tests.xml
+    displayName: 'AutoBatch UT'
+
   - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_template_func_tests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-templateFuncTests.xml
     displayName: 'TEMPLATE FuncTests'
 
@@ -314,16 +317,10 @@ jobs:
 
   - script: |
       call $(SETUPVARS) && $(INSTALL_TEST_DIR)\InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-InferenceEngineCAPITests.xml
-    env:
-      DATA_PATH: $(MODELS_PATH)
-      MODELS_PATH: $(MODELS_PATH)
     displayName: 'IE CAPITests'
 
   - script: |
       call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_capi_test --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-ov_capi_test.xml
-    env:
-      DATA_PATH: $(MODELS_PATH)
-      MODELS_PATH: $(MODELS_PATH)
     displayName: 'OV CAPITests'
 
   - task: PublishTestResults@2

.ci/azure/windows_conditional_compilation.yml

@@ -35,6 +35,7 @@ resources:
     type: github
     endpoint: openvinotoolkit
     name: openvinotoolkit/testdata
+    ref: releases/2023/0
 
 variables:
   - group: github
@@ -65,11 +66,11 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11.2'
       addToPath: true
       architecture: 'x64'
       githubToken: $(auth_token)
-    displayName: Setup Python 3.10
+    displayName: Setup Python 3.11
     name: setupPython
 
   - script: |
@@ -78,6 +79,8 @@ jobs:
       python --version
       where java
       java -version
+      where cmake
+      cmake --version
       wmic computersystem get TotalPhysicalMemory
       wmic cpu list
       wmic logicaldisk get description,name
@@ -93,7 +96,6 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    fetchDepth: '1'
     submodules: 'true'
     path: openvino
 
@@ -107,15 +109,15 @@ jobs:
   - checkout: testdata
     clean: 'true'
     lfs: 'true'
-    fetchDepth: '1'
     path: testdata
 
   - script: |
       set PATH=$(WORK_DIR)\ninja-win;%PATH%
-      call "$(MSVS_VARS_PATH)" && cmake -GNinja ^
+      call "$(MSVS_VARS_PATH)" && cmake ^
+        -G Ninja ^
         -DENABLE_CPPLINT=OFF ^
         -DENABLE_GAPI_PREPROCESSING=OFF ^
-        -DENABLE_FASTER_BUILD=ON ^
+        -DENABLE_PLUGINS_XML=ON ^
         -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ^
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^
         -DENABLE_PROFILING_ITT=ON ^
@@ -147,12 +149,11 @@ jobs:
     displayName: 'List csv files'
 
   - script: |
-      call "$(MSVS_VARS_PATH)" && cmake -G"Visual Studio 16 2019" ^
+      call "$(MSVS_VARS_PATH)" && cmake ^
+        -G "Visual Studio 16 2019" ^
         -DVERBOSE_BUILD=ON ^
         -DENABLE_CPPLINT=OFF ^
         -DENABLE_GAPI_PREPROCESSING=OFF ^
-        -DENABLE_FASTER_BUILD=ON ^
-        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^
         -DENABLE_PROFILING_ITT=OFF ^
         -DSELECTIVE_BUILD=ON ^
         -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ^

.ci/openvino-onnx/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.04
 
 LABEL version=2021.03.30.1
 
@@ -38,6 +38,7 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
         python3 \
         python3-pip \
         python3-dev \
+        pybind11-dev \
         python3-virtualenv \
         cython3 \
         tox && \
@@ -71,5 +72,5 @@ RUN ninja install
 WORKDIR /openvino/src/bindings/python
 ENV OpenVINO_DIR=/openvino/dist/runtime/cmake
 ENV LD_LIBRARY_PATH=/openvino/dist/runtime/lib/intel64:/openvino/dist/runtime/3rdparty/tbb/lib
-ENV PYTHONPATH=/openvino/bin/intel64/${BUILD_TYPE}/python_api/python3.10:${PYTHONPATH}
+ENV PYTHONPATH=/openvino/bin/intel64/${BUILD_TYPE}/python_api/python3.11:${PYTHONPATH}
 CMD tox

.github/ISSUE_TEMPLATE/bug.md

@@ -1,5 +1,5 @@
 ---
-name: Bug
+name: Bug 
 about: Create a report to help us improve
 title: "[Bug]"
 labels: bug, support_request
@@ -8,19 +8,28 @@ assignees: ''
 ---
 
 ##### System information (version)
-<!-- Example
-- OpenVINO => 2020.4
-- Operating System / Platform => Windows 64 Bit
-- Compiler => Visual Studio 2017
-- Problem classification: Model Conversion
+<!-- Please use this template to submit a new issue and provide all the necessary information to expedite the response. 
+Example
+- OpenVINO Source => Runtime /pip install / GitHub 
+- OpenVINO Version => Version 2022.3 / Github Master Branch / tag 2023.0 
+- Operating System / Platform => Windows 64 Bit / Ubuntu 20
+- Compiler => Visual Studio 2017 / Cmake
+- Problem classification: Model Conversion /Accuracy/TensorFlow FE 
+- Device use: CPU / GPU / HDDL
 - Framework: TensorFlow (if applicable)
-- Model name: ResNet50 (if applicable)
+- Model name: ResNet50 and the link to pre-train modal (if applicable) 
+              Please provide us with the link to your model or attach .zip file. 
+
 -->
 
-- OpenVINO=> :grey_question:
+- OpenVINO Source=> :grey_question:
+- OpenVINO Version=> :grey_question:
 - Operating System / Platform => :grey_question:
 - Compiler => :grey_question:
 - Problem classification => :grey_question:
+- Device use: => :grey_question:
+- Framework => :grey_question:
+- Model name => :grey_question:
 
 ##### Detailed description
 <!-- your description -->

.github/dependabot.yml

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

.github/workflows/build_doc.yml

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

.github/workflows/code_snippets.yml

@@ -30,6 +30,13 @@ jobs:
           submodules: recursive
           lfs: true
 
+      - name: Install OpenCL
+        uses: awalsh128/cache-apt-pkgs-action@v1.3.0
+        if: runner.os == 'Linux'
+        with:
+          packages: ocl-icd-opencl-dev opencl-headers
+          version: 3.0
+
       - name: CMake configure
         run: cmake -DCMAKE_BUILD_TYPE=Release -B build
 

.github/workflows/code_style.yml

@@ -85,8 +85,8 @@ jobs:
       - name: Install Clang dependency
         run: |
           sudo apt update
-          sudo apt --assume-yes remove clang-7 clang-8 clang-9 clang-10 clang-11 clang-12 clang-13
-          sudo apt --assume-yes install libclang-14-dev
+          sudo apt --assume-yes remove clang-7 clang-8 clang-9 clang-10 clang-11 clang-12 clang-13 clang-15
+          sudo apt --assume-yes install clang-14 libclang-14-dev
 
       - name: Install Python-based dependencies
         run: python3 -m pip install -r cmake/developer_package/ncc_naming_style/requirements_dev.txt

.github/workflows/mo.yml

@@ -30,7 +30,7 @@ jobs:
           python-version: '3.10'
 
       - name: Cache pip
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('tools/mo/requirements*.txt') }}

.gitignore

@@ -26,6 +26,7 @@ temp/
 .repo/
 CMakeLists.txt.user
 docs/IE_PLUGIN_DG/html/
+CMakeUserPresets.json
 
 *.project
 *.cproject
@@ -57,3 +58,5 @@ __pycache__
 /tools/mo/*.mapping
 /tools/mo/*.dat
 /tools/mo/*.svg
+/src/plugins/intel_cpu/tools/commit_slider/*.json
+/src/plugins/intel_cpu/tools/commit_slider/slider_cache/*

.gitmodules

@@ -66,3 +66,9 @@
 [submodule "thirdparty/flatbuffers/flatbuffers"]
 	path = thirdparty/flatbuffers/flatbuffers
 	url = https://github.com/google/flatbuffers.git
+[submodule "thirdparty/snappy"]
+	path = thirdparty/snappy
+	url = https://github.com/google/snappy.git
+[submodule "ARMComputeLibrary"]
+	path = src/plugins/intel_cpu/thirdparty/ComputeLibrary
+	url = https://github.com/ARM-software/ComputeLibrary.git

CMakeLists.txt

@@ -17,12 +17,12 @@ else()
     endif()
 endif()
 
-project(OpenVINO DESCRIPTION "OpenVINO toolkit")
-
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "CMake build type" FORCE)
+if(POLICY CMP0091)
+    cmake_policy(SET CMP0091 NEW) # Enables use of MSVC_RUNTIME_LIBRARY
 endif()
 
+project(OpenVINO DESCRIPTION "OpenVINO toolkit")
+
 find_package(IEDevScripts REQUIRED
              PATHS "${OpenVINO_SOURCE_DIR}/cmake/developer_package"
              NO_CMAKE_FIND_ROOT_PATH
@@ -39,19 +39,34 @@ if(ENABLE_COVERAGE)
 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 "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})
-message (STATUS "GLIBC_VERSION.......................... " ${OV_GLIBC_VERSION})
-
+if(OV_GENERATOR_MULTI_CONFIG)
+    string(REPLACE ";" " " config_types "${CMAKE_CONFIGURATION_TYPES}")
+    message (STATUS "CMAKE_CONFIGURATION_TYPES ............. " ${config_types})
+    unset(config_types)
+    if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$")
+        message (STATUS "CMAKE_DEFAULT_BUILD_TYPE .............. " ${CMAKE_DEFAULT_BUILD_TYPE})
+    endif()
+else()
+    message (STATUS "CMAKE_BUILD_TYPE ...................... " ${CMAKE_BUILD_TYPE})
+endif()
+if(CMAKE_GENERATOR_PLATFORM)
+    message (STATUS "CMAKE_GENERATOR_PLATFORM .............. " ${CMAKE_GENERATOR_PLATFORM})
+endif()
+if(CMAKE_GENERATOR_TOOLSET)
+    message (STATUS "CMAKE_GENERATOR_TOOLSET ............... " ${CMAKE_GENERATOR_TOOLSET})
+endif()
+if(CMAKE_TOOLCHAIN_FILE)
+    message (STATUS "CMAKE_TOOLCHAIN_FILE .................. " ${CMAKE_TOOLCHAIN_FILE})
+endif()
+if(NOT OV_GLIBC_VERSION VERSION_EQUAL 0.0)
+    message (STATUS "GLIBC_VERSION ......................... " ${OV_GLIBC_VERSION})
+endif()
 
 # remove file with exported developer targets to force its regeneration
 file(REMOVE "${CMAKE_BINARY_DIR}/ngraphTargets.cmake")

CONTRIBUTING.md

@@ -1,55 +1,88 @@
-# How to contribute to the OpenVINO repository
+# Contributing to OpenVINO
 
-We welcome community contributions to OpenVINO™. Please read the following guide to learn how to find ideas for contribution, practices for good pull requests, checking your changes with our tests and more.
+## How to contribute to the OpenVINO project
+
+OpenVINO™ is always looking for opportunities to improve and your contributions 
+play a big role in this process. There are several ways you can make the 
+product better:
 
 
-## Before you start contributing you should
+### Provide Feedback
 
--   Make sure you agree to contribute your code under  [OpenVINO™ (Apache 2.0)](https://github.com/openvinotoolkit/openvino/blob/master/LICENSE)  license.
--   Figure out what you’re going to contribute. If you don’t know what you are going to work on, navigate to the   [Github "Issues" tab](https://github.com/openvinotoolkit/openvino/issues). Make 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 are going to fix a bug, check that it's still exists in the latest release. This can be done by building 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)).
+   * **Report bugs / issues**  
+     If you experience faulty behavior in OpenVINO or its components, you can 
+     [create a new issue](https://github.com/openvinotoolkit/openvino/issues)
+     in the GitHub issue tracker. 
+
+   * **Propose new features / improvements**  
+     If you have a suggestion for improving OpenVINO or want to share your ideas, you can open a new
+     [GitHub Discussion](https://github.com/openvinotoolkit/openvino/discussions). 
+     If your idea is already well defined, you can also create a 
+     [Feature Request Issue](https://github.com/openvinotoolkit/openvino/issues/new?assignees=octocat&labels=enhancement%2Cfeature&projects=&template=feature_request.yml&title=%5BFeature+Request%5D%3A+)
+     In both cases, provide a detailed description, including use cases, benefits, and potential challenges.
+     If your points are especially well aligned with the product vision, they will be included in the 
+     [development roadmap](./ROADMAP.md).
+     User feedback is crucial for OpenVINO development and even if your input is not immediately prioritized,
+     it may be used at a later time or undertaken by the community, regardless of the official roadmap.
+    
+
+### Contribute Code Changes
+
+   * **Fix Bugs or Develop New Features**  
+     If you want to help improving OpenVINO, choose one of the issues reported in 
+     [GitHub Issue Tracker](https://github.com/openvinotoolkit/openvino/issues) and 
+     [create a Pull Request](./CONTRIBUTING_PR.md) addressing it. Consider one of the
+     tasks listed as [first-time contributions](https://github.com/openvinotoolkit/openvino/issues/17502).
+     If the feature you want to develop is more complex or not well defined by the reporter, 
+     it is always a good idea to [discuss it](https://github.com/openvinotoolkit/openvino/discussions) 
+     with OpenVINO developers first. Before creating a new PR, check if nobody is already
+     working on it. In such a case, you may still help, having aligned with the other developer.
+
+     Importantly, always check if the change hasn't been implemented before you start working on it!
+     You can build OpenVINO using the latest master branch and make sure that it still needs your
+     changes. Also, do not address issues that only affect older non-LTS releases, like 2022.2.
+
+   * **Develop a New Device Plugin**  
+     Since the market of computing devices is constantly evolving, OpenVINO is always open to extending
+     its support for new hardware. If you want to run inference on a device that is currently not supported, 
+     you can see how to develop a new plugin for it in the 
+     [Plugin Developer Guide](https://docs.openvino.ai/canonical/openvino_docs_ie_plugin_dg_overview.html).
+     
+
+### Improve documentation
+
+   * **OpenVINO developer documentation** is contained entirely in this repository, under the 
+     [./docs/dev](https://github.com/openvinotoolkit/openvino/tree/master/docs/dev) folder.
+
+   * **User documentation** is built from several sources and published at 
+     [docs.openvino.ai](docs.openvino.ai), which is the recommended place for reading 
+     these documents. Use the files maintained in this repository only for editing purposes. 
+
+   * The easiest way to help with documentation is to review it and provide feedback on the 
+     existing articles. Whether you notice a mistake, see the possibility of improving the text, 
+     or think more information should be added, you can reach out to any of the documentation 
+     contributors to discuss the potential changes.
+     
+     You can also create a Pull Request directly, following the [editor's guide](./docs/CONTRIBUTING_DOCS.md).
 
 
-## "Fork & Pull Request model" for code contribution
+### Promote and Support OpenVINO
 
-### [](https://github.com/openvinotoolkit/openvino/blob/master/CONTRIBUTING.md#the-instruction-in-brief)The instruction in brief
+   * **Popularize OpenVINO**  
+     Articles, tutorials, blog posts, demos, videos, and any other involvement 
+     in the OpenVINO community is always a welcome contribution. If you discuss 
+     or present OpenVINO on various social platforms, you are raising awareness
+     of the product among A.I. enthusiasts and enabling other people to discover
+     the toolkit. Feel free to reach out to OpenVINO developers if you need help
+     with making such community-based content.
 
--   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](./docs/dev/coding_style.md).
--   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)
--   If you want to contribute to the documentation and want to add a new guide, follow that instruction [Documentation guidelines](https://github.com/openvinotoolkit/openvino/wiki/CodingStyleGuideLinesDocumentation)
--   Run testsuite locally:
-    -   execute each test binary from the artifacts directory, e.g.  `<source dir>/bin/intel64/Release/ieFuncTests`
--   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:
-
--   One PR – one issue.
--   Build perfectly on your local system.
--   Choose the right base branch [Branches](https://github.com/openvinotoolkit/openvino/wiki/Branches).
--   Follow the  [Coding Style Guide](./docs/dev/coding_style.md) for your code.
--   Update documentation using [Documentation guidelines](https://github.com/openvinotoolkit/openvino/wiki/CodingStyleGuideLinesDocumentation) if needed.
--   Cover your changes with test. 
--   Add license at the top of new files [C++ example](https://github.com/openvinotoolkit/openvino/blob/master/samples/cpp/classification_sample_async/main.cpp#L1-L2), [Python example](https://github.com/openvinotoolkit/openvino/blob/master/samples/python/hello_classification/hello_classification.py#L3-L4). 
--   Add enough information: a meaningful title, the reason why you made the commit and a link to the issue page if exists.
--   Remove unrelated to PR changes.
--   If it is still WIP and you want to check CI test results early then use  _Draft_  PR.
--   Submit your PR and become an OpenVINO™ contributor! 
+   * **Help Other Community Members**  
+     If you are an experienced OpenVINO user and want to help, you can always 
+     share your expertise with the community. Check GitHub Discussions and 
+     Issues to see if you can help someone. 
 
 
-## Testing and merging pull requests
+## License
 
-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 need 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!
-
-
-## Merging PR
-
-When the reviewer accepts the pull request and the pre-commit shows a "green" status, the review status is set to "Approved", which signals to the OpenVINO™ maintainers that they can merge your pull request.
+By contributing to the OpenVINO project, you agree that your contributions will be 
+licensed under the terms stated in the [LICENSE](./LICENSE.md) file.

CONTRIBUTING_DOCS.md

@@ -0,0 +1,111 @@
+# OpenVINO Documentation Guide
+
+## Basic article structure
+
+OpenVINO documentation is built using Sphinx and the reStructuredText formatting. 
+That means the basic formatting rules need to be used:
+
+
+### White Spaces
+
+OpenVINO documentation is developed to be easily readable in both html and 
+reStructuredText. Here are some suggestions on how to make it render nicely 
+and improve document clarity.
+
+### Headings (including the article title)
+
+They are made by "underscoring" text with punctuation marks (at least as 
+many marks as letters in the underscored header). We use the following convention:
+
+```
+   H1
+   ==================== 
+    
+   H2
+   ####################  
+    
+   H3
+   ++++++++++++++++++++ 
+    
+   H4
+   --------------------
+    
+   H5
+   ....................
+```
+
+### Line length
+
+In programming, a limit of 80 characters per line is a common BKM. It may also apply 
+to reading natural languages fairly well. For this reason, we aim at lines of around 
+70 to 100 characters long. The limit is not a strict rule but rather a guideline to 
+follow in most cases. The breaks will not translate to html, and rightly so, but will 
+make reading and editing documents in GitHub or an editor much easier.
+
+### Tables 
+
+Tables may be difficult to implement well in websites. For example, longer portions 
+of text, like descriptions, may render them difficult to read (e.g. improper cell 
+widths or heights). Complex tables may also be difficult to read in source files. 
+To prevent that, check the [table directive documentation](https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#table-directives)
+and see our custom directives. Use the following guidelines for easier editing:
+
+* For very big and complex data sets: use a list instead of a table or remove 
+  the problematic content from the table and implement it differently. 
+* For very big and complex data sets that need to use tables: use an external 
+  file (e.g. PDF) and link to it.
+* For medium tables that look bad in source (e.g. due to long lines of text), 
+  use the reStructuredText list table format.
+* For medium and small tables, use the reStructuredText grid or simple table formats.
+
+
+## Cross-linking
+
+There are several directives Sphinx uses for linking, each has its purpose and format. 
+Follow these guidelines for consistent results:
+
+* Avoid absolute references to internal documents as much as possible (link to source, not html).
+* Note that sphinx uses the "back-tick" character and not the "inverted-comma" => ` vs. '
+* When a file path starts at the same directory is used, put "./" at its beginning.
+* Always add a space before the opening angle bracket ("<") for target files.
+
+Use the following formatting for different links:
+
+* link to an external page / file
+  * `` `text <url> `__ ``
+  * use a double underscore for consistency
+
+* link to an internal documentation page / file
+  * `` :doc:`a docs page <relative file path>` ``
+  * Link to an rst or md file within our documentation, so that it renders properly in html
+
+* link to a header on the same page
+  * `` 'a header in the same article <this-is-section-header-title>`__ ``
+  * anchors are created automatically for all existing headers
+  * such anchor looks like the header, with minor adjustments:
+    * all letters are lower case,
+    * remove all special glyphs, like brackets,
+    * replace spaces with hyphens 
+
+* Create an anchor in an article
+   * `` .. _anchor-in-the target-article:: ``
+   * put it before the header to which you want to link
+   * See the rules for naming anchors / labels at the bottom of this article
+   
+* link to an anchor on a different page in our documentation
+   * `` :ref:`the created anchor <anchor-in-the target-article>` ``
+   * link to the anchor using just its name
+
+
+* anchors / labels 
+
+  Read about anchors 
+
+  Sphinx uses labels to create html anchors, which can be linked to from anywhere in documentation. 
+  Although they may be put at the top of any article to make linking to it very easy, we do not use 
+  this approach. Every label definition starts with an underscore, the underscore is not used in links.
+
+  Most importantly, every label needs to be globally unique. It means that it is always a good 
+  practice to start their labels with a clear identifier of the article they reside in.
+
+

CONTRIBUTING_PR.md

@@ -0,0 +1,63 @@
+# How to Prepare a Good PR
+
+   OpenVINO is an open-source project and you can contribute to its code directly. 
+   To do so, follow these guidelines for creating Pull Requests, so that your 
+   changes get the highest chance of being merged.
+
+
+## General Rules of a Good Pull Request
+
+* Create your own fork of the repository and use it to create PRs. 
+  Avoid creating change branches in the main repository.
+* Choose a proper branch for your work and create your own branch based on it. 
+* Give your branches, commits, and Pull Requests meaningful names and descriptions. 
+  It helps to track changes later. If your changes cover a particular component, 
+  you can indicate it in the PR name as a prefix, for example: ``[DOCS] PR name``.
+* Follow the [OpenVINO code style guide](https://github.com/openvinotoolkit/openvino/blob/master/docs/dev/coding_style.md).
+* Make your PRs small - each PR should address one issue. Remove all changes 
+  unrelated to the PR.
+* Document your contribution! If your changes may impact how the user works with
+  OpenVINO, provide the information in proper articles. You can do it yourself, 
+  or contact one of OpenVINO documentation contributors to work together on
+  developing the right content. 
+* For Work In Progress, or checking test results early, use a Draft PR.
+
+
+## Ensure Change Quality
+
+Your pull request will be automatically tested by OpenVINO™'s pre-commit and marked 
+as "green" if it is ready for merging. If any builders fail, the status is "red," 
+you need to fix the issues listed in console logs. Any change to the PR branch will 
+automatically trigger the checks, so you don't need to recreate the PR, Just wait
+for the updated results. 
+
+Regardless of the automated tests, you should ensure the quality of your changes:
+
+* Test your changes locally:
+  * Make sure to double-check your code. 
+  * Run tests locally to identify and fix potential issues (execute test binaries 
+    from the artifacts directory, e.g. ``<source dir>/bin/intel64/Release/ieFuncTests``)
+* Before creating a PR, make sure that your branch is up to date with the latest 
+  state of the branch you want to contribute to (e.g. git fetch upstream && git 
+  merge upstream/master).
+
+
+## Branching Policy
+
+* The "master" branch is used for development and constitutes the base for each new release.
+* Each OpenVINO release has its own branch: ``releases/<year>/<release number>``.
+* The final release each year is considered a Long Term Support version, 
+  which means it remains active.
+* Contributions are accepted only by active branches, which are:
+  * the "master" branch for future releases,
+  * the most recently published version for fixes,
+  * LTS versions (for two years from their release dates).
+
+
+## Need Additional Help? Check these Articles
+
+* [How to create a fork](https://help.github.com/articles/fork-a-rep) 
+* [Install Git](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup)
+* If you want to add a new sample, please have a look at the Guide for contributing
+  to C++/C/Python IE samples and add the license statement at the top of new files for
+  C++ example, Python example.

README.md

@@ -2,13 +2,14 @@
 
 <img src="docs/img/openvino-logo-purple-black.png" width="400px">
 
-[![Stable release](https://img.shields.io/badge/version-2022.2-green.svg)](https://github.com/openvinotoolkit/openvino/releases/tag/2022.2.0)
-[![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 Status](https://badge.fury.io/py/openvino.svg)](https://badge.fury.io/py/openvino)
+[![Anaconda Status](https://anaconda.org/conda-forge/openvino/badges/version.svg)](https://anaconda.org/conda-forge/openvino)
+[![brew Status](https://img.shields.io/homebrew/v/openvino)](https://formulae.brew.sh/formula/openvino)
+
 [![PyPI Downloads](https://pepy.tech/badge/openvino)](https://pepy.tech/project/openvino)
- 
+[![Anaconda Downloads](https://anaconda.org/conda-forge/openvino/badges/downloads.svg)](https://anaconda.org/conda-forge/openvino/files)
+[![brew Downloads](https://img.shields.io/homebrew/installs/dy/openvino)](https://formulae.brew.sh/formula/openvino)
+
  </div>
 
 ## Contents:
@@ -69,24 +70,24 @@ The OpenVINO™ Runtime can infer models on different hardware devices. This sec
     <tbody>
         <tr>
             <td rowspan=2>CPU</td>
-            <td> <a href="https://docs.openvino.ai/nightly/openvino_docs_OV_UG_supported_plugins_CPU.html#doxid-openvino-docs-o-v-u-g-supported-plugins-c-p-u">Intel CPU</a></tb>
+            <td> <a href="https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_supported_plugins_CPU.html#doxid-openvino-docs-o-v-u-g-supported-plugins-c-p-u">Intel CPU</a></tb>
             <td><b><i><a href="./src/plugins/intel_cpu">openvino_intel_cpu_plugin</a></i></b></td>
             <td>Intel Xeon with Intel® Advanced Vector Extensions 2 (Intel® AVX2), Intel® Advanced Vector Extensions 512 (Intel® AVX-512), and AVX512_BF16, Intel Core Processors with Intel AVX2, Intel Atom Processors with Intel® Streaming SIMD Extensions (Intel® SSE)</td>
         </tr>
         <tr>
-            <td> <a href="https://docs.openvino.ai/nightly/openvino_docs_OV_UG_supported_plugins_ARM_CPU.html">ARM CPU</a></tb>
+            <td> <a href="https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_supported_plugins_CPU.html">ARM CPU</a></tb>
             <td><b><i><a href="https://github.com/openvinotoolkit/openvino_contrib/tree/master/modules/arm_plugin">openvino_arm_cpu_plugin</a></i></b></td>
             <td>Raspberry Pi™ 4 Model B, Apple® Mac mini with M1 chip, NVIDIA® Jetson Nano™, Android™ devices
         </tr>
         <tr>
             <td>GPU</td>
-            <td><a href="https://docs.openvino.ai/nightly/openvino_docs_OV_UG_supported_plugins_GPU.html#doxid-openvino-docs-o-v-u-g-supported-plugins-g-p-u">Intel GPU</a></td>
+            <td><a href="https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_supported_plugins_GPU.html#doxid-openvino-docs-o-v-u-g-supported-plugins-g-p-u">Intel GPU</a></td>
             <td><b><i><a href="./src/plugins/intel_gpu">openvino_intel_gpu_plugin</a></i></b></td>
             <td>Intel Processor Graphics, including Intel HD Graphics and Intel Iris Graphics</td>
         </tr>
         <tr>
             <td>GNA</td>
-            <td><a href="https://docs.openvino.ai/nightly/openvino_docs_OV_UG_supported_plugins_GNA.html#doxid-openvino-docs-o-v-u-g-supported-plugins-g-n-a">Intel GNA</a></td>
+            <td><a href="https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_supported_plugins_GNA.html#doxid-openvino-docs-o-v-u-g-supported-plugins-g-n-a">Intel GNA</a></td>
             <td><b><i><a href="./src/plugins/intel_gna">openvino_intel_gna_plugin</a></i></b></td>
             <td>Intel Speech Enabling Developer Kit, Amazon Alexa* Premium Far-Field Developer Kit, Intel Pentium Silver J5005 Processor, Intel Pentium Silver N5000 Processor, Intel Celeron J4005 Processor, Intel Celeron J4105 Processor, Intel Celeron Processor N4100, Intel Celeron Processor N4000, Intel Core i3-8121U Processor, Intel Core i7-1065G7 Processor, Intel Core i7-1060G7 Processor, Intel Core i5-1035G4 Processor, Intel Core i5-1035G7 Processor, Intel Core i5-1035G1 Processor, Intel Core i5-1030G7 Processor, Intel Core i5-1030G4 Processor, Intel Core i3-1005G1 Processor, Intel Core i3-1000G1 Processor, Intel Core i3-1000G4 Processor</td>
         </tr>
@@ -104,22 +105,22 @@ OpenVINO™ Toolkit also contains several plugins which simplify loading models
     </thead>
     <tbody>
         <tr>
-            <td><a href="https://docs.openvino.ai/nightly/openvino_docs_IE_DG_supported_plugins_AUTO.html#doxid-openvino-docs-i-e-d-g-supported-plugins-a-u-t-o">Auto</a></td>
+            <td><a href="https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_supported_plugins_AUTO.html">Auto</a></td>
             <td><b><i><a href="./src/plugins/auto">openvino_auto_plugin</a></i></b></td>
             <td>Auto plugin enables selecting Intel device for inference automatically</td>
         </tr>
         <tr>
-            <td><a href="https://docs.openvino.ai/nightly/openvino_docs_OV_UG_Automatic_Batching.html">Auto Batch</a></td>
+            <td><a href="https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_Automatic_Batching.html">Auto Batch</a></td>
             <td><b><i><a href="./src/plugins/auto_batch">openvino_auto_batch_plugin</a></i></b></td>
             <td>Auto batch plugin performs on-the-fly automatic batching (i.e. grouping inference requests together) to improve device utilization, with no programming effort from the user</td>
         </tr>
         <tr>
-            <td><a href="https://docs.openvino.ai/nightly/openvino_docs_OV_UG_Hetero_execution.html#doxid-openvino-docs-o-v-u-g-hetero-execution">Hetero</a></td>
+            <td><a href="https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_Hetero_execution.html#doxid-openvino-docs-o-v-u-g-hetero-execution">Hetero</a></td>
             <td><b><i><a href="./src/plugins/hetero">openvino_hetero_plugin</a></i></b></td>
             <td>Heterogeneous execution enables automatic inference splitting between several devices</td>
         </tr>
         <tr>
-            <td><a href="https://docs.openvino.ai/nightly/openvino_docs_OV_UG_Running_on_multiple_devices.html#doxid-openvino-docs-o-v-u-g-running-on-multiple-devices">Multi</a></td>
+            <td><a href="https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_Running_on_multiple_devices.html#doxid-openvino-docs-o-v-u-g-running-on-multiple-devices">Multi</a></td>
             <td><b><i><a href="./src/plugins/auto">openvino_auto_plugin</a></i></b></td>
             <td>Multi plugin enables simultaneous inference of the same model on several devices in parallel</td>
         </tr>
@@ -156,14 +157,14 @@ The list of OpenVINO tutorials:
 ## System requirements
 
 The system requirements vary depending on platform and are available on dedicated pages:
-- [Linux](https://docs.openvino.ai/nightly/openvino_docs_install_guides_installing_openvino_linux_header.html)
-- [Windows](https://docs.openvino.ai/nightly/openvino_docs_install_guides_installing_openvino_windows_header.html)
-- [macOS](https://docs.openvino.ai/nightly/openvino_docs_install_guides_installing_openvino_macos_header.html)
-- [Raspbian](https://docs.openvino.ai/nightly/openvino_docs_install_guides_installing_openvino_raspbian.html)
+- [Linux](https://docs.openvino.ai/2023.0/openvino_docs_install_guides_installing_openvino_linux_header.html)
+- [Windows](https://docs.openvino.ai/2023.0/openvino_docs_install_guides_installing_openvino_windows_header.html)
+- [macOS](https://docs.openvino.ai/2023.0/openvino_docs_install_guides_installing_openvino_macos_header.html)
+- [Raspbian](https://docs.openvino.ai/2023.0/openvino_docs_install_guides_installing_openvino_raspbian.html)
 
 ## How to build
 
-See the [OpenVINO Wiki](https://github.com/openvinotoolkit/openvino/wiki#how-to-build) to get more information about the OpenVINO build process.
+See [How to build OpenVINO](./docs/dev/build.md) to get more information about the OpenVINO build process.
 
 ## How to contribute
 
@@ -188,7 +189,6 @@ Report questions, issues and suggestions, using:
 * [Neural Network Compression Framework (NNCF)](https://github.com/openvinotoolkit/nncf) - a suite of advanced algorithms for model inference optimization including quantization, filter pruning, binarization and sparsity
 * [OpenVINO™ Training Extensions (OTE)](https://github.com/openvinotoolkit/training_extensions) - convenient environment to train Deep Learning models and convert them using OpenVINO for optimized inference.
 * [OpenVINO™ Model Server (OVMS)](https://github.com/openvinotoolkit/model_server) - a scalable, high-performance solution for serving deep learning models optimized for Intel architectures
-* [DL Workbench](https://docs.openvino.ai/nightly/workbench_docs_Workbench_DG_Introduction.html) - an alternative, web-based version of OpenVINO designed to facilitate optimization and compression of pre-trained deep learning models.
 * [Computer Vision Annotation Tool (CVAT)](https://github.com/opencv/cvat) - an online, interactive video and image annotation tool for computer vision purposes.
 * [Dataset Management Framework (Datumaro)](https://github.com/openvinotoolkit/datumaro) - a framework and CLI tool to build, transform, and analyze datasets.
 
@@ -196,7 +196,7 @@ 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/nightly/openvino_docs_OV_UG_OV_Runtime_User_Guide.html
-[Model Optimizer]:https://docs.openvino.ai/nightly/openvino_docs_MO_DG_Deep_Learning_Model_Optimizer_DevGuide.html
-[Post-Training Optimization Tool]:https://docs.openvino.ai/nightly/pot_introduction.html
+[OpenVINO™ Runtime]:https://docs.openvino.ai/2023.0/openvino_docs_OV_UG_OV_Runtime_User_Guide.html
+[Model Optimizer]:https://docs.openvino.ai/2023.0/openvino_docs_MO_DG_Deep_Learning_Model_Optimizer_DevGuide.html
+[Post-Training Optimization Tool]:https://docs.openvino.ai/2023.0/pot_introduction.html
 [Samples]:https://github.com/openvinotoolkit/openvino/tree/master/samples

cmake/dependencies.cmake

@@ -53,7 +53,7 @@ if(THREADING STREQUAL "OMP")
     update_deps_cache(OMP "${OMP}" "Path to OMP root folder")
     debug_message(STATUS "intel_omp=" ${OMP})
 
-    ie_cpack_add_component(omp HIDDEN)
+    ov_cpack_add_component(omp HIDDEN)
     file(GLOB_RECURSE source_list "${OMP}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
     install(FILES ${source_list}
             DESTINATION ${OV_CPACK_RUNTIMEDIR}
@@ -96,11 +96,12 @@ function(ov_download_tbb)
 
     if(WIN32 AND X86_64)
         # TODO: add target_path to be platform specific as well, to avoid following if
+        # build oneTBB 2021.2.1 with Visual Studio 2019 (MSVC 14.21)
         RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_WIN "tbb2020_617e9a71_win.zip"
+                ARCHIVE_WIN "oneapi-tbb-2021.2.2-win.zip"
                 TARGET_PATH "${TEMP}/tbb"
                 ENVIRONMENT "TBBROOT"
-                SHA256 "01cac3cc48705bd52b83a6e1fa1ed95c708928be76160f5b9c5c37f954d56df4"
+                SHA256 "103b19a8af288c6a7d83ed3f0d2239c4afd0dd189fc12aad1d34b3c9e78df94b"
                 USE_NEW_LOCATION TRUE)
     elseif(ANDROID AND X86_64)
         RESOLVE_DEPENDENCY(TBB
@@ -108,12 +109,13 @@ function(ov_download_tbb)
                 TARGET_PATH "${TEMP}/tbb"
                 ENVIRONMENT "TBBROOT"
                 SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
-    elseif(LINUX AND X86_64)
+    elseif(LINUX AND X86_64 AND OV_GLIBC_VERSION VERSION_GREATER_EQUAL 2.17)
+        # build oneTBB 2021.2.1 with gcc 4.8 (glibc 2.17)
         RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_LIN "tbb2020_617e9a71_lin_strip.tgz"
+                ARCHIVE_LIN "oneapi-tbb-2021.2.1-lin.tgz"
                 TARGET_PATH "${TEMP}/tbb"
                 ENVIRONMENT "TBBROOT"
-                SHA256 "e7a38f68059fb36de8b59d40b283a849f26275e34a58d2acadfdb84d49e31b9b"
+                SHA256 "0a56f73baaa40d72e06949ea6d593ae63a19f7580ce71c08287c1f59d2e5b988"
                 USE_NEW_LOCATION TRUE)
     elseif(YOCTO_AARCH64)
         RESOLVE_DEPENDENCY(TBB
@@ -122,11 +124,36 @@ function(ov_download_tbb)
                 ENVIRONMENT "TBBROOT"
                 SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
     elseif(APPLE AND X86_64)
+        # build oneTBB 2021.2.1 with OS version 11.4
         RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_MAC "tbb2020_617e9a71_mac.tgz"
+                ARCHIVE_MAC "oneapi-tbb-2021.2.1-mac.tgz"
                 TARGET_PATH "${TEMP}/tbb"
                 ENVIRONMENT "TBBROOT"
-                SHA256 "67a44b695bef3348416eaf5bf2baca2b1401576c0e09c394304eba1e0eee96cd"
+                SHA256 "c57ce4b97116cd3093c33e6dcc147fb1bbb9678d0ee6c61a506b2bfe773232cb"
+                USE_NEW_LOCATION TRUE)
+    elseif(WIN32 AND AARCH64)
+        # build oneTBB 2021.2.1 with Visual Studio 2022 (MSVC 14.35)
+        RESOLVE_DEPENDENCY(TBB
+                ARCHIVE_WIN "oneapi-tbb-2021.2.1-win-arm64.zip"
+                TARGET_PATH "${TEMP}/tbb"
+                ENVIRONMENT "TBBROOT"
+                SHA256 "09fe7f5e7be589aa34ccd20fdfd7cad9e0afa89d1e74ecdb008a75d0af71d6e1"
+                USE_NEW_LOCATION TRUE)
+    elseif(LINUX AND AARCH64 AND OV_GLIBC_VERSION VERSION_GREATER_EQUAL 2.17)
+        # build oneTBB 2021.2.1 with gcc 4.8 (glibc 2.17)
+        RESOLVE_DEPENDENCY(TBB
+                ARCHIVE_LIN "oneapi-tbb-2021.2.1-lin-arm64.tgz"
+                TARGET_PATH "${TEMP}/tbb"
+                ENVIRONMENT "TBBROOT"
+                SHA256 "6b87194a845aa9314f3785d842e250d934e545eccc4636655c7b27c98c302c0c"
+                USE_NEW_LOCATION TRUE)
+    elseif(APPLE AND AARCH64)
+        # build oneTBB 2021.2.1 with export MACOSX_DEPLOYMENT_TARGET=11.0
+        RESOLVE_DEPENDENCY(TBB
+                ARCHIVE_MAC "oneapi-tbb-2021.2.1-mac-arm64.tgz"
+                TARGET_PATH "${TEMP}/tbb"
+                ENVIRONMENT "TBBROOT"
+                SHA256 "15d46ef19501e4315a5498af59af873dbf8180e9a3ea55253ccf7f0c0bb6f940"
                 USE_NEW_LOCATION TRUE)
     else()
         message(WARNING "Prebuilt TBB is not available on current platform")
@@ -177,16 +204,18 @@ function(ov_download_tbbbind_2_5)
 
     if(WIN32 AND X86_64)
         RESOLVE_DEPENDENCY(TBBBIND_2_5
-                ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip"
+                ARCHIVE_WIN "tbbbind_2_5_static_win_v2.zip"
                 TARGET_PATH "${TEMP}/tbbbind_2_5"
                 ENVIRONMENT "TBBBIND_2_5_ROOT"
-                SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1")
+                SHA256 "49ae93b13a13953842ff9ae8d01681b269b5b0bc205daf18619ea9a828c44bee"
+                USE_NEW_LOCATION TRUE)
     elseif(LINUX AND X86_64)
         RESOLVE_DEPENDENCY(TBBBIND_2_5
-                ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz"
+                ARCHIVE_LIN "tbbbind_2_5_static_lin_v3.tgz"
                 TARGET_PATH "${TEMP}/tbbbind_2_5"
                 ENVIRONMENT "TBBBIND_2_5_ROOT"
-                SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4")
+                SHA256 "d39deb262c06981b5e2d2e3c593e9fc9be62ce4feb91dd4e648e92753659a6b3"
+                USE_NEW_LOCATION TRUE)
     else()
         # TMP: for Apple Silicon TBB does not provide TBBBind
         if(NOT (APPLE AND AARCH64))
@@ -298,8 +327,8 @@ if(ENABLE_INTEL_GNA)
             GNA_LIB_DIR
             libGNA_INCLUDE_DIRS
             libGNA_LIBRARIES_BASE_PATH)
-        set(GNA_VERSION "03.00.00.1910")
-        set(GNA_HASH "894ddbc0ae3459f04513b853b0cabc32890dd4ea37228a022b6a32101bdbb7f8")
+        set(GNA_VERSION "03.05.00.2116")
+        set(GNA_HASH "960350567702bda17276ac4c060d7524fb7ce7ced785004bd861c81ff2bfe2c5")
 
         set(FILES_TO_EXTRACT_LIST gna_${GNA_VERSION}/include)
         if(WIN32)

cmake/developer_package/IEDevScriptsConfig.cmake

@@ -24,7 +24,6 @@ function(set_ci_build_number)
 endfunction()
 
 include(features)
-include(message)
 
 set_ci_build_number()
 
@@ -112,10 +111,13 @@ 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$")
+if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
+    # 'Ninja Multi-Config' specific, see:
+    # https://cmake.org/cmake/help/latest/variable/CMAKE_DEFAULT_BUILD_TYPE.html
     set(CMAKE_DEFAULT_BUILD_TYPE "Release" CACHE STRING "CMake default build type")
+elseif(NOT OV_GENERATOR_MULTI_CONFIG)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "CMake build type")
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Release;Debug;RelWithDebInfo;MinSizeRel")
 endif()
 
 if(USE_BUILD_TYPE_SUBFOLDER)
@@ -153,10 +155,10 @@ 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(OV_GENERATOR_MULTI_CONFIG)
     set(IE_BUILD_POSTFIX $<$<CONFIG:Debug>:${IE_DEBUG_POSTFIX}>$<$<CONFIG:Release>:${IE_RELEASE_POSTFIX}>)
-else ()
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+else()
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(IE_BUILD_POSTFIX ${IE_DEBUG_POSTFIX})
     else()
         set(IE_BUILD_POSTFIX ${IE_RELEASE_POSTFIX})
@@ -238,7 +240,7 @@ if(ENABLE_LTO)
                         LANGUAGES C CXX)
 
     if(NOT IPO_SUPPORTED)
-        set(ENABLE_LTO "OFF" CACHE STRING "Enable Link Time Optmization" FORCE)
+        set(ENABLE_LTO "OFF" CACHE STRING "Enable Link Time Optimization" FORCE)
         message(WARNING "IPO / LTO is not supported: ${OUTPUT_MESSAGE}")
     endif()
 endif()
@@ -248,8 +250,8 @@ endif()
 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)
+        if(target_type STREQUAL "STATIC_LIBRARY")
+            set_target_properties(${target} PROPERTIES EXCLUDE_FROM_ALL OFF)
         endif()
         install(TARGETS ${target} EXPORT OpenVINOTargets
                 ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${comp} ${ARGN})

cmake/developer_package/api_validator/api_validator.cmake

@@ -4,61 +4,105 @@
 
 if(WIN32)
     set(PROGRAMFILES_ENV "ProgramFiles(X86)")
-    file(TO_CMAKE_PATH $ENV{${PROGRAMFILES_ENV}} PROGRAMFILES)
-    set(UWP_SDK_PATH "${PROGRAMFILES}/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64")
 
-    message(STATUS "Trying to find apivalidator in: ${UWP_SDK_PATH}")
-    find_host_program(UWP_API_VALIDATOR
-                      NAMES apivalidator
-                      PATHS "${UWP_SDK_PATH}"
-                      DOC "ApiValidator for UWP compliance")
+    # check that PROGRAMFILES_ENV is defined, because in case of cross-compilation for Windows
+    # we don't have such variable
+    if(DEFINED ENV{PROGRAMFILES_ENV})
+        file(TO_CMAKE_PATH $ENV{${PROGRAMFILES_ENV}} PROGRAMFILES)
 
-    if(UWP_API_VALIDATOR)
-        message(STATUS "Found apivalidator: ${UWP_API_VALIDATOR}")
+        set(WDK_PATHS "${PROGRAMFILES}/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64"
+                    "${PROGRAMFILES}/Windows Kits/10/bin/x64")
+
+        message(STATUS "Trying to find apivalidator in: ")
+        foreach(wdk_path IN LISTS WDK_PATHS)
+            message("    * ${wdk_path}")
+        endforeach()
+
+        find_host_program(ONECORE_API_VALIDATOR
+                        NAMES apivalidator
+                        PATHS ${WDK_PATHS}
+                        DOC "ApiValidator for OneCore compliance")
+
+        if(ONECORE_API_VALIDATOR)
+            message(STATUS "Found apivalidator: ${ONECORE_API_VALIDATOR}")
+        endif()
     endif()
 endif()
 
 function(_ie_add_api_validator_post_build_step_recursive)
     cmake_parse_arguments(API_VALIDATOR "" "TARGET" "" ${ARGN})
 
-    list(APPEND API_VALIDATOR_TARGETS ${API_VALIDATOR_TARGET})
-    set(API_VALIDATOR_TARGETS ${API_VALIDATOR_TARGETS} PARENT_SCOPE)
-
-    get_target_property(IS_IMPORTED ${API_VALIDATOR_TARGET} IMPORTED)
-    if(IS_IMPORTED)
-        return()
-    endif()
-
     get_target_property(LIBRARY_TYPE ${API_VALIDATOR_TARGET} TYPE)
-    if(LIBRARY_TYPE STREQUAL "EXECUTABLE" OR LIBRARY_TYPE STREQUAL "SHARED_LIBRARY")
-        get_target_property(LINKED_LIBRARIES ${API_VALIDATOR_TARGET} LINK_LIBRARIES)
-        if(LINKED_LIBRARIES)
-            foreach(ITEM IN LISTS LINKED_LIBRARIES)
-                if(NOT TARGET ${ITEM})
-                    continue()
-                endif()
-                get_target_property(LIBRARY_TYPE_DEPENDENCY ${ITEM} TYPE)
-                if(LIBRARY_TYPE_DEPENDENCY STREQUAL "SHARED_LIBRARY")
-                    _ie_add_api_validator_post_build_step_recursive(TARGET ${ITEM})
-                endif()
-            endforeach()
-        endif()
+    if(LIBRARY_TYPE MATCHES "^(SHARED_LIBRARY|MODULE_LIBRARY|EXECUTABLE)$" AND
+        NOT ${API_VALIDATOR_TARGET} IN_LIST API_VALIDATOR_TARGETS)
+        list(APPEND API_VALIDATOR_TARGETS ${API_VALIDATOR_TARGET})
     endif()
+    # keep checks target list to track cyclic dependencies, leading to infinite recursion
+    list(APPEND checked_targets ${API_VALIDATOR_TARGET})
+
+    if(NOT LIBRARY_TYPE STREQUAL "INTERFACE_LIBRARY")
+        get_target_property(LINKED_LIBRARIES ${API_VALIDATOR_TARGET} LINK_LIBRARIES)
+    else()
+        set(LINKED_LIBRARIES)
+    endif()
+    get_target_property(INTERFACE_LINKED_LIBRARIES ${API_VALIDATOR_TARGET} INTERFACE_LINK_LIBRARIES)
+
+    foreach(library IN LISTS LINKED_LIBRARIES INTERFACE_LINKED_LIBRARIES)
+        if(TARGET "${library}")
+            get_target_property(orig_library ${library} ALIASED_TARGET)
+            if(orig_library IN_LIST checked_targets OR library IN_LIST checked_targets)
+                # in case of cyclic dependencies, we need to skip current target
+                continue()
+            endif()
+            if(TARGET "${orig_library}")
+                _ie_add_api_validator_post_build_step_recursive(TARGET ${orig_library})
+            else()
+                _ie_add_api_validator_post_build_step_recursive(TARGET ${library})
+            endif()
+        endif()
+    endforeach()
 
     set(API_VALIDATOR_TARGETS ${API_VALIDATOR_TARGETS} PARENT_SCOPE)
 endfunction()
 
-set(VALIDATED_LIBRARIES "" CACHE INTERNAL "")
+set(VALIDATED_TARGETS "" CACHE INTERNAL "")
 
 function(_ov_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")
-
-    if((NOT UWP_API_VALIDATOR) OR (WINDOWS_STORE OR WINDOWS_PHONE))
+    if((NOT ONECORE_API_VALIDATOR) OR (WINDOWS_STORE OR WINDOWS_PHONE))
         return()
     endif()
 
-    cmake_parse_arguments(API_VALIDATOR "" "TARGET" "" ${ARGN})
+    # see https://learn.microsoft.com/en-us/windows-hardware/drivers/develop/validating-windows-drivers#known-apivalidator-issues
+    # ApiValidator does not run on Arm64 because AitStatic does not work on Arm64
+    if(HOST_AARCH64)
+        return()
+    endif()
+
+    if(X86_64)
+        set(wdk_platform "x64")
+    elseif(X86)
+        set(wdk_platform "x86")
+    elseif(ARM)
+        set(wdk_platform "arm")
+    elseif(AARCH64)
+        set(wdk_platform "arm64")
+    else()
+        message(FATAL_ERROR "Unknown configuration: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+    endif()
+
+    find_file(ONECORE_API_VALIDATOR_APIS NAMES UniversalDDIs.xml
+              PATHS "${PROGRAMFILES}/Windows Kits/10/build/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/universalDDIs/${wdk_platform}"
+                    "${PROGRAMFILES}/Windows Kits/10/build/universalDDIs/${wdk_platform}"
+              DOC "Path to UniversalDDIs.xml file")
+    find_file(ONECORE_API_VALIDATOR_EXCLUSION NAMES BinaryExclusionlist.xml
+              PATHS ${WDK_PATHS}
+              DOC "Path to BinaryExclusionlist.xml file")
+
+    if(NOT ONECORE_API_VALIDATOR_APIS)
+        message(FATAL_ERROR "Internal error: apiValidator is found (${ONECORE_API_VALIDATOR}), but UniversalDDIs.xml file has not been found for ${wdk_platform} platform")
+    endif()
+
+    cmake_parse_arguments(API_VALIDATOR "" "TARGET" "EXTRA" "" ${ARGN})
 
     if(NOT API_VALIDATOR_TARGET)
         message(FATAL_ERROR "RunApiValidator requires TARGET to validate!")
@@ -69,74 +113,81 @@ function(_ov_add_api_validator_post_build_step)
     endif()
 
     # collect targets
-
     _ie_add_api_validator_post_build_step_recursive(TARGET ${API_VALIDATOR_TARGET})
+    if (API_VALIDATOR_EXTRA)
+        foreach(target IN LISTS API_VALIDATOR_EXTRA)
+            _ie_add_api_validator_post_build_step_recursive(TARGET ${target})
+        endforeach()
+    endif()
 
     # 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)
         list(REMOVE_ITEM API_VALIDATOR_TARGETS ${item})
     endforeach()
 
-    list(REMOVE_DUPLICATES API_VALIDATOR_TARGETS)
-
     if(NOT API_VALIDATOR_TARGETS)
         return()
     endif()
 
     # apply check
-
     macro(api_validator_get_target_name)
-        get_target_property(IS_IMPORTED ${target} IMPORTED)
+        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_filename_component(target_name "${target_location}" NAME_WE)
+        if(is_imported)
+            get_target_property(imported_configs ${target} IMPORTED_CONFIGURATIONS)
+            foreach(imported_config RELEASE RELWITHDEBINFO DEBUG)
+                if(imported_config IN_LIST imported_configs)
+                    get_target_property(target_location ${target} IMPORTED_LOCATION_${imported_config})
+                    get_filename_component(target_name "${target_location}" NAME_WE)
+                    break()
+                endif()
+            endforeach()
+            unset(imported_configs)
         elseif(TARGET "${orig_target}")
             set(target_name ${orig_target})
+            set(target_location $<TARGET_FILE:${orig_target}>)
         else()
             set(target_name ${target})
+            set(target_location $<TARGET_FILE:${target}>)
         endif()
+
+        unset(orig_target)
+        unset(is_imported)
     endmacro()
 
     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")
+        if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20 AND OV_GENERATOR_MULTI_CONFIG)
+            set(output_file "${OpenVINO_BINARY_DIR}/api_validator/$<CONFIG>/${target_name}.txt")
         else()
-            set(output_file "${CMAKE_BINARY_DIR}/api_validator/${target_name}.txt")
+            set(output_file "${OpenVINO_BINARY_DIR}/api_validator/${target_name}.txt")
         endif()
 
-        add_custom_command(TARGET ${API_VALIDATOR_TARGET} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} --config $<CONFIG>
-                -D UWP_API_VALIDATOR=${UWP_API_VALIDATOR}
-                -D UWP_API_VALIDATOR_TARGET=$<TARGET_FILE:${target}>
-                -D UWP_API_VALIDATOR_APIS=${UWP_API_VALIDATOR_APIS}
-                -D UWP_API_VALIDATOR_EXCLUSION=${UWP_API_VALIDATOR_EXCLUSION}
-                -D UWP_API_VALIDATOR_OUTPUT=${output_file}
+        list(APPEND post_build_commands
+             ${CMAKE_COMMAND} --config $<CONFIG>
+                -D ONECORE_API_VALIDATOR=${ONECORE_API_VALIDATOR}
+                -D ONECORE_API_VALIDATOR_TARGET=${target_location}
+                -D ONECORE_API_VALIDATOR_APIS=${ONECORE_API_VALIDATOR_APIS}
+                -D ONECORE_API_VALIDATOR_EXCLUSION=${ONECORE_API_VALIDATOR_EXCLUSION}
+                -D ONECORE_API_VALIDATOR_OUTPUT=${output_file}
                 -D CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-                -P "${IEDevScripts_DIR}/api_validator/api_validator_run.cmake"
-            BYPRODUCTS ${output_file}
-            COMMENT "[apiValidator] Check ${target_name} for OneCore compliance"
-            VERBATIM)
+                -P "${IEDevScripts_DIR}/api_validator/api_validator_run.cmake")
+        list(APPEND byproducts_files ${output_file})
+
+        unset(target_name)
+        unset(target_location)
     endforeach()
 
+    add_custom_command(TARGET ${API_VALIDATOR_TARGET} POST_BUILD
+        COMMAND ${post_build_commands}
+        BYPRODUCTS ${byproducts_files}
+        COMMENT "[apiValidator] Check ${API_VALIDATOR_TARGET} and dependencies for OneCore compliance"
+        VERBATIM)
+
     # update list of validated libraries
 
-    list(APPEND VALIDATED_LIBRARIES ${API_VALIDATOR_TARGETS})
-    set(VALIDATED_LIBRARIES "${VALIDATED_LIBRARIES}" CACHE INTERNAL "" FORCE)
+    list(APPEND VALIDATED_TARGETS ${API_VALIDATOR_TARGETS})
+    set(VALIDATED_TARGETS "${VALIDATED_TARGETS}" CACHE INTERNAL "" FORCE)
 endfunction()
 
 #

cmake/developer_package/api_validator/api_validator_run.cmake

@@ -4,9 +4,9 @@
 
 cmake_policy(SET CMP0012 NEW)
 
-foreach(var UWP_API_VALIDATOR UWP_API_VALIDATOR_TARGET
-            UWP_API_VALIDATOR_APIS UWP_API_VALIDATOR_EXCLUSION
-            UWP_API_VALIDATOR_OUTPUT CMAKE_TOOLCHAIN_FILE)
+foreach(var ONECORE_API_VALIDATOR ONECORE_API_VALIDATOR_TARGET
+            ONECORE_API_VALIDATOR_APIS ONECORE_API_VALIDATOR_EXCLUSION
+            ONECORE_API_VALIDATOR_OUTPUT CMAKE_TOOLCHAIN_FILE)
     if(NOT DEFINED ${var})
         message(FATAL_ERROR "Variable ${var} is not defined")
     endif()
@@ -14,18 +14,18 @@ endforeach()
 
 # create command
 
-if(NOT EXISTS "${UWP_API_VALIDATOR_APIS}")
-    message(FATAL_ERROR "${UWP_API_VALIDATOR_APIS} does not exist")
+if(NOT EXISTS "${ONECORE_API_VALIDATOR_APIS}")
+    message(FATAL_ERROR "${ONECORE_API_VALIDATOR_APIS} does not exist")
 endif()
 
-set(command "${UWP_API_VALIDATOR}"
-        -SupportedApiXmlFiles:${UWP_API_VALIDATOR_APIS}
-        -DriverPackagePath:${UWP_API_VALIDATOR_TARGET})
-if(EXISTS "${UWP_API_VALIDATOR_EXCLUSION}")
+set(command "${ONECORE_API_VALIDATOR}"
+        -SupportedApiXmlFiles:${ONECORE_API_VALIDATOR_APIS}
+        -DriverPackagePath:${ONECORE_API_VALIDATOR_TARGET})
+if(EXISTS "${ONECORE_API_VALIDATOR_EXCLUSION}")
     list(APPEND command
-        -BinaryExclusionListXmlFile:${UWP_API_VALIDATOR_EXCLUSION}
+        -BinaryExclusionListXmlFile:${ONECORE_API_VALIDATOR_EXCLUSION}
         -StrictCompliance:TRUE)
-    set(UWP_HAS_BINARY_EXCLUSION ON)
+    set(ONECORE_HAS_BINARY_EXCLUSION ON)
 endif()
 
 # execute
@@ -36,13 +36,13 @@ execute_process(COMMAND ${command}
                 RESULT_VARIABLE exit_code
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-file(WRITE "${UWP_API_VALIDATOR_OUTPUT}" "${output_message}\n\n\n${error_message}")
+file(WRITE "${ONECORE_API_VALIDATOR_OUTPUT}" "CMAKE COMMAND: ${command}\n\n\n${output_message}\n\n\n${error_message}")
 
 # post-process output
 
-get_filename_component(name "${UWP_API_VALIDATOR_TARGET}" NAME)
+get_filename_component(name "${ONECORE_API_VALIDATOR_TARGET}" NAME)
 
-if(NOT UWP_HAS_BINARY_EXCLUSION)
+if(NOT ONECORE_HAS_BINARY_EXCLUSION)
     if(CMAKE_TOOLCHAIN_FILE MATCHES "onecoreuap.toolchain.cmake$")
         # empty since we compile with static MSVC runtime
     else()
@@ -66,7 +66,7 @@ endif()
 
 # write output
 
-if(UWP_HAS_BINARY_EXCLUSION AND NOT exit_code EQUAL 0)
+if(ONECORE_HAS_BINARY_EXCLUSION AND NOT exit_code EQUAL 0)
     message(FATAL_ERROR "${error_message}")
 endif()
 

cmake/developer_package/check_python_requirements.py

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

cmake/developer_package/clang_format/clang_format.cmake

@@ -3,23 +3,23 @@
 #
 
 if(ENABLE_CLANG_FORMAT)
-    set(clang_format_required_version 9)
-    set(CLANG_FORMAT_FILENAME clang-format-${clang_format_required_version} clang-format)
+    set(CLANG_FORMAT_REQUIRED_VERSION 9 CACHE STRING "Clang-format version to use")
+    set(CLANG_FORMAT_FILENAME clang-format-${CLANG_FORMAT_REQUIRED_VERSION} clang-format)
     find_host_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)
-            message(WARNING "Supported clang-format version is ${clang_format_required_version}!")
+            message(WARNING "Supported clang-format version is ${CLANG_FORMAT_REQUIRED_VERSION}!")
             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 clang_format_required_version)
+            if(NOT CLANG_FORMAT_MAJOR_VERSION EQUAL CLANG_FORMAT_REQUIRED_VERSION)
                 message(WARNING "Supported clang-format version is 9! Provided version ${CLANG_FORMAT_MAJOR_VERSION}")
                 set(ENABLE_CLANG_FORMAT OFF)
             endif()
         endif()
     else()
-        message(WARNING "Supported clang-format-${clang_format_required_version} is not found!")
+        message(WARNING "Supported clang-format-${CLANG_FORMAT_REQUIRED_VERSION} is not found!")
         set(ENABLE_CLANG_FORMAT OFF)
     endif()
 endif()
@@ -70,6 +70,10 @@ function(add_clang_format_target TARGET_NAME)
             continue()
         endif()
 
+        if(IS_DIRECTORY "${source_file}")
+            message(FATAL_ERROR "Directory ${source_file} cannot be passed to clang-format")
+        endif()
+
         file(RELATIVE_PATH source_file_relative "${CMAKE_CURRENT_SOURCE_DIR}" "${source_file}")
         set(output_file "${CMAKE_CURRENT_BINARY_DIR}/clang_format/${source_file_relative}.clang")
         string(REPLACE ".." "__" output_file "${output_file}")

cmake/developer_package/compile_flags/fuzzing.cmake

@@ -4,8 +4,13 @@
 
 macro(enable_fuzzing)
     # Enable (libFuzzer)[https://llvm.org/docs/LibFuzzer.html] if supported.
-    set(FUZZING_COMPILER_FLAGS "-fsanitize=fuzzer-no-link -fprofile-instr-generate -fcoverage-mapping")
-    set(FUZZING_LINKER_FLAGS "-fsanitize-coverage=trace-pc-guard -fprofile-instr-generate")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        # see https://learn.microsoft.com/en-us/cpp/build/reference/fsanitize?view=msvc-160#remarks
+        set(FUZZING_COMPILER_FLAGS "/fsanitize=fuzzer")
+    elseif(OV_COMPILER_IS_CLANG)
+        set(FUZZING_COMPILER_FLAGS "-fsanitize=fuzzer-no-link -fprofile-instr-generate -fcoverage-mapping")
+        set(FUZZING_LINKER_FLAGS "-fsanitize-coverage=trace-pc-guard -fprofile-instr-generate")
+    endif()
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FUZZING_COMPILER_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FUZZING_COMPILER_FLAGS}")
@@ -20,6 +25,10 @@ function(add_fuzzer FUZZER_EXE_NAME FUZZER_SOURCES)
     add_executable(${FUZZER_EXE_NAME} ${FUZZER_SOURCES})
     target_link_libraries(${FUZZER_EXE_NAME} PRIVATE fuzz-testhelper)
     if(ENABLE_FUZZING)
-        set_target_properties(${FUZZER_EXE_NAME} PROPERTIES LINK_FLAGS "-fsanitize=fuzzer")
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+            # no extra flags are required
+        elseif(OV_COMPILER_IS_CLANG)
+            set_target_properties(${FUZZER_EXE_NAME} PROPERTIES LINK_FLAGS "-fsanitize=fuzzer")
+        endif()
     endif()
 endfunction(add_fuzzer)

cmake/developer_package/compile_flags/os_flags.cmake

@@ -12,23 +12,17 @@ include(CheckCXXCompilerFlag)
 # Defines ie_c_cxx_deprecated varaible which contains C / C++ compiler flags
 #
 macro(ov_disable_deprecated_warnings)
-    if(WIN32)
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        set(ie_c_cxx_deprecated "/wd4996")
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        if(WIN32)
             set(ie_c_cxx_deprecated "/Qdiag-disable:1478,1786")
-        elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            set(ie_c_cxx_deprecated "/wd4996")
-        elseif(OV_COMPILER_IS_CLANG)
-            set(ie_c_cxx_deprecated "-Wno-deprecated-declarations")
-        endif()
-    else()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        else()
             set(ie_c_cxx_deprecated "-diag-disable=1478,1786")
-        elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
-            set(ie_c_cxx_deprecated "-Wno-deprecated-declarations")
         endif()
-    endif()
-
-    if(NOT ie_c_cxx_deprecated)
+    elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
+        set(ie_c_cxx_deprecated "-Wno-deprecated-declarations")
+    else()
         message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 
@@ -49,24 +43,18 @@ endmacro()
 # Defines ie_c_cxx_deprecated_no_errors varaible which contains C / C++ compiler flags
 #
 macro(ov_deprecated_no_errors)
-    if(WIN32)
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        # show 4996 only for /w4
+        set(ie_c_cxx_deprecated_no_errors "/wd4996")
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        if(WIN32)
             set(ie_c_cxx_deprecated_no_errors "/Qdiag-warning:1478,1786")
-        elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            # show 4996 only for /w4
-            set(ie_c_cxx_deprecated_no_errors "/wd4996")
-        elseif(OV_COMPILER_IS_CLANG)
-            set(ie_c_cxx_deprecated_no_errors "-Wno-error=deprecated-declarations")
-        endif()
-    else()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        else()
             set(ie_c_cxx_deprecated_no_errors "-diag-warning=1478,1786")
-        elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
-            set(ie_c_cxx_deprecated_no_errors "-Wno-error=deprecated-declarations")
         endif()
-    endif()
-
-    if(NOT ie_c_cxx_deprecated_no_errors)
+    elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
+        set(ie_c_cxx_deprecated_no_errors "-Wno-error=deprecated-declarations")
+    else()
         message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 
@@ -101,23 +89,21 @@ endmacro()
 # Provides SSE4.2 compilation flags depending on an OS and a compiler
 #
 macro(ie_sse42_optimization_flags flags)
-    if(WIN32)
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            # No such option for MSVC 2019
-        elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        # No such option for MSVC 2019
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        if(WIN32)
             set(${flags} /QxSSE4.2)
         else()
-            message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
+            set(${flags} -xSSE4.2)
+        endif()
+    elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
+        set(${flags} -msse4.2)
+        if(EMSCRIPTEN)
+            list(APPEND ${flags} -msimd128)
         endif()
     else()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} -xSSE4.2)
-        else()
-            set(${flags} -msse4.2)
-            if(EMSCRIPTEN)
-                list(APPEND ${flags} -msimd128)
-            endif()
-        endif()
+        message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 endmacro()
 
@@ -127,20 +113,18 @@ endmacro()
 # Provides AVX2 compilation flags depending on an OS and a compiler
 #
 macro(ie_avx2_optimization_flags flags)
-    if(WIN32)
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        set(${flags} /arch:AVX2)
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        if(WIN32)
             set(${flags} /QxCORE-AVX2)
-        elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            set(${flags} /arch:AVX2)
         else()
-            message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
-        endif()
-    else()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
             set(${flags} -xCORE-AVX2)
-        else()
-            set(${flags} -mavx2 -mfma)
         endif()
+    elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
+        set(${flags} -mavx2 -mfma)
+    else()
+        message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 endmacro()
 
@@ -151,24 +135,18 @@ endmacro()
 # depending on an OS and a compiler
 #
 macro(ie_avx512_optimization_flags flags)
-    if(WIN32)
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        set(${flags} /arch:AVX512)
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        if(WIN32)
             set(${flags} /QxCOMMON-AVX512)
-        elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            set(${flags} /arch:AVX512)
         else()
-            message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
-        endif()
-    else()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
             set(${flags} -xCOMMON-AVX512)
         endif()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set(${flags} -mavx512f -mfma)
-        endif()
-        if(CMAKE_CXX_COMPILER_ID MATCHES "^(Clang|AppleClang)$")
-            set(${flags} -mavx512f -mfma)
-        endif()
+    elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
+        set(${flags} -mavx512f -mfma)
+    else()
+        message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 endmacro()
 
@@ -265,8 +243,10 @@ endfunction()
 function(ov_force_include target scope header_file)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         target_compile_options(${target} ${scope} /FI"${header_file}")
-    else()
+    elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
         target_compile_options(${target} ${scope} -include "${header_file}")
+    else()
+        message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 endfunction()
 
@@ -318,11 +298,11 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 if(CMAKE_CL_64)
     # Default char Type Is unsigned
     # ie_add_compiler_flags(/J)
-else()
+elseif(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
     ie_add_compiler_flags(-fsigned-char)
 endif()
 
-if(WIN32)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     #
     # Common options / warnings enabled
     #
@@ -335,16 +315,14 @@ if(WIN32)
     # This option helps ensure the fewest possible hard-to-find code defects. Similar to -Wall on GNU / Clang
     ie_add_compiler_flags(/W3)
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        # Increase Number of Sections in .Obj file
-        ie_add_compiler_flags(/bigobj)
-        # Build with multiple processes
-        ie_add_compiler_flags(/MP)
+    # Increase Number of Sections in .Obj file
+    ie_add_compiler_flags(/bigobj)
+    # Build with multiple processes
+    ie_add_compiler_flags(/MP)
 
-        if(AARCH64 AND NOT MSVC_VERSION LESS 1930)
-            # otherwise, _ARM64_EXTENDED_INTRINSICS is defined, which defines 'mvn' macro
-            ie_add_compiler_flags(/D_ARM64_DISTINCT_NEON_TYPES)
-        endif()
+    if(AARCH64 AND NOT MSVC_VERSION LESS 1930)
+        # otherwise, _ARM64_EXTENDED_INTRINSICS is defined, which defines 'mvn' macro
+        ie_add_compiler_flags(/D_ARM64_DISTINCT_NEON_TYPES)
     endif()
 
     # Handle Large Addresses
@@ -361,42 +339,62 @@ if(WIN32)
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /WX")
         set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /WX")
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WX")
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            ie_add_compiler_flags(/Qdiag-warning:47,1740,1786)
-        endif()
     endif()
 
     #
     # Disable noisy warnings
     #
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        # C4251 needs to have dll-interface to be used by clients of class
-        ie_add_compiler_flags(/wd4251)
-        # C4275 non dll-interface class used as base for dll-interface class
-        ie_add_compiler_flags(/wd4275)
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-        # 161: unrecognized pragma
-        # 177: variable was declared but never referenced
-        # 556: not matched type of assigned function pointer
-        # 1744: field of class type without a DLL interface used in a class with a DLL interface
-        # 1879: unimplemented pragma ignored
-        # 2586: decorated name length exceeded, name was truncated
-        # 2651: attribute does not apply to any entity
-        # 3180: unrecognized OpenMP pragma
-        # 11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo
-        # 15335: was not vectorized: vectorization possible but seems inefficient. Use vector always directive or /Qvec-threshold0 to override
-        ie_add_compiler_flags(/Qdiag-disable:161,177,556,1744,1879,2586,2651,3180,11075,15335)
-    endif()
+    # C4251 needs to have dll-interface to be used by clients of class
+    ie_add_compiler_flags(/wd4251)
+    # C4275 non dll-interface class used as base for dll-interface class
+    ie_add_compiler_flags(/wd4275)
 
+    #
     # Debug information flags, by default CMake adds /Zi option
     # but provides no way to specify CMAKE_COMPILE_PDB_NAME on root level
     # In order to avoid issues with ninja we are replacing default flag instead of having two of them
     # and observing warning D9025 about flag override
+    #
+
     string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
     string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
     string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
     string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND WIN32)
+    #
+    # Warnings as errors
+    #
+
+    if(CMAKE_COMPILE_WARNING_AS_ERROR AND CMAKE_VERSION VERSION_LESS 3.24)
+        ie_add_compiler_flags(/Qdiag-warning:47,1740,1786)
+    endif()
+
+    #
+    # Disable noisy warnings
+    #
+
+    # 161: unrecognized pragma
+    ie_add_compiler_flags(/Qdiag-disable:161)
+    # 177: variable was declared but never referenced
+    ie_add_compiler_flags(/Qdiag-disable:177)
+    # 556: not matched type of assigned function pointer
+    ie_add_compiler_flags(/Qdiag-disable:556)
+    # 1744: field of class type without a DLL interface used in a class with a DLL interface
+    ie_add_compiler_flags(/Qdiag-disable:1744)
+    # 1879: unimplemented pragma ignored
+    ie_add_compiler_flags(/Qdiag-disable:1879)
+    # 2586: decorated name length exceeded, name was truncated
+    ie_add_compiler_flags(/Qdiag-disable:2586)
+    # 2651: attribute does not apply to any entity
+    ie_add_compiler_flags(/Qdiag-disable:2651)
+    # 3180: unrecognized OpenMP pragma
+    ie_add_compiler_flags(/Qdiag-disable:3180)
+    # 11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo
+    ie_add_compiler_flags(/Qdiag-disable:11075)
+    # 15335: was not vectorized: vectorization possible but seems inefficient. 
+    # Use vector always directive or /Qvec-threshold0 to override
+    ie_add_compiler_flags(/Qdiag-disable:15335)
 else()
     #
     # Common enabled warnings
@@ -412,11 +410,6 @@ else()
     # Warn if an undefined identifier is evaluated in an #if directive. Such identifiers are replaced with zero.
     ie_add_compiler_flags(-Wundef)
 
-    check_cxx_compiler_flag("-Wsuggest-override" SUGGEST_OVERRIDE_SUPPORTED)
-    if(SUGGEST_OVERRIDE_SUPPORTED)
-        set(CMAKE_CXX_FLAGS "-Wsuggest-override ${CMAKE_CXX_FLAGS}")
-    endif()
-
     #
     # Warnings as errors
     #
@@ -460,14 +453,13 @@ else()
     endif()
 endif()
 
-# if(OV_COMPILER_IS_CLANG)
-#     ie_add_compiler_flags(-Wshorten-64-to-32)
-# endif()
-# TODO
-if(OV_COMPILER_IS_CLANG)
-    ie_add_compiler_flags(-Wno-delete-non-abstract-non-virtual-dtor)
+check_cxx_compiler_flag("-Wsuggest-override" SUGGEST_OVERRIDE_SUPPORTED)
+if(SUGGEST_OVERRIDE_SUPPORTED)
+    set(CMAKE_CXX_FLAGS "-Wsuggest-override ${CMAKE_CXX_FLAGS}")
 endif()
 
+check_cxx_compiler_flag("-Wunused-but-set-variable" UNUSED_BUT_SET_VARIABLE_SUPPORTED)
+
 #
 # link_system_libraries(target <PUBLIC | PRIVATE | INTERFACE> <lib1 [lib2 lib3 ...]>)
 #
@@ -499,6 +491,11 @@ endfunction()
 # Tries to use gold linker in current scope (directory, function)
 #
 function(ov_try_use_gold_linker)
+    # don't use the gold linker, if the mold linker is set
+    if(CMAKE_EXE_LINKER_FLAGS MATCHES "mold" OR CMAKE_MODULE_LINKER_FLAGS MATCHES "mold" OR CMAKE_SHARED_LINKER_FLAGS MATCHES "mold")
+        return()
+    endif()
+
     # gold linker on ubuntu20.04 may fail to link binaries build with sanitizer
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_SANITIZER AND NOT CMAKE_CROSSCOMPILING)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold" PARENT_SCOPE)

cmake/developer_package/compile_flags/sanitizer.cmake

@@ -5,7 +5,9 @@
 include(CheckCXXCompilerFlag)
 
 if (ENABLE_SANITIZER)
-    if (WIN32)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        # the flag is available since MSVC 2019 16.9
+        # see https://learn.microsoft.com/en-us/cpp/build/reference/fsanitize?view=msvc-160
         check_cxx_compiler_flag("/fsanitize=address" SANITIZE_ADDRESS_SUPPORTED)
         if (SANITIZE_ADDRESS_SUPPORTED)
             set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} /fsanitize=address")
@@ -14,26 +16,28 @@ if (ENABLE_SANITIZER)
             "Please, check requirements:\n"
             "https://github.com/openvinotoolkit/openvino/wiki/AddressSanitizer-and-LeakSanitizer")
         endif()
-    else()
+    elseif(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
         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")
+    else()
+        message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 endif()
 
-if (ENABLE_UB_SANITIZER)
-    if (WIN32)
-        message(FATAL_ERROR "UndefinedBehavior sanitizer is not supported in Windows")
+if(ENABLE_UB_SANITIZER)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        message(FATAL_ERROR "UndefinedBehavior sanitizer is not supported in Windows with MSVC compiler. Please, use clang-cl or mingw")
     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 *(*)()'
+    #       call to function get_api_version 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
@@ -48,43 +52,50 @@ if (ENABLE_UB_SANITIZER)
         set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fno-sanitize=function")
     endif()
 
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        # TODO: Remove -Wno-maybe-uninitialized after CVS-61143 fix
+    if(CMAKE_COMPILER_IS_GNUCXX)
+        # TODO: Remove -Wno-maybe-uninitialized after CVS-61143 is fixed
         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)
+    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")
+if(ENABLE_THREAD_SANITIZER)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        message(FATAL_ERROR "Thread sanitizer is not supported in Windows with MSVC compiler. Please, use clang-cl or mingw")
+    elseif(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
+        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -fsanitize=thread")
+        set(SANITIZER_LINKER_FLAGS "${SANITIZER_LINKER_FLAGS} -fsanitize=thread")
+    else()
+        message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
+    endif()
 endif()
 
 # common sanitizer options
-if (DEFINED SANITIZER_COMPILER_FLAGS)
+if(DEFINED SANITIZER_COMPILER_FLAGS)
     # ensure symbols are present
-    if (NOT WIN32)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} /Oy-")
+    elseif(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
         set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} -g -fno-omit-frame-pointer")
-        if(NOT OV_COMPILER_IS_CLANG)
+        if(CMAKE_COMPILER_IS_GNUCXX)
             # 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
-        if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+        if(NOT OV_COMPILER_IS_APPLECLANG)
             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 "${SANITIZER_LINKER_FLAGS} -fuse-ld=lld")
             endif()
         endif()
-
     else()
-        set(SANITIZER_COMPILER_FLAGS "${SANITIZER_COMPILER_FLAGS} /Oy-")
+        message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_COMPILER_FLAGS}")

cmake/developer_package/compile_flags/sdl.cmake

@@ -2,58 +2,68 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(UNIX)
-    set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -Wformat -Wformat-security")
+if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG OR
+    (UNIX AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel"))
+    set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -Wformat -Wformat-security")
+
     if (NOT ENABLE_SANITIZER)
         if(EMSCRIPTEN)
             # emcc does not support fortification, see:
             # https://stackoverflow.com/questions/58854858/undefined-symbol-stack-chk-guard-in-libopenh264-so-when-building-ffmpeg-wit
         else()
             # 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")
+            set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
         endif()
     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")
-        set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv")
+    if(CMAKE_COMPILER_IS_GNUCXX)
+        set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv")
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
-            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-all")
+            set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fstack-protector-all")
         else()
-            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-strong")
+            set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fstack-protector-strong")
         endif()
         if (NOT ENABLE_SANITIZER)
-            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -s")
+            # Remove all symbol table and relocation information from the executable
+            set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -s")
+        endif()
+        if(NOT MINGW)
+            set(OV_LINKER_FLAGS "${OV_LINKER_FLAGS} -z noexecstack -z relro -z now")
         endif()
     elseif(OV_COMPILER_IS_CLANG)
         if(EMSCRIPTEN)
             # emcc does not support fortification 
             # https://stackoverflow.com/questions/58854858/undefined-symbol-stack-chk-guard-in-libopenh264-so-when-building-ffmpeg-wit
         else()
-            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -fstack-protector-all")
+            set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fstack-protector-all")
         endif()
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
         if (NOT ENABLE_SANITIZER)
-            set(IE_C_CXX_FLAGS "${IE_C_CXX_FLAGS} -Wl,--strip-all")
+            set(OV_C_CXX_FLAGS "${OV_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()
-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")
+        set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fstack-protector-strong")
+        set(OV_LINKER_FLAGS "${OV_LINKER_FLAGS} -z noexecstack -z relro -z now")
     endif()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} /sdl /guard:cf")
 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}")
+if(ENABLE_QSPECTRE)
+    set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} /Qspectre")
+endif()
+
+if(ENABLE_INTEGRITYCHECK)
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /INTEGRITYCHECK")
+endif()
+
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${OV_C_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${OV_C_CXX_FLAGS}")
+set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${OV_LINKER_FLAGS}")
+set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${OV_LINKER_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${OV_LINKER_FLAGS}")
+
+unset(OV_C_CXX_FLAGS)
+unset(OV_LINKER_FLAGS)

cmake/developer_package/cpplint/cpplint.py

@@ -641,7 +641,7 @@ _repository = None
 # Files to exclude from linting. This is set by the --exclude flag.
 _excludes = None
 
-# Whether to supress PrintInfo messages
+# Whether to suppress PrintInfo messages
 _quiet = False
 
 # The allowed line length of files.
@@ -752,7 +752,7 @@ def ParseNolintSuppressions(filename, raw_line, linenum, error):
                           'Unknown NOLINT error category: %s' % category)
 
 
-def ProcessGlobalSuppresions(lines):
+def ProcessGlobalSuppressions(lines):
     """Updates the list of global error suppressions.
 
   Parses any lint directives in the file that have global effect.
@@ -780,7 +780,7 @@ def IsErrorSuppressedByNolint(category, linenum):
     """Returns true if the specified error category is suppressed on this line.
 
   Consults the global error_suppressions map populated by
-  ParseNolintSuppressions/ProcessGlobalSuppresions/ResetNolintSuppressions.
+  ParseNolintSuppressions/ProcessGlobalSuppressions/ResetNolintSuppressions.
 
   Args:
     category: str, the category of the error.
@@ -6203,7 +6203,7 @@ def ProcessFileData(filename, file_extension, lines, error,
     ResetNolintSuppressions()
 
     CheckForCopyright(filename, lines, error)
-    ProcessGlobalSuppresions(lines)
+    ProcessGlobalSuppressions(lines)
     RemoveMultiLineComments(filename, lines, error)
     clean_lines = CleansedLines(lines)
 

cmake/developer_package/features.cmake

@@ -8,7 +8,7 @@ include(target_flags)
 # FIXME: there are compiler failures with LTO and Cross-Compile toolchains. Disabling for now, but
 #        this must be addressed in a proper way
 ie_dependent_option (ENABLE_LTO "Enable Link Time Optimization" OFF
-    "LINUX OR (APPLE AND AARCH64);EMSCRIPTEN OR NOT CMAKE_CROSSCOMPILING;CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9" OFF)
+    "LINUX;EMSCRIPTEN OR NOT CMAKE_CROSSCOMPILING;CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9" OFF)
 
 ie_option (OS_FOLDER "create OS dedicated folder in output" OFF)
 
@@ -26,6 +26,8 @@ endif()
 
 ie_option (CMAKE_COMPILE_WARNING_AS_ERROR "Enable warnings as errors" ${CMAKE_COMPILE_WARNING_AS_ERROR_DEFAULT})
 
+ie_dependent_option (ENABLE_QSPECTRE "Enable Qspectre mitigation" OFF "CMAKE_CXX_COMPILER_ID STREQUAL MSVC" OFF)
+
 ie_dependent_option (ENABLE_INTEGRITYCHECK "build DLLs with /INTEGRITYCHECK flag" OFF "CMAKE_CXX_COMPILER_ID STREQUAL MSVC" OFF)
 
 ie_option (ENABLE_SANITIZER "enable checking memory errors via AddressSanitizer" OFF)
@@ -72,7 +74,12 @@ 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)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1930)
+    # Visual Studio 2022: 1930-1939 = VS 17.0 (v143 toolset)
+    set(_msvc_version_2022 ON)
+endif()
+
+ie_dependent_option (ENABLE_FUZZING "instrument build for fuzzing" OFF "OV_COMPILER_IS_CLANG OR _msvc_version_2022" OFF)
 
 #
 # Check features

cmake/developer_package/frontends/create_frontends_hpp.cmake

@@ -15,8 +15,8 @@ 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}")
+    set(_OV_FRONTEND_DATA_FUNC "get_front_end_data_${frontend}")
+    set(_OV_VERSION_FUNC "get_api_version_${frontend}")
 
     # declarations
     set(OV_FRONTEND_DECLARATIONS "${OV_FRONTEND_DECLARATIONS}

cmake/developer_package/frontends/frontends.cmake

@@ -171,7 +171,7 @@ macro(ov_add_frontend)
     endforeach()
 
     # Disable all warnings for generated code
-    set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS} PROPERTIES COMPILE_OPTIONS -w GENERATED TRUE)
+    set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS} PROPERTIES COMPILE_OPTIONS -w GENERATED ON)
 
     # Create library
     add_library(${TARGET_NAME} ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS}
@@ -182,7 +182,7 @@ macro(ov_add_frontend)
         add_library(openvino::frontend::${OV_FRONTEND_NAME} ALIAS ${TARGET_NAME})
     endif()
 
-    # Shutdown protobuf when unloading the front dynamic library
+    # Shutdown protobuf when unloading the frontend dynamic library
     if(proto_files AND BUILD_SHARED_LIBS)
         target_link_libraries(${TARGET_NAME} PRIVATE ov_protobuf_shutdown)
     endif()
@@ -190,21 +190,8 @@ macro(ov_add_frontend)
     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()
-
-    # enable LTO
-    set_target_properties(${TARGET_NAME} PROPERTIES
-        INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
-
-    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 "${frontend_root_dir}/include"
-                            ADDITIONAL_INCLUDE_DIRECTORIES
-                                $<TARGET_PROPERTY:frontend_common::static,INTERFACE_INCLUDE_DIRECTORIES>)
+            "-Dget_front_end_data=get_front_end_data_${OV_FRONTEND_NAME}"
+            "-Dget_api_version=get_api_version_${OV_FRONTEND_NAME}")
     endif()
 
     target_include_directories(${TARGET_NAME}
@@ -214,13 +201,10 @@ macro(ov_add_frontend)
                 ${frontend_root_dir}/src
                 ${CMAKE_CURRENT_BINARY_DIR})
 
-    ie_add_vs_version_file(NAME ${TARGET_NAME}
+    ov_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})
+    target_link_libraries(${TARGET_NAME} PRIVATE ${OV_FRONTEND_LINK_LIBRARIES} PUBLIC openvino::runtime)
     ov_add_library_version(${TARGET_NAME})
 
     # WA for TF frontends which always require protobuf (not protobuf-lite)
@@ -231,23 +215,34 @@ macro(ov_add_frontend)
 
     if(proto_files)
         if(OV_FRONTEND_PROTOBUF_LITE)
-            if(NOT protobuf_lite_installed)
-                ov_install_static_lib(${Protobuf_LITE_LIBRARIES} ${OV_CPACK_COMP_CORE})
-                set(protobuf_lite_installed ON CACHE INTERNAL "" FORCE)
-            endif()
-            link_system_libraries(${TARGET_NAME} PRIVATE ${Protobuf_LITE_LIBRARIES})
+            set(protobuf_target_name libprotobuf-lite)
+            set(protobuf_install_name "protobuf_lite_installed")
         else()
-            if(NOT protobuf_installed)
-                ov_install_static_lib(${Protobuf_LIBRARIES} ${OV_CPACK_COMP_CORE})
-                set(protobuf_installed ON CACHE INTERNAL "" FORCE)
-            endif()
-            link_system_libraries(${TARGET_NAME} PRIVATE ${Protobuf_LIBRARIES})
+            set(protobuf_target_name libprotobuf)
+            set(protobuf_install_name "protobuf_installed")
+        endif()
+        if(ENABLE_SYSTEM_PROTOBUF)
+            # use imported target name with namespace
+            set(protobuf_target_name "protobuf::${protobuf_target_name}")
         endif()
 
-        # prptobuf generated code emits -Wsuggest-override error
+        link_system_libraries(${TARGET_NAME} PRIVATE ${protobuf_target_name})
+
+        # protobuf generated code emits -Wsuggest-override error
         if(SUGGEST_OVERRIDE_SUPPORTED)
             target_compile_options(${TARGET_NAME} PRIVATE -Wno-suggest-override)
         endif()
+
+        # install protobuf if it is not installed yet
+        if(NOT ${protobuf_install_name})
+            if(ENABLE_SYSTEM_PROTOBUF)
+                # we have to add find_package(Protobuf) to the OpenVINOConfig.cmake for static build
+                # no needs to install protobuf
+            else()
+                ov_install_static_lib(${protobuf_target_name} ${OV_CPACK_COMP_CORE})
+                set("${protobuf_install_name}" ON CACHE INTERNAL "" FORCE)
+            endif()
+        endif()
     endif()
 
     if(flatbuffers_schema_files)
@@ -255,10 +250,30 @@ macro(ov_add_frontend)
     endif()
 
     add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}
-                            EXCLUDE_PATTERNS ${PROTO_SRCS} ${PROTO_HDRS} ${flatbuffers_schema_files})
+                            EXCLUDE_PATTERNS ${PROTO_SRCS} ${PROTO_HDRS} ${proto_files} ${flatbuffers_schema_files})
+
+    # enable LTO
+    set_target_properties(${TARGET_NAME} PROPERTIES
+                          INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
+
+    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_DIRECTORIES "${frontend_root_dir}/include"
+                                               "${frontend_root_dir}/src"
+                            ADDITIONAL_INCLUDE_DIRECTORIES
+                                $<TARGET_PROPERTY:${TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>
+                                $<TARGET_PROPERTY:${TARGET_NAME},INCLUDE_DIRECTORIES>)
+    endif()
 
     add_dependencies(ov_frontends ${TARGET_NAME})
 
+    # must be called after all target_link_libraries
+    ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
+
+    # installation
+
     if(NOT OV_FRONTEND_SKIP_INSTALL)
         if(BUILD_SHARED_LIBS)
             # Note:
@@ -268,7 +283,7 @@ macro(ov_add_frontend)
             set(dev_component "${OV_CPACK_COMP_CORE_DEV}")
 
             # TODO: whether we need to do it configuralbe on Windows installer?
-            ie_cpack_add_component(${lib_component} HIDDEN)
+            ov_cpack_add_component(${lib_component} HIDDEN)
 
             if(OV_FRONTEND_LINKABLE_FRONTEND)
                 set(export_set EXPORT OpenVINOTargets)

cmake/developer_package/frontends/ov_frontends.hpp.in

@@ -10,12 +10,12 @@
 
 namespace {
 
-using GetFrontEndDataFunc = void*();
-using GetAPIVersionFunc = ov::frontend::FrontEndVersion();
+using get_front_end_data_func = void*();
+using get_api_version_func = ov::frontend::FrontEndVersion();
 
 struct Value {
-    GetFrontEndDataFunc* m_dataFunc;
-    GetAPIVersionFunc* m_versionFunc;
+    get_front_end_data_func* m_dataFunc;
+    get_api_version_func* m_versionFunc;
 };
 
 using FrontendsStaticRegistry = std::vector<Value>;

cmake/developer_package/linux_name.cmake

@@ -2,41 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include(target_flags)
-
-# TODO: remove this function: we must not have conditions for particular OS names or versions
-
-# cmake needs to look at /etc files only when we build for Linux on Linux
-if(CMAKE_HOST_LINUX AND LINUX)
-    function(get_linux_name res_var)
-        if(EXISTS "/etc/lsb-release")
-            # linux version detection using cat /etc/lsb-release
-            file(READ "/etc/lsb-release" release_data)
-            set(name_regex "DISTRIB_ID=([^ \n]*)\n")
-            set(version_regex "DISTRIB_RELEASE=([0-9]+(\\.[0-9]+)?)")
-        else()
-            execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
-                            OUTPUT_VARIABLE release_data
-                            RESULT_VARIABLE result)
-            string(REPLACE "Red Hat" "CentOS" release_data "${release_data}")
-            set(name_regex "NAME=\"([^ \"\n]*).*\"\n")
-            set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"")
-        endif()
-
-        string(REGEX MATCH ${name_regex} name ${release_data})
-        set(os_name ${CMAKE_MATCH_1})
-
-        string(REGEX MATCH ${version_regex} version ${release_data})
-        set(os_name "${os_name} ${CMAKE_MATCH_1}")
-
-        if(os_name)
-            set(${res_var} ${os_name} PARENT_SCOPE)
-        else ()
-            set(${res_var} NOTFOUND PARENT_SCOPE)
-        endif ()
-    endfunction()
-else()
-    function(get_linux_name res_var)
-        set(${res_var} NOTFOUND PARENT_SCOPE)
-    endfunction()
-endif ()
+function(get_linux_name res_var)
+    set(${res_var} NOTFOUND PARENT_SCOPE)
+endfunction()

cmake/developer_package/message.cmake

@@ -1,27 +0,0 @@
-# Copyright (C) 2018-2023 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-if(UNIX AND ENABLE_ERROR_HIGHLIGHT)
-    function(message)
-        string(ASCII 27 ESC)
-        set(RESET  "${ESC}[m")
-        set(RED    "${ESC}[31;1m")
-        set(YELLOW "${ESC}[33;1m")
-
-        list(GET ARGV 0 MessageType)
-        list(REMOVE_AT ARGV 0)
-
-        foreach(arg IN LISTS ARGV)
-            set(_msg "${_msg}${arg}")
-        endforeach()
-
-        if(MessageType STREQUAL FATAL_ERROR OR MessageType STREQUAL SEND_ERROR)
-            _message(${MessageType} "${RED}${_msg}${RESET}")
-        elseif(MessageType STREQUAL WARNING)
-            _message(${MessageType} "${YELLOW}${_msg}${RESET}")
-        else()
-            _message(${MessageType} "${_msg}")
-        endif()
-    endfunction()
-endif()

cmake/developer_package/native_compile.cmake

@@ -18,7 +18,7 @@ function(ov_native_compile_external_project)
     set(multiValueArgs CMAKE_ARGS NATIVE_TARGETS)
     cmake_parse_arguments(ARG "" "${oneValueRequiredArgs};${oneValueOptionalArgs}" "${multiValueArgs}" ${ARGN})
 
-    if(YOCTO_AARCH64)
+    if(YOCTO_AARCH64 OR EMSCRIPTEN)
         # need to unset several variables which can set env to cross-environment
         foreach(var SDKTARGETSYSROOT CONFIG_SITE OECORE_NATIVE_SYSROOT OECORE_TARGET_SYSROOT
                     OECORE_ACLOCAL_OPTS OECORE_BASELIB OECORE_TARGET_ARCH OECORE_TARGET_OS CC CXX
@@ -31,10 +31,17 @@ function(ov_native_compile_external_project)
             endif()
         endforeach()
 
+        # set root path
+        if(YOCTO_AARCH64)
+            set(root_path "$ENV{OECORE_NATIVE_SYSROOT}")
+        elseif(EMSCRIPTEN)
+            set(root_path "$ENV{EMSDK}")
+        endif()
+
         # filter out PATH from yocto locations
         string(REPLACE ":" ";" custom_path "$ENV{PATH}")
         foreach(path IN LISTS custom_path)
-            if(NOT path MATCHES "^$ENV{OECORE_NATIVE_SYSROOT}")
+            if(DEFINED root_path AND NOT path MATCHES "^${root_path}")
                 list(APPEND clean_path "${path}")
             endif()
         endforeach()
@@ -63,6 +70,39 @@ function(ov_native_compile_external_project)
         set(ARG_NATIVE_SOURCE_SUBDIR SOURCE_SUBDIR ${ARG_NATIVE_SOURCE_SUBDIR})
     endif()
 
+    if(OV_GENERATOR_MULTI_CONFIG)
+        if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$")
+            list(APPEND ARG_CMAKE_ARGS "-DCMAKE_CONFIGURATION_TYPES=${CMAKE_DEFAULT_BUILD_TYPE}")
+            list(APPEND ARG_CMAKE_ARGS "-DCMAKE_DEFAULT_BUILD_TYPE=${CMAKE_DEFAULT_BUILD_TYPE}")
+        endif()
+    else()
+        list(APPEND ARG_CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
+    endif()
+
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21)
+        if(DEFINED CMAKE_CXX_LINKER_LAUNCHER)
+            list(APPEND ARG_CMAKE_ARGS "-DCMAKE_CXX_LINKER_LAUNCHER=${CMAKE_CXX_LINKER_LAUNCHER}")
+        endif()
+        if(DEFINED CMAKE_C_LINKER_LAUNCHER)
+            list(APPEND ARG_CMAKE_ARGS "-DCMAKE_C_LINKER_LAUNCHER=${CMAKE_C_LINKER_LAUNCHER}")
+        endif()
+    endif()
+
+    if(compile_flags)
+        list(APPEND ARG_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${compile_flags}" "-DCMAKE_C_FLAGS=${compile_flags}")
+    endif()
+
+    if(DEFINED CMAKE_CXX_COMPILER_LAUNCHER)
+        list(APPEND ARG_CMAKE_ARGS "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}")
+    endif()
+    if(DEFINED CMAKE_C_COMPILER_LAUNCHER)
+        list(APPEND ARG_CMAKE_ARGS "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}")
+    endif()
+
+    if(DEFINED CMAKE_MAKE_PROGRAM)
+        list(APPEND ARG_CMAKE_ARGS "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
+    endif()
+
     ExternalProject_Add(${ARG_TARGET_NAME}
         # Directory Options
         SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -71,23 +111,17 @@ function(ov_native_compile_external_project)
         INSTALL_DIR "${ARG_NATIVE_INSTALL_DIR}"
         # Configure Step Options:
         CMAKE_COMMAND
-            ${NATIVE_CMAKE_COMMAND}
+            "${NATIVE_CMAKE_COMMAND}" -E env ${cmake_env}
+                "${NATIVE_CMAKE_COMMAND}"
         CMAKE_ARGS
-            "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}"
-            "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}"
-            "-DCMAKE_CXX_LINKER_LAUNCHER=${CMAKE_CXX_LINKER_LAUNCHER}"
-            "-DCMAKE_C_LINKER_LAUNCHER=${CMAKE_C_LINKER_LAUNCHER}"
-            "-DCMAKE_CXX_FLAGS=${compile_flags}"
-            "-DCMAKE_C_FLAGS=${compile_flags}"
             "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW"
             "-DCMAKE_INSTALL_PREFIX=${ARG_NATIVE_INSTALL_DIR}"
-            "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
             ${ARG_CMAKE_ARGS}
         CMAKE_GENERATOR "${CMAKE_GENERATOR}"
         ${ARG_NATIVE_SOURCE_SUBDIR}
         # Build Step Options:
         BUILD_COMMAND
-            ${NATIVE_CMAKE_COMMAND}
+            "${NATIVE_CMAKE_COMMAND}"
                 --build "${CMAKE_CURRENT_BINARY_DIR}/build"
                 --config Release
                 --parallel

cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake

@@ -27,6 +27,8 @@ elseif(PYTHON_VERSION_MINOR EQUAL 9)
     set(clang_version 12)
 elseif(PYTHON_VERSION_MINOR EQUAL 10)
     set(clang_version 14)
+elseif(PYTHON_VERSION_MINOR EQUAL 11)
+    set(clang_version 14)
 else()
     message(WARNING "Cannot suggest clang package for python ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
 endif()
@@ -112,13 +114,13 @@ endif()
 
 #
 # ov_ncc_naming_style(FOR_TARGET target_name
-#                     SOURCE_DIRECTORY dir
+#                     [SOURCE_DIRECTORIES dir1 dir2 ...]
 #                     [STYLE_FILE style_file.style]
 #                     [ADDITIONAL_INCLUDE_DIRECTORIES dir1 dir2 ..]
 #                     [DEFINITIONS def1 def2 ..])
 #
 # FOR_TARGET - name of the target
-# SOURCE_DIRECTORY - directory to check sources from
+# SOURCE_DIRECTORIES - directory to check sources from
 # STYLE_FILE - path to the specific style file
 # ADDITIONAL_INCLUDE_DIRECTORIES - additional include directories used in checked headers
 # DEFINITIONS - additional definitions passed to preprocessor stage
@@ -129,9 +131,9 @@ function(ov_ncc_naming_style)
     endif()
 
     cmake_parse_arguments(NCC_STYLE "FAIL"
-        "FOR_TARGET;SOURCE_DIRECTORY;STYLE_FILE" "ADDITIONAL_INCLUDE_DIRECTORIES;DEFINITIONS" ${ARGN})
+        "FOR_TARGET;STYLE_FILE" "SOURCE_DIRECTORIES;ADDITIONAL_INCLUDE_DIRECTORIES;DEFINITIONS" ${ARGN})
 
-    foreach(var FOR_TARGET SOURCE_DIRECTORY)
+    foreach(var FOR_TARGET SOURCE_DIRECTORIES)
         if(NOT DEFINED NCC_STYLE_${var})
             message(FATAL_ERROR "${var} is not defined in ov_ncc_naming_style function")
         endif()
@@ -141,18 +143,18 @@ function(ov_ncc_naming_style)
         set(NCC_STYLE_STYLE_FILE ${ncc_style_dir}/openvino.style)
     endif()
 
-    file(GLOB_RECURSE sources
-         RELATIVE "${NCC_STYLE_SOURCE_DIRECTORY}"
-         "${NCC_STYLE_SOURCE_DIRECTORY}/*.hpp"
-         "${NCC_STYLE_SOURCE_DIRECTORY}/*.cpp")
+    foreach(source_dir IN LISTS NCC_STYLE_SOURCE_DIRECTORIES)
+        file(GLOB_RECURSE local_sources "${source_dir}/*.hpp" "${source_dir}/*.cpp")
+        list(APPEND sources ${local_sources})
+    endforeach()
 
-    list(APPEND NCC_STYLE_ADDITIONAL_INCLUDE_DIRECTORIES "${NCC_STYLE_SOURCE_DIRECTORY}")
-    # without it sources with same name from different directories will map to same .ncc_style target
-    file(RELATIVE_PATH source_dir_rel ${CMAKE_SOURCE_DIR} ${NCC_STYLE_SOURCE_DIRECTORY})
+    list(APPEND NCC_STYLE_ADDITIONAL_INCLUDE_DIRECTORIES ${NCC_STYLE_SOURCE_DIRECTORIES})
 
-    foreach(source IN LISTS sources)
-        set(output_file "${ncc_style_bin_dir}/${source_dir_rel}/${source}.ncc_style")
-        set(full_source_path "${NCC_STYLE_SOURCE_DIRECTORY}/${source}")
+    foreach(source_file IN LISTS sources)
+        get_filename_component(source_dir "${source_file}" DIRECTORY)
+        file(RELATIVE_PATH source_dir_rel "${CMAKE_SOURCE_DIR}" "${source_dir}")
+        get_filename_component(source_name "${source_file}" NAME)
+        set(output_file "${ncc_style_bin_dir}/${source_dir_rel}/${source_name}.ncc_style")
 
         add_custom_command(
             OUTPUT
@@ -161,7 +163,7 @@ function(ov_ncc_naming_style)
                 "${CMAKE_COMMAND}"
                 -D "PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
                 -D "NCC_PY_SCRIPT=${ncc_script_py}"
-                -D "INPUT_FILE=${full_source_path}"
+                -D "INPUT_FILE=${source_file}"
                 -D "OUTPUT_FILE=${output_file}"
                 -D "DEFINITIONS=${NCC_STYLE_DEFINITIONS}"
                 -D "CLANG_LIB_PATH=${libclang_location}"
@@ -170,12 +172,12 @@ function(ov_ncc_naming_style)
                 -D "EXPECTED_FAIL=${NCC_STYLE_FAIL}"
                 -P "${ncc_style_dir}/ncc_run.cmake"
             DEPENDS
-                "${full_source_path}"
+                "${source_file}"
                 "${ncc_style_dir}/openvino.style"
                 "${ncc_script_py}"
                 "${ncc_style_dir}/ncc_run.cmake"
             COMMENT
-                "[ncc naming style] ${source}"
+                "[ncc naming style] ${source_dir_rel}/${source_name}"
             VERBATIM)
         list(APPEND output_files ${output_file})
     endforeach()
@@ -191,6 +193,6 @@ endfunction()
 
 if(TARGET ncc_all)
     ov_ncc_naming_style(FOR_TARGET ncc_all
-                        SOURCE_DIRECTORY "${ncc_style_dir}/self_check"
+                        SOURCE_DIRECTORIES "${ncc_style_dir}/self_check"
                         FAIL)
 endif()

cmake/developer_package/ncc_naming_style/openvino.style

@@ -1,7 +1,7 @@
 # custom OpenVINO values
 CppMethod: '^(operator\W+|[a-z_\d]+|signaling_NaN|quiet_NaN)$'
 ClassName: '^([A-Z][\w]+|b?float16|numeric_limits|ngraph_error|stopwatch|unsupported_op)$'
-StructName: '^([A-Z][\w]+|element_type_traits|hash|oi_pair)$'
+StructName: '^([A-Z][\w]+|element_type_traits|hash|oi_pair|stat)$'
 FunctionName: '^(operator\W+|[a-z_\d]+)|PrintTo$'
 Namespace: '^([a-z\d_]*|InferenceEngine)$'
 NamespaceAlias: '^([a-z\d_]+|InferenceEngine)$'
@@ -12,7 +12,7 @@ TemplateNonTypeParameter: '^\w*$'
 ClassTemplate: '^([A-Z][\w]+|element_type_traits)$'
 TemplateTypeParameter: '^\w*$'
 ParameterName: '^\w*$'
-FunctionTemplate: '^(operator.+|[\w]+|Impl<.*>)$'
+FunctionTemplate: '^(operator.+|[\w]+|SoPtr.+|Impl<.*>)$'
 TypeAliasName: '^\w+$'
 VariableReference: '^\w+$'
 
@@ -27,7 +27,7 @@ CxxDynamicCastExpression: '^.*$'
 # not needed values
 ClassTemplatePartialSpecialization: '^.*$'
 ConversionFunction: '^.*$'
-UsingDirective: 'XXXX'
+UsingDirective: '^.*$'
 ClassAccessSpecifier: '^.*$' # looks like can be fixed
 TypeReference: '^.*$' # looks like can be fixed
 CxxBaseSpecifier: '^.*$' # looks like can be fixed

cmake/developer_package/packaging/common-libraries.cmake

@@ -25,7 +25,7 @@ macro(ov_common_libraries_cpack_set_dirs)
     set(OV_CPACK_IE_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/inferenceengine${OpenVINO_VERSION})
     set(OV_CPACK_NGRAPH_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph${OpenVINO_VERSION})
     set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/openvino${OpenVINO_VERSION})
-    set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION})
+    set(OV_CPACK_LICENSESDIR licenses)
 
     ov_get_pyversion(pyversion)
     if(pyversion)

cmake/developer_package/packaging/debian/debian.cmake

@@ -31,6 +31,7 @@ macro(ov_debian_cpack_set_dirs)
     set(OV_CPACK_NGRAPH_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/ngraph${OpenVINO_VERSION})
     set(OV_CPACK_OPENVINO_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/openvino${OpenVINO_VERSION})
     set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION})
+    set(OV_CPACK_LICENSESDIR ${OV_CPACK_DOCDIR}/licenses)
     set(OV_CPACK_PYTHONDIR lib/python3/dist-packages)
 
     # non-native stuff

cmake/developer_package/packaging/packaging.cmake

@@ -29,6 +29,7 @@ macro(ov_cpack_set_dirs)
     set(OV_CPACK_NGRAPH_CMAKEDIR runtime/cmake)
     set(OV_CPACK_OPENVINO_CMAKEDIR runtime/cmake)
     set(OV_CPACK_DOCDIR docs)
+    set(OV_CPACK_LICENSESDIR ${OV_CPACK_DOCDIR}/licenses)
     set(OV_CPACK_SAMPLESDIR samples)
     set(OV_CPACK_WHEELSDIR tools)
     set(OV_CPACK_TOOLSDIR tools)
@@ -66,11 +67,11 @@ endmacro()
 ov_cpack_set_dirs()
 
 #
-# ie_cpack_add_component(NAME ...)
+# ov_cpack_add_component(NAME ...)
 #
 # Wraps original `cpack_add_component` and adds component to internal IE list
 #
-function(ie_cpack_add_component name)
+function(ov_cpack_add_component name)
     if(NOT ${name} IN_LIST IE_CPACK_COMPONENTS_ALL)
         cpack_add_component(${name} ${ARGN})
 
@@ -99,10 +100,10 @@ endif()
 # if <FILE> is a symlink, we resolve it, but install file with a name of symlink
 #
 function(ov_install_with_name file component)
-    if((APPLE AND file MATCHES "^[^\.]+\.[0-9]+${CMAKE_SHARED_LIBRARY_SUFFIX}$") OR
-                (file MATCHES "^.*\.${CMAKE_SHARED_LIBRARY_SUFFIX}\.[0-9]+$"))
+    get_filename_component(actual_name "${file}" NAME)
+    if((APPLE AND actual_name MATCHES "^[^\.]+\.[0-9]+${CMAKE_SHARED_LIBRARY_SUFFIX}$") OR
+                (actual_name MATCHES "^.*\.${CMAKE_SHARED_LIBRARY_SUFFIX}\.[0-9]+$"))
         if(IS_SYMLINK "${file}")
-            get_filename_component(actual_name "${file}" NAME)
             get_filename_component(file "${file}" REALPATH)
             set(install_rename RENAME "${actual_name}")
         endif()
@@ -162,7 +163,7 @@ elseif(CPACK_GENERATOR STREQUAL "RPM")
     include(packaging/rpm/rpm)
 elseif(CPACK_GENERATOR STREQUAL "NSIS")
     include(packaging/nsis)
-elseif(CPACK_GENERATOR MATCHES "^(CONDA-FORGE|BREW)$")
+elseif(CPACK_GENERATOR MATCHES "^(CONDA-FORGE|BREW|CONAN)$")
     include(packaging/common-libraries)
 endif()
 
@@ -194,7 +195,7 @@ macro(ie_cpack)
         set(CPACK_STRIP_FILES ON)
     endif()
 
-    # TODO: replace with openvino
+    # TODO: replace with openvino and handle multi-config generators case
     if(WIN32)
         set(CPACK_PACKAGE_NAME inference-engine_${CMAKE_BUILD_TYPE})
     else()
@@ -202,6 +203,7 @@ macro(ie_cpack)
     endif()
 
     set(CPACK_PACKAGE_VERSION "${OpenVINO_VERSION}")
+    # build version can be empty in case we are running cmake out of git repository
     if(NOT OpenVINO_VERSION_BUILD STREQUAL "000")
         set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.${OpenVINO_VERSION_BUILD}")
     endif()

cmake/developer_package/packaging/rpm/post_build.cmake

@@ -10,6 +10,24 @@ endif()
 
 set(rpmlint_passed ON)
 
+execute_process(COMMAND "${rpmlint_PROGRAM}" --version
+                RESULT_VARIABLE rpmlint_exit_code
+                OUTPUT_VARIABLE rpmlint_version)
+
+if(NOT rpmlint_exit_code EQUAL 0)
+    message(FATAL_ERROR "Failed to get ${rpmlint_PROGRAM} version. Output is '${rpmlint_version}'")
+endif()
+
+if(rpmlint_version MATCHES "([0-9]+)\.([0-9]+)")
+    set(rpmlint_version "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
+else()
+    message(FATAL_ERROR "Failed to parse rpmlint version '${rpmlint_version}'")
+endif()
+
+if(rpmlint_version VERSION_GREATER_EQUAL 2.0)
+    set(rpmlint_has_strict_option ON)
+endif()
+
 foreach(rpm_file IN LISTS CPACK_PACKAGE_FILES)
     get_filename_component(rpm_name "${rpm_file}" NAME)
     get_filename_component(dir_name "${rpm_file}" DIRECTORY)
@@ -17,20 +35,25 @@ foreach(rpm_file IN LISTS CPACK_PACKAGE_FILES)
 
     set(rpmlint_overrides "${dir_name}/${rpm_name}.rpmlintrc")
     if(EXISTS "${rpmlint_overrides}")
-        set(file_option --file "${rpmlint_overrides}")
+        set(rpmlint_options --file "${rpmlint_overrides}")
+    endif()
+    if(rpmlint_has_strict_option)
+        list(APPEND rpmlint_options --strict)
     endif()
 
-    execute_process(COMMAND "${rpmlint_PROGRAM}" --strict ${file_option} ${rpm_file}
+    execute_process(COMMAND "${rpmlint_PROGRAM}" ${rpmlint_options} ${rpm_file}
                     RESULT_VARIABLE rpmlint_exit_code
                     OUTPUT_VARIABLE rpmlint_output)
 
-    if(NOT rpmlint_exit_code EQUAL 0)
+    if(NOT rpmlint_exit_code EQUAL 0 OR NOT rpmlint_has_strict_option)
         message("Package ${rpm_name}:")
         message("${rpmlint_output}")
-        set(rpmlint_passed OFF)
+        if(rpmlint_has_strict_option)
+            set(rpmlint_passed OFF)
+        endif()
     endif()
 
-    unset(file_option)
+    unset(rpmlint_options)
 endforeach()
 
 if(NOT rpmlint_passed)

cmake/developer_package/packaging/rpm/rpm.cmake

@@ -22,6 +22,11 @@ macro(ov_rpm_cpack_set_dirs)
     set(OV_CPACK_NGRAPH_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph${OpenVINO_VERSION})
     set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/openvino${OpenVINO_VERSION})
     set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION})
+    set(OV_CPACK_LICENSESDIR ${OV_CPACK_DOCDIR}/licenses)
+
+    # TODO:
+    # 1. define python installation directories for RPM packages
+    # 2. make sure only a single version of python API can be installed at the same time (define conflicts section)
     # set(OV_CPACK_PYTHONDIR lib/python3/dist-packages)
 
     ov_get_pyversion(pyversion)

cmake/developer_package/plugins/create_plugin_file.cmake

@@ -4,13 +4,13 @@
 
 cmake_policy(SET CMP0007 NEW)
 
-set(newContent "        <plugin name=\"${IE_DEVICE_NAME}\" location=\"${IE_PLUGIN_LIBRARY_NAME}\">")
+set(newContent "        <plugin name=\"${OV_DEVICE_NAME}\" location=\"${OV_PLUGIN_LIBRARY_NAME}\">")
 
-if(IE_PLUGIN_PROPERTIES)
+if(OV_PLUGIN_PROPERTIES)
     set(newContent "${newContent}
             <properties>")
 
-    foreach(props IN LISTS IE_PLUGIN_PROPERTIES)
+    foreach(props IN LISTS OV_PLUGIN_PROPERTIES)
         string(REPLACE ":" ";" props "${props}")
 
         list(GET props 0 key)
@@ -27,4 +27,4 @@ endif()
 set(newContent "${newContent}
         </plugin>")
 
-file(WRITE "${IE_CONFIG_OUTPUT_FILE}" "${newContent}")
+file(WRITE "${OV_CONFIG_OUTPUT_FILE}" "${newContent}")

cmake/developer_package/plugins/create_plugins_hpp.cmake

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-foreach(var IE_DEVICE_MAPPING IE_PLUGINS_HPP_HEADER IE_PLUGINS_HPP_HEADER_IN)
+foreach(var OV_DEVICE_MAPPING BUILD_SHARED_LIBS OV_PLUGINS_HPP_HEADER OV_PLUGINS_HPP_HEADER_IN)
     if(NOT DEFINED ${var})
         message(FATAL_ERROR "${var} is required, but not defined")
     endif()
@@ -10,29 +10,15 @@ endforeach()
 
 # configure variables
 
-set(IE_PLUGINS_DECLARATIONS "")
-set(IE_PLUGINS_MAP_DEFINITION
+set(OV_PLUGINS_DECLARATIONS "")
+set(OV_PLUGINS_MAP_DEFINITION
     "    static const std::map<Key, Value> plugins_hpp = {")
 
-foreach(dev_map IN LISTS IE_DEVICE_MAPPING)
+foreach(dev_map IN LISTS OV_DEVICE_MAPPING)
     string(REPLACE ":" ";" dev_map "${dev_map}")
     list(GET dev_map 0 mapped_dev_name)
     list(GET dev_map 1 actual_dev_name)
 
-    # common
-    set(_IE_CREATE_PLUGIN_FUNC "CreatePluginEngine${actual_dev_name}")
-    set(_IE_CREATE_EXTENSION_FUNC "CreateExtensionShared${actual_dev_name}")
-
-    # declarations
-    set(IE_PLUGINS_DECLARATIONS "${IE_PLUGINS_DECLARATIONS}
-IE_DEFINE_PLUGIN_CREATE_FUNCTION_DECLARATION(${_IE_CREATE_PLUGIN_FUNC});")
-    if(${actual_dev_name}_AS_EXTENSION)
-        set(IE_PLUGINS_DECLARATIONS "${IE_PLUGINS_DECLARATIONS}
-IE_DEFINE_EXTENSION_CREATE_FUNCTION_DECLARATION(${_IE_CREATE_EXTENSION_FUNC});")
-    else()
-        set(_IE_CREATE_EXTENSION_FUNC "nullptr")
-    endif()
-
     # definitions
     set(dev_config "{")
     if(${mapped_dev_name}_CONFIG)
@@ -48,11 +34,31 @@ IE_DEFINE_EXTENSION_CREATE_FUNCTION_DECLARATION(${_IE_CREATE_EXTENSION_FUNC});")
     endif()
     set(dev_config "${dev_config}}")
 
-    set(IE_PLUGINS_MAP_DEFINITION "${IE_PLUGINS_MAP_DEFINITION}
-        { \"${mapped_dev_name}\", Value { ${_IE_CREATE_PLUGIN_FUNC}, ${_IE_CREATE_EXTENSION_FUNC}, ${dev_config} } },")
+
+    if(NOT BUILD_SHARED_LIBS)
+        # common
+        set(_OV_CREATE_PLUGIN_FUNC "CreatePluginEngine${actual_dev_name}")
+        set(_OV_CREATE_EXTENSION_FUNC "CreateExtensionShared${actual_dev_name}")
+
+        # declarations
+        set(OV_PLUGINS_DECLARATIONS "${OV_PLUGINS_DECLARATIONS}
+        IE_DEFINE_PLUGIN_CREATE_FUNCTION_DECLARATION(${_OV_CREATE_PLUGIN_FUNC});")
+        if(${actual_dev_name}_AS_EXTENSION)
+            set(OV_PLUGINS_DECLARATIONS "${OV_PLUGINS_DECLARATIONS}
+            IE_DEFINE_EXTENSION_CREATE_FUNCTION_DECLARATION(${_OV_CREATE_EXTENSION_FUNC});")
+        else()
+            set(_OV_CREATE_EXTENSION_FUNC "nullptr")
+        endif()
+
+        set(OV_PLUGINS_MAP_DEFINITION "${OV_PLUGINS_MAP_DEFINITION}
+        { \"${mapped_dev_name}\", Value { ${_OV_CREATE_PLUGIN_FUNC}, ${_OV_CREATE_EXTENSION_FUNC}, ${dev_config} } },")
+    else()
+        set(OV_PLUGINS_MAP_DEFINITION "${OV_PLUGINS_MAP_DEFINITION}
+        { \"${mapped_dev_name}\", Value { \"${actual_dev_name}\", ${dev_config} } },")
+    endif()
 endforeach()
 
-set(IE_PLUGINS_MAP_DEFINITION "${IE_PLUGINS_MAP_DEFINITION}
+set(OV_PLUGINS_MAP_DEFINITION "${OV_PLUGINS_MAP_DEFINITION}
     };\n")
 
-configure_file("${IE_PLUGINS_HPP_HEADER_IN}" "${IE_PLUGINS_HPP_HEADER}" @ONLY)
+configure_file("${OV_PLUGINS_HPP_HEADER_IN}" "${OV_PLUGINS_HPP_HEADER}" @ONLY)

cmake/developer_package/plugins/plugins.cmake

@@ -6,11 +6,15 @@ include(CMakeParseArguments)
 
 set(PLUGIN_FILES "" CACHE INTERNAL "")
 
-function(ie_plugin_get_file_name target_name library_name)
+function(ov_plugin_get_file_name target_name library_name)
     set(LIB_PREFIX "${CMAKE_SHARED_MODULE_PREFIX}")
     set(LIB_SUFFIX "${IE_BUILD_POSTFIX}${CMAKE_SHARED_MODULE_SUFFIX}")
 
-    set("${library_name}" "${LIB_PREFIX}${target_name}${LIB_SUFFIX}" PARENT_SCOPE)
+    get_target_property(LIB_NAME ${target_name} OUTPUT_NAME)
+    if (LIB_NAME STREQUAL "LIB_NAME-NOTFOUND")
+        set(LIB_NAME ${target_name})
+    endif()
+    set("${library_name}" "${LIB_PREFIX}${LIB_NAME}${LIB_SUFFIX}" PARENT_SCOPE)
 endfunction()
 
 if(NOT TARGET ov_plugins)
@@ -18,7 +22,7 @@ if(NOT TARGET ov_plugins)
 endif()
 
 #
-# ie_add_plugin(NAME <targetName>
+# ov_add_plugin(NAME <targetName>
 #               DEVICE_NAME <deviceName>
 #               [PSEUDO_DEVICE]
 #               [PSEUDO_PLUGIN_FOR <actual_device>]
@@ -32,29 +36,25 @@ endif()
 #               [ADD_CLANG_FORMAT]
 #               )
 #
-function(ie_add_plugin)
+function(ov_add_plugin)
     set(options SKIP_INSTALL PSEUDO_DEVICE ADD_CLANG_FORMAT AS_EXTENSION SKIP_REGISTRATION)
     set(oneValueArgs NAME DEVICE_NAME VERSION_DEFINES_FOR PSEUDO_PLUGIN_FOR)
     set(multiValueArgs DEFAULT_CONFIG SOURCES OBJECT_LIBRARIES CPPLINT_FILTERS)
-    cmake_parse_arguments(IE_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    cmake_parse_arguments(OV_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    if(NOT IE_PLUGIN_NAME)
+    if(NOT OV_PLUGIN_NAME)
         message(FATAL_ERROR "Please, specify plugin target name")
     endif()
 
-    if(NOT IE_PLUGIN_DEVICE_NAME)
-        message(FATAL_ERROR "Please, specify device name for ${IE_PLUGIN_NAME}")
+    if(NOT OV_PLUGIN_DEVICE_NAME)
+        message(FATAL_ERROR "Please, specify device name for ${OV_PLUGIN_NAME}")
     endif()
 
     # create and configure target
 
-    if(NOT IE_PLUGIN_PSEUDO_PLUGIN_FOR)
-        if(IE_PLUGIN_VERSION_DEFINES_FOR)
-            addVersionDefines(${IE_PLUGIN_VERSION_DEFINES_FOR} CI_BUILD_NUMBER)
-        endif()
-
-        set(input_files ${IE_PLUGIN_SOURCES})
-        foreach(obj_lib IN LISTS IE_PLUGIN_OBJECT_LIBRARIES)
+    if(NOT OV_PLUGIN_PSEUDO_PLUGIN_FOR)
+        set(input_files ${OV_PLUGIN_SOURCES})
+        foreach(obj_lib IN LISTS OV_PLUGIN_OBJECT_LIBRARIES)
             list(APPEND input_files $<TARGET_OBJECTS:${obj_lib}>)
             add_cpplint_target(${obj_lib}_cpplint FOR_TARGETS ${obj_lib})
         endforeach()
@@ -65,116 +65,122 @@ function(ie_add_plugin)
             set(library_type STATIC)
         endif()
 
-        add_library(${IE_PLUGIN_NAME} ${library_type} ${input_files})
+        add_library(${OV_PLUGIN_NAME} ${library_type} ${input_files})
 
-        target_compile_definitions(${IE_PLUGIN_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN)
+        if(OV_PLUGIN_VERSION_DEFINES_FOR)
+            ov_add_version_defines(${OV_PLUGIN_VERSION_DEFINES_FOR} ${OV_PLUGIN_NAME})
+        endif()
+
+        target_compile_definitions(${OV_PLUGIN_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN)
         if(NOT BUILD_SHARED_LIBS)
             # to distinguish functions creating plugin objects
-            target_compile_definitions(${IE_PLUGIN_NAME} PRIVATE
-                IE_CREATE_PLUGIN=CreatePluginEngine${IE_PLUGIN_DEVICE_NAME}
-                OV_CREATE_PLUGIN=CreatePluginEngine${IE_PLUGIN_DEVICE_NAME})
-            if(IE_PLUGIN_AS_EXTENSION)
+            target_compile_definitions(${OV_PLUGIN_NAME} PRIVATE
+                IE_CREATE_PLUGIN=CreatePluginEngine${OV_PLUGIN_DEVICE_NAME}
+                OV_CREATE_PLUGIN=CreatePluginEngine${OV_PLUGIN_DEVICE_NAME})
+            if(OV_PLUGIN_AS_EXTENSION)
                 # to distinguish functions creating extensions objects
-                target_compile_definitions(${IE_PLUGIN_NAME} PRIVATE
-                    IE_CREATE_EXTENSION=CreateExtensionShared${IE_PLUGIN_DEVICE_NAME})
+                target_compile_definitions(${OV_PLUGIN_NAME} PRIVATE
+                    IE_CREATE_EXTENSION=CreateExtensionShared${OV_PLUGIN_DEVICE_NAME})
             endif()
         endif()
 
-        ie_add_vs_version_file(NAME ${IE_PLUGIN_NAME}
-            FILEDESCRIPTION "OpenVINO Runtime ${IE_PLUGIN_DEVICE_NAME} device plugin library")
+        ov_add_vs_version_file(NAME ${OV_PLUGIN_NAME}
+            FILEDESCRIPTION "OpenVINO Runtime ${OV_PLUGIN_DEVICE_NAME} device plugin library")
 
-        target_link_libraries(${IE_PLUGIN_NAME} PRIVATE openvino::runtime openvino::runtime::dev)
+        target_link_libraries(${OV_PLUGIN_NAME} PRIVATE openvino::runtime openvino::runtime::dev)
 
         if(WIN32)
-            set_target_properties(${IE_PLUGIN_NAME} PROPERTIES COMPILE_PDB_NAME ${IE_PLUGIN_NAME})
+            set_target_properties(${OV_PLUGIN_NAME} PROPERTIES COMPILE_PDB_NAME ${OV_PLUGIN_NAME})
         endif()
 
         if(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CROSSCOMPILING)
-            target_link_options(${IE_PLUGIN_NAME} PRIVATE -Wl,--unresolved-symbols=ignore-in-shared-libs)
+            target_link_options(${OV_PLUGIN_NAME} PRIVATE -Wl,--unresolved-symbols=ignore-in-shared-libs)
         endif()
 
         set(custom_filter "")
-        foreach(filter IN LISTS IE_PLUGIN_CPPLINT_FILTERS)
+        foreach(filter IN LISTS OV_PLUGIN_CPPLINT_FILTERS)
             string(CONCAT custom_filter "${custom_filter}" "," "${filter}")
         endforeach()
 
-        if (IE_PLUGIN_ADD_CLANG_FORMAT)
-            add_clang_format_target(${IE_PLUGIN_NAME}_clang FOR_TARGETS ${IE_PLUGIN_NAME})
+        if (OV_PLUGIN_ADD_CLANG_FORMAT)
+            add_clang_format_target(${OV_PLUGIN_NAME}_clang FOR_TARGETS ${OV_PLUGIN_NAME})
         else()
-            add_cpplint_target(${IE_PLUGIN_NAME}_cpplint FOR_TARGETS ${IE_PLUGIN_NAME} CUSTOM_FILTERS ${custom_filter})
+            add_cpplint_target(${OV_PLUGIN_NAME}_cpplint FOR_TARGETS ${OV_PLUGIN_NAME} CUSTOM_FILTERS ${custom_filter})
         endif()
 
-        add_dependencies(ov_plugins ${IE_PLUGIN_NAME})
+        add_dependencies(ov_plugins ${OV_PLUGIN_NAME})
 
         # install rules
-        if(NOT IE_PLUGIN_SKIP_INSTALL OR NOT BUILD_SHARED_LIBS)
-            string(TOLOWER "${IE_PLUGIN_DEVICE_NAME}" install_component)
+        if(NOT OV_PLUGIN_SKIP_INSTALL OR NOT BUILD_SHARED_LIBS)
+            string(TOLOWER "${OV_PLUGIN_DEVICE_NAME}" install_component)
 
-            if(IE_PLUGIN_PSEUDO_DEVICE)
+            if(OV_PLUGIN_PSEUDO_DEVICE)
                 set(plugin_hidden HIDDEN)
             endif()
-            ie_cpack_add_component(${install_component} 
-                                   DISPLAY_NAME "${IE_PLUGIN_DEVICE_NAME} runtime"
-                                   DESCRIPTION "${IE_PLUGIN_DEVICE_NAME} runtime"
+            ov_cpack_add_component(${install_component}
+                                   DISPLAY_NAME "${OV_PLUGIN_DEVICE_NAME} runtime"
+                                   DESCRIPTION "${OV_PLUGIN_DEVICE_NAME} runtime"
                                    ${plugin_hidden}
                                    DEPENDS ${OV_CPACK_COMP_CORE})
 
             if(BUILD_SHARED_LIBS)
-                install(TARGETS ${IE_PLUGIN_NAME}
+                install(TARGETS ${OV_PLUGIN_NAME}
                         LIBRARY DESTINATION ${OV_CPACK_PLUGINSDIR}
                         COMPONENT ${install_component})
-                install(TARGETS ${IE_PLUGIN_NAME}
+                install(TARGETS ${OV_PLUGIN_NAME}
                         LIBRARY DESTINATION ${OV_CPACK_PLUGINSDIR}
                         COMPONENT ${install_component})
             else()
-                ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component})
+                ov_install_static_lib(${OV_PLUGIN_NAME} ${install_component})
             endif()
         endif()
     endif()
 
     # Enable for static build to generate correct plugins.hpp
-    if(NOT IE_PLUGIN_SKIP_REGISTRATION OR NOT BUILD_SHARED_LIBS)
+    if(NOT OV_PLUGIN_SKIP_REGISTRATION OR NOT BUILD_SHARED_LIBS)
         # check that plugin with such name is not registered
         foreach(plugin_entry IN LISTS PLUGIN_FILES)
             string(REPLACE ":" ";" plugin_entry "${plugin_entry}")
             list(GET plugin_entry -1 library_name)
             list(GET plugin_entry 0 plugin_name)
-            if(plugin_name STREQUAL "${IE_PLUGIN_DEVICE_NAME}" AND
-                    NOT library_name STREQUAL ${IE_PLUGIN_NAME})
-                message(FATAL_ERROR "${IE_PLUGIN_NAME} and ${library_name} are both registered as ${plugin_name}")
+            if(plugin_name STREQUAL "${OV_PLUGIN_DEVICE_NAME}" AND
+                    NOT library_name STREQUAL ${OV_PLUGIN_NAME})
+                message(FATAL_ERROR "${OV_PLUGIN_NAME} and ${library_name} are both registered as ${plugin_name}")
             endif()
         endforeach()
 
         # append plugin to the list to register
 
-        list(APPEND PLUGIN_FILES "${IE_PLUGIN_DEVICE_NAME}:${IE_PLUGIN_NAME}")
+        list(APPEND PLUGIN_FILES "${OV_PLUGIN_DEVICE_NAME}:${OV_PLUGIN_NAME}")
         set(PLUGIN_FILES "${PLUGIN_FILES}" CACHE INTERNAL "" FORCE)
-        set(${IE_PLUGIN_DEVICE_NAME}_CONFIG "${IE_PLUGIN_DEFAULT_CONFIG}" CACHE INTERNAL "" FORCE)
-        set(${IE_PLUGIN_DEVICE_NAME}_PSEUDO_PLUGIN_FOR "${IE_PLUGIN_PSEUDO_PLUGIN_FOR}" CACHE INTERNAL "" FORCE)
-        set(${IE_PLUGIN_DEVICE_NAME}_AS_EXTENSION "${IE_PLUGIN_AS_EXTENSION}" CACHE INTERNAL "" FORCE)
+        set(${OV_PLUGIN_DEVICE_NAME}_CONFIG "${OV_PLUGIN_DEFAULT_CONFIG}" CACHE INTERNAL "" FORCE)
+        set(${OV_PLUGIN_DEVICE_NAME}_PSEUDO_PLUGIN_FOR "${OV_PLUGIN_PSEUDO_PLUGIN_FOR}" CACHE INTERNAL "" FORCE)
+        set(${OV_PLUGIN_DEVICE_NAME}_AS_EXTENSION "${OV_PLUGIN_AS_EXTENSION}" CACHE INTERNAL "" FORCE)
     endif()
 endfunction()
 
-function(ov_add_plugin)
-    ie_add_plugin(${ARGN})
+function(ie_add_plugin)
+    ov_add_plugin(${ARGN})
 endfunction()
 
 #
-# ie_register_plugins_dynamic(MAIN_TARGET <main target name>)
+# ov_register_in_plugins_xml(MAIN_TARGET <main target name>)
 #
-macro(ie_register_plugins_dynamic)
+# Registers plugins in plugins.xml files for dynamic plugins build
+#
+macro(ov_register_in_plugins_xml)
     set(options)
     set(oneValueArgs MAIN_TARGET)
     set(multiValueArgs)
-    cmake_parse_arguments(IE_REGISTER "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    cmake_parse_arguments(OV_REGISTER "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    if(NOT IE_REGISTER_MAIN_TARGET)
+    if(NOT OV_REGISTER_MAIN_TARGET)
         message(FATAL_ERROR "Please, define MAIN_TARGET")
     endif()
 
     # Unregister <device_name>.xml files for plugins from current build tree
 
-    set(config_output_file "$<TARGET_FILE_DIR:${IE_REGISTER_MAIN_TARGET}>/plugins.xml")
+    set(config_output_file "$<TARGET_FILE_DIR:${OV_REGISTER_MAIN_TARGET}>/plugins.xml")
 
     foreach(name IN LISTS PLUGIN_FILES)
         string(REPLACE ":" ";" name "${name}")
@@ -183,12 +189,12 @@ macro(ie_register_plugins_dynamic)
             message(FATAL_ERROR "Unexpected error, please, contact developer of this script")
         endif()
         list(GET name 0 device_name)
-        add_custom_command(TARGET ${IE_REGISTER_MAIN_TARGET} POST_BUILD
+        add_custom_command(TARGET ${OV_REGISTER_MAIN_TARGET} POST_BUILD
                   COMMAND
                     "${CMAKE_COMMAND}"
-                    -D "IE_CONFIG_OUTPUT_FILE=${config_output_file}"
-                    -D "IE_PLUGIN_NAME=${device_name}"
-                    -D "IE_CONFIGS_DIR=${CMAKE_BINARY_DIR}/plugins"
+                    -D "OV_CONFIG_OUTPUT_FILE=${config_output_file}"
+                    -D "OV_PLUGIN_NAME=${device_name}"
+                    -D "OV_CONFIGS_DIR=${CMAKE_BINARY_DIR}/plugins"
                     -P "${IEDevScripts_DIR}/plugins/unregister_plugin_cmake.cmake"
                   COMMENT
                     "Remove ${device_name} from the plugins.xml file"
@@ -209,15 +215,15 @@ macro(ie_register_plugins_dynamic)
 
         # create plugin file
         set(config_file_name "${CMAKE_BINARY_DIR}/plugins/${device_name}.xml")
-        ie_plugin_get_file_name(${name} library_name)
+        ov_plugin_get_file_name(${name} library_name)
 
-        add_custom_command(TARGET ${IE_REGISTER_MAIN_TARGET} POST_BUILD
+        add_custom_command(TARGET ${OV_REGISTER_MAIN_TARGET} POST_BUILD
            COMMAND
               "${CMAKE_COMMAND}"
-              -D "IE_CONFIG_OUTPUT_FILE=${config_file_name}"
-              -D "IE_DEVICE_NAME=${device_name}"
-              -D "IE_PLUGIN_PROPERTIES=${${device_name}_CONFIG}"
-              -D "IE_PLUGIN_LIBRARY_NAME=${library_name}"
+              -D "OV_CONFIG_OUTPUT_FILE=${config_file_name}"
+              -D "OV_DEVICE_NAME=${device_name}"
+              -D "OV_PLUGIN_PROPERTIES=${${device_name}_CONFIG}"
+              -D "OV_PLUGIN_LIBRARY_NAME=${library_name}"
               -P "${IEDevScripts_DIR}/plugins/create_plugin_file.cmake"
           COMMENT "Register ${device_name} device as ${library_name}"
           VERBATIM)
@@ -227,40 +233,38 @@ macro(ie_register_plugins_dynamic)
 
     # Combine all <device_name>.xml files into plugins.xml
 
-    add_custom_command(TARGET ${IE_REGISTER_MAIN_TARGET} POST_BUILD
-                      COMMAND
-                        "${CMAKE_COMMAND}"
-                        -D "CMAKE_SHARED_MODULE_PREFIX=${CMAKE_SHARED_MODULE_PREFIX}"
-                        -D "IE_CONFIG_OUTPUT_FILE=${config_output_file}"
-                        -D "IE_CONFIGS_DIR=${CMAKE_BINARY_DIR}/plugins"
-                        -P "${IEDevScripts_DIR}/plugins/register_plugin_cmake.cmake"
-                      COMMENT
-                        "Registering plugins to plugins.xml config file"
-                      VERBATIM)
-endmacro()
-
-#
-# ie_register_plugins()
-#
-macro(ie_register_plugins)
-    if(BUILD_SHARED_LIBS)
-        ie_register_plugins_dynamic(${ARGN})
-    endif()
+    add_custom_command(TARGET ${OV_REGISTER_MAIN_TARGET} POST_BUILD
+                       COMMAND
+                          "${CMAKE_COMMAND}"
+                          -D "CMAKE_SHARED_MODULE_PREFIX=${CMAKE_SHARED_MODULE_PREFIX}"
+                          -D "OV_CONFIG_OUTPUT_FILE=${config_output_file}"
+                          -D "OV_CONFIGS_DIR=${CMAKE_BINARY_DIR}/plugins"
+                          -P "${IEDevScripts_DIR}/plugins/register_plugin_cmake.cmake"
+                        COMMENT
+                          "Registering plugins to plugins.xml config file"
+                        VERBATIM)
 endmacro()
 
 #
 # ov_register_plugins()
 #
 macro(ov_register_plugins)
-    if(BUILD_SHARED_LIBS)
-        ie_register_plugins_dynamic(${ARGN})
+    if(BUILD_SHARED_LIBS AND ENABLE_PLUGINS_XML)
+        ov_register_in_plugins_xml(${ARGN})
     endif()
 endmacro()
 
 #
-# ie_target_link_plugins(<TARGET_NAME>)
+# ie_register_plugins()
 #
-function(ie_target_link_plugins TARGET_NAME)
+macro(ie_register_plugins)
+    ov_register_plugins(${ARGN})
+endmacro()
+
+#
+# ov_target_link_plugins(<TARGET_NAME>)
+#
+function(ov_target_link_plugins TARGET_NAME)
     if(BUILD_SHARED_LIBS)
         return()
     endif()
@@ -279,13 +283,13 @@ function(ie_target_link_plugins TARGET_NAME)
 endfunction()
 
 #
-# ie_generate_plugins_hpp()
+# ov_generate_plugins_hpp()
 #
-function(ie_generate_plugins_hpp)
-    if(BUILD_SHARED_LIBS)
-        return()
-    endif()
-
+# Generates plugins.hpp file for:
+# - static plugins build
+# - cases when plugins.xml file is disabled
+#
+function(ov_generate_plugins_hpp)
     set(device_mapping)
     set(device_configs)
     set(as_extension)
@@ -296,17 +300,23 @@ function(ie_generate_plugins_hpp)
             message(FATAL_ERROR "Unexpected error, please, contact developer of this script")
         endif()
 
-        # create device mapping: preudo device => actual device
+        # create device mapping: pseudo device => actual device
         list(GET name 0 device_name)
-        if(${device_name}_PSEUDO_PLUGIN_FOR)
-            list(APPEND device_mapping "${device_name}:${${device_name}_PSEUDO_PLUGIN_FOR}")
+        if(BUILD_SHARED_LIBS)
+            list(GET name 1 library_name)
+            ov_plugin_get_file_name(${library_name} library_name)
+            list(APPEND device_mapping "${device_name}:${library_name}")
         else()
-            list(APPEND device_mapping "${device_name}:${device_name}")
-        endif()
+            if(${device_name}_PSEUDO_PLUGIN_FOR)
+                list(APPEND device_mapping "${device_name}:${${device_name}_PSEUDO_PLUGIN_FOR}")
+            else()
+                list(APPEND device_mapping "${device_name}:${device_name}")
+            endif()
 
-        # register plugin as extension
-        if(${device_name}_AS_EXTENSION)
-            list(APPEND as_extension -D "${device_name}_AS_EXTENSION=ON")
+            # register plugin as extension
+            if(${device_name}_AS_EXTENSION)
+                list(APPEND as_extension -D "${device_name}_AS_EXTENSION=ON")
+            endif()
         endif()
 
         # add default plugin config options
@@ -317,21 +327,26 @@ function(ie_generate_plugins_hpp)
         endif()
     endforeach()
 
-    # add plugins to libraries including ie_plugins.hpp
-    ie_target_link_plugins(openvino)
+    # add plugins to libraries including ov_plugins.hpp
+    ov_target_link_plugins(openvino)
     if(TARGET inference_engine_s)
-        ie_target_link_plugins(inference_engine_s)
+        ov_target_link_plugins(inference_engine_s)
     endif()
 
-    set(ie_plugins_hpp "${CMAKE_BINARY_DIR}/src/inference/ie_plugins.hpp")
+    if(OV_GENERATOR_MULTI_CONFIG AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
+        set(ov_plugins_hpp "${CMAKE_BINARY_DIR}/src/inference/$<CONFIG>/ov_plugins.hpp")
+    else()
+        set(ov_plugins_hpp "${CMAKE_BINARY_DIR}/src/inference/ov_plugins.hpp")
+    endif()
     set(plugins_hpp_in "${IEDevScripts_DIR}/plugins/plugins.hpp.in")
 
-    add_custom_command(OUTPUT "${ie_plugins_hpp}"
+    add_custom_command(OUTPUT "${ov_plugins_hpp}"
                        COMMAND
                         "${CMAKE_COMMAND}"
-                        -D "IE_DEVICE_MAPPING=${device_mapping}"
-                        -D "IE_PLUGINS_HPP_HEADER_IN=${plugins_hpp_in}"
-                        -D "IE_PLUGINS_HPP_HEADER=${ie_plugins_hpp}"
+                        -D "BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}"
+                        -D "OV_DEVICE_MAPPING=${device_mapping}"
+                        -D "OV_PLUGINS_HPP_HEADER_IN=${plugins_hpp_in}"
+                        -D "OV_PLUGINS_HPP_HEADER=${ov_plugins_hpp}"
                         ${device_configs}
                         ${as_extension}
                         -P "${IEDevScripts_DIR}/plugins/create_plugins_hpp.cmake"
@@ -339,28 +354,11 @@ function(ie_generate_plugins_hpp)
                          "${plugins_hpp_in}"
                          "${IEDevScripts_DIR}/plugins/create_plugins_hpp.cmake"
                        COMMENT
-                         "Generate ie_plugins.hpp for static build"
+                         "Generate ov_plugins.hpp for build"
                        VERBATIM)
 
     # for some reason dependency on source files does not work
-    # so, we have to use explicit target and make it dependency for inference_engine
-    add_custom_target(_ie_plugins_hpp DEPENDS ${ie_plugins_hpp})
-    add_dependencies(inference_engine_obj _ie_plugins_hpp)
-
-    # add dependency for object files
-    get_target_property(sources inference_engine_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 ${ie_plugins_hpp})
+    # so, we have to use explicit target and make it dependency for inference_engine_obj
+    add_custom_target(_ov_plugins_hpp DEPENDS ${ov_plugins_hpp})
+    add_dependencies(inference_engine_obj _ov_plugins_hpp)
 endfunction()

cmake/developer_package/plugins/plugins.hpp.in

@@ -4,10 +4,14 @@
 
 #pragma once
 
+#include <map>
+#include <string>
+
+#ifdef OPENVINO_STATIC_LIBRARY
+
 #include "cpp_interfaces/interface/ie_iplugin_internal.hpp"
 
-namespace {
-@IE_PLUGINS_DECLARATIONS@
+@OV_PLUGINS_DECLARATIONS@
 
 struct Value {
     InferenceEngine::CreatePluginEngineFunc * m_create_plugin_func;
@@ -15,12 +19,20 @@ struct Value {
     std::map<std::string, std::string> m_default_config;
 };
 
+#else
+
+struct Value {
+    std::string m_plugin_path;
+    std::map<std::string, std::string> m_default_config;
+};
+
+#endif
+
 using Key = std::string;
 using PluginsStaticRegistry = std::map<Key, Value>;
 
-const std::map<Key, Value> getStaticPluginsRegistry() {
-@IE_PLUGINS_MAP_DEFINITION@
+
+inline const std::map<Key, Value> getCompiledPluginsRegistry() {
+@OV_PLUGINS_MAP_DEFINITION@
     return plugins_hpp;
 }
-
-} // namespace

cmake/developer_package/plugins/register_plugin_cmake.cmake

@@ -8,18 +8,18 @@ set(file_content
     </plugins>
 </ie>")
 
-if(NOT EXISTS "${IE_CONFIG_OUTPUT_FILE}")
-    file(WRITE "${IE_CONFIG_OUTPUT_FILE}" "${file_content}")
+if(NOT EXISTS "${OV_CONFIG_OUTPUT_FILE}")
+    file(WRITE "${OV_CONFIG_OUTPUT_FILE}" "${file_content}")
 endif()
 
 # get list of plugin files
-file(GLOB plugin_files "${IE_CONFIGS_DIR}/*.xml")
+file(GLOB plugin_files "${OV_CONFIGS_DIR}/*.xml")
 
 function(check_plugin_exists plugin_name outvar)
     set(${outvar} OFF PARENT_SCOPE)
 
     # check if config file already has this plugin
-    file(STRINGS "${IE_CONFIG_OUTPUT_FILE}" content REGEX "plugin .*=\"")
+    file(STRINGS "${OV_CONFIG_OUTPUT_FILE}" content REGEX "plugin .*=\"")
 
     foreach(line IN LISTS content)
         string(REGEX MATCH "location=\"([^\"]*)\"" location "${line}")
@@ -44,7 +44,7 @@ endforeach()
 
 # add plugin
 set(newContent "")
-file(STRINGS "${IE_CONFIG_OUTPUT_FILE}" content)
+file(STRINGS "${OV_CONFIG_OUTPUT_FILE}" content)
 
 set(already_exists_in_xml OFF)
 foreach(line IN LISTS content)
@@ -77,4 +77,4 @@ ${content}")
     endif()
 endforeach()
 
-file(WRITE "${IE_CONFIG_OUTPUT_FILE}" "${newContent}")
+file(WRITE "${OV_CONFIG_OUTPUT_FILE}" "${newContent}")

cmake/developer_package/plugins/unregister_plugin_cmake.cmake

@@ -2,16 +2,16 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(NOT EXISTS "${IE_CONFIG_OUTPUT_FILE}")
+if(NOT EXISTS "${OV_CONFIG_OUTPUT_FILE}")
     return()
 endif()
 
 # remove plugin file
-file(REMOVE "${IE_CONFIGS_DIR}/${IE_PLUGIN_NAME}.xml")
+file(REMOVE "${OV_CONFIGS_DIR}/${IE_PLUGIN_NAME}.xml")
 
 # remove plugin
 set(newContent "")
-file(STRINGS "${IE_CONFIG_OUTPUT_FILE}" content)
+file(STRINGS "${OV_CONFIG_OUTPUT_FILE}" content)
 
 set(skip_plugin OFF)
 foreach(line IN LISTS content)
@@ -32,4 +32,4 @@ foreach(line IN LISTS content)
     endif()
 endforeach()
 
-file(WRITE "${IE_CONFIG_OUTPUT_FILE}" "${newContent}")
+file(WRITE "${OV_CONFIG_OUTPUT_FILE}" "${newContent}")

cmake/developer_package/python_requirements.cmake

@@ -97,7 +97,11 @@ function(ov_check_pip_packages)
 
     if(PYTHONINTERP_FOUND)
         execute_process(
-            COMMAND ${PYTHON_EXECUTABLE} -c "import pkg_resources ; pkg_resources.require(open('${ARG_REQUIREMENTS_FILE}', mode='r'))"
+            COMMAND ${PYTHON_EXECUTABLE} -c "
+from check_python_requirements import check_python_requirements ;
+check_python_requirements('${ARG_REQUIREMENTS_FILE}') ;
+            "
+            WORKING_DIRECTORY "${IEDevScripts_DIR}"
             RESULT_VARIABLE EXIT_CODE
             OUTPUT_VARIABLE OUTPUT_TEXT
             ERROR_VARIABLE ERROR_TEXT)

cmake/developer_package/target_flags.cmake

@@ -17,22 +17,46 @@ if(WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 
 if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-  set(arch_flag X86_64)
+  set(host_arch_flag X86_64)
 elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
-  set(arch_flag X86)
-elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*)")
-  set(arch_flag AARCH64)
+  set(host_arch_flag X86)
+elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*)")
+  set(host_arch_flag AARCH64)
 elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
-  set(arch_flag ARM)
+  set(host_arch_flag ARM)
 elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^riscv64$")
-  set(arch_flag RISCV64)
+  set(host_arch_flag RISCV64)
 endif()
 
-set(HOST_${arch_flag} ON)
+set(HOST_${host_arch_flag} ON)
 
-macro(_ie_process_msvc_generator_platform arch_flag)
-  # if cmake -A <ARM|ARM64> is passed
-  if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+macro(_ov_detect_arch_by_processor_type)
+  if(CMAKE_OSX_ARCHITECTURES AND APPLE)
+    if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+      set(AARCH64 ON)
+    elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
+      set(X86_64 ON)
+    elseif(CMAKE_OSX_ARCHITECTURES MATCHES ".*x86_64.*" AND CMAKE_OSX_ARCHITECTURES MATCHES ".*arm64.*")
+      set(UNIVERSAL2 ON)
+    else()
+      message(FATAL_ERROR "Unsupported value: CMAKE_OSX_ARCHITECTURES = ${CMAKE_OSX_ARCHITECTURES}")
+    endif()
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
+    set(X86_64 ON)
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*|wasm")
+    set(X86 ON)
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*|armv8)")
+    set(AARCH64 ON)
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
+    set(ARM ON)
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64$")
+    set(RISCV64 ON)
+  endif()
+endmacro()
+
+macro(_ov_process_msvc_generator_platform)
+  # if cmake -A <ARM|ARM64|x64|Win32> is passed
+  if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
     set(AARCH64 ON)
   elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
     set(ARM ON)
@@ -41,45 +65,30 @@ macro(_ie_process_msvc_generator_platform arch_flag)
   elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")
     set(X86 ON)
   else()
-    set(${arch_flag} ON)
+    _ov_detect_arch_by_processor_type()
   endif()
 endmacro()
 
+# TODO: why OpenCV is found by cmake
 if(MSVC64 OR MINGW64)
-  _ie_process_msvc_generator_platform(${arch_flag})
+  _ov_process_msvc_generator_platform()
 elseif(MINGW OR (MSVC AND NOT CMAKE_CROSSCOMPILING))
-  _ie_process_msvc_generator_platform(${arch_flag})
-elseif(CMAKE_OSX_ARCHITECTURES AND APPLE)
-  if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
-    set(AARCH64 ON)
-  elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
-    set(X86_64 ON)
-  elseif(CMAKE_OSX_ARCHITECTURES MATCHES ".*x86_64.*" AND CMAKE_OSX_ARCHITECTURES MATCHES ".*arm64.*")
-    set(UNIVERSAL2 ON)
-  else()
-    message(FATAL_ERROR "Unsupported value: CMAKE_OSX_ARCHITECTURES = ${CMAKE_OSX_ARCHITECTURES}")
-  endif()
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-  set(X86_64 ON)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
-  set(X86 ON)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*)")
-  set(AARCH64 ON)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
-  set(ARM ON)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64$")
-  set(RISCV64 ON)
+  _ov_process_msvc_generator_platform()
+else()
+  _ov_detect_arch_by_processor_type()
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     set(EMSCRIPTEN ON)
 endif()
 
-if(UNIX AND NOT (APPLE OR ANDROID OR EMSCRIPTEN))
+if(UNIX AND NOT (APPLE OR ANDROID OR EMSCRIPTEN OR CYGWIN))
     set(LINUX ON)
 endif()
 
-if(NOT DEFINED CMAKE_HOST_LINUX AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+if(CMAKE_VERSION VERSION_LESS 3.25 AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+    # the variable is available since 3.25
+    # https://cmake.org/cmake/help/latest/variable/CMAKE_HOST_LINUX.html
     set(CMAKE_HOST_LINUX ON)
 endif()
 

cmake/developer_package/version.cmake

@@ -185,6 +185,46 @@ macro (addVersionDefines FILE)
     unset(__version_file)
 endmacro()
 
+macro (ov_add_version_defines FILE TARGET)
+    set(__version_file ${FILE})
+    if(NOT IS_ABSOLUTE ${__version_file})
+        set(__version_file "${CMAKE_CURRENT_SOURCE_DIR}/${__version_file}")
+    endif()
+    if(NOT EXISTS ${__version_file})
+        message(FATAL_ERROR "${FILE} does not exists in current source directory")
+    endif()
+    _remove_source_from_target(${TARGET} ${FILE})
+    _remove_source_from_target(${TARGET} ${__version_file})
+    if (BUILD_SHARED_LIBS)
+        add_library(${TARGET}_version OBJECT ${__version_file})
+    else()
+        add_library(${TARGET}_version STATIC ${__version_file})
+    endif()
+    if(SUGGEST_OVERRIDE_SUPPORTED)
+        set_source_files_properties(${__version_file}
+            PROPERTIES COMPILE_OPTIONS -Wno-suggest-override)
+    endif()
+
+    target_compile_definitions(${TARGET}_version PRIVATE
+        CI_BUILD_NUMBER=\"${CI_BUILD_NUMBER}\"
+        $<TARGET_PROPERTY:${TARGET},INTERFACE_COMPILE_DEFINITIONS>
+        $<TARGET_PROPERTY:${TARGET},COMPILE_DEFINITIONS>)
+    target_include_directories(${TARGET}_version PRIVATE
+        $<TARGET_PROPERTY:${TARGET},INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:${TARGET},INCLUDE_DIRECTORIES>)
+    target_link_libraries(${TARGET}_version PRIVATE
+        $<TARGET_PROPERTY:${TARGET},LINK_LIBRARIES>)
+    target_compile_options(${TARGET}_version PRIVATE
+        $<TARGET_PROPERTY:${TARGET},INTERFACE_COMPILE_OPTIONS>
+        $<TARGET_PROPERTY:${TARGET},COMPILE_OPTIONS>)
+    set_target_properties(${TARGET}_version
+        PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE 
+        $<TARGET_PROPERTY:${TARGET},INTERPROCEDURAL_OPTIMIZATION_RELEASE>)
+
+    target_sources(${TARGET} PRIVATE $<TARGET_OBJECTS:${TARGET}_version>)
+    unset(__version_file)
+endmacro()
+
 function(ov_add_library_version library)
     if(NOT DEFINED OpenVINO_SOVERSION)
         message(FATAL_ERROR "Internal error: OpenVINO_SOVERSION is not defined")

cmake/developer_package/vs_version/vs_version.cmake

@@ -2,18 +2,18 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set(IE_VS_VER_FILEVERSION_QUAD "${OpenVINO_VERSION_MAJOR},${OpenVINO_VERSION_MINOR},${OpenVINO_VERSION_PATCH},${OpenVINO_VERSION_BUILD}")
-set(IE_VS_VER_PRODUCTVERSION_QUAD "${OpenVINO_VERSION_MAJOR},${OpenVINO_VERSION_MINOR},${OpenVINO_VERSION_PATCH},${OpenVINO_VERSION_BUILD}")
-set(IE_VS_VER_FILEVERSION_STR "${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH}.${OpenVINO_VERSION_BUILD}")
+set(OV_VS_VER_FILEVERSION_QUAD "${OpenVINO_VERSION_MAJOR},${OpenVINO_VERSION_MINOR},${OpenVINO_VERSION_PATCH},${OpenVINO_VERSION_BUILD}")
+set(OV_VS_VER_PRODUCTVERSION_QUAD "${OpenVINO_VERSION_MAJOR},${OpenVINO_VERSION_MINOR},${OpenVINO_VERSION_PATCH},${OpenVINO_VERSION_BUILD}")
+set(OV_VS_VER_FILEVERSION_STR "${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH}.${OpenVINO_VERSION_BUILD}")
 
-set(IE_VS_VER_COMPANY_NAME_STR "Intel Corporation")
-set(IE_VS_VER_PRODUCTVERSION_STR "${CI_BUILD_NUMBER}")
-set(IE_VS_VER_PRODUCTNAME_STR "OpenVINO toolkit")
-set(IE_VS_VER_COPYRIGHT_STR "Copyright (C) 2018-2021, Intel Corporation")
-set(IE_VS_VER_COMMENTS_STR "https://docs.openvino.ai/")
+set(OV_VS_VER_COMPANY_NAME_STR "Intel Corporation")
+set(OV_VS_VER_PRODUCTVERSION_STR "${CI_BUILD_NUMBER}")
+set(OV_VS_VER_PRODUCTNAME_STR "OpenVINO toolkit")
+set(OV_VS_VER_COPYRIGHT_STR "Copyright (C) 2018-2021, Intel Corporation")
+set(OV_VS_VER_COMMENTS_STR "https://docs.openvino.ai/")
 
 #
-# ie_add_vs_version_file(NAME <name>
+# ov_add_vs_version_file(NAME <name>
 #                        FILEDESCRIPTION <file description>
 #                        [COMPANY_NAME <company name>]
 #                        [FILEVERSION <file version>]
@@ -25,7 +25,7 @@ set(IE_VS_VER_COMMENTS_STR "https://docs.openvino.ai/")
 #                        [FILEVERSION_QUAD <name>]
 #                        [PRODUCTVERSION_QUAD <name>])
 #
-function(ie_add_vs_version_file)
+function(ov_add_vs_version_file)
     if(NOT WIN32 OR NOT BUILD_SHARED_LIBS)
         return()
     endif()
@@ -38,14 +38,14 @@ function(ie_add_vs_version_file)
 
     get_target_property(target_type ${VS_VER_NAME} TYPE)
     if(NOT target_type MATCHES "^(SHARED|MODULE)_LIBRARY$")
-        message(FATAL_ERROR "ie_add_vs_version_file can work only with dynamic libraries")
+        message(FATAL_ERROR "ov_add_vs_version_file can work only with dynamic libraries")
     endif()
 
     macro(_vs_ver_update_variable name)
-        if(VS_VER_NAME AND DEFINED IE_${VS_VER_NAME}_VS_VER_${name})
-            set(IE_VS_VER_${name} "${IE_${VS_VER_NAME}_VS_VER_${name}}")
+        if(VS_VER_NAME AND DEFINED OV_${VS_VER_NAME}_VS_VER_${name})
+            set(OV_VS_VER_${name} "${OV_${VS_VER_NAME}_VS_VER_${name}}")
         elseif(VS_VER_${name})
-            set(IE_VS_VER_${name} "${VS_VER_${name}}")
+            set(OV_VS_VER_${name} "${VS_VER_${name}}")
         endif()
     endmacro()
 
@@ -53,10 +53,10 @@ function(ie_add_vs_version_file)
     _vs_ver_update_variable(PRODUCTVERSION_QUAD)
 
     macro(_vs_ver_update_str_variable name)
-        if(VS_VER_NAME AND DEFINED IE_${VS_VER_NAME}_VS_VER_${name})
-            set(IE_VS_VER_${name}_STR "${IE_${VS_VER_NAME}_VS_VER_${name}}")
+        if(VS_VER_NAME AND DEFINED OV_${VS_VER_NAME}_VS_VER_${name})
+            set(OV_VS_VER_${name}_STR "${OV_${VS_VER_NAME}_VS_VER_${name}}")
         elseif(VS_VER_${name})
-            set(IE_VS_VER_${name}_STR "${VS_VER_${name}}")
+            set(OV_VS_VER_${name}_STR "${VS_VER_${name}}")
         endif()
     endmacro()
 
@@ -69,8 +69,8 @@ function(ie_add_vs_version_file)
     _vs_ver_update_str_variable(PRODUCTVERSION)
     _vs_ver_update_str_variable(COMMENTS)
 
-    set(IE_VS_VER_ORIGINALFILENAME_STR "${CMAKE_SHARED_LIBRARY_PREFIX}${VS_VER_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set(IE_VS_VER_INTERNALNAME_STR ${VS_VER_NAME})
+    set(OV_VS_VER_ORIGINALFILENAME_STR "${CMAKE_SHARED_LIBRARY_PREFIX}${VS_VER_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set(OV_VS_VER_INTERNALNAME_STR ${VS_VER_NAME})
 
     set(vs_version_output "${CMAKE_CURRENT_BINARY_DIR}/vs_version.rc")
     configure_file("${IEDevScripts_DIR}/vs_version/vs_version.rc.in" "${vs_version_output}" @ONLY)

cmake/developer_package/vs_version/vs_version.rc.in

@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO         VERSIONINFO
-  FILEVERSION           @IE_VS_VER_FILEVERSION_QUAD@
-  PRODUCTVERSION        @IE_VS_VER_PRODUCTVERSION_QUAD@
+  FILEVERSION           @OV_VS_VER_FILEVERSION_QUAD@
+  PRODUCTVERSION        @OV_VS_VER_PRODUCTVERSION_QUAD@
   FILEFLAGSMASK         VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS             1
@@ -17,15 +17,15 @@ BEGIN
   BEGIN
     BLOCK "040904E4"
     BEGIN
-      VALUE "CompanyName", "@IE_VS_VER_COMPANY_NAME_STR@\0"
-      VALUE "FileDescription", "@IE_VS_VER_FILEDESCRIPTION_STR@\0"
-      VALUE "FileVersion", "@IE_VS_VER_FILEVERSION_STR@\0"
-      VALUE "InternalName", "@IE_VS_VER_INTERNALNAME_STR@\0"
-      VALUE "LegalCopyright", "@IE_VS_VER_COPYRIGHT_STR@\0"
-      VALUE "OriginalFilename", "@IE_VS_VER_ORIGINALFILENAME_STR@\0"
-      VALUE "ProductName", "@IE_VS_VER_PRODUCTNAME_STR@\0"
-      VALUE "ProductVersion", "@IE_VS_VER_PRODUCTVERSION_STR@\0"
-      VALUE "Comments", "@IE_VS_VER_COMMENTS_STR@\0"
+      VALUE "CompanyName", "@OV_VS_VER_COMPANY_NAME_STR@\0"
+      VALUE "FileDescription", "@OV_VS_VER_FILEDESCRIPTION_STR@\0"
+      VALUE "FileVersion", "@OV_VS_VER_FILEVERSION_STR@\0"
+      VALUE "InternalName", "@OV_VS_VER_INTERNALNAME_STR@\0"
+      VALUE "LegalCopyright", "@OV_VS_VER_COPYRIGHT_STR@\0"
+      VALUE "OriginalFilename", "@OV_VS_VER_ORIGINALFILENAME_STR@\0"
+      VALUE "ProductName", "@OV_VS_VER_PRODUCTNAME_STR@\0"
+      VALUE "ProductVersion", "@OV_VS_VER_PRODUCTVERSION_STR@\0"
+      VALUE "Comments", "@OV_VS_VER_COMMENTS_STR@\0"
     END
   END
   BLOCK "VarFileInfo"

cmake/developer_package/whole_archive.cmake

@@ -40,6 +40,7 @@ function(ieTargetLinkWholeArchive targetName)
                 "-Wl,-noall_load"
                 )
         else()
+            # non-Apple Clang and GCC / MinGW
             list(APPEND libs
                 "-Wl,--whole-archive"
                 ${staticLib}

cmake/extra_modules.cmake

@@ -169,9 +169,9 @@ ov_generate_dev_package_config()
 # with all imported developer targets
 register_extra_modules()
 
-# for static libraries case we need to generate final ie_plugins.hpp
+# for static libraries case we need to generate final ov_plugins.hpp
 # with all the information about plugins
-ie_generate_plugins_hpp()
+ov_generate_plugins_hpp()
 
 # used for static build
 ov_generate_frontends_hpp()

cmake/features.cmake

@@ -6,7 +6,9 @@
 # Common cmake options
 #
 
-ie_dependent_option (ENABLE_INTEL_CPU "CPU plugin for OpenVINO Runtime" ON "RISCV64 OR X86 OR X86_64" OFF)
+ie_dependent_option (ENABLE_INTEL_CPU "CPU plugin for OpenVINO Runtime" ON "RISCV64 OR X86 OR X86_64 OR AARCH64 OR ARM" OFF)
+
+ie_dependent_option (ENABLE_ARM_COMPUTE_CMAKE "Enable ARM Compute build via cmake" OFF "ENABLE_INTEL_CPU" OFF)
 
 ie_option (ENABLE_TESTS "unit, behavior and functional tests" OFF)
 
@@ -14,7 +16,13 @@ ie_option (ENABLE_COMPILE_TOOL "Enables compile_tool" ON)
 
 ie_option (ENABLE_STRICT_DEPENDENCIES "Skip configuring \"convinient\" dependencies for efficient parallel builds" ON)
 
-ie_dependent_option (ENABLE_INTEL_GPU "GPU OpenCL-based plugin for OpenVINO Runtime" ON "X86_64;NOT APPLE;NOT MINGW;NOT WINDOWS_STORE;NOT WINDOWS_PHONE" OFF)
+if(X86_64)
+    set(ENABLE_INTEL_GPU_DEFAULT ON)
+else()
+    set(ENABLE_INTEL_GPU_DEFAULT OFF)
+endif()
+
+ie_dependent_option (ENABLE_INTEL_GPU "GPU OpenCL-based plugin for OpenVINO Runtime" ${ENABLE_INTEL_GPU_DEFAULT} "X86_64 OR AARCH64;NOT APPLE;NOT WINDOWS_STORE;NOT WINDOWS_PHONE" OFF)
 
 if (ANDROID OR (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0))
     # oneDNN doesn't support old compilers and android builds for now, so we'll
@@ -26,6 +34,10 @@ endif()
 
 ie_dependent_option (ENABLE_ONEDNN_FOR_GPU "Enable oneDNN with GPU support" ${ENABLE_ONEDNN_FOR_GPU_DEFAULT} "ENABLE_INTEL_GPU" OFF)
 
+ie_option (ENABLE_DEBUG_CAPS "enable OpenVINO debug capabilities at runtime" OFF)
+ie_dependent_option (ENABLE_GPU_DEBUG_CAPS "enable GPU debug capabilities at runtime" ON "ENABLE_DEBUG_CAPS;ENABLE_INTEL_CPU" OFF)
+ie_dependent_option (ENABLE_CPU_DEBUG_CAPS "enable CPU debug capabilities at runtime" ON "ENABLE_DEBUG_CAPS;ENABLE_INTEL_GPU" OFF)
+
 ie_option (ENABLE_PROFILING_ITT "Build with ITT tracing. Optionally configure pre-built ittnotify library though INTEL_VTUNE_DIR variable." OFF)
 
 ie_option_enum(ENABLE_PROFILING_FILTER "Enable or disable ITT counter groups.\
@@ -41,8 +53,6 @@ In case SELECTIVE_BUILD is enabled, the SELECTIVE_BUILD_STAT variable should con
 Usage: -DSELECTIVE_BUILD=ON -DSELECTIVE_BUILD_STAT=/path/*.csv" OFF
                ALLOWED_VALUES ON OFF COLLECT)
 
-ie_option(ENABLE_ERROR_HIGHLIGHT "Highlight errors and warnings during compile time" ON)
-
 ie_option (ENABLE_DOCS "Build docs using Doxygen" OFF)
 
 find_package(PkgConfig QUIET)
@@ -75,39 +85,45 @@ ie_dependent_option (ENABLE_TBBBIND_2_5 "Enable TBBBind_2_5 static usage in Open
 ie_dependent_option (ENABLE_INTEL_GNA "GNA support for OpenVINO Runtime" ON
     "NOT APPLE;NOT ANDROID;X86_64;CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.4" OFF)
 
-ie_option (ENABLE_INTEL_GNA_DEBUG "GNA debug build" OFF)
-
+ie_dependent_option (ENABLE_INTEL_GNA_DEBUG "GNA debug build" OFF "ENABLE_INTEL_GNA" OFF)
+ie_dependent_option (ENABLE_V7_SERIALIZE "enables serialization to IR v7" OFF "ENABLE_INTEL_GNA" OFF)
 ie_dependent_option (ENABLE_IR_V7_READER "Enables IR v7 reader" ${BUILD_SHARED_LIBS} "ENABLE_TESTS;ENABLE_INTEL_GNA" OFF)
 
-ie_option (ENABLE_GAPI_PREPROCESSING "Enables G-API preprocessing" ON)
+ie_dependent_option (ENABLE_GAPI_PREPROCESSING "Enables G-API preprocessing" ON "NOT MINGW64" OFF)
 
 ie_option (ENABLE_MULTI "Enables MULTI Device Plugin" ON)
 ie_option (ENABLE_AUTO "Enables AUTO Device Plugin" ON)
-
 ie_option (ENABLE_AUTO_BATCH "Enables Auto-Batching Plugin" ON)
-
 ie_option (ENABLE_HETERO "Enables Hetero Device Plugin" ON)
-
 ie_option (ENABLE_TEMPLATE "Enable template plugin" ON)
 
+ie_dependent_option (ENABLE_PLUGINS_XML "Generate plugins.xml configuration file or not" OFF "BUILD_SHARED_LIBS" OFF)
+
 ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_TESTS;ENABLE_GAPI_PREPROCESSING" OFF)
 
 ie_dependent_option (ENABLE_DATA "fetch models from testdata repo" ON "ENABLE_FUNCTIONAL_TESTS;NOT ANDROID" OFF)
 
-ie_dependent_option (ENABLE_BEH_TESTS "tests oriented to check OpenVINO Runtime API correctness" ON "ENABLE_TESTS" OFF)
-
 ie_dependent_option (ENABLE_FUNCTIONAL_TESTS "functional tests" ON "ENABLE_TESTS" OFF)
 
 ie_option (ENABLE_SAMPLES "console samples are part of OpenVINO Runtime package" ON)
 
 ie_option (ENABLE_OPENCV "enables custom OpenCV download" OFF)
 
-ie_option (ENABLE_V7_SERIALIZE "enables serialization to IR v7" OFF)
-
 set(OPENVINO_EXTRA_MODULES "" CACHE STRING "Extra paths for extra modules to include into OpenVINO build")
 
 ie_dependent_option(ENABLE_TBB_RELEASE_ONLY "Only Release TBB libraries are linked to the OpenVINO Runtime binaries" ON "THREADING MATCHES TBB;LINUX" OFF)
 
+find_host_package(PythonInterp 3 QUIET)
+ie_option(ENABLE_OV_ONNX_FRONTEND "Enable ONNX FrontEnd" ${PYTHONINTERP_FOUND})
+ie_option(ENABLE_OV_PADDLE_FRONTEND "Enable PaddlePaddle FrontEnd" ON)
+ie_option(ENABLE_OV_IR_FRONTEND "Enable IR FrontEnd" ON)
+ie_option(ENABLE_OV_PYTORCH_FRONTEND "Enable PyTorch FrontEnd" ON)
+ie_option(ENABLE_OV_IR_FRONTEND "Enable IR FrontEnd" ON)
+ie_option(ENABLE_OV_TF_FRONTEND "Enable TensorFlow FrontEnd" ON)
+ie_option(ENABLE_OV_TF_LITE_FRONTEND "Enable TensorFlow Lite FrontEnd" ON)
+ie_dependent_option(ENABLE_SNAPPY_COMPRESSION "Enables compression support for TF FE" ON
+    "ENABLE_OV_TF_FRONTEND" ON)
+
 if(CMAKE_HOST_LINUX AND LINUX)
     # Debian packages are enabled on Ubuntu systems
     # so, system TBB / pugixml / OpenCL can be tried for usage
@@ -123,38 +139,38 @@ else()
     set(ENABLE_SYSTEM_TBB_DEFAULT ${ENABLE_SYSTEM_LIBS_DEFAULT})
 endif()
 
+if(BUILD_SHARED_LIBS)
+    set(ENABLE_SYSTEM_PUGIXML_DEFAULT ${ENABLE_SYSTEM_LIBS_DEFAULT})
+else()
+    # for static libraries case libpugixml.a must be compiled with -fPIC
+    # but we still need an ability to compile with system PugiXML and BUILD_SHARED_LIBS
+    # for Conan case where everything is compiled statically
+    set(ENABLE_SYSTEM_PUGIXML_DEFAULT OFF)
+endif()
+
 # users wants to use his own TBB version, specific either via env vars or cmake options
 if(DEFINED ENV{TBBROOT} OR DEFINED ENV{TBB_DIR} OR DEFINED TBB_DIR OR DEFINED TBBROOT)
     set(ENABLE_SYSTEM_TBB_DEFAULT OFF)
 endif()
 
-# for static libraries case libpugixml.a must be compiled with -fPIC
-ie_dependent_option (ENABLE_SYSTEM_PUGIXML "use the system copy of pugixml" ${ENABLE_SYSTEM_LIBS_DEFAULT} "BUILD_SHARED_LIBS" OFF)
-
-ie_dependent_option (ENABLE_SYSTEM_TBB  "use the system version of TBB" ${ENABLE_SYSTEM_TBB_DEFAULT} "THREADING MATCHES TBB" OFF)
-
-ie_dependent_option (ENABLE_SYSTEM_OPENCL "Use the system version of OpenCL" ${ENABLE_SYSTEM_LIBS_DEFAULT} "BUILD_SHARED_LIBS;ENABLE_INTEL_GPU" OFF)
-
-ie_option (ENABLE_DEBUG_CAPS "enable OpenVINO debug capabilities at runtime" OFF)
-
-ie_dependent_option (ENABLE_GPU_DEBUG_CAPS "enable GPU debug capabilities at runtime" ON "ENABLE_DEBUG_CAPS" OFF)
-
-ie_dependent_option (ENABLE_CPU_DEBUG_CAPS "enable CPU debug capabilities at runtime" ON "ENABLE_DEBUG_CAPS" OFF)
-
-find_host_package(PythonInterp 3 QUIET)
-ie_option(ENABLE_OV_ONNX_FRONTEND "Enable ONNX FrontEnd" ${PYTHONINTERP_FOUND})
-ie_option(ENABLE_OV_PADDLE_FRONTEND "Enable PaddlePaddle FrontEnd" ON)
-ie_option(ENABLE_OV_IR_FRONTEND "Enable IR FrontEnd" ON)
-ie_option(ENABLE_OV_PYTORCH_FRONTEND "Enable PyTorch FrontEnd" ON)
-ie_option(ENABLE_OV_TF_FRONTEND "Enable TensorFlow FrontEnd" ON)
-ie_option(ENABLE_OV_TF_LITE_FRONTEND "Enable TensorFlow Lite FrontEnd" ON)
-ie_dependent_option(ENABLE_SYSTEM_PROTOBUF "Use system protobuf" OFF
-    "ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_TF_FRONTEND;BUILD_SHARED_LIBS" OFF)
-ie_option(ENABLE_OV_IR_FRONTEND "Enable IR FrontEnd" ON)
-ie_dependent_option(ENABLE_SYSTEM_FLATBUFFERS "Use system flatbuffers" ON
+ie_dependent_option (ENABLE_SYSTEM_TBB  "Enables use of system TBB" ${ENABLE_SYSTEM_TBB_DEFAULT}
+    "THREADING MATCHES TBB" OFF)
+# TODO: turn it off by default during the work on cross-os distribution, because pugixml is not
+# available out of box on all systems (like RHEL, UBI)
+ie_option (ENABLE_SYSTEM_PUGIXML "Enables use of system PugiXML" ${ENABLE_SYSTEM_PUGIXML_DEFAULT})
+# the option is on by default, because we use only flatc compiler and don't use any libraries
+ie_dependent_option(ENABLE_SYSTEM_FLATBUFFERS "Enables use of system flatbuffers" ON
     "ENABLE_OV_TF_LITE_FRONTEND" OFF)
+ie_dependent_option (ENABLE_SYSTEM_OPENCL "Enables use of system OpenCL" ${ENABLE_SYSTEM_LIBS_DEFAULT}
+    "ENABLE_INTEL_GPU" OFF)
+# the option is turned off by default, because we compile our own static version of protobuf
+# with LTO and -fPIC options, while system one does not have such flags
+ie_dependent_option (ENABLE_SYSTEM_PROTOBUF "Enables use of system Protobuf" OFF
+    "ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_TF_FRONTEND" OFF)
+# the option is turned off by default, because we don't want to have a dependency on libsnappy.so
+ie_dependent_option (ENABLE_SYSTEM_SNAPPY "Enables use of system version of Snappy" OFF
+    "ENABLE_SNAPPY_COMPRESSION" OFF)
 
-ie_dependent_option(ENABLE_OV_CORE_UNIT_TESTS "Enables OpenVINO core unit tests" ON "ENABLE_TESTS" OFF)
 ie_option(ENABLE_OPENVINO_DEBUG "Enable output for OPENVINO_DEBUG statements" OFF)
 
 if(NOT BUILD_SHARED_LIBS AND ENABLE_OV_TF_FRONTEND)

cmake/packaging/common-libraries.cmake

@@ -10,8 +10,8 @@ macro(ov_cpack_settings)
     set(cpack_components_all ${CPACK_COMPONENTS_ALL})
     unset(CPACK_COMPONENTS_ALL)
     foreach(item IN LISTS cpack_components_all)
-        # filter out some components, which are not needed to be wrapped to conda-forge | brew
-        if(# python is not a part of conda | brew
+        # filter out some components, which are not needed to be wrapped to conda-forge | brew | conan
+        if(# python is not a part of conda | brew | conan
            NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO}_python.*" AND
            # python wheels are not needed to be wrapped by conda | brew packages
            NOT item STREQUAL OV_CPACK_COMP_PYTHON_WHEELS AND

cmake/packaging/debian.cmake

@@ -52,6 +52,8 @@ macro(ov_cpack_settings)
            NOT item STREQUAL OV_CPACK_COMP_PYTHON_WHEELS AND
            # see ticket # 82605
            NOT item STREQUAL "gna" AND
+           # don't install Intel OpenMP during debian
+           NOT item STREQUAL "omp" AND
            # even for case of system TBB we have installation rules for wheels packages
            # so, need to skip this explicitly
            NOT item MATCHES "^tbb(_dev)?$" AND
@@ -91,7 +93,7 @@ macro(ov_cpack_settings)
         # - 2022.1.0 is the last public release with debian packages from Intel install team
         # - 2022.1.1, 2022.2 do not have debian packages enabled, distributed only as archives
         # - 2022.3 is the first release where Debian updated packages are introduced, others 2022.3.X are LTS
-        2022.3.0 2022.3.1 2022.3.2 2022.3.3 2022.3.4 2022.3.5
+        2022.3.0 2022.3.1 2022.3.2 2022.3.3 2022.3.4 2022.3.5 2023.0.0 2023.0.1
         )
 
     #
@@ -154,17 +156,20 @@ macro(ov_cpack_settings)
         set(auto_copyright "generic")
     endif()
 
-    # intel-cpu
-    if(ENABLE_INTEL_CPU OR DEFINED openvino_arm_cpu_plugin_SOURCE_DIR)
-        if(ENABLE_INTEL_CPU)
+    # cpu
+    if(ENABLE_INTEL_CPU)
+        if(ARM OR AARCH64)
+            set(CPACK_DEBIAN_CPU_PACKAGE_NAME "libopenvino-arm-cpu-plugin-${cpack_name_ver}")
+            set(CPACK_COMPONENT_CPU_DESCRIPTION "ARM® CPU plugin")
+            set(cpu_copyright "arm_cpu")
+        elseif(X86 OR X86_64)
+            set(CPACK_DEBIAN_CPU_PACKAGE_NAME "libopenvino-intel-cpu-plugin-${cpack_name_ver}")
             set(CPACK_COMPONENT_CPU_DESCRIPTION "Intel® CPU plugin")
             set(cpu_copyright "generic")
         else()
-            set(CPACK_COMPONENT_CPU_DESCRIPTION "ARM CPU")
-            set(cpu_copyright "arm_cpu")
+            message(FATAL_ERROR "Unsupported CPU architecture: ${CMAKE_SYSTEM_PROCESSOR}")
         endif()
         set(CPACK_COMPONENT_CPU_DEPENDS "${OV_CPACK_COMP_CORE}")
-        set(CPACK_DEBIAN_CPU_PACKAGE_NAME "libopenvino-intel-cpu-plugin-${cpack_name_ver}")
         set(CPACK_DEBIAN_CPU_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}")
         _ov_add_plugin(cpu OFF)
     endif()

cmake/packaging/packaging.cmake

@@ -6,7 +6,7 @@ if(CPACK_GENERATOR STREQUAL "DEB")
     include(cmake/packaging/debian.cmake)
 elseif(CPACK_GENERATOR STREQUAL "RPM")
     include(cmake/packaging/rpm.cmake)
-elseif(CPACK_GENERATOR MATCHES "^(CONDA-FORGE|BREW)$")
+elseif(CPACK_GENERATOR MATCHES "^(CONDA-FORGE|BREW|CONAN)$")
     include(cmake/packaging/common-libraries.cmake)
 elseif(CPACK_GENERATOR STREQUAL "NSIS")
     include(cmake/packaging/nsis.cmake)

cmake/packaging/rpm.cmake

@@ -38,6 +38,8 @@ macro(ov_cpack_settings)
            NOT item STREQUAL OV_CPACK_COMP_PYTHON_WHEELS AND
            # see ticket # 82605
            NOT item STREQUAL "gna" AND
+           # don't install Intel OpenMP during rpm
+           NOT item STREQUAL "omp" AND
            # even for case of system TBB we have installation rules for wheels packages
            # so, need to skip this explicitly
            NOT item MATCHES "^tbb(_dev)?$" AND
@@ -77,7 +79,7 @@ macro(ov_cpack_settings)
         # - 2022.1.0 is the last public release with rpm packages from Intel install team
         # - 2022.1.1, 2022.2 do not have rpm packages enabled, distributed only as archives
         # - 2022.3 is the first release where RPM updated packages are introduced, others 2022.3.X are LTS
-        2022.3.0 2022.3.1 2022.3.2 2022.3.3 2022.3.4 2022.3.5
+        2022.3.0 2022.3.1 2022.3.2 2022.3.3 2022.3.4 2022.3.5 2023.0.0 2023.0.1
         )
 
     find_host_program(rpmlint_PROGRAM NAMES rpmlint DOC "Path to rpmlint")
@@ -154,17 +156,20 @@ macro(ov_cpack_settings)
         set(auto_copyright "generic")
     endif()
 
-    # intel-cpu
-    if(ENABLE_INTEL_CPU OR DEFINED openvino_arm_cpu_plugin_SOURCE_DIR)
-        if(ENABLE_INTEL_CPU)
+    # cpu
+    if(ENABLE_INTEL_CPU)
+        if(ARM OR AARCH64)
+            set(CPACK_RPM_CPU_PACKAGE_NAME "libopenvino-arm-cpu-plugin-${cpack_name_ver}")
+            set(CPACK_COMPONENT_CPU_DESCRIPTION "ARM® CPU plugin")
+            set(cpu_copyright "arm_cpu")
+        elseif(X86 OR X86_64)
+            set(CPACK_RPM_CPU_PACKAGE_NAME "libopenvino-intel-cpu-plugin-${cpack_name_ver}")
             set(CPACK_COMPONENT_CPU_DESCRIPTION "Intel® CPU")
             set(cpu_copyright "generic")
         else()
-            set(CPACK_COMPONENT_CPU_DESCRIPTION "ARM CPU")
-            set(cpu_copyright "arm_cpu")
+            message(FATAL_ERROR "Unsupported CPU architecture: ${CMAKE_SYSTEM_PROCESSOR}")
         endif()
         set(CPACK_RPM_CPU_PACKAGE_REQUIRES "${core_package}")
-        set(CPACK_RPM_CPU_PACKAGE_NAME "libopenvino-intel-cpu-plugin-${cpack_name_ver}")
         _ov_add_package(plugin_packages cpu)
     endif()
 

cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in

@@ -16,7 +16,8 @@ set(ie_options "@IE_OPTIONS@")
 list(APPEND ie_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER
                        CMAKE_CXX_LINKER_LAUNCHER CMAKE_C_LINKER_LAUNCHER
                        CMAKE_BUILD_TYPE CMAKE_SKIP_RPATH CMAKE_INSTALL_PREFIX
-                       CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET)
+                       CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET
+                       CMAKE_CONFIGURATION_TYPES CMAKE_DEFAULT_BUILD_TYPE)
 file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path)
 
 message(STATUS "The following CMake options are exported from Inference Engine Developer package")
@@ -141,6 +142,14 @@ if(ENABLE_SYSTEM_PUGIXML)
     endif()
 endif()
 
+set(_IE_nlohmann_json_FOUND "@nlohmann_json_FOUND@")
+if(_IE_nlohmann_json_FOUND)
+    find_dependency(nlohmann_json)
+    set_target_properties(nlohmann_json::nlohmann_json PROPERTIES IMPORTED_GLOBAL ON)
+    add_library(IE::nlohmann_json ALIAS nlohmann_json::nlohmann_json)
+endif()
+unset(_IE_nlohmann_json_FOUND)
+
 # inherit OpenCV from main IE project if enabled
 if ("@OpenCV_FOUND@")
     load_cache("${cache_path}" READ_WITH_PREFIX "" OpenCV_DIR)

cmake/templates/OpenVINOConfig.cmake.in

@@ -85,9 +85,9 @@
 #
 #   `OpenVINO_VERSION_MAJOR`
 #   Major version component
-# 
+#
 #   `OpenVINO_VERSION_MINOR`
-#   minor version component
+#   Minor version component
 #
 #   `OpenVINO_VERSION_PATCH`
 #   Patch version component
@@ -138,7 +138,7 @@ endmacro()
 
 macro(_ov_find_tbb)
     set(THREADING "@THREADING@")
-    if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND)
+    if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
         set(enable_pkgconfig_tbb "@tbb_FOUND@")
 
         # try tbb.pc
@@ -153,10 +153,10 @@ macro(_ov_find_tbb)
                 endif()
 
                 pkg_search_module(tbb
-                                ${pkg_config_quiet_arg}
-                                ${pkg_config_required_arg}
-                                IMPORTED_TARGET
-                                tbb)
+                                  ${pkg_config_quiet_arg}
+                                  ${pkg_config_required_arg}
+                                  IMPORTED_TARGET
+                                  tbb)
                 unset(pkg_config_quiet_arg)
                 unset(pkg_config_required_arg)
 
@@ -223,28 +223,185 @@ macro(_ov_find_tbb)
                                 PATHS ${_tbb_bind_dir}
                                 NO_CMAKE_FIND_ROOT_PATH
                                 NO_DEFAULT_PATH)
-            set_target_properties(${TBBBIND_2_5_IMPORTED_TARGETS} PROPERTIES IMPORTED_GLOBAL ON)
             unset(_tbb_bind_dir)
         endif()
         unset(install_tbbbind)
     endif()
 endmacro()
 
+macro(_ov_find_pugixml)
+    set(_OV_ENABLE_SYSTEM_PUGIXML "@ENABLE_SYSTEM_PUGIXML@")
+    if(_OV_ENABLE_SYSTEM_PUGIXML)
+        set(_ov_pugixml_pkgconfig_interface "@pugixml_FOUND@")
+        set(_ov_pugixml_cmake_interface "@PugiXML_FOUND@")
+
+        if(_ov_pugixml_pkgconfig_interface AND NOT ANDROID)
+            _ov_find_dependency(PkgConfig)
+        elseif(_ov_pugixml_cmake_interface)
+            _ov_find_dependency(PugiXML REQUIRED)
+        endif()
+
+        if(PugiXML_FOUND)
+            if(TARGET pugixml)
+                set(_ov_pugixml_target pugixml)
+            elseif(TARGET pugixml::pugixml)
+                set(_ov_pugixml_target pugixml::pugixml)
+            endif()
+            if(OpenVINODeveloperPackage_DIR)
+                set_property(TARGET ${_ov_pugixml_target} PROPERTY IMPORTED_GLOBAL ON)
+                # align with build tree
+                add_library(openvino::pugixml ALIAS ${_ov_pugixml_target})
+            endif()
+            unset(_ov_pugixml_target)
+        elseif(PkgConfig_FOUND)
+            if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
+                set(pkg_config_quiet_arg QUIET)
+            endif()
+            if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
+                set(pkg_config_required_arg REQUIRED)
+            endif()
+
+            pkg_search_module(pugixml
+                              ${pkg_config_quiet_arg}
+                              ${pkg_config_required_arg}
+                              IMPORTED_TARGET
+                              GLOBAL
+                              pugixml)
+
+            unset(pkg_config_quiet_arg)
+            unset(pkg_config_required_arg)
+
+            if(pugixml_FOUND)
+                if(OpenVINODeveloperPackage_DIR)
+                    add_library(openvino::pugixml ALIAS PkgConfig::pugixml)
+                endif()
+
+                # PATCH: on Ubuntu 18.04 pugixml.pc contains incorrect include directories
+                get_target_property(interface_include_dir PkgConfig::pugixml INTERFACE_INCLUDE_DIRECTORIES)
+                if(interface_include_dir AND NOT EXISTS "${interface_include_dir}")
+                    set_target_properties(PkgConfig::pugixml PROPERTIES
+                        INTERFACE_INCLUDE_DIRECTORIES "")
+                endif()
+            endif()
+        endif()
+
+        # debian 9 case: no cmake, no pkg-config files
+        if(NOT TARGET openvino::pugixml)
+            find_library(PUGIXML_LIBRARY NAMES pugixml DOC "Path to pugixml library")
+            if(PUGIXML_LIBRARY)
+                add_library(openvino::pugixml INTERFACE IMPORTED)
+                set_target_properties(openvino::pugixml PROPERTIES INTERFACE_LINK_LIBRARIES "${PUGIXML_LIBRARY}")
+            else()
+                message(FATAL_ERROR "Failed to find system pugixml in OpenVINO Developer Package")
+            endif()
+        endif()
+    endif()
+endmacro()
+
+macro(_ov_find_itt)
+    set(_ENABLE_PROFILING_ITT "@ENABLE_PROFILING_ITT@")
+    # whether 'ittapi' is found via find_package
+    set(_ENABLE_SYSTEM_ITTAPI "@ittapi_FOUND@")
+    if(_ENABLE_PROFILING_ITT AND _ENABLE_SYSTEM_ITTAPI)
+        _ov_find_dependency(ittapi)
+    endif()
+    unset(_ENABLE_PROFILING_ITT)
+    unset(_ENABLE_SYSTEM_ITTAPI)
+endmacro()
+
+macro(_ov_find_ade)
+    set(_OV_ENABLE_GAPI_PREPROCESSING "@ENABLE_GAPI_PREPROCESSING@")
+    # whether 'ade' is found via find_package
+    set(_ENABLE_SYSTEM_ADE "@ade_FOUND@")
+    if(_OV_ENABLE_GAPI_PREPROCESSING AND _ENABLE_SYSTEM_ADE)
+        _ov_find_dependency(ade 0.1.2)
+    endif()
+    unset(_OV_ENABLE_GAPI_PREPROCESSING)
+    unset(_ENABLE_SYSTEM_ADE)
+endmacro()
+
+macro(_ov_find_intel_cpu_dependencies)
+    set(_OV_ENABLE_CPU_ACL "@DNNL_USE_ACL@")
+    if(_OV_ENABLE_CPU_ACL)
+        if(_ov_as_external_package)
+            set_and_check(ARM_COMPUTE_LIB_DIR "@PACKAGE_ARM_COMPUTE_LIB_DIR@")
+            set(_ov_find_acl_options NO_DEFAULT_PATH)
+            set(_ov_find_acl_path "${CMAKE_CURRENT_LIST_DIR}")
+        else()
+            set_and_check(_ov_find_acl_path "@PACKAGE_FIND_ACL_PATH@")
+        endif()
+
+        _ov_find_dependency(ACL
+                            NO_MODULE
+                            PATHS "${_ov_find_acl_path}"
+                            ${_ov_find_acl_options})
+
+        unset(ARM_COMPUTE_LIB_DIR)
+        unset(_ov_find_acl_path)
+        unset(_ov_find_acl_options)
+    endif()
+    unset(_OV_ENABLE_CPU_ACL)
+endmacro()
+
+macro(_ov_find_intel_gpu_dependencies)
+    set(_OV_ENABLE_INTEL_GPU "@ENABLE_INTEL_GPU@")
+    set(_OV_ENABLE_SYSTEM_OPENCL "@ENABLE_SYSTEM_OPENCL@")
+    if(_OV_ENABLE_INTEL_GPU AND _OV_ENABLE_SYSTEM_OPENCL)
+        set(_OV_OpenCLICDLoader_FOUND "@OpenCLICDLoader_FOUND@")
+        if(_OV_OpenCLICDLoader_FOUND)
+            _ov_find_dependency(OpenCLICDLoader)
+        else()
+            _ov_find_dependency(OpenCL)
+        endif()
+        unset(_OV_OpenCLICDLoader_FOUND)
+    endif()
+    unset(_OV_ENABLE_INTEL_GPU)
+    unset(_OV_ENABLE_SYSTEM_OPENCL)
+endmacro()
+
 macro(_ov_find_intel_gna_dependencies)
     set(_OV_ENABLE_INTEL_GNA "@ENABLE_INTEL_GNA@")
-    if(_OV_ENABLE_INTEL_GNA AND NOT libGNA_FOUND)
+    if(_OV_ENABLE_INTEL_GNA)
         set_and_check(GNA_PATH "@PACKAGE_GNA_PATH@")
         _ov_find_dependency(libGNA
                             COMPONENTS KERNEL
                             CONFIG
                             PATHS "${CMAKE_CURRENT_LIST_DIR}"
-                            NO_CMAKE_FIND_ROOT_PATH
                             NO_DEFAULT_PATH)
         unset(GNA_PATH)
     endif()
     unset(_OV_ENABLE_INTEL_GNA)
 endmacro()
 
+macro(_ov_find_protobuf_frontend_dependency)
+    set(_OV_ENABLE_SYSTEM_PROTOBUF "@ENABLE_SYSTEM_PROTOBUF@")
+    # TODO: remove check for target existence
+    if(_OV_ENABLE_SYSTEM_PROTOBUF AND NOT TARGET protobuf::libprotobuf)
+        _ov_find_dependency(Protobuf @Protobuf_VERSION@ EXACT)
+    endif()
+    unset(_OV_ENABLE_SYSTEM_PROTOBUF)
+endmacro()
+
+macro(_ov_find_tensorflow_frontend_dependencies)
+    set(_OV_ENABLE_SYSTEM_SNAPPY "@ENABLE_SYSTEM_SNAPPY@")
+    set(_ov_snappy_lib "@ov_snappy_lib@")
+    # TODO: remove check for target existence
+    if(_OV_ENABLE_SYSTEM_SNAPPY AND NOT TARGET ${_ov_snappy_lib})
+        _ov_find_dependency(Snappy @Snappy_VERSION@ EXACT)
+    endif()
+    unset(_OV_ENABLE_SYSTEM_SNAPPY)
+    unset(_ov_snappy_lib)
+    set(PACKAGE_PREFIX_DIR ${_ov_package_prefix_dir})
+endmacro()
+
+macro(_ov_find_onnx_frontend_dependencies)
+    set(_OV_ENABLE_SYSTEM_ONNX "@ENABLE_SYSTEM_ONNX@")
+    if(_OV_ENABLE_SYSTEM_ONNX)
+        _ov_find_dependency(ONNX @ONNX_VERSION@ EXACT)
+    endif()
+    unset(_OV_ENABLE_SYSTEM_ONNX)
+endmacro()
+
 function(_ov_target_no_deprecation_error)
     if(NOT MSVC)
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
@@ -265,13 +422,41 @@ endfunction()
 # OpenVINO config
 #
 
+cmake_policy(PUSH)
+# we need CMP0057 to allow IN_LIST in if() command
+if(POLICY CMP0057)
+    cmake_policy(SET CMP0057 NEW)
+else()
+    message(FATAL_ERROR "OpenVINO requires CMake 3.3 or newer")
+endif()
+
 # need to store current PACKAGE_PREFIX_DIR, because it's overwritten by sub-package one
 set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}")
 
 set(_OV_ENABLE_OPENVINO_BUILD_SHARED "@BUILD_SHARED_LIBS@")
 
+if(NOT TARGET openvino)
+    set(_ov_as_external_package ON)
+endif()
+
 if(NOT _OV_ENABLE_OPENVINO_BUILD_SHARED)
+    # common openvino dependencies
     _ov_find_tbb()
+
+    _ov_find_itt()
+    _ov_find_pugixml()
+
+    # preprocessing dependencies
+    _ov_find_ade()
+
+    # frontend dependencies
+    _ov_find_protobuf_frontend_dependency()
+    _ov_find_tensorflow_frontend_dependencies()
+    _ov_find_onnx_frontend_dependencies()
+
+    # plugin dependencies
+    _ov_find_intel_cpu_dependencies()
+    _ov_find_intel_gpu_dependencies()
     _ov_find_intel_gna_dependencies()
 endif()
 
@@ -279,13 +464,26 @@ _ov_find_dependency(Threads)
 
 unset(_OV_ENABLE_OPENVINO_BUILD_SHARED)
 
-if(NOT TARGET openvino)
-    set(_ov_as_external_package ON)
+set(_ov_imported_libs openvino::runtime openvino::runtime::c
+   openvino::frontend::onnx openvino::frontend::paddle openvino::frontend::tensorflow
+   openvino::frontend::pytorch openvino::frontend::tensorflow_lite)
+
+if(_ov_as_external_package)
     include("${CMAKE_CURRENT_LIST_DIR}/OpenVINOTargets.cmake")
 
+    foreach(target IN LISTS _ov_imported_libs)
+        if(TARGET ${target})
+            get_target_property(imported_configs ${target} IMPORTED_CONFIGURATIONS)
+            if(NOT RELWITHDEBINFO IN_LIST imported_configs)
+                set_property(TARGET ${target} PROPERTY MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)
+            endif()
+            unset(imported_configs)
+        endif()
+    endforeach()
+
     # WA for cmake version < 3.16 which does not export
     # IMPORTED_LINK_DEPENDENT_LIBRARIES_** properties if no PUBLIC dependencies for the library
-    if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBB_FOUND)
+    if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
         foreach(type RELEASE DEBUG RELWITHDEBINFO MINSIZEREL)
             foreach(tbb_target TBB::tbb TBB::tbbmalloc PkgConfig::tbb)
                 if(TARGET ${tbb_target})
@@ -326,12 +524,12 @@ endif()
 # Apply common functions
 #
 
-foreach(target openvino::runtime openvino::runtime::c
-               openvino::frontend::onnx openvino::frontend::paddle openvino::frontend::tensorflow)
+foreach(target IN LISTS _ov_imported_libs)
     if(TARGET ${target} AND _ov_as_external_package)
         _ov_target_no_deprecation_error(${target})
     endif()
 endforeach()
+unset(_ov_imported_libs)
 unset(_ov_as_external_package)
 
 # restore PACKAGE_PREFIX_DIR
@@ -349,3 +547,7 @@ unset(${CMAKE_FIND_PACKAGE_NAME}_IR_FOUND)
 unset(${CMAKE_FIND_PACKAGE_NAME}_Paddle_FOUND)
 unset(${CMAKE_FIND_PACKAGE_NAME}_ONNX_FOUND)
 unset(${CMAKE_FIND_PACKAGE_NAME}_TensorFlow_FOUND)
+unset(${CMAKE_FIND_PACKAGE_NAME}_TensorFlowLite_FOUND)
+unset(${CMAKE_FIND_PACKAGE_NAME}_PyTorch_FOUND)
+
+cmake_policy(POP)

cmake/templates/OpenVINODeveloperPackageConfig.cmake.in

@@ -14,7 +14,8 @@ set(ov_options "@IE_OPTIONS@")
 list(APPEND ov_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER
                        CMAKE_CXX_LINKER_LAUNCHER CMAKE_C_LINKER_LAUNCHER
                        CMAKE_BUILD_TYPE CMAKE_SKIP_RPATH CMAKE_INSTALL_PREFIX
-                       CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET)
+                       CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET
+                       CMAKE_CONFIGURATION_TYPES CMAKE_DEFAULT_BUILD_TYPE)
 file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path)
 
 message(STATUS "The following CMake options are exported from OpenVINO Developer package")
@@ -27,6 +28,9 @@ foreach(option IN LISTS ov_options)
 endforeach()
 message(" ")
 
+# activate generation of plugins.xml
+set(ENABLE_PLUGINS_XML ON)
+
 # for samples in 3rd party projects
 if(ENABLE_SAMPLES)
     set_and_check(gflags_DIR "@gflags_BINARY_DIR@")
@@ -52,6 +56,7 @@ find_dependency(OpenVINO
                 NO_DEFAULT_PATH)
 
 _ov_find_tbb()
+_ov_find_pugixml()
 
 foreach(component @openvino_export_components@)
     # TODO: remove legacy targets from some tests
@@ -61,58 +66,6 @@ foreach(component @openvino_export_components@)
     # endif()
 endforeach()
 
-if(ENABLE_SYSTEM_PUGIXML)
-    set(_ov_pugixml_pkgconfig_interface "@pugixml_FOUND@")
-    set(_ov_pugixml_cmake_interface "@PugiXML_FOUND@")
-    if(_ov_pugixml_pkgconfig_interface)
-        find_dependency(PkgConfig)
-    elseif(_ov_pugixml_cmake_interface)
-        find_dependency(PugiXML)
-    endif()
-    if(PugiXML_FOUND)
-        set_property(TARGET pugixml PROPERTY IMPORTED_GLOBAL TRUE)
-        add_library(openvino::pugixml ALIAS pugixml)
-    elseif(PkgConfig_FOUND)
-        if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
-            set(pkg_config_quiet_arg QUIET)
-        endif()
-        if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
-            set(pkg_config_required_arg REQUIRED)
-        endif()
-
-        pkg_search_module(pugixml
-                          ${pkg_config_quiet_arg}
-                          ${pkg_config_required_arg}
-                          IMPORTED_TARGET GLOBAL
-                          pugixml)
-
-        unset(pkg_config_quiet_arg)
-        unset(pkg_config_required_arg)
-
-        if(pugixml_FOUND)
-            add_library(openvino::pugixml ALIAS PkgConfig::pugixml)
-
-            # PATCH: on Ubuntu 18.04 pugixml.pc contains incorrect include directories
-            get_target_property(interface_include_dir PkgConfig::pugixml INTERFACE_INCLUDE_DIRECTORIES)
-            if(interface_include_dir AND NOT EXISTS "${interface_include_dir}")
-                set_target_properties(PkgConfig::pugixml PROPERTIES
-                    INTERFACE_INCLUDE_DIRECTORIES "")
-            endif()
-        endif()
-    endif()
-
-    # debian 9 case: no cmake, no pkg-config files
-    if(NOT TARGET openvino::pugixml)
-        find_library(PUGIXML_LIBRARY NAMES pugixml DOC "Path to pugixml library")
-        if(PUGIXML_LIBRARY)
-            add_library(openvino::pugixml INTERFACE IMPORTED GLOBAL)
-            set_target_properties(openvino::pugixml PROPERTIES INTERFACE_LINK_LIBRARIES "${PUGIXML_LIBRARY}")
-        else()
-            message(FATAL_ERROR "Failed to find system pugixml in OpenVINO Developer Package")
-        endif()
-    endif()
-endif()
-
 # inherit OpenCV from main OpenVINO project if enabled
 if ("@OpenCV_FOUND@")
     load_cache("${cache_path}" READ_WITH_PREFIX "" OpenCV_DIR)

cmake/test_model_zoo.cmake

@@ -42,11 +42,12 @@ function(ov_model_convert SRC DST OUT)
         endif()
 
         set(full_out_name "${DST}/${rel_out_name}")
-        file(MAKE_DIRECTORY "${DST}/${rel_dir}")
 
         if(ext STREQUAL ".prototxt")
             # convert .prototxt models to .onnx binary
             add_custom_command(OUTPUT ${full_out_name}
+                COMMAND ${CMAKE_COMMAND} -E make_directory
+                    "${DST}/${rel_dir}"
                 COMMAND ${PYTHON_EXECUTABLE} ${onnx_gen_script}
                     "${SRC}/${in_file}" ${full_out_name}
                 DEPENDS ${onnx_gen_script} "${SRC}/${in_file}"
@@ -55,6 +56,8 @@ function(ov_model_convert SRC DST OUT)
                 WORKING_DIRECTORY "${model_source_dir}")
         else()
             add_custom_command(OUTPUT ${full_out_name}
+                COMMAND ${CMAKE_COMMAND} -E make_directory
+                    "${DST}/${rel_dir}"
                 COMMAND "${CMAKE_COMMAND}" -E copy_if_different
                     "${SRC}/${in_file}" ${full_out_name}
                 DEPENDS ${onnx_gen_script} "${SRC}/${in_file}"
@@ -68,18 +71,24 @@ function(ov_model_convert SRC DST OUT)
     set(${OUT} ${files} PARENT_SCOPE)
 endfunction()
 
+if(OV_GENERATOR_MULTI_CONFIG AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
+    set(test_model_zoo_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/test_model_zoo")
+else()
+    set(test_model_zoo_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo")
+endif()
+
 ov_model_convert("${CMAKE_CURRENT_SOURCE_DIR}/src/core/tests"
-                 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo/core"
+                 "${test_model_zoo_output_dir}/core"
                   core_tests_out_files)
 
 set(rel_path "src/tests/functional/plugin/shared/models")
 ov_model_convert("${OpenVINO_SOURCE_DIR}/${rel_path}"
-                 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo/func_tests/models"
+                 "${test_model_zoo_output_dir}/func_tests/models"
                  ft_out_files)
 
 set(rel_path "src/frontends/onnx/tests/models")
 ov_model_convert("${OpenVINO_SOURCE_DIR}/${rel_path}"
-                 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo/onnx"
+                 "${test_model_zoo_output_dir}/onnx"
                  onnx_fe_out_files)
 
 if(ENABLE_TESTS)
@@ -87,11 +96,12 @@ if(ENABLE_TESTS)
                                              ${ft_out_files}
                                              ${onnx_fe_out_files})
 
-    if (ENABLE_OV_PADDLE_FRONTEND)
-        add_dependencies(test_model_zoo paddle_test_models)
-    endif()
+    # TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
+    #if (ENABLE_OV_PADDLE_FRONTEND)
+    #    add_dependencies(test_model_zoo paddle_test_models)
+    #endif()
 
-    install(DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo"
+    install(DIRECTORY "${test_model_zoo_output_dir}"
             DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL)
 
     set(TEST_MODEL_ZOO "./test_model_zoo" CACHE PATH "Path to test model zoo")

cmake/toolchains/mingw-w64.toolchain.cmake

@@ -0,0 +1,95 @@
+# Copyright (C) 2018-2023 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Prerequisites:
+#
+# Build platform: Ubuntu
+# apt-get install mingw-w64 mingw-w64-tools g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64
+#
+# Build platform: macOS
+# brew install mingw-w64
+#
+
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
+set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)
+set(PKG_CONFIG_EXECUTABLE x86_64-w64-mingw32-pkg-config CACHE PATH "Path to Windows x86_64 pkg-config")
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+macro(__cmake_find_root_save_and_reset)
+    foreach(v
+            CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
+            CMAKE_FIND_ROOT_PATH_MODE_INCLUDE
+            CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
+            CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
+            )
+        set(__save_${v} ${${v}})
+        set(${v} NEVER)
+    endforeach()
+endmacro()
+
+macro(__cmake_find_root_restore)
+    foreach(v
+            CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
+            CMAKE_FIND_ROOT_PATH_MODE_INCLUDE
+            CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
+            CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
+            )
+        set(${v} ${__save_${v}})
+        unset(__save_${v})
+    endforeach()
+endmacro()
+
+
+# macro to find programs on the host OS
+macro(find_host_program)
+    __cmake_find_root_save_and_reset()
+    if(CMAKE_HOST_WIN32)
+        SET(WIN32 1)
+        SET(UNIX)
+        SET(APPLE)
+    elseif(CMAKE_HOST_APPLE)
+        SET(APPLE 1)
+        SET(UNIX)
+        SET(WIN32)
+    elseif(CMAKE_HOST_UNIX)
+        SET(UNIX 1)
+        SET(WIN32)
+        SET(APPLE)
+    endif()
+    find_program(${ARGN})
+    SET(WIN32 1)
+    SET(APPLE)
+    SET(UNIX)
+    __cmake_find_root_restore()
+endmacro()
+
+# macro to find packages on the host OS
+macro(find_host_package)
+    __cmake_find_root_save_and_reset()
+    if(CMAKE_HOST_WIN32)
+        SET(WIN32 1)
+        SET(UNIX)
+        SET(APPLE)
+    elseif(CMAKE_HOST_APPLE)
+        SET(APPLE 1)
+        SET(WIN32)
+        SET(UNIX)
+    elseif(CMAKE_HOST_UNIX)
+        SET(UNIX 1)
+        SET(WIN32)
+        SET(APPLE)
+    endif()
+    find_package(${ARGN})
+    SET(WIN32 1)
+    SET(APPLE)
+    SET(UNIX)
+    __cmake_find_root_restore()
+endmacro()

cmake/toolchains/riscv64-gnu.toolchain.cmake

@@ -24,7 +24,7 @@ set(CMAKE_LINKER ${RISCV_TOOLCHAIN_ROOT}/bin/riscv64-unknown-linux-gnu-ld)
 set(CMAKE_OBJCOPY ${RISCV_TOOLCHAIN_ROOT}/bin/riscv64-unknown-linux-gnu-objcopy)
 set(CMAKE_OBJDUMP ${RISCV_TOOLCHAIN_ROOT}/bin/riscv64-unknown-linux-gnu-objdump)
 set(CMAKE_READELF ${RISCV_TOOLCHAIN_ROOT}/bin/riscv64-unknown-linux-gnu-readelf)
-set(PKG_CONFIG_EXECUTABLE "NOT-FOUND" CACHE PATH "Path to ARM64 pkg-config")
+set(PKG_CONFIG_EXECUTABLE "NOT-FOUND" CACHE PATH "Path to RISC-V pkg-config")
 
 # Don't run the linker on compiler check
 set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)

cmake/toolchains/x86_64.linux.toolchain.cmake

@@ -0,0 +1,75 @@
+# Copyright (C) 2018-2023 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR amd64)
+
+set(CMAKE_C_COMPILER x86_64-linux-gnu-gcc)
+set(CMAKE_CXX_COMPILER x86_64-linux-gnu-g++)
+set(CMAKE_STRIP x86_64-linux-gnu-strip)
+set(PKG_CONFIG_EXECUTABLE "NOT-FOUND" CACHE PATH "Path to amd64 pkg-config")
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+macro(__cmake_find_root_save_and_reset)
+    foreach(v
+            CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
+            CMAKE_FIND_ROOT_PATH_MODE_INCLUDE
+            CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
+            CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
+            )
+        set(__save_${v} ${${v}})
+        set(${v} NEVER)
+    endforeach()
+endmacro()
+
+macro(__cmake_find_root_restore)
+    foreach(v
+            CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
+            CMAKE_FIND_ROOT_PATH_MODE_INCLUDE
+            CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
+            CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
+            )
+        set(${v} ${__save_${v}})
+        unset(__save_${v})
+    endforeach()
+endmacro()
+
+
+# macro to find programs on the host OS
+macro(find_host_program)
+    __cmake_find_root_save_and_reset()
+    if(CMAKE_HOST_WIN32)
+        SET(WIN32 1)
+        SET(UNIX)
+    elseif(CMAKE_HOST_APPLE)
+        SET(APPLE 1)
+        SET(UNIX)
+    endif()
+    find_program(${ARGN})
+    SET(WIN32)
+    SET(APPLE)
+    SET(UNIX 1)
+    __cmake_find_root_restore()
+endmacro()
+
+# macro to find packages on the host OS
+macro(find_host_package)
+    __cmake_find_root_save_and_reset()
+    if(CMAKE_HOST_WIN32)
+        SET(WIN32 1)
+        SET(UNIX)
+    elseif(CMAKE_HOST_APPLE)
+        SET(APPLE 1)
+        SET(UNIX)
+    endif()
+    find_package(${ARGN})
+    SET(WIN32)
+    SET(APPLE)
+    SET(UNIX 1)
+    __cmake_find_root_restore()
+endmacro()

conan.lock

@@ -0,0 +1,36 @@
+{
+    "version": "0.5",
+    "requires": [
+        "zlib/1.2.13#97d5730b529b4224045fe7090592d4c1%1692672717.049",
+        "xbyak/6.73#250bc3bc73379f90f255876c1c00a4cd%1691853024.351",
+        "snappy/1.1.10#916523630083f6d855cb2977de8eefb6%1689780661.062",
+        "pybind11/2.10.4#dd44c80a5ed6a2ef11194380daae1248%1682692198.909",
+        "pugixml/1.13#f615c1fcec55122b2e177d17061276e7%1691917296.869",
+        "protobuf/3.21.12#d9f5f4e3b86552552dda4c0a2e928eeb%1685218275.69",
+        "opencl-icd-loader/2023.04.17#5f73dd9f0c023d416a7f162e320b9c77%1692732261.088",
+        "opencl-headers/2023.04.17#3d98f2d12a67c2400de6f11d5335b5a6%1683936272.16",
+        "opencl-clhpp-headers/2023.04.17#7c62fcc7ac2559d4839150d2ebaac5c8%1685450803.672",
+        "onnx/1.13.1#f11071c8aba52731a5205b028945acbb%1693130310.715",
+        "onetbb/2021.10.0#cbb2fc43088070b48f6e4339bc8fa0e1%1693812561.235",
+        "nlohmann_json/3.11.2#a35423bb6e1eb8f931423557e282c7ed%1666619820.488",
+        "ittapi/3.24.0#9246125f13e7686dee2b0c992b71db94%1682969872.743",
+        "hwloc/2.9.2#1c63e2eccac57048ae226e6c946ebf0e%1688677682.002",
+        "gflags/2.2.2#48d1262ffac8d30c3224befb8275a533%1676224985.343",
+        "flatbuffers/23.5.26#b153646f6546daab4c7326970b6cd89c%1685838458.449",
+        "ade/0.1.2a#b569ff943843abd004e65536e265a445%1688125447.482"
+    ],
+    "build_requires": [
+        "zlib/1.2.13#97d5730b529b4224045fe7090592d4c1%1692672717.049",
+        "protobuf/3.21.12#d9f5f4e3b86552552dda4c0a2e928eeb%1685218275.69",
+        "protobuf/3.21.9#515ceb0a1653cf84363d9968b812d6be%1678364058.993",
+        "patchelf/0.13#0eaada8970834919c3ce14355afe7fac%1680534241.341",
+        "m4/1.4.19#c1c4b1ee919e34630bb9b50046253d3c%1676610086.39",
+        "libtool/2.4.6#9ee8efc04c2e106e7fba13bb1e477617%1677509454.345",
+        "gnu-config/cci.20210814#15c3bf7dfdb743977b84d0321534ad90%1681250000.747",
+        "flatbuffers/23.5.26#b153646f6546daab4c7326970b6cd89c%1685838458.449",
+        "cmake/3.27.4#a7e78418b024dccacccc887f049f47ed%1693515860.005",
+        "automake/1.16.5#058bda3e21c36c9aa8425daf3c1faf50%1688481772.751",
+        "autoconf/2.71#53be95d228b2dcb30dc199cb84262d8f%1693395343.513"
+    ],
+    "python_requires": []
+}

conanfile.txt

@@ -0,0 +1,33 @@
+[requires]
+ade/0.1.2a
+onetbb/[>=2021.2.1]
+pugixml/[>=1.10]
+protobuf/3.21.12
+ittapi/[>=3.23.0]
+zlib/[>=1.2.8]
+opencl-icd-loader/[>=2022.09.30]
+# opencl-clhpp-headers/[>=2022.09.30]
+opencl-headers/[>=2022.09.30]
+xbyak/[>=6.62]
+snappy/[>=1.1.7]
+gflags/2.2.2
+onnx/1.13.1
+nlohmann_json/[>=3.1.1]
+pybind11/[>=2.10.1]
+flatbuffers/[>=22.9.24]
+
+[tool_requires]
+cmake/[>=3.15]
+patchelf/[>=0.12]
+protobuf/3.21.9
+flatbuffers/[>=22.9.24]
+
+[options]
+protobuf/*:lite=True
+onetbb/*:tbbmalloc=True
+onetbb/*:tbbproxy=True
+flatbuffers/*:header_only=True
+
+[generators]
+CMakeDeps
+CMakeToolchain

docs/CMakeLists.txt

@@ -77,7 +77,7 @@ function(build_docs)
     if(ENABLE_OPENVINO_NOTEBOOKS)
         set(NBDOC_SCRIPT "${DOCS_SOURCE_DIR}/nbdoc/nbdoc.py")
         list(APPEND commands
-            COMMAND ${PYTHON_EXECUTABLE} "${NBDOC_SCRIPT}" "${RST_OUTPUT}/notebooks"
+            COMMAND ${PYTHON_EXECUTABLE} "${NBDOC_SCRIPT}" "${DOCS_SOURCE_DIR}/notebooks" "${RST_OUTPUT}/notebooks"
         )
     endif()
 

docs/Documentation/datumaro.md

@@ -0,0 +1,76 @@
+# Datumaro {#datumaro_documentation}
+
+@sphinxdirective
+
+.. meta::
+   :description: Start working with Datumaro, which offers functionalities for basic data 
+                 import/export, validation, correction, filtration and transformations.
+
+
+Datumaro provides a suite of basic data import/export (IE) for more than 35 public vision data
+formats and manipulation functionalities such as validation, correction, filtration, and some
+transformations. To achieve the web-scale training, this further aims to merge multiple
+heterogeneous datasets through comparator and merger. Datumaro is integrated into Geti™, OpenVINO™
+Training Extensions, and CVAT for the ease of data preparation. Datumaro is open-sourced and
+available on `GitHub <https://github.com/openvinotoolkit/datumaro>`__.
+Refer to the official `documentation <https://openvinotoolkit.github.io/datumaro/stable/docs/get-started/introduction.html>`__ to learn more.
+Plus, enjoy `Jupyter notebooks <https://github.com/openvinotoolkit/datumaro/tree/develop/notebooks>`__ for the real Datumaro practices.
+
+Detailed Workflow
+#################
+
+.. image:: ./_static/images/datumaro.png
+
+1. To start working with Datumaro, download public datasets or prepare your own annotated dataset.
+
+   .. note:: 
+      Datumaro provides a CLI `datum download` for downloading `TensorFlow Datasets <https://www.tensorflow.org/datasets>`__.
+
+2. Import data into Datumaro and manipulate the dataset for the data quality using `Validator`, `Corrector`, and `Filter`.
+
+3. Compare two datasets and transform the label schemas (category information) before merging them.
+
+4. Merge two datasets to a large-scale dataset.
+
+   .. note:: 
+      There are some choices of merger, i.e., `ExactMerger`, `IntersectMerger`, and `UnionMerger`.
+
+5. Split the unified dataset into subsets, e.g., `train`, `valid`, and `test` through `Splitter`.
+
+   .. note:: 
+      We can split data with a given ratio of subsets according to both the number of samples or
+      annotations. Please see `SplitTask` for the task-specific split.
+
+6. Export the cleaned and unified dataset for follow-up workflows such as model training.
+Go to :doc:`OpenVINO™ Training Extensions <ote_documentation>`.
+
+If the results are unsatisfactory, add datasets and perform the same steps, starting with dataset annotation.
+
+Datumaro Components
+###################
+
+* `Datumaro CLIs <https://openvinotoolkit.github.io/datumaro/stable/docs/command-reference/overview.html>`__
+* `Datumaro APIs <https://openvinotoolkit.github.io/datumaro/stable/docs/reference/datumaro_module.html>`__
+* `Datumaro data format <https://openvinotoolkit.github.io/datumaro/stable/docs/data-formats/datumaro_format.html>`__
+* `Supported data formats <https://openvinotoolkit.github.io/datumaro/stable/docs/data-formats/formats/index.html>`__
+
+Tutorials
+#########
+
+* `Basic skills <https://openvinotoolkit.github.io/datumaro/stable/docs/level-up/basic_skills/index.html>`__
+* `Intermediate skills <https://openvinotoolkit.github.io/datumaro/stable/docs/level-up/intermediate_skills/index.html>`__
+* `Advanced skills <https://openvinotoolkit.github.io/datumaro/stable/docs/level-up/advanced_skills/index.html>`__
+
+Python Hands-on Examples
+########################
+
+* `Data IE <https://openvinotoolkit.github.io/datumaro/stable/docs/jupyter_notebook_examples/dataset_IO.html>`__
+* `Data manipulation <https://openvinotoolkit.github.io/datumaro/stable/docs/jupyter_notebook_examples/manipulate.html>`__
+* `Data exploration <https://openvinotoolkit.github.io/datumaro/stable/docs/jupyter_notebook_examples/explore.html>`__
+* `Data refinement <https://openvinotoolkit.github.io/datumaro/stable/docs/jupyter_notebook_examples/refine.html>`__
+* `Data transformation <https://openvinotoolkit.github.io/datumaro/stable/docs/jupyter_notebook_examples/transform.html>`__
+* `Deep learning end-to-end use-cases <https://openvinotoolkit.github.io/datumaro/stable/docs/jupyter_notebook_examples/e2e_example.html>`__
+
+
+@endsphinxdirective 
+

docs/Documentation/deployment_guide_introduction.md

@@ -1,37 +0,0 @@
-# Running and Deploying Inference {#openvino_docs_deployment_guide_introduction}
-
-@sphinxdirective
-
-.. toctree::
-   :maxdepth: 1
-   :hidden:
-
-   Run and Deploy Locally <openvino_deployment_guide>
-   Deploy via Model Serving <ovms_what_is_openvino_model_server>
-
-@endsphinxdirective
-
-
-Once you have a model that meets both OpenVINO™ and your requirements, you can choose how to deploy it with your application.
-
-@sphinxdirective
-.. panels::
-
-    :doc:`Deploy via OpenVINO Runtime <openvino_deployment_guide>` 
-    ^^^^^^^^^^^^^^
-
-    Local deployment uses OpenVINO Runtime that is called from, and linked to, the application directly. 
-    It utilizes resources available to the system and provides the quickest way of launching inference.
-    ---
-
-    :doc:`Deploy via Model Server <ovms_what_is_openvino_model_server>`
-    ^^^^^^^^^^^^^^
-
-    Deployment via OpenVINO Model Server allows the application to connect to the inference server set up remotely. 
-    This way inference can use external resources instead of those available to the application itself. 
-
-@endsphinxdirective
-
-
-
-Apart from the default deployment options, you may also [deploy your application for the TensorFlow framework with OpenVINO Integration](./openvino_ecosystem_ovtf.md).

docs/Documentation/dl_workbench_overview.md

@@ -1,15 +0,0 @@
-# OpenVINO™ Deep Learning Workbench Overview {#workbench_docs_Workbench_DG_Introduction}
-
-@sphinxdirective
-.. toctree::
-   :maxdepth: 1
-   :hidden:
-
-   workbench_docs_Workbench_DG_Install
-   workbench_docs_Workbench_DG_Work_with_Models_and_Sample_Datasets
-   Tutorials <workbench_docs_Workbench_DG_Tutorials>
-   User Guide <workbench_docs_Workbench_DG_User_Guide>
-   workbench_docs_Workbench_DG_Troubleshooting
-
-@endsphinxdirective
-

docs/Documentation/inference_modes_overview.md

@@ -10,15 +10,15 @@
    openvino_docs_OV_UG_Running_on_multiple_devices
    openvino_docs_OV_UG_Hetero_execution
    openvino_docs_OV_UG_Automatic_Batching
- 
-@endsphinxdirective
 
-OpenVINO Runtime offers multiple inference modes to allow optimum hardware utilization under different conditions. The most basic one is a single-device mode, which defines just one device responsible for the entire inference workload. It supports a range of Intel hardware by means of plugins embedded in the Runtime library, each set up to offer the best possible performance. For a complete list of supported devices and instructions on how to use them, refer to the [guide on inference devices](../OV_Runtime_UG/supported_plugins/Device_Plugins.md).
+
+OpenVINO Runtime offers multiple inference modes to allow optimum hardware utilization under different conditions. The most basic one is a single-device mode, which defines just one device responsible for the entire inference workload. It supports a range of Intel hardware by means of plugins embedded in the Runtime library, each set up to offer the best possible performance. For a complete list of supported devices and instructions on how to use them, refer to the :doc:`guide on inference devices <openvino_docs_OV_UG_Working_with_devices>`.
 
 The remaining modes assume certain levels of automation in selecting devices for inference. Using them in the deployed solution may potentially increase its performance and portability. The automated modes are:
 
-* [Automatic Device Selection (AUTO)](../OV_Runtime_UG/auto_device_selection.md)
-* [Multi-Device Execution (MULTI)](../OV_Runtime_UG/multi_device.md)
-* [Heterogeneous Execution (HETERO)](../OV_Runtime_UG/hetero_execution.md)
-* [Automatic Batching Execution (Auto-batching)](../OV_Runtime_UG/automatic_batching.md)
+* :doc:`Automatic Device Selection (AUTO) <openvino_docs_OV_UG_supported_plugins_AUTO>`
+* :doc:`Multi-Device Execution (MULTI) <openvino_docs_OV_UG_Running_on_multiple_devices>`
+* :doc:`Heterogeneous Execution (HETERO) <openvino_docs_OV_UG_Hetero_execution>`
+* :doc:`Automatic Batching Execution (Auto-batching) <openvino_docs_OV_UG_Automatic_Batching>`
 
+@endsphinxdirective

docs/Documentation/media_processing_cv_libraries.md

@@ -2,6 +2,10 @@
 
 @sphinxdirective
 
+.. meta::
+  :description: Explore OpenCV Graph API and other media processing frameworks 
+                used for development of computer vision solutions.
+
 .. toctree::
    :maxdepth: 1
 

docs/Documentation/model_introduction.md

@@ -1,6 +1,12 @@
 # Model Preparation {#openvino_docs_model_processing_introduction}
 
 @sphinxdirective
+
+.. meta::
+   :description: Preparing models for OpenVINO Runtime. Learn about the methods 
+                 used to read, convert and compile models from different frameworks.
+
+
 .. toctree::
    :maxdepth: 1
    :hidden:
@@ -9,22 +15,53 @@
    openvino_docs_MO_DG_Deep_Learning_Model_Optimizer_DevGuide
    omz_tools_downloader
 
-@endsphinxdirective
+
+Every deep learning workflow begins with obtaining a model. You can choose to prepare a custom one, use a ready-made solution and adjust it to your needs, or even download and run a pre-trained network from an online database, such as `TensorFlow Hub <https://tfhub.dev/>`__, `Hugging Face <https://huggingface.co/>`__, or `Torchvision models <https://pytorch.org/hub/>`__.
+
+Import a model using ``read_model()``
+#################################################
+
+Model files (not Python objects) from :doc:`ONNX, PaddlePaddle, TensorFlow and TensorFlow Lite <Supported_Model_Formats>`  (check :doc:`TensorFlow Frontend Capabilities and Limitations <openvino_docs_MO_DG_TensorFlow_Frontend>`) do not require a separate step for model conversion, that is ``mo.convert_model``.
+
+The ``read_model()`` method reads a model from a file and produces `openvino.runtime.Model <api/ie_python_api/_autosummary/openvino.runtime.Model.html>`__. If the file is in one of the supported original framework :doc:`file formats <Supported_Model_Formats>`, the method runs internal conversion to an OpenVINO model format. If the file is already in the :doc:`OpenVINO IR format <openvino_ir>`, it is read "as-is", without any conversion involved.
+
+You can also convert a model from original framework to `openvino.runtime.Model <api/ie_python_api/_autosummary/openvino.runtime.Model.html>`__ using ``convert_model()`` method. More details about ``convert_model()`` are provided in :doc:`model conversion guide <openvino_docs_MO_DG_Deep_Learning_Model_Optimizer_DevGuide>` .
+
+``ov.Model`` can be serialized to IR using the ``ov.serialize()`` method. The serialized IR can be further optimized using :doc:`Neural Network Compression Framework (NNCF) <ptq_introduction>` that applies post-training quantization methods.
+
+.. note::
+
+   ``convert_model()`` also allows you to perform input/output cut, add pre-processing or add custom Python conversion extensions.
+
+Convert a model with Python using ``mo.convert_model()``
+###########################################################
+
+Model conversion API, specifically, the ``mo.convert_model()`` method converts a model from original framework to ``ov.Model``. ``mo.convert_model()`` returns ``ov.Model`` object in memory so the ``read_model()`` method is not required. The resulting ``ov.Model`` can be inferred in the same training environment (python script or Jupiter Notebook). ``mo.convert_model()`` provides a convenient way to quickly switch from framework-based code to OpenVINO-based code in your inference application. 
+
+In addition to model files, ``mo.convert_model()`` can take OpenVINO extension objects constructed directly in Python for easier conversion of operations that are not supported in OpenVINO. The ``mo.convert_model()`` method also has a set of parameters to :doc:`cut the model <openvino_docs_MO_DG_prepare_model_convert_model_Cutting_Model>`, :doc:`set input shapes or layout <openvino_docs_MO_DG_prepare_model_convert_model_Converting_Model>`, :doc:`add preprocessing <openvino_docs_MO_DG_Additional_Optimization_Use_Cases>`, etc.
+
+The figure below illustrates the typical workflow for deploying a trained deep learning model, where IR is a pair of files describing the model:
+
+* ``.xml`` - Describes the network topology.
+* ``.bin`` - Contains the weights and biases binary data.
+
+.. image:: _static/images/model_conversion_diagram.svg
+   :alt: model conversion diagram
 
 
-Every deep learning workflow begins with obtaining a model. You can choose to prepare a custom one, use a ready-made solution and adjust it to your needs, or even download and run a pre-trained network from an online database, such as OpenVINO's [Open Model Zoo](../model_zoo.md).  
+Convert a model using ``mo`` command-line tool
+#################################################
 
-[OpenVINO™ supports several model formats](../MO_DG/prepare_model/convert_model/supported_model_formats.md) and allows to convert them to it's own, OpenVINO IR, providing a tool dedicated to this task.
+Another option to convert a model is to use ``mo`` command-line tool. ``mo`` is a cross-platform tool that facilitates the transition between training and deployment environments, performs static model analysis, and adjusts deep learning models for optimal execution on end-point target devices in the same measure, as the ``mo.convert_model()`` method.
 
-[Model Optimizer](../MO_DG/Deep_Learning_Model_Optimizer_DevGuide.md) reads the original model and creates the OpenVINO IR model (.xml and .bin files) so that inference can ultimately be performed without delays due to format conversion. Optionally, Model Optimizer can adjust the model to be more suitable for inference, for example, by [alternating input shapes](../MO_DG/prepare_model/convert_model/Converting_Model.md), [embedding preprocessing](../MO_DG/prepare_model/Additional_Optimizations.md) and [cutting training parts off](../MO_DG/prepare_model/convert_model/Cutting_Model.md).
+``mo`` requires the use of a pre-trained deep learning model in one of the supported formats: TensorFlow, TensorFlow Lite, PaddlePaddle, or ONNX. ``mo`` converts the model to the OpenVINO Intermediate Representation format (IR), which needs to be read with the ``ov.read_model()`` method. Then, you can compile and infer the ``ov.Model`` later with :doc:`OpenVINO™ Runtime <openvino_docs_OV_UG_OV_Runtime_User_Guide>`.
 
-The approach to fully convert a model is considered the default choice, as it allows the full extent of OpenVINO features. The OpenVINO IR model format is used by other conversion and preparation tools, such as the Post-Training Optimization Tool, for further optimization of the converted model.
-
-Conversion is not required for ONNX and PaddlePaddle models, as OpenVINO provides C++ and Python APIs for importing them to OpenVINO Runtime directly. It provides a convenient way to quickly switch from framework-based code to OpenVINO-based code in your inference application.
+The results of both ``mo`` and ``mo.convert_model()`` conversion methods described above are the same. You can choose one of them, depending on what is most convenient for you. Keep in mind that there should not be any differences in the results of model conversion if the same set of parameters is used.
 
 This section describes how to obtain and prepare your model for work with OpenVINO to get the best inference results:
-* [See the supported formats and how to use them in your project](../MO_DG/prepare_model/convert_model/supported_model_formats.md)
-* [Convert different model formats to the OpenVINO IR format](../MO_DG/Deep_Learning_Model_Optimizer_DevGuide.md).
-* [Automate model-related tasks with Model Downloader and additional OMZ Tools](https://docs.openvino.ai/latest/omz_tools_downloader.html).
 
-To begin with, you may want to [browse a database of models for use in your projects](../model_zoo.md).
+* :doc:`See the supported formats and how to use them in your project <Supported_Model_Formats>`.
+* :doc:`Convert different model formats to the ov.Model format <openvino_docs_MO_DG_Deep_Learning_Model_Optimizer_DevGuide>`.
+
+
+@endsphinxdirective

docs/Documentation/openvino_ecosystem.md

@@ -2,82 +2,99 @@
 
 @sphinxdirective
 
+.. meta::
+   :description: OpenVINO™ is an ecosystem of utilities that have advanced capabilities, which help develop deep learning solutions.
+
+
 .. toctree::
    :maxdepth: 1
    :hidden:
 
-   ovtf_integration
    ote_documentation
+   datumaro_documentation
    ovsa_get_started
-   openvino_inference_engine_tools_compile_tool_README
    openvino_docs_tuning_utilities
-   workbench_docs_Workbench_DG_Introduction
-
-@endsphinxdirective
-
 
 
 OpenVINO™ is not just one tool. It is an expansive ecosystem of utilities, providing a comprehensive workflow for deep learning solution development. Learn more about each of them to reach the full potential of OpenVINO™ Toolkit.
 
-### Neural Network Compression Framework (NNCF)
+
+
+**Neural Network Compression Framework (NNCF)**
+
 A suite of advanced algorithms for Neural Network inference optimization with minimal accuracy drop. NNCF applies quantization, filter pruning, binarization and sparsity algorithms to PyTorch and TensorFlow models during training.
 
 More resources:
-* [Documentation](@ref tmo_introduction)
-* [GitHub](https://github.com/openvinotoolkit/nncf)
-* [PyPI](https://pypi.org/project/nncf/)
 
-### OpenVINO™ Security Add-on	 
-A solution for Model Developers and Independent Software Vendors to use secure packaging and secure model execution.	 
-
-More resources:
-* [documentation](https://docs.openvino.ai/latest/ovsa_get_started.html)
-* [GitHub](https://github.com/openvinotoolkit/security_addon)
+* :doc:`Documentation <tmo_introduction>`  
+* `GitHub <https://github.com/openvinotoolkit/nncf>`__  
+* `PyPI <https://pypi.org/project/nncf/>`__  
 
 
-### OpenVINO™ integration with TensorFlow (OVTF)
-A solution empowering TensorFlow developers with OpenVINO's optimization capabilities. With just two lines of code in your application, you can offload inference to OpenVINO, while keeping the TensorFlow API.
+**OpenVINO™ Training Extensions**
 
-More resources:
-* [documentation](https://github.com/openvinotoolkit/openvino_tensorflow)	 
-* [PyPI](https://pypi.org/project/openvino-tensorflow/) 
-* [GitHub](https://github.com/openvinotoolkit/openvino_tensorflow)
-
-### DL Streamer		
-A streaming media analytics framework, based on the GStreamer multimedia framework, for creating complex media analytics pipelines.
-
-More resources:
-* [documentation on GitHub](https://dlstreamer.github.io/index.html)
-* [installation Guide on GitHub](https://github.com/openvinotoolkit/dlstreamer_gst/wiki/Install-Guide)
-
-### DL Workbench
-A web-based tool for deploying deep learning models. Built on the core of OpenVINO and equipped with a graphics user interface, DL Workbench is a great way to explore the possibilities of the OpenVINO workflow, import, analyze, optimize, and build your pre-trained models. You can do all that by visiting [Intel® DevCloud for the Edge](https://software.intel.com/content/www/us/en/develop/tools/devcloud.html) and launching DL Workbench on-line.
-
-More resources:
-* [documentation](dl_workbench_overview.md)
-* [Docker Hub](https://hub.docker.com/r/openvino/workbench)
-* [PyPI](https://pypi.org/project/openvino-workbench/)
-
-### OpenVINO™ Training Extensions (OTE)
 A convenient environment to train Deep Learning models and convert them using the OpenVINO™ toolkit for optimized inference.
 
 More resources:
-* [GitHub](https://github.com/openvinotoolkit/training_extensions)
 
-### Computer Vision Annotation Tool (CVAT)
-An online, interactive video and image annotation tool for computer vision purposes.
+* :doc:`Overview <ote_documentation>`
+* `GitHub <https://github.com/openvinotoolkit/training_extensions>`__
+* `Documentation <https://openvinotoolkit.github.io/training_extensions/stable/guide/get_started/introduction.html>`__
+
+
+**OpenVINO™ Security Add-on**
+
+A solution for Model Developers and Independent Software Vendors to use secure packaging and secure model execution.	 
 
 More resources:
-* [documentation on GitHub](https://opencv.github.io/cvat/docs/)	
-* [web application](https://cvat.org/) 
-* [Docker Hub](https://hub.docker.com/r/openvino/cvat_server) 
-* [GitHub](https://github.com/openvinotoolkit/cvat)
 
-### Dataset Management Framework (Datumaro)
+* :doc:`Documentation <ovsa_get_started>`
+* `GitHub <https://github.com/openvinotoolkit/security_addon>`__  
+
+**Dataset Management Framework (Datumaro)**
+
 A framework and CLI tool to build, transform, and analyze datasets.
 
 More resources:
-* [documentation on GitHub](https://openvinotoolkit.github.io/datumaro/docs/)
-* [PyPI](https://pypi.org/project/datumaro/)
-* [GitHub](https://github.com/openvinotoolkit/datumaro)
+ 
+* :doc:`Overview <datumaro_documentation>`
+* `PyPI <https://pypi.org/project/datumaro/>`__  
+* `GitHub <https://github.com/openvinotoolkit/datumaro>`__  
+* `Documentation <https://openvinotoolkit.github.io/datumaro/stable/docs/get-started/introduction.html>`__ 
+
+**Compile Tool** 
+
+
+Compile tool is now deprecated. If you need to compile a model for inference on a specific device, use the following script: 
+
+.. tab-set::
+
+   .. tab-item:: Python
+      :sync: py
+
+      .. doxygensnippet:: docs/snippets/export_compiled_model.py
+         :language: python
+         :fragment: [export_compiled_model]
+
+   .. tab-item:: C++
+      :sync: cpp
+
+      .. doxygensnippet:: docs/snippets/export_compiled_model.cpp
+         :language: cpp
+         :fragment: [export_compiled_model]
+
+
+To learn which device supports the import / export functionality, see the :doc:`feature support matrix <openvino_docs_OV_UG_Working_with_devices>`.
+
+For more details on preprocessing steps, refer to the :doc:`Optimize Preprocessing <openvino_docs_OV_UG_Preprocessing_Overview>`. To compile the model with advanced preprocessing capabilities, refer to the :doc:`Use Case - Integrate and Save Preprocessing Steps Into OpenVINO IR <openvino_docs_OV_UG_Preprocess_Usecase_save>`, which shows how to have all the preprocessing in the compiled blob. 
+
+**DL Workbench**
+
+A web-based tool for deploying deep learning models. Built on the core of OpenVINO and equipped with a graphics user interface, DL Workbench is a great way to explore the possibilities of the OpenVINO workflow, import, analyze, optimize, and build your pre-trained models. You can do all that by visiting `Intel® Developer Cloud <https://software.intel.com/content/www/us/en/develop/tools/devcloud.html>`__ and launching DL Workbench online.
+
+**OpenVINO™ integration with TensorFlow (OVTF)**
+
+OpenVINO™ Integration with TensorFlow will no longer be supported as of OpenVINO release 2023.0. As part of the 2023.0 release, OpenVINO will feature a significantly enhanced TensorFlow user experience within native OpenVINO without needing offline model conversions. :doc:`Learn more <openvino_docs_MO_DG_TensorFlow_Frontend>`.
+
+@endsphinxdirective
 

docs/Documentation/openvino_ecosystem_ovtf.md

@@ -1,42 +0,0 @@
-# OpenVINO™ integration with TensorFlow {#ovtf_integration}
-
-**OpenVINO™ integration with TensorFlow** is a solution for TensorFlow developers who want to get started with OpenVINO™ in their inferencing applications. By adding just two lines of code you can now take advantage of OpenVINO™ toolkit optimizations with TensorFlow inference applications across a range of Intel® computation devices.
-
-This is all you need:
-```bash
-import openvino_tensorflow
-openvino_tensorflow.set_backend('<backend_name>')
-```
-
-**OpenVINO™ integration with TensorFlow** accelerates inference across many AI models on a variety of Intel® technologies, such as:
-- Intel® CPUs
-- Intel® integrated GPUs
-
-> **NOTE**: For maximum performance, efficiency, tooling customization, and hardware control, we recommend developers to adopt native OpenVINO™ solutions.
-To find out more about the product itself, as well as learn how to use it in your project, check its dedicated [GitHub repository](https://github.com/openvinotoolkit/openvino_tensorflow/tree/master/docs). 
-
-
-To see what you can do with **OpenVINO™ integration with TensorFlow**, explore the demos located in the [examples folder](https://github.com/openvinotoolkit/openvino_tensorflow/tree/master/examples) in our GitHub repository.  
-
-Sample tutorials are also hosted on [Intel® DevCloud](https://www.intel.com/content/www/us/en/developer/tools/devcloud/edge/build/ovtfoverview.html). The demo applications are implemented using Jupyter Notebooks. You can interactively execute them on Intel® DevCloud nodes, compare the results of **OpenVINO™ integration with TensorFlow**, native TensorFlow, and OpenVINO™. 
-
-## License
-**OpenVINO™ integration with TensorFlow** is licensed under [Apache License Version 2.0](https://github.com/openvinotoolkit/openvino_tensorflow/blob/master/LICENSE).
-By contributing to the project, you agree to the license and copyright terms therein
-and release your contribution under these terms.
-
-## Support
-
-Submit your questions, feature requests and bug reports via [GitHub issues](https://github.com/openvinotoolkit/openvino_tensorflow/issues).
-
-## How to Contribute
-
-We welcome community contributions to **OpenVINO™ integration with TensorFlow**. If you have an idea for improvement:
-
-* Share your proposal via [GitHub issues](https://github.com/openvinotoolkit/openvino_tensorflow/issues).
-* Submit a [pull request](https://github.com/openvinotoolkit/openvino_tensorflow/pulls).
-
-We will review your contribution as soon as possible. If any additional fixes or modifications are necessary, we will guide you and provide feedback. Before you make your contribution, make sure you can build **OpenVINO™ integration with TensorFlow** and run all the examples with your fix/patch. If you want to introduce a large feature, create test cases for your feature. Upon our verification of your pull request, we will merge it to the repository provided that the pull request has met the above mentioned requirements and proved acceptable.
-
----
-\* Other names and brands may be claimed as the property of others.

docs/Documentation/openvino_training_extensions.md

@@ -0,0 +1,47 @@
+# OpenVINO™ Training Extensions {#ote_documentation}
+
+@sphinxdirective
+
+.. meta::
+   :description: OpenVINO™ Training Extensions include advanced algorithms used 
+                 to create, train and convert deep learning models with OpenVINO 
+                 Toolkit for optimized inference.
+
+
+OpenVINO™ Training Extensions provide a suite of advanced algorithms to train
+Deep Learning models and convert them using the `OpenVINO™
+toolkit <https://software.intel.com/en-us/openvino-toolkit>`__ for optimized
+inference. It allows you to export and convert the models to the needed format. OpenVINO Training Extensions independently create and train the model. It is open-sourced and available on `GitHub <https://github.com/openvinotoolkit/training_extensions>`__. Read the OpenVINO Training Extensions `documentation <https://openvinotoolkit.github.io/training_extensions/stable/guide/get_started/introduction.html>`__ to learn more.
+
+Detailed Workflow
+#################
+
+.. image:: ./_static/images/training_extensions_framework.png
+
+1. To start working with OpenVINO Training Extensions, prepare and annotate your dataset. For example, on CVAT.
+
+2. OpenVINO Training Extensions train the model, using training interface, and evaluate the model quality on your dataset, using evaluation and inference interfaces.
+
+   .. note:: 
+      Prepare a separate dataset or split the dataset you have for more accurate quality evaluation.
+
+3. Having successful evaluation results received, you have an opportunity to deploy your model or continue optimizing it, using NNCF. For more information about these frameworks, go to :doc:`Optimization Guide <openvino_docs_model_optimization_guide>`.
+
+If the results are unsatisfactory, add datasets and perform the same steps, starting with dataset annotation.
+
+OpenVINO Training Extensions Components
+#######################################
+
+* `OpenVINO Training Extensions API <https://github.com/openvinotoolkit/training_extensions/tree/develop/otx/api>`__
+* `OpenVINO Training Extensions CLI <https://github.com/openvinotoolkit/training_extensions/tree/develop/otx/cli>`__
+* `OpenVINO Training Extensions Algorithms <https://github.com/openvinotoolkit/training_extensions/tree/develop/otx/algorithms>`__
+
+Tutorials
+#########
+
+* `Base tutorial <https://openvinotoolkit.github.io/training_extensions/stable/guide/tutorials/base/index.html>`__
+* `Advanced tutorial <https://openvinotoolkit.github.io/training_extensions/stable/guide/tutorials/advanced/index.html>`__
+
+@endsphinxdirective 
+
+

docs/Documentation/openvino_workflow.md

@@ -3,22 +3,46 @@
 
 @sphinxdirective
 
+.. meta::
+   :description: OpenVINO toolkit workflow usually involves preparation, 
+                 optimization, and compression of models, running inference and 
+                 deploying deep learning applications.
+
 .. toctree::
    :maxdepth: 1
    :hidden:
 
    Model Preparation <openvino_docs_model_processing_introduction>
    Model Optimization and Compression <openvino_docs_model_optimization_guide>
-   Running and Deploying Inference <openvino_docs_deployment_guide_introduction>
+   Running Inference <openvino_docs_OV_UG_OV_Runtime_User_Guide>
+   Deployment on a Local System  <openvino_deployment_guide>
+   Deployment on a Model Server <ovms_what_is_openvino_model_server>
+   pytorch_2_0_torch_compile
    
 
 | :doc:`Model Preparation <openvino_docs_model_processing_introduction>`
-| With Model Downloader and Model Optimizer guides, you will learn to download pre-trained models and convert them for use with OpenVINO™. You can use your own models or choose some from a broad selection provided in the Open Model Zoo.
+| With model conversion API guide, you will learn to convert pre-trained models for use with OpenVINO™. You can use your own models or choose some from a broad selection in online databases, such as `TensorFlow Hub <https://tfhub.dev/>`__, `Hugging Face <https://huggingface.co/>`__, `Torchvision models <https://pytorch.org/hub/>`__..
 
 | :doc:`Model Optimization and Compression <openvino_docs_model_optimization_guide>`
 | In this section you will find out how to optimize a model to achieve better inference performance. It describes multiple optimization methods for both the training and post-training stages. 
 
-| :doc:`Deployment <openvino_docs_deployment_guide_introduction>`
-| This section explains the process of deploying your own inference application using either OpenVINO Runtime or OpenVINO Model Server. It describes how to run inference which is the most basic form of deployment and the quickest way of launching inference.
+| :doc:`Running Inference <openvino_docs_OV_UG_OV_Runtime_User_Guide>`
+| This section explains describes how to run inference which is the most basic form of deployment and the quickest way of launching inference.
+
+
+Once you have a model that meets both OpenVINO™ and your requirements, you can choose how to deploy it with your application. 
+
+
+| :doc:`Option 1. Deployment via OpenVINO Runtime <openvino_deployment_guide>` 
+| Local deployment uses OpenVINO Runtime that is called from, and linked to, the application directly. 
+| It utilizes resources available to the system and provides the quickest way of launching inference.
+| Deployment on a local system requires performing the steps from the running inference section.
+
+
+| :doc:`Option 2. Deployment via Model Server <ovms_what_is_openvino_model_server>`
+| Deployment via OpenVINO Model Server allows the application to connect to the inference server set up remotely. 
+| This way inference can use external resources instead of those available to the application itself. 
+| Deployment on a model server can be done quickly and without performing any additional steps described in the running inference section.
+
 
 @endsphinxdirective

docs/Documentation/torch_compile.md

@@ -0,0 +1,157 @@
+# PyTorch Deployment via "torch.compile" {#pytorch_2_0_torch_compile}
+
+@sphinxdirective
+
+
+The ``torch.compile`` feature enables you to use OpenVINO for PyTorch-native applications. 
+It speeds up PyTorch code by JIT-compiling it into optimized kernels.
+By default, Torch code runs in eager-mode, but with the use of ``torch.compile`` it goes through the following steps:
+
+1. **Graph acquisition** - the model is rewritten as blocks of subgraphs that are either:
+
+   * compiled by TorchDynamo and "flattened",
+   * falling back to the eager-mode, due to unsupported Python constructs (like control-flow code).
+
+2. **Graph lowering** - all PyTorch operations are decomposed into their constituent kernels specific to the chosen backend.
+3. **Graph compilation** - the kernels call their corresponding low-level device-specific operations.
+
+
+
+How to Use
+#################
+
+To use ``torch.compile``, you need to add an import statement and define one of the two available backends:
+
+| ``openvino``
+|   With this backend, Torch FX subgraphs are directly converted to OpenVINO representation without any additional PyTorch based tracing/scripting.
+
+| ``openvino_ts``
+|   With this backend, Torch FX subgraphs are first traced/scripted with PyTorch Torchscript, and then converted to OpenVINO representation.
+
+
+.. tab-set::
+
+   .. tab-item:: openvino
+      :sync: backend-openvino
+
+      .. code-block:: console
+
+         import openvino.torch 
+         ...
+         model = torch.compile(model, backend='openvino')
+
+      Execution diagram:
+
+      .. image:: _static/images/torch_compile_backend_openvino.svg
+         :width: 992px
+         :height: 720px
+         :scale: 60%
+         :align: center
+
+   .. tab-item:: openvino_ts
+      :sync: backend-openvino-ts
+
+      .. code-block:: console
+
+         import openvino.torch
+         ...
+         model = torch.compile(model, backend='openvino_ts')
+
+      Execution diagram:
+
+      .. image:: _static/images/torch_compile_backend_openvino_ts.svg
+         :width: 1088px
+         :height: 720px
+         :scale: 60%
+         :align: center
+
+
+Environment Variables
++++++++++++++++++++++++++++
+
+* **OPENVINO_TORCH_BACKEND_DEVICE**: enables selecting a specific hardware device to run the application. 
+  By default, the OpenVINO backend for ``torch.compile`` runs PyTorch applications using the CPU. Setting 
+  this variable to GPU.0, for example, will make the application use the integrated graphics processor instead.
+* **OPENVINO_TORCH_MODEL_CACHING**: enables saving the optimized model files to a hard drive, after the first application run.
+  This makes them available for the following application executions, reducing the first-inference latency.
+  By default, this variable is set to ``False``. Setting it to ``True`` enables caching.
+* **OPENVINO_TORCH_CACHE_DIR**: enables defining a custom directory for the model files (if model caching set to ``True``).
+  By default, the OpenVINO IR is saved in the ``cache`` sub-directory, created in the application's root directory. 
+
+Windows support
+++++++++++++++++++++++++++
+
+Currently, PyTorch does not support ``torch.compile`` feature on Windows officially. However, it can be accessed by running
+the below instructions:
+
+1. Install the PyTorch nightly wheel file - `2.1.0.dev20230713 <https://download.pytorch.org/whl/nightly/cpu/torch-2.1.0.dev20230713%2Bcpu-cp38-cp38-win_amd64.whl>`__ ,
+2. Update the file at ``<python_env_root>/Lib/site-packages/torch/_dynamo/eval_frames.py``
+3. Find the function called ``check_if_dynamo_supported()``:
+
+   .. code-block:: console
+
+      def check_if_dynamo_supported():
+          if sys.platform == "win32":
+              raise RuntimeError("Windows not yet supported for torch.compile")
+          if sys.version_info >= (3, 11):
+              raise RuntimeError("Python 3.11+ not yet supported for torch.compile")
+
+4. Put in comments the first two lines in this function, so it looks like this:
+
+   .. code-block:: console
+
+      def check_if_dynamo_supported():
+       #if sys.platform == "win32":
+       #    raise RuntimeError("Windows not yet supported for torch.compile")
+       if sys.version_info >= (3, 11):
+           `raise RuntimeError("Python 3.11+ not yet supported for torch.compile")
+
+
+Support for Automatic1111 Stable Diffusion WebUI
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Automatic1111 Stable Diffusion WebUI is an open-source repository that hosts a browser-based interface for the Stable Diffusion 
+based image generation. It allows users to create realistic and creative images from text prompts. 
+Stable Diffusion WebUI is supported on Intel CPUs, Intel integrated GPUs, and Intel discrete GPUs by leveraging OpenVINO 
+``torch.compile`` capability. Detailed instructions are available in 
+`Stable Diffusion WebUI repository. <https://github.com/openvinotoolkit/stable-diffusion-webui/wiki/Installation-on-Intel-Silicon>`__
+
+
+Architecture
+#################
+
+The ``torch.compile`` feature is part of PyTorch 2.0, and is based on:
+
+* **TorchDynamo** - a Python-level JIT that hooks into the frame evaluation API in CPython,
+  (PEP 523) to dynamically modify Python bytecode right before it is executed (PyTorch operators 
+  that cannot be extracted to FX graph are executed in the native Python environment). 
+  It maintains the eager-mode capabilities using 
+  `Guards <https://pytorch.org/docs/stable/dynamo/guards-overview.html>`__ to ensure the 
+  generated graphs are valid.
+
+* **AOTAutograd** - generates the backward graph corresponding to the forward graph captured by TorchDynamo.
+* **PrimTorch** - decomposes complicated PyTorch operations into simpler and more elementary ops.
+* **TorchInductor** - a deep learning compiler that generates fast code for multiple accelerators and backends.
+
+
+
+
+When the PyTorch module is wrapped with ``torch.compile``, TorchDynamo traces the module and 
+rewrites Python bytecode to extract sequences of PyTorch operations into an FX Graph,
+which can be optimized by the OpenVINO backend. The Torch FX graphs are first converted to 
+inlined FX graphs and the graph partitioning module traverses inlined FX graph to identify 
+operators supported by OpenVINO. 
+
+All the supported operators are clustered into OpenVINO submodules, converted to the OpenVINO 
+graph using OpenVINO's PyTorch decoder, and executed in an optimized manner using OpenVINO runtime. 
+All unsupported operators fall back to the native PyTorch runtime on CPU. If the subgraph 
+fails during OpenVINO conversion, the subgraph falls back to PyTorch's default inductor backend.
+
+
+
+Additional Resources
+############################
+
+* `PyTorch 2.0 documentation <https://pytorch.org/docs/stable/index.html>`_
+
+@endsphinxdirective

docs/Doxyfile.config

@@ -1002,7 +1002,6 @@ EXCLUDE_SYMBOLS        = InferenceEngine::details \
                          ie_api::BlobBuffer \
                          *impl* \
                          *device_name* \
-                         *num_requests* \
                          *exec_net* \
                          *c_config* \
                          *ie_core_impl* \

docs/Extensibility_UG/GPU_Extensibility.md

@@ -1,237 +1,361 @@
 # How to Implement Custom GPU Operations {#openvino_docs_Extensibility_UG_GPU}
 
+@sphinxdirective
+
+.. meta::
+   :description: Learn the details of custom kernel support for the GPU device to 
+                 enable operations not supported by OpenVINO.
+
+
 To enable operations not supported by OpenVINO™ out of the box, you may need an extension for OpenVINO operation set, and a custom kernel for the device you will target. This article describes custom kernel support for the GPU device.
 
 The GPU codepath abstracts many details about OpenCL. You need to provide the kernel code in OpenCL C and an XML configuration file that connects the kernel and its parameters to the parameters of the operation.
 
 There are two options for using the custom operation configuration file:
 
-* Include a section with your kernels into the automatically-loaded `<lib_path>/cldnn_global_custom_kernels/cldnn_global_custom_kernels.xml` file.
-* Call the `ov::Core::set_property()` method from your application with the `"CONFIG_FILE"` key and the configuration file name as a value before loading the network that uses custom operations to the plugin:
-@sphinxtabset
+* Include a section with your kernels into the automatically-loaded ``<lib_path>/cldnn_global_custom_kernels/cldnn_global_custom_kernels.xml`` file.
+* Call the ``:ref:`ov::Core::set_property() <doxid-classov_1_1_core_1aa953cb0a1601dbc9a34ef6ba82b8476e>``` method from your application with the ``"CONFIG_FILE"`` key and the configuration file name as a value before loading the network that uses custom operations to the plugin:
 
-@sphinxtab{C++}
-@snippet docs/snippets/gpu/custom_kernels_api.cpp part0
-@endsphinxtab
+.. tab-set::
 
-@sphinxtab{Python}
-@snippet docs/snippets/gpu/custom_kernels_api.py part0
-@endsphinxtab
+   .. tab-item:: Python
+      :sync: py
+ 
+      .. doxygensnippet:: docs/snippets/gpu/custom_kernels_api.py
+        :language: python
+        :fragment: [part0]
 
-@endsphinxtabset
+   .. tab-item:: C++
+      :sync: cpp
+ 
+      .. doxygensnippet:: docs/snippets/gpu/custom_kernels_api.cpp
+        :language: cpp
+        :fragment: [part0]
 
-All OpenVINO samples, except the trivial `hello_classification`, and most Open Model Zoo demos
-feature a dedicated command-line option `-c` to load custom kernels. For example, to load custom operations for the classification sample, run the command below:
-```sh
-$ ./classification_sample -m <path_to_model>/bvlc_alexnet_fp16.xml -i ./validation_set/daily/227x227/apron.bmp -d GPU
- -c <absolute_path_to_config>/custom_layer_example.xml
-```
 
-## Configuration File Format <a name="config-file-format"></a>
+All OpenVINO samples, except the trivial ``hello_classification``, and most Open Model Zoo demos
+feature a dedicated command-line option ``-c`` to load custom kernels. For example, to load custom operations for the classification sample, run the command below:
 
-The configuration file is expected to follow the `.xml` file structure
-with a node of the type `CustomLayer` for every custom operation you provide.
+.. code-block:: cpp
+
+   $ ./classification_sample -m <path_to_model>/bvlc_alexnet_fp16.xml -i ./validation_set/daily/227x227/apron.bmp -d GPU
+   -c <absolute_path_to_config>/custom_layer_example.xml
+
+.. _config-file-format: 
+
+Configuration File Format
+######################### 
+
+The configuration file is expected to follow the ``.xml`` file structure
+with a node of the type ``CustomLayer`` for every custom operation you provide.
 
 The definitions described in the sections below use the following notations:
 
-Notation | Description
----|---
-(0/1) | Can have zero or one instance of this node or attribute
-(1) | Must have only one instance of this node or attribute
-(0+) | Can have any number of instances of this node or attribute
-(1+) | Can have one or more instances of this node or attribute
+.. list-table::
+    :header-rows: 1
 
-### CustomLayer Node and Sub-Node Structure
+    * - Notation
+      - Description
+    * - (0/1)
+      - Can have zero or one instance of this node or attribute
+    * - (1)
+      - Must have only one instance of this node or attribute
+    * - (0+)
+      - Can have any number of instances of this node or attribute
+    * - (1+)
+      - Can have one or more instances of this node or attribute
 
-The `CustomLayer` node contains the entire configuration for a single custom operation.
+CustomLayer Node and Sub-Node Structure
++++++++++++++++++++++++++++++++++++++++
 
-| Attribute Name   |\#    |  Description |
-|-----|-----|-----|
-| `name`           | (1)  | The name of the operation type to be used. This name should be identical to the type used in the OpenVINO IR.|
-| `type`           | (1)  | Must be `SimpleGPU`.                                                                                         |
-| `version`        | (1)  | Must be `1`.                                                                                                 |
+The ``CustomLayer`` node contains the entire configuration for a single custom operation.
 
-**Sub-nodes**: `Kernel` (1), `Buffers` (1), `CompilerOptions` (0+),
-`WorkSizes` (0/1)
+.. list-table::
+    :header-rows: 1
 
-### Kernel Node and Sub-Node Structure
+    * - Attribute Name
+      - #
+      - Description
+    * - ``name``
+      - (1)
+      - The name of the operation type to be used. This name should be identical to the type used in the IR.
+    * - ``type``
+      - (1)
+      - Must be ``SimpleGPU`` .
+    * - ``version``
+      - (1)
+      - Must be ``1`` .
 
-The `Kernel` node contains all kernel source code configuration.
+**Sub-nodes**: ``Kernel`` (1), ``Buffers`` (1), ``CompilerOptions`` (0+),
+``WorkSizes`` (0/1)
 
-**Sub-nodes**: `Source` (1+), `Define` (0+)
+Kernel Node and Sub-Node Structure
+++++++++++++++++++++++++++++++++++
 
-### Source Node and Sub-Node Structure
+The ``Kernel`` node contains all kernel source code configuration.
 
-The `Source` node points to a single OpenCL source file.
+**Sub-nodes**: ``Source`` (1+), ``Define`` (0+)
 
-| Attribute Name | \#  |Description|
-|-----|-----|-----|
-| `filename`     | (1) | Name of the file containing OpenCL source code. The path is relative to your executable. Multiple source nodes will have their sources concatenated in order. |
+Source Node and Sub-Node Structure
+++++++++++++++++++++++++++++++++++
+
+The ``Source`` node points to a single OpenCL source file.
+
+.. list-table::
+    :header-rows: 1
+
+    * - Attribute Name
+      - #
+      - Description
+    * - ``filename``
+      - (1)
+      - Name of the file containing OpenCL source code. The path is relative to your executable. Multiple source nodes will have their sources concatenated in order.
 
 **Sub-nodes**: None
 
-### Define Node and Sub-Node Structure
+Define Node and Sub-Node Structure
+++++++++++++++++++++++++++++++++++
 
-The `Define` node configures a single `#&zwj;define` instruction to be added to
+The ``Define`` node configures a single ``#define`` instruction to be added to
 the sources during compilation (JIT).
 
-| Attribute Name | \#    | Description |
-|------|-------|------|
-| `name`         | (1)   | The name of the defined JIT. For static constants, this can include the value as well, which is taken as a string.   |
-| `param`        | (0/1) | This parameter value is used as the value of this JIT definition.                                                    |
-| `type`         | (0/1) | The parameter type. Accepted values: `int`, `float`, and `int[]`, `float[]` for arrays.                              |
-| `default`      | (0/1) | The default value to be used if the specified parameters are missing from the operation in the OpenVINO IR.          |
+.. list-table::
+    :header-rows: 1
+
+    * - Attribute Name
+      - #
+      - Description
+    * - ``name``
+      - (1)
+      - The name of the defined JIT. For static constants, this can include the value as well, which is taken as a string.
+    * - ``param``
+      - (0/1)
+      - This parameter value is used as the value of this JIT definition.
+    * - ``type``
+      - (0/1)
+      - The parameter type. Accepted values: ``int`` , ``float`` , and ``int[]`` , ``float[]`` for arrays.
+    * - ``default``
+      - (0/1)
+      - The default value to be used if the specified parameters are missing from the operation in the OpenVINO IR.
 
 **Sub-nodes:** None
 
 The resulting JIT has the following form:
-`#&zwj;define [name] [type] [value/default]`.
+``#define [name] [type] [value/default]``.
 
-### Buffers Node and Sub-Node Structure
+Buffers Node and Sub-Node Structure
++++++++++++++++++++++++++++++++++++
 
-The `Buffers` node configures all input/output buffers for the OpenCL entry
+The ``Buffers`` node configures all input/output buffers for the OpenCL entry
 function. No buffers node structure exists.
 
-**Sub-nodes:** `Data` (0+), `Tensor` (1+)
+**Sub-nodes:** ``Data`` (0+), ``Tensor`` (1+)
 
-### Data Node and Sub-Node Structure
+Data Node and Sub-Node Structure
+++++++++++++++++++++++++++++++++
 
-The `Data` node configures a single input with static data, for example,
+The ``Data`` node configures a single input with static data, for example,
 weights or biases.
 
-| Attribute Name | \#  | Description |
-|----|-----|------|
-| `name`         | (1) | Name of a blob attached to an operation in the OpenVINO IR.             |
-| `arg-index`    | (1) | 0-based index in the entry function arguments to be bound to.           |
+.. list-table::
+    :header-rows: 1
+
+    * - Attribute Name
+      - #
+      - Description
+    * - ``name``
+      - (1)
+      - Name of a blob attached to an operation in the OpenVINO IR.
+    * - ``arg-index``
+      - (1)
+      - 0-based index in the entry function arguments to be bound to.
+
 
 **Sub-nodes**: None
 
-### Tensor Node and Sub-Node Structure
+Tensor Node and Sub-Node Structure
+++++++++++++++++++++++++++++++++++
 
-The `Tensor` node configures a single input or output tensor.
+The ``Tensor`` node configures a single input or output tensor.
 
-| Attribute Name | \#    | Description  |
-|------|-------|-------|
-| `arg-index`    | (1)   | 0-based index in the entry function arguments to be bound to.                                                                          |
-| `type`         | (1)   | `input` or `output`                                                                                                                    |
-| `port-index`   | (1)   | 0-based index in the operation input/output ports in the OpenVINO IR                                                                   |
-| `format`       | (0/1) | Data layout declaration for the tensor. Accepted values: `BFYX`, `BYXF`, `YXFB`, `FYXB`(also in lowercase). The default value: `BFYX`  |
+.. list-table::
+    :header-rows: 1
 
-### CompilerOptions Node and Sub-Node Structure
+    * - Attribute Name
+      - #
+      - Description
+    * - ``arg-index``
+      - (1)
+      - 0-based index in the entry function arguments to be bound to.
+    * - ``type``
+      - (1)
+      - ``input`` or ``output``
+    * - ``port-index``
+      - (1)
+      - 0-based index in the operation input/output ports in the OpenVINO IR
+    * - ``format``
+      - (0/1)
+      - Data layout declaration for the tensor. Accepted values: ``BFYX`` , ``BYXF`` , ``YXFB`` , ``FYXB`` , and same values in all lowercase. Default value: ``BFYX``.
 
-The `CompilerOptions` node configures the compilation flags for the OpenCL
+CompilerOptions Node and Sub-Node Structure
++++++++++++++++++++++++++++++++++++++++++++
+
+The ``CompilerOptions`` node configures the compilation flags for the OpenCL
 sources.
 
-| Attribute Name | \#  | Description                                        |
-|--------|-----|------|
-| `options`      | (1) | Options string to be passed to the OpenCL compiler |
+.. list-table::
+    :header-rows: 1
+
+    * - Attribute Name
+      - #
+      - Description
+    * - ``options``
+      - (1)
+      - Options string to be passed to the OpenCL compiler
 
 **Sub-nodes**: None
 
-### WorkSizes Node and Sub-Node Structure
+WorkSizes Node and Sub-Node Structure
++++++++++++++++++++++++++++++++++++++
 
-The `WorkSizes` node configures the global/local work sizes to be used when
+The ``WorkSizes`` node configures the global/local work sizes to be used when
 queuing an OpenCL program for execution.
 
-| Attribute Name      | \#             | Description                                                                 |
-|-----|------|-----|
-| `global`<br>`local` | (0/1)<br>(0/1) | An array of up to three integers or formulas for defining OpenCL work-sizes to be used during execution.<br> The formulas can use the values of the B,F,Y,X dimensions and contain the operators: +,-,/,\*,%. All operators are evaluated in integer arithmetic. <br>Default value: `global=”B*F*Y*X” local=””` |
-| `dim`               | (0/1)          | A tensor to take the work-size from. Accepted values: `input N`, `output`, where `N` is an index of input tensor starting with 0. The default value: `output` |
+.. list-table::
+    :header-rows: 1
+
+    * - Attribute Name
+      - #
+      - Description
+    * - ``global`` ``local``
+      - (0/1) (0/1)
+      - An array of up to three integers or formulas for defining OpenCL work-sizes to be used during execution. The formulas can use the values of the B,F,Y,X dimensions and contain the operators: +,-,/,\*,%. All operators are evaluated in integer arithmetic. Default value: ``global=”B\*F\*Y\*X” local=””``
+    * - ``dim``
+      - (0/1)
+      - A tensor to take the work-size from. Accepted values: ``input N`` , ``output`` , where ``N`` is an index of input tensor starting with 0. Default value: ``output``
 
 **Sub-nodes**: None
 
-## Example Configuration File
+Example Configuration File
+##########################
 
 The following code sample provides an example configuration file in XML
-format. For information on the configuration file structure, see the 
-[Configuration File Format](#config-file-format).
-```xml
-<CustomLayer name="ReLU" type="SimpleGPU" version="1">
-  <Kernel entry="example_relu_kernel">
-    <Source filename="custom_layer_kernel.cl"/>
-    <Define name="neg_slope" type="float" param="negative_slope" default="0.0"/>
-  </Kernel>
-  <Buffers>
-    <Tensor arg-index="0" type="input" port-index="0" format="BFYX"/>
-    <Tensor arg-index="1" type="output" port-index="0" format="BFYX"/>
-  </Buffers>
-  <CompilerOptions options="-cl-mad-enable"/>
-  <WorkSizes global="X,Y,B*F"/>
-</CustomLayer>
-```
+format. For information on the configuration file structure, see the `Configuration File Format <#config-file-format>`__.
 
-## Built-In Definitions for Custom Layers
+.. code-block:: xml
+   :force:
+
+   <CustomLayer name="ReLU" type="SimpleGPU" version="1">
+     <Kernel entry="example_relu_kernel">
+       <Source filename="custom_layer_kernel.cl"/>
+       <Define name="neg_slope" type="float" param="negative_slope" default="0.0"/>
+     </Kernel>
+     <Buffers>
+       <Tensor arg-index="0" type="input" port-index="0" format="BFYX"/>
+       <Tensor arg-index="1" type="output" port-index="0" format="BFYX"/>
+     </Buffers>
+     <CompilerOptions options="-cl-mad-enable"/>
+     <WorkSizes global="X,Y,B*F"/>
+   </CustomLayer>
+
+
+Built-In Definitions for Custom Layers
+######################################
 
 The following table includes definitions that are attached before
 user sources.
 
-For an example, see [Example Kernel](#example-kernel).
+For an example, see `Example Kernel <#example-kernel>`__.
 
-| Name | Value  |
-|---|---|
-| `NUM_INPUTS` | Number of the input tensors bound to this kernel. |
-| `GLOBAL_WORKSIZE`  | An array of global work sizes used to execute this kernel. |
-| `GLOBAL_WORKSIZE_SIZE` | The size of the `GLOBAL_WORKSIZE` array. |
-| `LOCAL_WORKSIZE`  | An array of local work sizes used to execute this kernel.  |
-| `LOCAL_WORKSIZE_SIZE`   | The size of the `LOCAL_WORKSIZE` array. |
-| `<TENSOR>_DIMS`| An array of the tensor dimension sizes. Always ordered as `BFYX`. |
-| `<TENSOR>_DIMS_SIZE`| The size of the `<TENSOR>_DIMS` array.|
-| `<TENSOR>_TYPE`| The datatype of the tensor: `float`, `half`, or `char`. |
-| `<TENSOR>_FORMAT_<TENSOR_FORMAT>` | The format of the tensor, BFYX, BYXF, YXFB , FYXB, or ANY. The format is concatenated to the defined name. You can use the tensor format to define codepaths in your code with `#&zwj;ifdef/#&zwj;endif`. |
-| `<TENSOR>_LOWER_PADDING` | An array of padding elements used for the tensor dimensions before they start. Always ordered as BFYX.|
-| `<TENSOR>_LOWER_PADDING_SIZE` | The size of the `<TENSOR>_LOWER_PADDING` array. |
-| `<TENSOR>_UPPER_PADDING`   | An array of padding elements used for the tensor dimensions after they end. Always ordered as BFYX. |
-| `<TENSOR>_UPPER_PADDING_SIZE`  | The size of the `<TENSOR>_UPPER_PADDING` array. |
-| `<TENSOR>_PITCHES` | The offset (in elements) between adjacent elements in each dimension. Always ordered as BFYX. |
-| `<TENSOR>_PITCHES_SIZE`| The size of the `<TENSOR>_PITCHES` array. |
-| `<TENSOR>_OFFSET`| The number of elements from the start of the tensor to the first valid element, bypassing the lower padding. |
+.. list-table::
+    :header-rows: 1
 
-All `<TENSOR>` values are automatically defined for every tensor
-bound to this operation, such as `INPUT0`, `INPUT1`, and `OUTPUT0`, as shown
+    * - Name
+      - Value
+    * - ``NUM_INPUTS``
+      - Number of the input tensors bound to this kernel
+    * - ``GLOBAL_WORKSIZE``
+      - An array of global work sizes used to execute this kernel
+    * - ``GLOBAL_WORKSIZE_SIZE``
+      - The size of the ``GLOBAL_WORKSIZE`` array
+    * - ``LOCAL_WORKSIZE``
+      - An array of local work sizes used to execute this kernel
+    * - ``LOCAL_WORKSIZE_SIZE``
+      - The size of the ``LOCAL_WORKSIZE`` array
+    * - ``<TENSOR>_DIMS``
+      - An array of the tensor dimension sizes. Always ordered as ``BFYX``
+    * - ``<TENSOR>_DIMS_SIZE``
+      - The size of the ``<TENSOR>_DIMS`` array.
+    * - ``<TENSOR>_TYPE``
+      - The datatype of the tensor: ``float`` , ``half`` , or ``char``
+    * - ``<TENSOR>_FORMAT_<TENSOR_FORMAT>``
+      - The format of the tensor, BFYX, BYXF, YXFB , FYXB, or ANY. The format is concatenated to the defined name. You can use the tensor format to define codepaths in your code with ``#ifdef/#endif`` .
+    * - ``<TENSOR>_LOWER_PADDING``
+      - An array of padding elements used for the tensor dimensions before they start. Always ordered as BFYX.
+    * - ``<TENSOR>_LOWER_PADDING_SIZE``
+      - The size of the ``<TENSOR>_LOWER_PADDING`` array
+    * - ``<TENSOR>_UPPER_PADDING``
+      - An array of padding elements used for the tensor dimensions after they end. Always ordered as BFYX.
+    * - ``<TENSOR>_UPPER_PADDING_SIZE``
+      - The size of the ``<TENSOR>_UPPER_PADDING`` array
+    * - ``<TENSOR>_PITCHES``
+      - The offset (in elements) between adjacent elements in each dimension. Always ordered as BFYX.
+    * - ``<TENSOR>_PITCHES_SIZE``
+      - The size of the ``<TENSOR>_PITCHES`` array
+    * - ``<TENSOR>_OFFSET``
+      - The number of elements from the start of the tensor to the first valid element, bypassing the lower padding.
+
+All ``<TENSOR>`` values are automatically defined for every tensor
+bound to this operation, such as ``INPUT0``, ``INPUT1``, and ``OUTPUT0``, as shown
 in the following example:
 
-```c
-#define INPUT0_DIMS_SIZE 4
-#define INPUT0_DIMS (int []){ 1,96,55,55, }
-```
+.. code-block:: c
 
-## Example Kernel<a name="example-kernel"></a>
+   #define INPUT0_DIMS_SIZE 4
+   #define INPUT0_DIMS (int []){ 1,96,55,55, }
 
-```c
-#pragma OPENCL EXTENSION cl_khr_fp16 : enable
-__kernel void example_relu_kernel(
-    const __global INPUT0_TYPE*  input0,
-          __global OUTPUT0_TYPE* output)
-{
-    const uint idx  = get_global_id(0);
-    const uint idy  = get_global_id(1);
-    const uint idbf = get_global_id(2); // batches*features, as OpenCL supports 3D nd-ranges only
-    const uint feature = idbf % OUTPUT0_DIMS[1];
-    const uint batch   = idbf / OUTPUT0_DIMS[1];
-    //notice that pitches are in elements, not in bytes!
-    const uint in_id  = batch*INPUT0_PITCHES[0] + feature*INPUT0_PITCHES[1]   + idy*INPUT0_PITCHES[2]  + idx*INPUT0_PITCHES[3]  + INPUT0_OFFSET;
-    const uint out_id = batch*OUTPUT0_PITCHES[0] + feature*OUTPUT0_PITCHES[1]  + idy*OUTPUT0_PITCHES[2]  + idx*OUTPUT0_PITCHES[3]  + OUTPUT0_OFFSET;
+.. _example-kernel:
 
-    INPUT0_TYPE value = input0[in_id];
-    // neg_slope (which is non-zero for leaky ReLU) is put automatically as #define, refer to the config xml
-    output[out_id] = value < 0 ? value * neg_slope : value;
-}
-```
+Example Kernel
+##############
 
+.. code-block:: c
 
-> **NOTE**: As described in the previous section, all items such as the 
-> `INPUT0_TYPE` are actually defined as OpenCL (pre-)compiler inputs by
-> OpenVINO for efficiency reasons. See the [Debugging
-> Tips](#debugging-tips) below for information on debugging the results.
+   #pragma OPENCL EXTENSION cl_khr_fp16 : enable
+   __kernel void example_relu_kernel(
+       const __global INPUT0_TYPE*  input0,
+             __global OUTPUT0_TYPE* output)
+   {
+       const uint idx  = get_global_id(0);
+       const uint idy  = get_global_id(1);
+       const uint idbf = get_global_id(2); // batches*features, as OpenCL supports 3D nd-ranges only
+       const uint feature = idbf % OUTPUT0_DIMS[1];
+       const uint batch   = idbf / OUTPUT0_DIMS[1];
+       //notice that pitches are in elements, not in bytes!
+       const uint in_id  = batch*INPUT0_PITCHES[0] + feature*INPUT0_PITCHES[1]   + idy*INPUT0_PITCHES[2]  + idx*INPUT0_PITCHES[3]  + INPUT0_OFFSET;
+       const uint out_id = batch*OUTPUT0_PITCHES[0] + feature*OUTPUT0_PITCHES[1]  + idy*OUTPUT0_PITCHES[2]  + idx*OUTPUT0_PITCHES[3]  + OUTPUT0_OFFSET;
 
-## Debugging Tips<a name="debugging-tips"></a>
+       INPUT0_TYPE value = input0[in_id];
+       // neg_slope (which is non-zero for leaky ReLU) is put automatically as #define, refer to the config xml
+       output[out_id] = value < 0 ? value * neg_slope : value;
+   }
 
-**Using `printf` in the OpenCL™ Kernels**.
-To debug the specific values, use `printf` in your kernels.
+.. _debugging-tips:
+
+.. note:: 
+   As described in the previous section, all items such as the ``INPUT0_TYPE`` are actually defined as OpenCL (pre-)compiler inputs by OpenVINO for efficiency reasons. See the `Debugging Tips <#debugging-tips>`__ below for information on debugging the results.
+
+Debugging Tips
+##############
+
+**Using ``printf`` in the OpenCL™ Kernels**.
+To debug the specific values, use ``printf`` in your kernels.
 However, be careful not to output excessively, which
-could generate too much data. The `printf` output is typical, so
+could generate too much data. The ``printf`` output is typical, so
 your output can be truncated to fit the buffer. Also, because of
 buffering, you actually get an entire buffer of output when the
-execution ends.<br>
+execution ends.
 
-For more information, refer to the [printf Function](https://www.khronos.org/registry/OpenCL/sdk/1.2/docs/man/xhtml/printfFunction.html).
+For more information, refer to the `printf Function <https://www.khronos.org/registry/OpenCL/sdk/1.2/docs/man/xhtml/printfFunction.html>`__.
+
+@endsphinxdirective

docs/Extensibility_UG/Intro.md

@@ -2,6 +2,11 @@
 
 @sphinxdirective
 
+.. meta::
+   :description: Explore OpenVINO™ Extensibility API, which allows adding 
+                 support for models with custom operations and their further implementation 
+                 in applications.
+
 .. toctree::
    :maxdepth: 1
    :hidden:
@@ -9,7 +14,6 @@
    openvino_docs_Extensibility_UG_add_openvino_ops
    openvino_docs_Extensibility_UG_Frontend_Extensions
    openvino_docs_Extensibility_UG_GPU
-   openvino_docs_MO_DG_prepare_model_customize_model_optimizer_Customize_Model_Optimizer
    
 .. toctree::
    :maxdepth: 1
@@ -18,48 +22,53 @@
    openvino_docs_transformations
    OpenVINO Plugin Developer Guide <openvino_docs_ie_plugin_dg_overview>
 
-@endsphinxdirective
+.. toctree::
+   :maxdepth: 1
+   :hidden:
+   
+   openvino_docs_MO_DG_prepare_model_customize_model_optimizer_Customize_Model_Optimizer
 
-The Intel® Distribution of OpenVINO™ toolkit supports neural network models trained with various frameworks, including
-TensorFlow, PyTorch, ONNX, PaddlePaddle, Apache MXNet, Caffe, and Kaldi. The list of supported operations is different for
-each of the supported frameworks. To see the operations supported by your framework, refer to
-[Supported Framework Operations](../MO_DG/prepare_model/Supported_Frameworks_Layers.md).
+The Intel® Distribution of OpenVINO™ toolkit supports neural-network models trained with various frameworks, including
+TensorFlow, PyTorch, ONNX, TensorFlow Lite, and PaddlePaddle (OpenVINO support for Apache MXNet, Caffe, and Kaldi is currently 
+being deprecated and will be removed entirely in the future). The list of supported operations is different for each of the supported frameworks. 
+To see the operations supported by your framework, refer to :doc:`Supported Framework Operations <openvino_resources_supported_operations_frontend>`.
 
 Custom operations, which are not included in the list, are not recognized by OpenVINO out-of-the-box. The need for custom operation may appear in two cases:
 
 1. A new or rarely used regular framework operation is not supported in OpenVINO yet.
-
 2. A new user operation that was created for some specific model topology by the author of the model using framework extension capabilities.
 
 Importing models with such operations requires additional steps. This guide illustrates the workflow for running inference on models featuring custom operations. This allows plugging in your own implementation for them. OpenVINO Extensibility API enables adding support for those custom operations and using one implementation for Model Optimizer and OpenVINO Runtime.
 
 Defining a new custom operation basically consists of two parts:
 
-1. Definition of operation semantics in OpenVINO, the code that describes how this operation should be inferred consuming input tensor(s) and producing output tensor(s). The implementation of execution kernels for [GPU](./GPU_Extensibility.md) is described in separate guides.
+1. Definition of operation semantics in OpenVINO, the code that describes how this operation should be inferred consuming input tensor(s) and producing output tensor(s). The implementation of execution kernels for :doc:`GPU <openvino_docs_Extensibility_UG_GPU>` is described in separate guides.
 
 2. Mapping rule that facilitates conversion of framework operation representation to OpenVINO defined operation semantics.
 
 The first part is required for inference. The second part is required for successful import of a model containing such operations from the original framework model format. There are several options to implement each part. The following sections will describe them in detail.
 
-## Definition of Operation Semantics
+Definition of Operation Semantics
+#################################
 
 If the custom operation can be mathematically represented as a combination of exiting OpenVINO operations and such decomposition gives desired performance, then low-level operation implementation is not required. Refer to the latest OpenVINO operation set, when deciding feasibility of such decomposition. You can use any valid combination of exiting operations. The next section of this document describes the way to map a custom operation.
 
-If such decomposition is not possible or appears too bulky with a large number of constituent operations that do not perform well, then a new class for the custom operation should be implemented, as described in the [Custom Operation Guide](add_openvino_ops.md).
+If such decomposition is not possible or appears too bulky with a large number of constituent operations that do not perform well, then a new class for the custom operation should be implemented, as described in the :doc:`Custom Operation Guide <openvino_docs_Extensibility_UG_add_openvino_ops>`.
 
 You might prefer implementing a custom operation class if you already have a generic C++ implementation of operation kernel. Otherwise, try to decompose the operation first, as described above. Then, after verifying correctness of inference and resulting performance, you may move on to optional implementation of Bare Metal C++.
 
-## Mapping from Framework Operation
+Mapping from Framework Operation
+################################
 
 Mapping of custom operation is implemented differently, depending on model format used for import. You may choose one of the following:
 
-1. If a model is represented in the ONNX (including models exported from Pytorch in ONNX) or PaddlePaddle formats, then one of the classes from [Frontend Extension API](frontend_extensions.md) should be used. It consists of several classes available in C++ which can be used with the `--extensions` option in Model Optimizer or when a model is imported directly to OpenVINO runtime using the `read_model` method. Python API is also available for runtime model import.
+1. If a model is represented in the ONNX (including models exported from Pytorch in ONNX), TensorFlow Lite, PaddlePaddle or TensorFlow formats, then one of the classes from :doc:`Frontend Extension API <openvino_docs_Extensibility_UG_Frontend_Extensions>` should be used. It consists of several classes available in C++ which can be used with the ``--extensions`` option in Model Optimizer or when a model is imported directly to OpenVINO runtime using the ``read_model`` method. Python API is also available for runtime model import.
 
-2. If a model is represented in the TensorFlow, Caffe, Kaldi or MXNet formats, then [Model Optimizer Extensions](../MO_DG/prepare_model/customize_model_optimizer/Customize_Model_Optimizer.md) should be used. This approach is available for model conversion in Model Optimizer only.
+2. If a model is represented in the Caffe, Kaldi or MXNet formats (as legacy frontends), then :doc:`[Legacy] Model Optimizer Extensions <openvino_docs_MO_DG_prepare_model_customize_model_optimizer_Customize_Model_Optimizer>` should be used. This approach is available for model conversion in Model Optimizer only.
 
-Existing of two approaches simultaneously is explained by two different types of frontends used for model conversion in OpenVINO: new frontends (ONNX, PaddlePaddle) and legacy frontends (TensorFlow, Caffe, Kaldi and Apache MXNet). Model Optimizer can use both front-ends in contrast to the direct import of model with `read_model` method which can use new frontends only. Follow one of the appropriate guides referenced above to implement mappings depending on framework frontend.
+Existing of two approaches simultaneously is explained by two different types of frontends used for model conversion in OpenVINO: new frontends (ONNX, PaddlePaddle, TensorFlow Lite, and TensorFlow) and legacy frontends (Caffe, Kaldi, and Apache MXNet). Model Optimizer can use both frontends in contrast to the direct import of model with ``read_model`` method which can use new frontends only. Follow one of the appropriate guides referenced above to implement mappings depending on framework frontend.
 
-If you are implementing extensions for new ONNX or PaddlePaddle frontends and plan to use the `--extensions` option in Model Optimizer for model conversion, then the extensions should be:
+If you are implementing extensions for new ONNX, PaddlePaddle, TensorFlow Lite or TensorFlow frontends and plan to use the ``--extensions`` option in Model Optimizer for model conversion, then the extensions should be:
 
 1. Implemented in C++ only.
 
@@ -69,109 +78,125 @@ Model Optimizer does not support new frontend extensions written in Python API.
 
 Remaining part of this guide describes application of Frontend Extension API for new frontends.
 
-## Registering Extensions
+Registering Extensions
+######################
 
 A custom operation class and a new mapping frontend extension class object should be registered to be usable in OpenVINO runtime.
 
-> **NOTE**: This documentation is derived from the [Template extension](https://github.com/openvinotoolkit/openvino/tree/master/src/core/template_extension/new), which demonstrates the details of extension development. It is based on minimalistic `Identity` operation that is a placeholder for your real custom operation. Review the complete, fully compilable code to see how it works.
+.. note:: 
+   This documentation is derived from the `Template extension <https://github.com/openvinotoolkit/openvino/tree/master/src/core/template_extension/new>`__, which demonstrates the details of extension development. It is based on minimalistic ``Identity`` operation that is a placeholder for your real custom operation. Review the complete, fully compilable code to see how it works.
 
-Use the `ov::Core::add_extension` method to load the extensions to the `ov::Core` object. This method allows loading library with extensions or extensions from the code.
+Use the ``:ref:`ov::Core::add_extension <doxid-classov_1_1_core_1a68d0dea1cbcd42a67bea32780e32acea>``` method to load the extensions to the ``:ref:`ov::Core <doxid-classov_1_1_core>``` object. This method allows loading library with extensions or extensions from the code.
 
-### Load Extensions to Core
+Load Extensions to Core
++++++++++++++++++++++++
 
-Extensions can be loaded from a code with the `ov::Core::add_extension` method:
+Extensions can be loaded from a code with the  ``:ref:`ov::Core::add_extension <doxid-classov_1_1_core_1a68d0dea1cbcd42a67bea32780e32acea>``` method:
 
-@sphinxtabset
+.. tab-set::
 
-@sphinxtab{C++}
-
-@snippet docs/snippets/ov_extensions.cpp add_extension
-
-@endsphinxtab
-
-@sphinxtab{Python}
-
-@snippet docs/snippets/ov_extensions.py add_extension
-
-@endsphinxtab
-
-@endsphinxtabset
-
-The `Identity` is a custom operation class defined in [Custom Operation Guide](add_openvino_ops.md). This is sufficient to enable reading OpenVINO IR which uses the `Identity` extension operation emitted by Model Optimizer. In order to load original model directly to the runtime, add a mapping extension:
-
-@sphinxdirective
-
-.. tab:: C++
-
-    .. doxygensnippet:: docs/snippets/ov_extensions.cpp
-       :language: cpp
-       :fragment: add_frontend_extension
-
-.. tab:: Python
-
-    .. doxygensnippet:: docs/snippets/ov_extensions.py
-       :language: python
-       :fragment: add_frontend_extension
-
-@endsphinxdirective
+   .. tab-item:: Python
+      :sync: py
  
+      .. doxygensnippet:: docs/snippets/ov_extensions.py
+         :language: python
+         :fragment: [add_extension]
+
+   .. tab-item:: C++
+      :sync: cpp
+ 
+      .. doxygensnippet:: docs/snippets/ov_extensions.cpp
+         :language: cpp
+         :fragment: [add_extension]
+   
+
+The ``Identity`` is a custom operation class defined in :doc:`Custom Operation Guide <openvino_docs_Extensibility_UG_add_openvino_ops>`. This is sufficient to enable reading OpenVINO IR which uses the ``Identity`` extension operation emitted by Model Optimizer. In order to load original model directly to the runtime, add a mapping extension:
+
+.. tab-set::
+
+   .. tab-item:: Python
+      :sync: py
+
+      .. doxygensnippet:: docs/snippets/ov_extensions.py
+         :language: python
+         :fragment: [add_frontend_extension]
+
+   .. tab-item:: C++
+      :sync: cpp
+
+      .. doxygensnippet:: docs/snippets/ov_extensions.cpp
+         :language: cpp
+         :fragment: [add_frontend_extension]
+
 When Python API is used, there is no way to implement a custom OpenVINO operation. Even if custom OpenVINO operation is implemented in C++ and loaded into the runtime by a shared library, there is still no way to add a frontend mapping extension that refers to this custom operation. In this case, use C++ shared library approach to implement both operations semantics and framework mapping.
 
 Python can still be used to map and decompose operations when only operations from the standard OpenVINO operation set are used.
 
-### Create a Library with Extensions
+.. _create_a_library_with_extensions:
+ 
+Create a Library with Extensions
+++++++++++++++++++++++++++++++++
 
 An extension library should be created in the following cases:
 
- - Conversion of a model with custom operations in Model Optimizer.
- - Loading a model with custom operations in a Python application. This applies to both framework model and OpenVINO IR.
- - Loading models with custom operations in tools that support loading extensions from a library, for example the `benchmark_app`.
+* Conversion of a model with custom operations in Model Optimizer.
+* Loading a model with custom operations in a Python application. This applies to both framework model and OpenVINO IR.
+* Loading models with custom operations in tools that support loading extensions from a library, for example the ``benchmark_app``.
 
 To create an extension library, for example, to load the extensions into Model Optimizer, perform the following:
 
-1. Create an entry point for extension library. OpenVINO provides the `OPENVINO_CREATE_EXTENSIONS()` macro, which allows to define an entry point to a library with OpenVINO Extensions.
+1. Create an entry point for extension library. OpenVINO provides the ``:ref:`OPENVINO_CREATE_EXTENSIONS() <doxid-core_2include_2openvino_2core_2extension_8hpp_1acdadcfa0eff763d8b4dadb8a9cb6f6e6>``` macro, which allows to define an entry point to a library with OpenVINO Extensions.
 This macro should have a vector of all OpenVINO Extensions as an argument.
 
 Based on that, the declaration of an extension class might look like the following:
 
-@snippet template_extension/new/ov_extension.cpp ov_extension:entry_point
+.. doxygensnippet:: ./src/core/template_extension/new/ov_extension.cpp
+   :language: cpp
+   :fragment: [ov_extension:entry_point]
 
 2. Configure the build of your extension library, using the following CMake script:
 
-@snippet template_extension/new/CMakeLists.txt cmake:extension
+.. doxygensnippet:: ./src/core/template_extension/new/CMakeLists.txt
+   :language: cpp
+   :fragment: [cmake:extension]
 
-This CMake script finds OpenVINO, using the `find_package` CMake command.
+This CMake script finds OpenVINO, using the ``find_package`` CMake command.
 
 3. Build the extension library, running the commands below:
 
-```sh
-$ cd src/core/template_extension/new
-$ mkdir build
-$ cd build
-$ cmake -DOpenVINO_DIR=<OpenVINO_DIR> ../
-$ cmake --build .
-```
+.. code-block:: sh
+   
+   $ cd src/core/template_extension/new
+   $ mkdir build
+   $ cd build
+   $ cmake -DOpenVINO_DIR=<OpenVINO_DIR> ../
+   $ cmake --build .
+
 
 4. After the build, you may use the path to your extension library to load your extensions to OpenVINO Runtime:
 
-@sphinxtabset
+.. tab-set::
+   
+   .. tab-item:: Python
+      :sync: py
+ 
+      .. doxygensnippet:: docs/snippets/ov_extensions.py
+         :language: python
+         :fragment: [add_extension_lib]
 
-@sphinxtab{C++}
+   .. tab-item:: C++
+      :sync: cpp 
 
-@snippet docs/snippets/ov_extensions.cpp add_extension_lib
+      .. doxygensnippet:: docs/snippets/ov_extensions.cpp
+         :language: cpp
+         :fragment: [add_extension_lib]
 
-@endsphinxtab
 
-@sphinxtab{Python}
+See Also
+########
 
-@snippet docs/snippets/ov_extensions.py add_extension_lib
+* :doc:`OpenVINO Transformations <openvino_docs_transformations>`
+* :doc:`Using OpenVINO Runtime Samples <openvino_docs_OV_UG_Samples_Overview>`
+* :doc:`Hello Shape Infer SSD sample <openvino_inference_engine_samples_hello_reshape_ssd_README>`
 
-@endsphinxtab
-
-@endsphinxtabset
-
-## See Also
-
-* [OpenVINO Transformations](./ov_transformations.md)
-* [Using OpenVINO Runtime Samples](../OV_Runtime_UG/Samples_Overview.md)
-* [Hello Shape Infer SSD sample](../../samples/cpp/hello_reshape_ssd/README.md)
+@endsphinxdirective

docs/Extensibility_UG/add_openvino_ops.md

@@ -1,59 +1,86 @@
 # Custom OpenVINO™ Operations {#openvino_docs_Extensibility_UG_add_openvino_ops}
 
-OpenVINO™ Extension API allows you to register custom operations to support models with operations which OpenVINO™ does not support out-of-the-box. This capability requires writing code in C++, so if you are using Python to develop your application you need to build a separate shared library implemented in C++ first and load it in Python using `add_extension` API. Please refer to [Create library with extensions](Intro.md#create-library-with-extensions) for more details on library creation and usage. The remining part of this document describes how to implement an operation class.
+@sphinxdirective 
 
-## Operation Class
+.. meta::
+   :description: Explore OpenVINO™ Extension API which enables registering 
+                 custom operations to support models with operations 
+                 not supported by OpenVINO.
 
-To add your custom operation, create a new class that extends `ov::Op`, which is in turn derived from `ov::Node`, the base class for all graph operations in OpenVINO™. To add `ov::Op` please include next file:
+OpenVINO™ Extension API allows you to register custom operations to support models with operations which OpenVINO™ does not support out-of-the-box. This capability requires writing code in C++, so if you are using Python to develop your application you need to build a separate shared library implemented in C++ first and load it in Python using ``add_extension`` API. Please refer to :ref:`Create library with extensions <create_library_with_extensions>` for more details on library creation and usage. The remining part of this document describes how to implement an operation class.
 
-@snippet template_extension/new/identity.hpp op:common_include
+Operation Class
+###############
+
+To add your custom operation, create a new class that extends ``ov::Op``, which is in turn derived from ``:ref:`ov::Node <doxid-classov_1_1_node>```, the base class for all graph operations in OpenVINO™. To add ``ov::Op``, include the next file:
+
+.. doxygensnippet:: ./src/core/template_extension/new/identity.hpp
+   :language: cpp
+   :fragment: [op:common_include]
 
 Follow the steps below to add a custom operation:
 
-1. Add the `OPENVINO_OP` macro which defines a `NodeTypeInfo` object that identifies the type of the operation to the graph users and helps with dynamic type resolution. The type info of an operation currently consists of a string operation identifier and a string for operation version.
+1. Add the ``OPENVINO_OP`` macro which defines a ``NodeTypeInfo`` object that identifies the type of the operation to the graph users and helps with dynamic type resolution. The type info of an operation currently consists of a string operation identifier and a string for operation version.
 
 2. Implement default constructor and constructors that optionally take the operation inputs and attributes as parameters. 
 
-3. Override the shape inference method `validate_and_infer_types`. This method is called multiple times during graph manipulations to determine the shapes and element types of the operations outputs. To access the input shapes and input element types, use the `get_input_partial_shape()` and `get_input_element_type()` methods of `ov::Node`. Set the inferred shape and element type of the output using `set_output_type`.
+3. Override the shape inference method ``validate_and_infer_types``. This method is called multiple times during graph manipulations to determine the shapes and element types of the operations outputs. To access the input shapes and input element types, use the ``get_input_partial_shape()`` and ``get_input_element_type()`` methods of ``:ref:`ov::Node <doxid-classov_1_1_node>```. Set the inferred shape and element type of the output using ``set_output_type``.
 
-4. Override the `clone_with_new_inputs` method, which enables graph manipulation routines to create copies of this operation and connect it to different nodes during optimization.
+4. Override the ``clone_with_new_inputs`` method, which enables graph manipulation routines to create copies of this operation and connect it to different nodes during optimization.
 
-5. Override the `visit_attributes` method, which enables serialization and deserialization of operation attributes. An `AttributeVisitor` is passed to the method, and the implementation is expected to walk over all the attributes in the op using the type-aware `on_attribute` helper. Helpers are already implemented for standard C++ types like `int64_t`, `float`, `bool`, `vector`, and for existing OpenVINO defined types.
+5. Override the ``visit_attributes`` method, which enables serialization and deserialization of operation attributes. An ``AttributeVisitor`` is passed to the method, and the implementation is expected to walk over all the attributes in the op using the type-aware ``on_attribute`` helper. Helpers are already implemented for standard C++ types like ``int64_t``, ``float``, ``bool``, ``vector``, and for existing OpenVINO defined types.
 
-6. Override `evaluate`, which is an optional method that enables fallback of some devices to this implementation and the application of constant folding if there is a custom operation on the constant branch. If your operation contains `evaluate` method you also need to override the `has_evaluate` method, this method allows to get information about availability of `evaluate` method for the operation.
+6. Override ``evaluate``, which is an optional method that enables fallback of some devices to this implementation and the application of constant folding if there is a custom operation on the constant branch. If your operation contains ``evaluate`` method you also need to override the ``has_evaluate`` method, this method allows to get information about availability of ``evaluate`` method for the operation.
 
 Based on that, declaration of an operation class can look as follows:
 
 
-### Operation Constructors
+Operation Constructors
+++++++++++++++++++++++
 
 OpenVINO™ operation contains two constructors: 
+
 * Default constructor, which enables you to create an operation without attributes 
 * Constructor that creates and validates an operation with specified inputs and attributes
 
-@snippet template_extension/new/identity.cpp op:ctor
+.. doxygensnippet:: ./src/core/template_extension/new/identity.cpp
+   :language: cpp
+   :fragment: [op:ctor]
 
-### `validate_and_infer_types()`
+``validate_and_infer_types()``
+++++++++++++++++++++++++++++++
 
-`ov::Node::validate_and_infer_types` method validates operation attributes and calculates output shapes using attributes of the operation.
+``:ref:`ov::Node::validate_and_infer_types <doxid-classov_1_1_node_1ac5224b5be848ec670d2078d9816d12e7>``` method validates operation attributes and calculates output shapes using attributes of the operation.
 
-@snippet template_extension/new/identity.cpp op:validate
+.. doxygensnippet:: ./src/core/template_extension/new/identity.cpp
+   :language: cpp
+   :fragment: [op:validate]
 
-### `clone_with_new_inputs()`
+``clone_with_new_inputs()``
++++++++++++++++++++++++++++
 
-`ov::Node::clone_with_new_inputs` method creates a copy of the operation with new inputs.
+``:ref:`ov::Node::clone_with_new_inputs <doxid-classov_1_1_node_1a04cb103fa069c3b7944ab7c44d94f5ff>``` method creates a copy of the operation with new inputs.
 
-@snippet template_extension/new/identity.cpp op:copy
+.. doxygensnippet:: ./src/core/template_extension/new/identity.cpp
+   :language: cpp
+   :fragment: [op:copy]
 
-### `visit_attributes()`
+``visit_attributes()``
+++++++++++++++++++++++
 
-`ov::Node::visit_attributes` method enables you to visit all operation attributes.
+``:ref:`ov::Node::visit_attributes <doxid-classov_1_1_node_1a9743b56d352970486d17dae2416d958e>``` method enables you to visit all operation attributes.
 
-@snippet template_extension/new/identity.cpp op:visit_attributes
+.. doxygensnippet:: ./src/core/template_extension/new/identity.cpp
+   :language: cpp
+   :fragment: [op:visit_attributes]
 
-### evaluate() and has_evaluate()
+``evaluate() and has_evaluate()``
++++++++++++++++++++++++++++++++++
 
-`ov::Node::evaluate` method enables you to apply constant folding to an operation.
+``:ref:`ov::Node::evaluate <doxid-classov_1_1_node_1acfb82acc8349d7138aeaa05217c7014e>``` method enables you to apply constant folding to an operation.
 
-@snippet template_extension/new/identity.cpp op:evaluate
+.. doxygensnippet:: ./src/core/template_extension/new/identity.cpp
+   :language: cpp
+   :fragment: [op:evaluate]
 
+@endsphinxdirective

docs/Extensibility_UG/frontend_extensions.md

@@ -1,133 +1,419 @@
 # Frontend Extensions {#openvino_docs_Extensibility_UG_Frontend_Extensions}
 
-The goal of this chapter is to explain how to use Frontend extension classes to facilitate mapping of custom operations from framework model representation to OpenVINO representation. Refer to [Introduction to OpenVINO Extension](Intro.md) to understand entire flow.
+@sphinxdirective
 
-This API is applicable for new frontends only, which exist for ONNX and PaddlePaddle. If a different model format is used, follow legacy [Model Optimizer Extensions](../MO_DG/prepare_model/customize_model_optimizer/Customize_Model_Optimizer.md) guide.
+.. meta::
+   :description: Learn how to use frontend extension classes to facilitate the mapping 
+                 of custom operations from the framework model representation to the OpenVINO 
+                 representation.
 
-> **NOTE**: This documentation is written based on the [Template extension](https://github.com/openvinotoolkit/openvino/tree/master/src/core/template_extension/new), which demonstrates extension development details based on minimalistic `Identity` operation that is a placeholder for your real custom operation. You can review the complete code, which is fully compliable, to see how it works.
 
-## Single Operation Mapping with OpExtension
+The goal of this chapter is to explain how to use Frontend extension classes to facilitate 
+mapping of custom operations from framework model representation to OpenVINO representation. 
+Refer to :doc:`Introduction to OpenVINO Extension <openvino_docs_Extensibility_UG_Intro>` to 
+understand the entire flow.
 
-This section covers the case when a single operation in framework representation is mapped to a single operation in OpenVINO representation. This is called *one-to-one mapping*. There is `OpExtension` class that works well if all the following conditions are satisfied:
+This API is applicable to new frontends only, which exist for ONNX, TensorFlow Lite, PaddlePaddle, and TensorFlow. 
+If a different model format is used, follow legacy 
+:doc:`Model Optimizer Extensions <openvino_docs_MO_DG_prepare_model_customize_model_optimizer_Customize_Model_Optimizer>` 
+guide.
+
+.. note:: 
+
+   This documentation is written based on the `Template extension <https://github.com/openvinotoolkit/openvino/tree/master/src/core/template_extension/new>`__, 
+   which demonstrates extension development details based on minimalistic ``Identity`` 
+   operation that is a placeholder for your real custom operation. You can review the complete code, 
+   which is fully compilable, to see how it works.
+
+
+.. note::
+   You can find more examples of extensions in `openvino_contrib repository <https://github.com/openvinotoolkit/openvino_contrib/tree/master/modules/custom_operations>`_.
+
+
+Single Operation Mapping with OpExtension
+#########################################
+
+This section covers the case when a single operation in framework representation is mapped to a single 
+operation in OpenVINO representation. This is called *one-to-one mapping*. There is ``OpExtension`` 
+class that works well if all the following conditions are satisfied:
 
 1. Number of inputs to operation in the Framework representation is the same as in the OpenVINO representation.
-
 2. Number of outputs is also the same in both representations.
-
-3. Inputs can be indexed and are mapped in order correspondingly, e.g. input with index 0 in framework representation maps to input with index 0 in OpenVINO representation and so on.
-
+3. Inputs can be indexed and are mapped in order correspondingly, e.g. 
+   input with index 0 in framework representation maps to input with index 0 in OpenVINO representation and so on.
 4. The same for outputs.
+5. Each attribute in OpenVINO operation can be initialized from one of the attributes of original operation or by 
+   some predefined constant value. Value of copied attributes cannot contain expressions, value is accepted as-is, 
+   so type of a value should be compatible.
 
-5. Each attribute in OpenVINO operation can be initialized from one of the attributes of original operation or by some predefined constant value. Value of copied attributes cannot contain expressions, value is accepted as-is, so type of a value should be compatible.
+.. note::
 
-> **NOTE**: `OpExtension` class is currently available for ONNX frontend only. PaddlePaddle frontend has named inputs and outputs for operation (not indexed) therefore OpExtension mapping is not applicable for this case.
+   ``OpExtension`` class is currently available for ONNX and TensorFlow frontends. 
+   PaddlePaddle frontend has named inputs and outputs for operation (not indexed) 
+   therefore OpExtension mapping is not applicable for this case.
 
-The next example maps ONNX operation with type [“Identity”]( https://github.com/onnx/onnx/blob/main/docs/Operators.md#Identity) to OpenVINO template extension `Identity` class.
+The following example maps ONNX operation with the type of `Identity <https://github.com/onnx/onnx/blob/main/docs/Operators.md#Identity>`__ 
+to OpenVINO template extension ``Identity`` class.
 
-@snippet ov_extensions.cpp frontend_extension_Identity_header
-@snippet ov_extensions.cpp frontend_extension_Identity
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_Identity_header]
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_Identity]
 
 The mapping doesn’t involve any attributes, as operation Identity doesn’t have them.
 
-Extension objects, like just constructed `extension` can be used to add to the OpenVINO runtime just before the loading a model that contains custom operations:
+Extension objects, like just constructed ``extension`` can be used to add to the 
+OpenVINO runtime just before the loading a model that contains custom operations:
 
-@snippet ov_extensions.cpp frontend_extension_read_model
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_read_model]
 
-Or extensions can be constructed in a separately compiled shared library. Separately compiled library can be used in Model Optimizer or `benchmark_app`. Read about how to build and load such library in chapter “Create library with extensions” in [Introduction to OpenVINO Extension](Intro.md).
+Or extensions can be constructed in a separately compiled shared library. 
+Separately compiled library can be used in Model Optimizer or ``benchmark_app``. 
+Read about how to build and load such a library in the chapter of “Create library with extensions” in 
+:doc:`Introduction to OpenVINO Extension <openvino_docs_Extensibility_UG_Intro>`.
 
-If operation have multiple inputs and/or outputs they will be mapped in order. The type of elements in input/output tensors should match expected types in the surrounding operations. For example, if custom operation produces `f32` data type then operation that consumes this output should also support `f32`. Otherwise, model conversion fails with an error, there are no automatic type conversion happens.
+If operation have multiple inputs and/or outputs they will be mapped in order. 
+The type of elements in input/output tensors should match expected types in the surrounding operations. 
+For example, if a custom operation produces the ``f32`` data type, the operation that consumes this output 
+should also support ``f32``. Otherwise, model conversion fails with an error, as no automatic type conversion is performed.
 
-### Converting to Standard OpenVINO Operation
+Converting to Standard OpenVINO Operation
++++++++++++++++++++++++++++++++++++++++++
 
-`OpExtension` class can be used when mapping to one of the operations from standard OpenVINO operation set is what you need and there is no class like `TemplateExtension::Identity` implemented.
+``OpExtension`` class can be used when mapping to one of the operations from standard OpenVINO 
+operation set is what you need and there is no class like ``TemplateExtension::Identity`` implemented.
 
-Here is an example for a custom framework operation “MyRelu”. Suppose it is mathematically equivalent to standard `Relu` that exists in OpenVINO operation set, but for some reason has type name “MyRelu”. In this case you can directly say that “MyRelu” -> `Relu` mapping should be used:
+Here is an example of a custom framework operation 'MyRelu'. Assume it is mathematically equivalent 
+to standard ``Relu`` that exists in the OpenVINO operation set, but for some reason has the type name of 'MyRelu'. 
+In this case, you can directly say that 'MyRelu' -> ``Relu`` mapping should be used:
 
-@sphinxtabset
+.. tab-set::
 
-@sphinxtab{C++}
-@snippet ov_extensions.cpp frontend_extension_MyRelu
-@endsphinxtab
-@sphinxtab{Python}
-@snippet ov_extensions.py py_frontend_extension_MyRelu
-@endsphinxtab
+   .. tab-item:: Python
+      :sync: py
+   
+      .. doxygensnippet:: docs/snippets/ov_extensions.py
+         :language: python
+         :fragment: [py_frontend_extension_MyRelu]
 
-@endsphinxtabset
+   .. tab-item:: C++
+      :sync: cpp
 
-In the resulting converted OpenVINO model, “MyRelu” operation will be replaced by the standard operation `Relu` from the latest available OpenVINO operation set. Notice that when standard operation is used, it can be specified using just a type string (“Relu”) instead of using a `ov::opset8::Relu` class name as a template parameter for `OpExtension`. This method is available for operations from the standard operation set only. For a user custom OpenVINO operation the corresponding class should be always specified as a template parameter as it was demonstrated with `TemplateExtension::Identity`.
+      .. doxygensnippet:: docs/snippets/ov_extensions.cpp
+         :language: cpp
+         :fragment: [frontend_extension_MyRelu]
 
-### Attributes Mapping
 
-As described above, `OpExtension` is useful when attributes can be mapped one by one or initialized by a constant. If the set of attributes in framework representation and OpenVINO representation completely match by their names and types, nothing should be specified in OpExtension constructor parameters. The attributes are discovered and mapped automatically based on `visit_attributes` method that should be defined for any OpenVINO operation.
+In the resulting converted OpenVINO model, “MyRelu” operation will be replaced by the standard operation 
+``Relu`` from the latest available OpenVINO operation set. Notice that when standard operation is used, 
+it can be specified using just a type string (“Relu”) instead of using a ``ov::opset8::Relu`` class name as a 
+template parameter for ``OpExtension``. This method is available for operations from the standard operation set only. 
+For a user custom OpenVINO operation the corresponding class should be always specified as a template parameter 
+as it was demonstrated with ``TemplateExtension::Identity``.
 
-Imagine you have CustomOperation class implementation that has two attributes with names `attr1` and `attr2`:
+Attribute Mapping
+++++++++++++++++++
 
-@snippet ov_extensions.cpp frontend_extension_CustomOperation
+As described above, ``OpExtension`` is useful when attributes can be mapped one by one or initialized by a constant.
+Attributes in OpenVINO operators are identified by their names, so for frameworks that also have named attributes (like TensorFlow, PaddlePaddle, ONNX), 
+you can specify name to name mapping. For frameworks where OpenVINO operator's attributes can be mapped to one of the framework 
+operator inputs (like PyTorch), there's a name to input index mapping.
 
-And original model in framework representation also has operation with name “CustomOperatoin” with the same `attr1` and `attr2` attributes. Then with the following code:
 
-@snippet ov_extensions.cpp frontend_extension_CustomOperation_as_is
+Named attributes mapping
+^^^^^^^^^^^^^^^^^^^^^^^^
 
-both `attr1` and `attr2` are copied from framework representation to OpenVINO representation automatically. If for some reason names of attributes are different but values still can be copied “as-is” you can pass attribute names mapping in `OpExtension` constructor:
+If the set of attributes in framework representation and OpenVINO representation completely match by their names and types, 
+no attribute mapping has to be specified in OpExtension constructor parameters. The attributes are discovered and mapped automatically 
+based on ``visit_attributes`` method that should be defined for any OpenVINO operation.
 
-@snippet ov_extensions.cpp frontend_extension_CustomOperation_rename
+Imagine you have CustomOperation class implementation that has two attributes with names: ``attr1`` and ``attr2``.
 
-Where `fw_attr1` and `fw_attr2` are names for corresponding attributes in framework operation representation.
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_CustomOperation]
 
-If copying of an attribute is not what you need, `OpExtension` also can set attribute to predefined constant value. For the same `CustomOperation`, imagine you want to set `attr2` to value 5 instead of copying from `fw_attr2`, to achieve that do the following:
+And original model in framework representation also has operation with name ``CustomOperation`` with the same 
+``attr1`` and ``attr2`` attributes. Then with the following code:
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_CustomOperation_as_is]
+
+Both ``attr1`` and ``attr2`` are copied from framework representation to OpenVINO representation automatically.
+
+If for some reason names of attributes are different but values still can be copied “as-is” you can pass attribute 
+names mapping in ``OpExtension`` constructor:
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_CustomOperation_rename]
+
+Where ``fw_attr1`` and ``fw_attr2`` are names for corresponding attributes in framework operation representation.
+
+If copying of an attribute is not what you need, ``OpExtension`` also can set attribute to predefined constant value. 
+For the same ``CustomOperation``, imagine you want to set ``attr2`` to value 5 instead of copying from ``fw_attr2``, 
+to achieve that do the following:
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_CustomOperation_rename_set]
 
-@snippet ov_extensions.cpp frontend_extension_CustomOperation_rename_set
 
 So the conclusion is that each attribute of target OpenVINO operation should be initialized either by
 
 1. Setting automatically due to name matching
-
 2. Mapped by attribute name
-
 3. Set to a constant value
 
-This is achieved by specifying maps as arguments for `OpExtension` constructor.
+This is achieved by specifying maps as arguments for ``OpExtension`` constructor.
 
 
-## Mapping to Multiple Operations with ConversionExtension
+Attribute mapping with named inputs and outputs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Previous sections cover the case when a single operation is mapped to a single operation with optional adjustment in names and attribute values. That is likely enough for your own custom operation with existing C++ kernel implementation. In this case your framework representation and OpenVINO representation for the operation are under your control and inputs/outpus/attributes can be aligned to make `OpExtension` usable.
+Mappings in previous examples assume that inputs and outputs of an operator in framework model representation come 
+with a particular order so you can directly map framework operation input ``0`` to OpenVINO operation input ``0`` and so on. 
+That's not always the case, for frameworks like PaddlePaddle, operation inputs and outputs are identified by their names 
+and may be defined in any order. So to map it to OpenVINO operation inputs and outputs, you have to specify that order yourself. 
+This can be done by creating two vector of strings, one for input and one for output, where framework operation 
+input name at position ``i`` maps to OpenVINO operation input at position ``i`` (and similarly for outputs).
 
-In case if one-to-one mapping is not possible, *decomposition to multiple operations* should be considered. It is achieved by using more verbose and less automated `ConversionExtension` class. It enables writing arbitrary code to replace a single framework operation by multiple connected OpenVINO operations constructing dependency graph of any complexity.
 
-`ConversionExtension` maps a single operation to a function which builds a graph using OpenVINO operation classes. Follow chapter [Build a Model in OpenVINO Runtime](@ref ov_ug_build_model) to learn how to use OpenVINO operation classes to build a fragment of model for replacement.
+Let's see the following example. Like previously, we'd like to map ``CustomOperation`` in the original model, 
+to OpenVINO ``CustomOperation`` as is (so their name and attributes names match). This time, that framework operation 
+inputs and outputs are not stricly ordered and can be identified  by their names ``A``, ``B``, ``C`` for inputs 
+and ``X``, ``Y`` for outputs. Those inputs and outputs can be mapped to OpenVINO operation, such that inputs 
+``A``, ``B``, ``C`` map to OpenVINO ``CustomOperation`` first, second and third input and ``X`` and ``Y`` 
+outputs map to OpenVINO ``CustomOperation`` first and second output respectively. 
 
-The next example illustrates using `ConversionExtension` for conversion of “ThresholdedRelu” from ONNX according to the formula: `ThresholdedRelu(x, alpha) -> Multiply(x, Convert(Greater(x, alpha), type=float))`.
+Given that, such custom operation can be registered by the following:
 
-> **NOTE**: `ThresholdedRelu` is one of the standard ONNX operators which is supported by ONNX frontend natively out-of-the-box. Here we are re-implementing it to illustrate how you can add a similar support for your custom operation instead of `ThresholdedRelu`.
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_CustomOperation_as_is_paddle]
 
-@sphinxtabset
 
-@sphinxtab{C++}
-@snippet ov_extensions.cpp frontend_extension_ThresholdedReLU_header
-@endsphinxtab
-@sphinxtab{Python}
-@snippet ov_extensions.py py_frontend_extension_ThresholdedReLU_header
-@endsphinxtab
+Second example shows how to map the operation with named inputs and outputs, but when names of attributes are different:
 
-@endsphinxtabset
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_CustomOperation_rename_paddle]
 
-@sphinxtabset
 
-@sphinxtab{C++}
-@snippet ov_extensions.cpp frontend_extension_ThresholdedReLU
-@endsphinxtab
-@sphinxtab{Python}
-@snippet ov_extensions.py py_frontend_extension_ThresholdedReLU
-@endsphinxtab
+and the last one shows how to map the operation with named inputs and outputs, but when (in order to correctly map framework 
+operation to OpenVINO operation) one of the attributes has to be set to predefined value:
 
-@endsphinxtabset
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_CustomOperation_rename_set_paddle]
 
-To access original framework operation attribute value and connect to inputs, `node` object of type `NodeContext` is used. It has two main methods:
 
-* `NodeContext::get_input` to get input with a given index,
+Mapping attributes from operation inputs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-* `NodeContext::get_attribute` to get attribute value with a given name.
+For models (like PyTorch models), where operations have attributes on the input list, you can specify name to input index mapping.
+For example, imagine you have created a custom OpenVINO operation that implements a variant of ELU activation function 
+with two attributes ``alpha`` and ``beta``:
+
+.. math::
+
+    CustomElu=\left\lbrace
+    \begin{array}{ll}
+    beta * x & \textrm{if x > 0} \newline
+    alpha * (exp(x) - 1) & \textrm{otherwise}
+    \end{array}
+    \right.
+
+Below is a snippet of ``CustomElu`` class showing how to define its attributes: 
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_framework_map_CustomElu]
+
+Let's see an example of how you can map ``CustomElu`` to PyTorch `aten::elu <https://pytorch.org/docs/stable/generated/torch.nn.functional.elu.html>`_ 
+(note that if ``beta`` is equal to ``1``, ``CustomElu`` works the same as ``aten::elu``).
+``aten::elu`` has ``alpha`` attribute second on the input list, but it doesn't have ``beta``. 
+So in order to map it to ``CustomElu`` you can use the following:
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_framework_map_CustomElu_mapping]
+
+This will map ``alpha`` to the second input and map ``beta`` attribute to constant value ``1.0f``.
+
+Such created extension can be used, e.g. in dynamic library, please refer to :ref:`Create a library with extensions <create_a_library_with_extensions>`.
+
+Mapping custom operations to frontends with OPENVINO_FRAMEWORK_MAP macro
+########################################################################
+
+``OPENVINO_FRAMEWORK_MAP`` is a macro that should be used inside OpenVINO operation's class definition and that lets you specify 
+the mapping between this operation to a frontend operation.
+
+Let's consider the following example. Imagine you have an ONNX model with ``CustomOp`` operation (and this operation has ``mode`` attribute), 
+a TensorFlow model with ``CustomOpV3`` operation (this operation has ``axis`` attribute) and a PaddlePaddle model with ``CustomOp`` (with ``mode`` attribute) 
+that has input named "X" and output named "Out" and all of them can be implemented with a single OpenVINO operation ``CustomOp`` like follows:
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_framework_map_macro_headers]
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_framework_map_macro_CustomOp]
+
+Let's take a closer look at the parameters this macro takes (note that there are two flavors - the second one is to map 
+for PaddlePaddle operations where input and output names have to be specified).
+
+.. code-block:: cpp
+
+   OPENVINO_FRAMEWORK_MAP(framework, name, attributes_map, attributes_values)
+   OPENVINO_FRAMEWORK_MAP(framework, input_names, output_names, name, attributes_map, attributes_values)
+
+- ``framework`` - framework name.
+- ``name`` - the framework operation name. It's optional if the OpenVINO custom operation name 
+  (that is the name that is passed as the first parameter to ``OPENVINO_OP`` macro) is the same 
+  as the framework operation name and both ``attributes_map`` and ``attributes_values`` are not provided.
+- ``input_names`` - vector of strings that specify the names of inputs (needed to map PaddlePaddle to OpenVINO operations),
+- ``output_names`` - vector of strings that specify the names of outputs (needed to map PaddlePaddle to OpenVINO operations),
+- ``attributes_map`` - used to provide a mapping between OpenVINO operation attribute and 
+  framework operation attribute. Contains key-value pairs, where key is an OpenVINO operation 
+  attribute name and value is its corresponding framework operation attribute name. 
+  This parameter is optional if the number of OpenVINO operation attributes and their names 
+  match one-to-one with framework operation attributes.
+- ``attributes_values`` - used to provide default values for OpenVINO operation attributes 
+  that are not specified in ``attributes_map``. Contains key-value pairs, where key is an OpenVINO 
+  operation attribute name and the value is this attribute value. This parameter cannot be provided 
+  if ``attributes_map`` contains all of OpenVINO operation attributes or if ``attributes_map`` is not provided.
+
+In the example above, ``OPENVINO_FRAMEWORK_MAP`` is used three times.
+First, OpenVINO ``CustomOp`` is mapped to ONNX ``CustomOp`` operation, ``m_mode`` attribute is mapped to ``mode`` 
+attribute, while ``m_axis`` attribute gets the default value ``-1``. Secondly, OpenVINO ``CustomOp`` is mapped 
+to TensorFlow ``CustomOpV3`` operation, ``m_axis`` attribute is mapped to ``axis`` attribute, while ``m_mode`` 
+attribute gets the default value ``"linear"``. Thirdly, OpenVINO ``CustomOp`` is mapped to PaddlePaddle ``CustomOp`` operation, 
+``m_mode`` attribute is mapped to ``mode`` attribute, while ``m_axis`` attribute gets the default value ``-1``. 
+This mapping also specifies the input name "X" and output name "Out".
+
+The last step is to register this custom operation by following:
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_framework_map_macro_add_extension]
+
+.. important::
+
+   To map an operation on a specific framework, you have to link to a respective 
+   frontend (``openvino::frontend::onnx``, ``openvino::frontend::tensorflow``, ``openvino::frontend::paddle``) in the ``CMakeLists.txt`` file:
+
+   .. code-block:: sh
+
+      target_link_libraries(${TARGET_NAME} PRIVATE openvino::frontend::onnx)
+
+
+Mapping to Multiple Operations with ConversionExtension
+#######################################################
+
+Previous sections cover the case when a single operation is mapped to a single operation with optional 
+adjustment in names and attribute values. That is likely enough for your own custom operation with existing 
+C++ kernel implementation. In this case your framework representation and OpenVINO representation for the 
+operation are under your control and inputs/outpus/attributes can be aligned to make ``OpExtension`` usable.
+
+In case if one-to-one mapping is not possible, *decomposition to multiple operations* should be considered. 
+It is achieved by using more verbose and less automated ``ConversionExtension`` class. 
+It enables writing arbitrary code to replace a single framework operation by multiple connected OpenVINO 
+operations constructing dependency graph of any complexity.
+
+``ConversionExtension`` maps a single operation to a function which builds a graph using OpenVINO 
+operation classes. Follow chapter :ref:`Build a Model in OpenVINO Runtime <ov_ug_build_model>` to 
+learn how to use OpenVINO operation classes to build a fragment of model for replacement.
+
+Below example illustrates using ``ConversionExtension`` for conversion of “ThresholdedRelu” 
+from ONNX according to the formula: ``ThresholdedRelu(x, alpha) -> Multiply(x, Convert(Greater(x, alpha), type=float))``.
+
+.. note:: 
+
+   ``ThresholdedRelu`` is one of the standard ONNX operators which is supported by ONNX frontend 
+   natively out-of-the-box. Here we are re-implementing it to illustrate how you can add a similar 
+   support for your custom operation instead of ``ThresholdedRelu``.
+
+.. tab-set::
+
+   .. tab-item:: Python
+      :sync: py
+
+      .. doxygensnippet:: docs/snippets/ov_extensions.py
+         :language: python
+         :fragment: [py_frontend_extension_ThresholdedReLU_header]
+
+   .. tab-item:: C++
+      :sync: cpp
+ 
+      .. doxygensnippet:: docs/snippets/ov_extensions.cpp
+         :language: cpp
+         :fragment: [frontend_extension_ThresholdedReLU_header]
+
+.. tab-set::
+
+   .. tab-item:: Python
+      :sync: py
+ 
+      .. doxygensnippet:: docs/snippets/ov_extensions.py
+         :language: python
+         :fragment: [py_frontend_extension_ThresholdedReLU]
+
+   .. tab-item:: C++
+      :sync: cpp
+ 
+      .. doxygensnippet:: docs/snippets/ov_extensions.cpp
+         :language: cpp
+         :fragment: [frontend_extension_ThresholdedReLU]
+
+
+The next example shows how to use ``ConversionExtension`` to convert PyTorch 
+`aten::hardtanh <https://pytorch.org/docs/stable/generated/torch.nn.functional.hardtanh.html>`_ 
+to demonstrate how to use ``get_values_from_const_input`` function to fetch an attribute value from input:
+
+
+.. doxygensnippet:: docs/snippets/ov_extensions.py
+   :language: python
+   :fragment: [py_frontend_extension_aten_hardtanh]
+
+
+To access original framework operation attribute value and connect to inputs, ``node`` object of type ``NodeContext`` is used. It has three main methods:
+
+* ``NodeContext::get_input`` to get input with a given index,
+
+* ``NodeContext::get_attribute`` to get attribute value with a given name,
+
+* ``NodeContext::get_values_from_const_input`` to get an attribute with a given input index.
+
+The conversion function should return a vector of node outputs that are mapped to 
+corresponding outputs of the original framework operation in the same order.
+
+Some frameworks require output names of the operation to be provided during conversion.
+For PaddlePaddle operations, it is generally necessary to provide names for all outputs using the ``NamedOutputs`` container.
+Usually those names can be found in source code of the individual operation in PaddlePaddle code.
+The next example shows such conversion for the ``top_k_v2`` operation.
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_paddle_TopK]
+
+For TensorFlow framework, if an operation has more than one output, it is recommended to assign names to
+those outputs using the ``NamedOutputVector`` structure which allows both indexed and named output access.
+For a description of TensorFlow operations, including the names of their outputs, refer to the
+`tf.raw_ops <https://www.tensorflow.org/api_docs/python/tf/raw_ops/>`__ documentation page.
+The next example shows such conversion for the ``TopKV2`` operation.
+
+.. doxygensnippet:: docs/snippets/ov_extensions.cpp
+   :language: cpp
+   :fragment: [frontend_extension_tf_TopK]
+
+@endsphinxdirective
 
-The conversion function should return a vector of node outputs that are mapped to corresponding outputs of the original framework operation in the same order.
 

docs/Extensibility_UG/graph_rewrite_pass.md

@@ -1,28 +1,42 @@
 # OpenVINO Graph Rewrite Pass {#openvino_docs_Extensibility_UG_graph_rewrite_pass}
 
-`ov::pass::GraphRewrite` serves for running multiple matcher passes on `ov::Model` in a single graph traversal.
+@sphinxdirective
+
+.. meta::
+   :description: Get to know how Graph Rewrite handles running multiple matcher passes on 
+                 ov::Model in a single graph traversal.
+
+
+``:ref:`ov::pass::GraphRewrite <doxid-classov_1_1pass_1_1_graph_rewrite>``` serves for running multiple matcher passes on ``:ref:`ov::Model <doxid-classov_1_1_model>``` in a single graph traversal.
 Example:
 
-@snippet src/transformations/template_pattern_transformation.cpp matcher_pass:graph_rewrite
+.. doxygensnippet:: docs/snippets/template_pattern_transformation.cpp
+   :language: cpp
+   :fragment: [matcher_pass:graph_rewrite]
 
 In addition, GraphRewrite handles nodes that were registered by MatcherPasses during their execution. This nodes will be added to the beginning of the sequence with nodes for pattern matching.
 
-> **NOTE**: when using `ov::pass::Manager` temporary GraphRewrite is used to execute single MatcherPass.
+.. note:: 
+
+   When using ``:ref:`ov::pass::Manager <doxid-classov_1_1pass_1_1_manager>``` temporary GraphRewrite is used to execute single MatcherPass.
 
 GraphRewrite has two algorithms for MatcherPasses execution. First algorithm is straightforward. It applies each MatcherPass in registration order to current node.
 
-![graph_rewrite_execution]
+.. image:: ./_static/images/graph_rewrite_execution.png  
 
 But it is not really efficient when you have a lot of registered passes. So first of all GraphRewrite checks that all MatcherPass patterns has type-based root node (it means that type of this node is not hidden into predicate).
 And then creates map from registered MatcherPasses. That helps to avoid additional cost of applying each MatcherPass for each node.
 
-![graph_rewrite_efficient_search]
+.. image:: ./_static/images/graph_rewrite_efficient_search.png
 
-> **NOTE**: GraphRewrite execution algorithm cannot be set manually and depends only on root nodes registered inside MatcherPasses.
+.. note::
 
-## See Also
+   GraphRewrite execution algorithm cannot be set manually and depends only on root nodes registered inside MatcherPasses.
 
-* [OpenVINO™ Transformations](./ov_transformations.md)
+See Also
+########
+
+* :doc:`OpenVINO™ Transformations <openvino_docs_transformations>`
+
+@endsphinxdirective
 
-[graph_rewrite_execution]: ./img/graph_rewrite_execution.png
-[graph_rewrite_efficient_search]: ./img/graph_rewrite_efficient_search.png

docs/Extensibility_UG/matcher_pass.md

@@ -1,13 +1,27 @@
 # OpenVINO Matcher Pass {#openvino_docs_Extensibility_UG_matcher_pass}
 
-`ov::pass::MatcherPass` is used for pattern-based transformations.
+@sphinxdirective
+
+.. meta::
+   :description: Learn how to create a pattern, implement a callback, register 
+                 the pattern and Matcher to execute MatcherPass transformation 
+                 on a model.
+
+``:ref:`ov::pass::MatcherPass <doxid-classov_1_1pass_1_1_matcher_pass>```  is used for pattern-based transformations.
 
 Template for MatcherPass transformation class
-@snippet src/transformations/template_pattern_transformation.hpp graph_rewrite:template_transformation_hpp
 
-@snippet src/transformations/template_pattern_transformation.cpp graph_rewrite:template_transformation_cpp
+.. doxygensnippet:: docs/snippets/template_pattern_transformation.hpp
+   :language: cpp
+   :fragment: [graph_rewrite:template_transformation_hpp]
+
+.. doxygensnippet:: docs/snippets/template_pattern_transformation.cpp
+   :language: cpp
+   :fragment: [graph_rewrite:template_transformation_cpp]
+
+
+To use ``:ref:`ov::pass::MatcherPass <doxid-classov_1_1pass_1_1_matcher_pass>```, you need to complete these steps:
 
-To use `ov::pass::MatcherPass`, you need to complete these steps:
 1. Create a pattern
 2. Implement a callback
 3. Register the pattern and Matcher
@@ -15,87 +29,135 @@ To use `ov::pass::MatcherPass`, you need to complete these steps:
 
 So let's go through each of these steps.
 
-## Create a pattern
+Create a pattern
+################
 
-Pattern is a single root `ov::Model`. But the only difference is that you do not need to create a model object, you just need to create and connect opset or special pattern operations.
+Pattern is a single root ``:ref:`ov::Model <doxid-classov_1_1_model>```. But the only difference is that you do not need to create a model object, you just need to create and connect opset or special pattern operations.
 Then you need to take the last created operation and put it as a root of the pattern. This root node will be used as a root node in pattern matching.
-> **NOTE**: Any nodes in a pattern that have no consumers and are not registered as root will not be used in pattern matching.
 
-@snippet ov_model_snippets.cpp pattern:simple_example
+.. note:: 
+   Any nodes in a pattern that have no consumers and are not registered as root will not be used in pattern matching.
 
-The `Parameter` operation in the example above has type and shape specified. These attributes are needed only to create Parameter operation class and will not be used in pattern matching.
+.. doxygensnippet:: docs/snippets/ov_model_snippets.cpp
+   :language: cpp
+   :fragment: [pattern:simple_example]
 
-For more pattern examples, refer to the [pattern matching](#pattern_matching) section.
+The ``Parameter`` operation in the example above has type and shape specified. These attributes are needed only to create Parameter operation class and will not be used in pattern matching.
 
-## Implement callback
+For more pattern examples, refer to the `pattern matching section <#pattern-matching>`__.
+
+Implement callback
+##################
 
 Callback is an action applied to every pattern entrance. In general, callback is the lambda function that takes Matcher object with detected subgraph.
 
-@snippet ov_model_snippets.cpp pattern:callback_example
+.. doxygensnippet:: docs/snippets/ov_model_snippets.cpp
+   :language: cpp
+   :fragment: [pattern:callback_example]
 
 The example above shows the callback structure and how Matcher can be used for accessing nodes detected by pattern.
-Callback return value is `true` if root node was replaced and another pattern cannot be applied to the same root node; otherwise, it is `false`.
-> **NOTE**: It is not recommended to manipulate with nodes that are under root node. This may affect GraphRewrite execution as it is expected that all nodes that come after root node in topological order are valid and can be used in pattern matching.
+Callback return value is ``true`` if root node was replaced and another pattern cannot be applied to the same root node; otherwise, it is ``false``.
+
+.. note:: 
+
+   It is not recommended to manipulate with nodes that are under root node. This may affect GraphRewrite execution as it is expected that all nodes that come after root node in topological order are valid and can be used in pattern matching.
 
 MatcherPass also provides functionality that allows reporting of the newly created nodes that can be used in additional pattern matching.
-If MatcherPass was registered in `ov::pass::Manager` or `ov::pass::GraphRewrite`, these registered nodes will be added for additional pattern matching.
-That means that matcher passes registered in `ov::pass::GraphRewrite` will be applied to these nodes.
+If MatcherPass was registered in ``:ref:`ov::pass::Manager <doxid-classov_1_1pass_1_1_manager>``` or ``:ref:`ov::pass::GraphRewrite <doxid-classov_1_1pass_1_1_graph_rewrite>```, these registered nodes will be added for additional pattern matching.
+That means that matcher passes registered in ``:ref:`ov::pass::GraphRewrite <doxid-classov_1_1pass_1_1_graph_rewrite>``` will be applied to these nodes.
 
-The example below shows how single MatcherPass can fuse sequence of operations using the `register_new_node` method.
+The example below shows how single MatcherPass can fuse sequence of operations using the ``register_new_node`` method.
 
-@snippet src/transformations/template_pattern_transformation.cpp matcher_pass:relu_fusion
+.. doxygensnippet:: docs/snippets/template_pattern_transformation.cpp
+   :language: cpp
+   :fragment: [matcher_pass:relu_fusion]
 
-> **NOTE**: If you register multiple nodes, please add them in topological order. We do not topologically sort these nodes as it is a time-consuming operation.
+.. note:: 
+   If you register multiple nodes, please add them in topological order. We do not topologically sort these nodes as it is a time-consuming operation.
 
-## Register pattern and Matcher
+Register pattern and Matcher
+############################
 
-The last step is to register Matcher and callback inside the MatcherPass pass. To do this, call the `register_matcher` method.
-> **NOTE**: Only one matcher can be registered for a single MatcherPass class.
+The last step is to register Matcher and callback inside the MatcherPass pass. To do this, call the ``register_matcher`` method.
 
-```cpp
-// Register matcher and callback
-register_matcher(m, callback);
-```
-## Execute MatcherPass
+.. note:: 
+
+   Only one matcher can be registered for a single MatcherPass class.
+
+.. code-block:: cpp
+   
+   // Register matcher and callback
+   register_matcher(m, callback);
+
+
+Execute MatcherPass
+###################
 
 MatcherPass has multiple ways to be executed:
-* Run on a single node - it can be useful if you want to run MatcherPass inside another transformation.
-@snippet src/transformations/template_pattern_transformation.cpp matcher_pass:run_on_node
-* Run on `ov::Model` using GraphRewrite - this approach gives ability to run MatcherPass on whole `ov::Model`. Moreover, multiple MatcherPass transformation can be registered in a single GraphRewite to be executed in a single graph traversal.
-@snippet src/transformations/template_pattern_transformation.cpp matcher_pass:graph_rewrite
-* Run on `ov::Model` using `ov::pass::Manager` - this approach helps you to register MatcherPass for execution on `ov::Model` as another transformation types.
-@snippet src/transformations/template_pattern_transformation.cpp matcher_pass:manager
 
-## Pattern Matching <a name="pattern_matching"></a>
+* Run on a single node - it can be useful if you want to run MatcherPass inside another transformation.
+
+.. doxygensnippet:: docs/snippets/template_pattern_transformation.cpp
+   :language: cpp
+   :fragment: [matcher_pass:run_on_node]
+
+* Run on ``:ref:`ov::Model <doxid-classov_1_1_model>``` using GraphRewrite - this approach gives ability to run MatcherPass on whole ``:ref:`ov::Model <doxid-classov_1_1_model>```. Moreover, multiple MatcherPass transformation can be registered in a single GraphRewite to be executed in a single graph traversal.
+
+.. doxygensnippet:: docs/snippets/template_pattern_transformation.cpp
+   :language: cpp
+   :fragment: [matcher_pass:graph_rewrite]
+
+* Run on ``:ref:`ov::Model <doxid-classov_1_1_model>``` using ``:ref:`ov::pass::Manager <doxid-classov_1_1pass_1_1_manager>``` - this approach helps you to register MatcherPass for execution on ``:ref:`ov::Model <doxid-classov_1_1_model>``` as another transformation types.
+
+.. doxygensnippet:: docs/snippets/template_pattern_transformation.cpp
+   :language: cpp
+   :fragment: [matcher_pass:manager]
+
+
+Pattern Matching
+################
 
 Sometimes patterns cannot be expressed via regular operations or it is too complicated.
 For example, if you want to detect **Convolution->Add** sub-graph without specifying particular input type for Convolution operation or you want to create a pattern where some of operations can have different types.
 And for these cases OpenVINO™ provides additional helpers to construct patterns for GraphRewrite transformations.
 
 There are two main helpers:
-1. `ov::pass::pattern::any_input` - helps to express inputs if their types are undefined.
-2. `ov::pass::pattern::wrap_type<T>` - helps to express nodes of pattern without specifying node attributes.
+
+1. ``:ref:`ov::pass::pattern::any_input <doxid-namespaceov_1_1pass_1_1pattern_1a8ed84c3eed4610f117ee10d86d500e02>``` - helps to express inputs if their types are undefined.
+2. ``:ref:`ov::pass::pattern::wrap_type <doxid-namespaceov_1_1pass_1_1pattern_1adfcd6031c95d7bace5f084e2aa105af8>`<T>`` - helps to express nodes of pattern without specifying node attributes.
 
 Let's go through the example to have better understanding of how it works:
 
-> **NOTE**: Node attributes do not participate in pattern matching and are needed only for operations creation. Only operation types participate in pattern matching.
+.. note::
+   Node attributes do not participate in pattern matching and are needed only for operations creation. Only operation types participate in pattern matching.
 
-The example below shows basic usage of `ov::passpattern::any_input`.
+The example below shows basic usage of ``ov::passpattern::any_input``.
 Here we construct Multiply pattern with arbitrary first input and Constant as a second input.
 Also as Multiply is commutative operation, it does not matter in which order we set inputs (any_input/Constant or Constant/any_input) because both cases will be matched.
 
-@snippet ov_model_snippets.cpp pattern:label_example
+.. doxygensnippet:: docs/snippets/ov_model_snippets.cpp
+   :language: cpp
+   :fragment: [pattern:label_example]
 
 This example shows how we can construct a pattern when operation has arbitrary number of inputs.
 
-@snippet ov_model_snippets.cpp pattern:concat_example
+.. doxygensnippet:: docs/snippets/ov_model_snippets.cpp
+   :language: cpp
+   :fragment: [pattern:concat_example]
 
 This example shows how to use predicate to construct a pattern. Also it shows how to match pattern manually on given node.
 
-@snippet ov_model_snippets.cpp pattern:predicate_example
+.. doxygensnippet:: docs/snippets/ov_model_snippets.cpp
+   :language: cpp
+   :fragment: [pattern:predicate_example]
 
-> **NOTE**: Be careful with manual matching because Matcher object holds matched nodes. To clear a match, use the m->clear_state() method.
+.. note::
 
-## See Also
+   Be careful with manual matching because Matcher object holds matched nodes. To clear a match, use the m->clear_state() method.
 
-* [OpenVINO™ Transformations](./ov_transformations.md)
+See Also
+########
+
+* :doc:`OpenVINO™ Transformations <openvino_docs_transformations>`
+
+@endsphinxdirective

docs/Extensibility_UG/model_pass.md

@@ -1,17 +1,31 @@
 # OpenVINO Model Pass {#openvino_docs_Extensibility_UG_model_pass}
 
-`ov::pass::ModelPass` is used for transformations that take entire `ov::Model` as an input and process it.
+@sphinxdirective
+
+.. meta::
+   :description: Learn how to use Model Pass transformation class to take entire 
+                 ov::Model as input and process it.
+
+
+``:ref:`ov::pass::ModelPass <doxid-classov_1_1pass_1_1_model_pass>``` is used for transformations that take entire ``:ref:`ov::Model <doxid-classov_1_1_model>``` as an input and process it.
 
 Template for ModelPass transformation class
 
-@snippet src/transformations/template_model_transformation.hpp model_pass:template_transformation_hpp
+.. doxygensnippet:: docs/snippets/template_model_transformation.hpp 
+   :language: cpp 
+   :fragment: [model_pass:template_transformation_hpp]
 
-@snippet src/transformations/template_model_transformation.cpp model_pass:template_transformation_cpp
+.. doxygensnippet:: docs/snippets/template_model_transformation.cpp
+   :language: cpp
+   :fragment: [model_pass:template_transformation_cpp]
 
-Using `ov::pass::ModelPass`, you need to override the `run_on_model` method where you will write the transformation code.
-Return value is `true` if the original model has changed during transformation (new operation was added, or operations replacement was made, or node attributes were changed); otherwise, it is `false`.
-Also `ov::pass::ModelPass` based transformations can be executed via `ov::pass::Manager`.
+Using ``:ref:`ov::pass::ModelPass <doxid-classov_1_1pass_1_1_model_pass>```, you need to override the ``run_on_model`` method where you will write the transformation code.
+Return value is ``true`` if the original model has changed during transformation (new operation was added, or operations replacement was made, or node attributes were changed); otherwise, it is ``false``.
+Also ``:ref:`ov::pass::ModelPass <doxid-classov_1_1pass_1_1_model_pass>``` based transformations can be executed via ``:ref:`ov::pass::Manager <doxid-classov_1_1pass_1_1_manager>```.
 
-## See Also
+See Also
+########
 
-* [OpenVINO™ Transformations](./ov_transformations.md)
+* :doc:`OpenVINO™ Transformations <openvino_docs_transformations>`
+
+@endsphinxdirective