M [>0;136;0c [>0;136;0cranch 'upstream/master' into onednn-static=build

.ci/azure/linux_arm64.yml

@@ -183,7 +183,6 @@ jobs:
   - script: |
       set -e
       source $(BUILD_OPENVINO)/dependencies/conanbuild.sh
-      # TODO: return tests building once GPU plugin migrates to Plugin API 2.0
       cmake \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DBUILD_SHARED_LIBS=OFF \
@@ -197,6 +196,7 @@ jobs:
         -DPYTHON_LIBRARY=/usr/lib/aarch64-linux-gnu/libc-2.31.so \
         -DPYTHON_INCLUDE_DIR=$(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/include/python$(OV_PYTHON_VERSION_MAJOR_MINOR) \
         -DENABLE_DATA=OFF \
+        -DENABLE_TESTS=ON \
         -DENABLE_SYSTEM_TBB=ON \
         -DENABLE_SYSTEM_PROTOBUF=ON \
         -DENABLE_SYSTEM_SNAPPY=ON \

.github/workflows/coverage.yml

@@ -144,6 +144,6 @@ jobs:
           lcov --capture --directory ${{ github.workspace }}/. --output-file coverage.info
           genhtml coverage.info --output-directory coverage-report
       - name: Collect coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           verbose: true

.github/workflows/linux_conditional_compilation.yml

@@ -0,0 +1,142 @@
+name: Linux Conditional Compilation (Ubuntu 22.04, Python 3.11)
+on:
+  workflow_dispatch:
+  schedule:
+    # run daily at 00:00
+    - cron: '0 0 * * *'
+#  pull_request:
+#    paths-ignore:
+#      - '**/docs/**'
+#      - 'docs/**'
+#      - '**/**.md'
+#      - '**.md'
+#      - '**/layer_tests_summary/**'
+#      - '**/conformance/**'
+#  push:
+#    paths-ignore:
+#      - '**/docs/**'
+#      - 'docs/**'
+#      - '**/**.md'
+#      - '**.md'
+#      - '**/layer_tests_summary/**'
+#      - '**/conformance/**'
+#    branches:
+#      - master
+
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}-linux-cc
+  cancel-in-progress: true
+
+jobs:
+  Build:
+    # TODO: remove. Temporary measure to prevent the workflow from scheduling on forks.
+    if: ${{ github.repository_owner == 'openvinotoolkit' }}
+    defaults:
+      run:
+        shell: bash
+    runs-on: ubuntu-latest-8-cores
+    env:
+      CMAKE_BUILD_TYPE: 'Release'
+      CMAKE_GENERATOR: 'Ninja'
+      CMAKE_CXX_COMPILER_LAUNCHER: ccache
+      CMAKE_C_COMPILER_LAUNCHER: ccache
+      OPENVINO_REPO: ${{ github.workspace }}/openvino
+      OPENVINO_CONTRIB_REPO: ${{ github.workspace }}/openvino_contrib
+      BUILD_DIR: ${{ github.workspace }}/build
+      DATA_PATH: ${{ github.workspace }}/testdata
+      MODELS_PATH: ${{ github.workspace }}/testdata
+      OV_TEMP: ${{ github.workspace }}/openvino_temp
+      PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin"
+    steps:
+      - name: Clone OpenVINO
+        uses: actions/checkout@v3
+        with:
+          path: 'openvino'
+          submodules: 'recursive'
+
+      - name: Clone testdata for C API tests
+        uses: actions/checkout@v3
+        with:
+          repository: 'openvinotoolkit/testdata'
+          path: 'testdata'
+          submodules: 'recursive'
+          lfs: 'true'
+
+      #
+      # Dependencies
+      #
+
+      - name: Install build dependencies
+        run: |
+          sudo -E ${{ env.OPENVINO_REPO }}/install_build_dependencies.sh
+          sudo -E apt update
+          sudo -E apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers
+
+          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/
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      #
+      # Build
+      #
+
+      - name: Setup ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          max-size: "2000M"
+          # Should save cache only if run in the master branch of the base repo
+          # github.ref_name is 'ref/PR_#' in case of the PR, and 'branch_name' when executed on push
+          # save: ${{ github.ref_name == 'master' && 'true' || 'false'  }}
+          verbose: 2
+          key: linux-cc
+          restore-keys: |
+            linux-cc
+
+      - name: Get number of CPU cores
+        uses: SimenB/github-actions-cpu-cores@v2
+        id: cpu-cores
+
+      - name: CMake configure CC COLLECT
+        run: |
+          cmake \
+            -G "Ninja Multi-Config" \
+            -DENABLE_CPPLINT=OFF \
+            -DENABLE_GAPI_PREPROCESSING=OFF \
+            -DCMAKE_VERBOSE_MAKEFILE=ON \
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
+            -DENABLE_FASTER_BUILD=ON \
+            -DENABLE_PROFILING_ITT=ON \
+            -DSELECTIVE_BUILD=COLLECT \
+            -S ${{ env.OPENVINO_REPO }} \
+            -B ${{ env.BUILD_DIR }}
+
+      - name: Clean ccache stats
+        run: ccache --zero-stats --show-config
+
+      - name: Build CC COLLECT
+        run: cmake --build ${{ env.BUILD_DIR }} --parallel ${{ steps.cpu-cores.outputs.count }} --config Release --target openvino_intel_cpu_plugin openvino_ir_frontend benchmark_app sea_itt_lib
+
+      - name: Show ccache stats
+        run: ccache --show-stats
+
+      - name: Code usage analysis
+        run: |
+          python3 ${{ env.OPENVINO_REPO }}/thirdparty/itt_collector/runtool/sea_runtool.py \
+            --bindir ${{ env.OPENVINO_REPO }}/bin/intel64/Release -o ${{ env.BUILD_DIR }}/itt_stat ! \
+          ${{ env.OPENVINO_REPO }}/bin/intel64/Release/benchmark_app -niter 1 -nireq 1 \
+            -m ${{ env.MODELS_PATH }}/models/test_model/test_model_fp32.xml -d CPU
+
+      - name: CMake configure with CC ON
+        run: cmake -DSELECTIVE_BUILD=ON -DSELECTIVE_BUILD_STAT=${{ env.BUILD_DIR }}/*.csv -S ${{ env.OPENVINO_REPO }} -B ${{ env.BUILD_DIR }}
+
+      - name: Build with CC ON
+        run: cmake --build ${{ env.BUILD_DIR }} --parallel ${{ steps.cpu-cores.outputs.count }} --config Release --target openvino_intel_cpu_plugin openvino_ir_frontend
+
+      - name: Use OpenVINO after CC
+        run: |
+          ${{ env.OPENVINO_REPO }}/bin/intel64/Release/benchmark_app -niter 1 -nireq 1 \
+            -m ${{ env.MODELS_PATH }}/models/test_model/test_model_fp32.xml -d CPU

.github/workflows/windows_conditional_compilation.yml

@@ -0,0 +1,170 @@
+name: Tests on Windows Conditional Compilation (VS 2022, Python 3.11)
+on:
+  workflow_dispatch:
+  schedule:
+    # run daily at 00:00
+    - cron: '0 0 * * *'
+#  pull_request:
+#    paths-ignore:
+#      - '**/docs/**'
+#      - 'docs/**'
+#      - '**/**.md'
+#      - '**.md'
+#      - '**/layer_tests_summary/**'
+#      - '**/conformance/**'
+#  push:
+#    paths-ignore:
+#      - '**/docs/**'
+#      - 'docs/**'
+#      - '**/**.md'
+#      - '**.md'
+#      - '**/layer_tests_summary/**'
+#      - '**/conformance/**'
+#    branches:
+#      - master
+
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}-windows-cc
+  cancel-in-progress: true
+
+env:
+  CMAKE_BUILD_TYPE: 'Release'
+  CMAKE_GENERATOR: 'Ninja'
+  CMAKE_CXX_COMPILER_LAUNCHER: sccache
+  CMAKE_C_COMPILER_LAUNCHER: sccache
+  OPENVINO_REPO: "${{ github.workspace }}\\openvino"
+  OPENVINO_CONTRIB_REPO: "${{ github.workspace }}\\openvino_contrib"
+  INSTALL_DIR: "${{ github.workspace }}\\install_pkg"
+  INSTALL_TEST_DIR: "${{ github.workspace }}\\install\\tests"
+  SAMPLES_INSTALL_DIR: "${{ github.workspace }}\\install\\samples"
+  LAYER_TESTS_INSTALL_DIR: "${{ github.workspace }}\\install\\tests\\layer_tests"
+  BUILD_DIR: "${{ github.workspace }}\\build"
+  BUILD_DIR_2: "${{ github.workspace }}\\build_s"
+  DATA_PATH: "${{ github.workspace }}\\testdata"
+  MODELS_PATH: "${{ github.workspace }}\\testdata"
+  OV_TEMP: "${{ github.workspace }}\\openvino_temp"
+  BUILD_TYPE: "Release"
+  PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin"
+  VCVARSPATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+
+jobs:
+  Build:
+    # TODO: remove. Temporary measure to prevent the workflow from scheduling on forks.
+    if: ${{ github.repository_owner == 'openvinotoolkit' }}
+    defaults:
+      run:
+        shell: pwsh
+    runs-on: windows-latest-8-cores
+    steps:
+      - name: Clone OpenVINO
+        uses: actions/checkout@v3
+        with:
+          path: 'openvino'
+          submodules: 'recursive'
+
+      - name: Clone testdata for sample test
+        uses: actions/checkout@v4
+        with:
+          repository: 'openvinotoolkit/testdata'
+          path: 'testdata'
+          submodules: 'recursive'
+          lfs: 'true'
+
+      #
+      # Dependencies
+      #
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install build dependencies
+        run: |
+          choco install --no-progress ninja
+
+      #
+      # Build
+      #
+
+      - name: Get number of CPU cores
+        uses: SimenB/github-actions-cpu-cores@v1
+        id: cpu-cores
+
+      - uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Setup sccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          variant: sccache
+          max-size: "2000M"
+          # Should save cache only if run in the master branch of the base repo
+          # github.ref_name is 'ref/PR_#' in case of the PR, and 'branch_name' when executed on push
+          save: ${{ github.ref_name == 'master' && 'true' || 'false'  }}
+          key: ${{ github.job }}-windows-cc
+          restore-keys: |
+            ${{ github.job }}-windows-cc
+
+      - name: CMake CC COLLECT
+        run: |
+          & "${{ env.VCVARSPATH }}" x64 && cmake -G Ninja `
+            -DENABLE_CPPLINT=OFF `
+            -DENABLE_GAPI_PREPROCESSING=OFF `
+            -DENABLE_PLUGINS_XML=ON `
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF `
+            -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
+            -DENABLE_PROFILING_ITT=ON `
+            -DSELECTIVE_BUILD=COLLECT `
+            -S ${{ env.OPENVINO_REPO }} `
+            -B ${{ env.BUILD_DIR }}
+
+      - name: Build CC COLLECT
+        run: |
+          & "${{ env.VCVARSPATH }}" x64 && cmake --build ${{ env.BUILD_DIR }} --parallel ${{ steps.cpu-cores.outputs.count }} --config ${{ env.BUILD_TYPE }} `
+            --target openvino_intel_cpu_plugin openvino_ir_frontend benchmark_app sea_itt_lib
+
+      - name: List bin files
+        shell: cmd
+        run: dir ${{ env.OPENVINO_REPO }}\bin\ /s
+
+      - name: Code usage analysis
+        shell: cmd
+        working-directory: ${{ env.OPENVINO_REPO }}
+        run: |
+          set path=%path%;${{ env.OPENVINO_REPO }}\temp\tbb\bin
+          call "${{ env.VCVARSPATH }}" && python thirdparty\itt_collector\runtool\sea_runtool.py --bindir ${{ env.OPENVINO_REPO }}\bin\intel64\${{ env.BUILD_TYPE }} -o ${{ env.BUILD_DIR }}\itt_stat ! ${{ env.OPENVINO_REPO }}\bin\intel64\${{ env.BUILD_TYPE }}\benchmark_app.exe -niter 1 -nireq 1 -m ${{ env.MODELS_PATH }}\models\test_model\test_model_fp32.xml -d CPU
+
+      - name: List csv files
+        shell: cmd
+        run: dir ${{ env.BUILD_DIR }}\*.csv /s /p
+
+      - name: CMake CC ON
+        run: |
+          & "${{ env.VCVARSPATH }}" x64 && cmake -G "Visual Studio 17 2022" `
+            -DVERBOSE_BUILD=ON `
+            -DENABLE_CPPLINT=OFF `
+            -DENABLE_GAPI_PREPROCESSING=OFF `
+            -DENABLE_PROFILING_ITT=OFF `
+            -DSELECTIVE_BUILD=ON `
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF `
+            -DSELECTIVE_BUILD_STAT=${{ env.BUILD_DIR }}\*.csv `
+            -S ${{ env.OPENVINO_REPO }} `
+            -B ${{ env.BUILD_DIR_2 }}
+
+      - name: Build CC ON
+        run: |
+          & "${{ env.VCVARSPATH }}" x64 && cmake --build ${{ env.BUILD_DIR_2 }} --parallel ${{ steps.cpu-cores.outputs.count }} --config ${{ env.BUILD_TYPE }} `
+            --target openvino_intel_cpu_plugin openvino_ir_frontend benchmark_app
+
+      - name: List bin files ON
+        shell: cmd
+        run: dir ${{ env.OPENVINO_REPO }}\bin\ /s
+
+      - name: Check conditional_compilation_gen.h header
+        shell: cmd
+        run: type ${{ env.BUILD_DIR_2 }}\src\common\conditional_compilation\conditional_compilation_gen.h
+
+      - name: Use OpenVINO after CC
+        shell: cmd
+        run: |
+          set path=%path%;${{ env.OPENVINO_REPO }}\temp\tbb\bin
+          ${{ env.OPENVINO_REPO }}\bin\intel64\${{ env.BUILD_TYPE }}\benchmark_app.exe -niter 1 -nireq 1 -m ${{ env.MODELS_PATH }}\models\test_model\test_model_fp32.xml -d CPU

cmake/developer_package/frontends/frontends.cmake

@@ -228,7 +228,7 @@ macro(ov_add_frontend)
 
         # protobuf generated code emits -Wsuggest-override error
         if(SUGGEST_OVERRIDE_SUPPORTED)
-            target_compile_options(${TARGET_NAME} PRIVATE -Wno-suggest-override)
+            target_compile_options(${TARGET_NAME} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-suggest-override>)
         endif()
 
         # install protobuf if it is not installed yet

cmake/extra_modules.cmake

@@ -132,12 +132,6 @@ endif()\n")
     ov_dev_package_no_errors()
     ov_deprecated_no_errors()
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        # 'argument': conversion from 'size_t' to 'int', possible loss of data
-        ov_add_compiler_flags(/wd4267)
-        ov_add_compiler_flags(/wd4244)
-    endif()
-
     # add each extra module
     foreach(module_path IN LISTS extra_modules)
         if(module_path)

cmake/templates/OpenVINOConfig.cmake.in

@@ -352,7 +352,8 @@ macro(_ov_find_intel_cpu_dependencies)
             set_and_check(ARM_COMPUTE_LIB_DIR "@PACKAGE_OPENVINO_LIB_DIR@")
             set(ACL_DIR "${CMAKE_CURRENT_LIST_DIR}")
         else()
-            set_and_check(ARM_COMPUTE_LIB_DIR "@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@")
+            # we are not using 'set_and_check' below, because the directory has not been created yet
+            set(ARM_COMPUTE_LIB_DIR "@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@")
             set_and_check(ACL_DIR "@PACKAGE_FIND_ACL_PATH@")
         endif()