From 8f84c0df9a94f20d1a2e5baad3d2b3594c3c759e Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 5 Sep 2024 17:27:12 +0400 Subject: [PATCH] Properly use OneCore toolchain in Windows CC (#26446) ### Details: - *item1* - *...* ### Tickets: - *ticket-id* --- .github/workflows/linux_conditional_compilation.yml | 1 + .github/workflows/windows_conditional_compilation.yml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_conditional_compilation.yml b/.github/workflows/linux_conditional_compilation.yml index 451da17bfcdaea..f037fb28022ace 100644 --- a/.github/workflows/linux_conditional_compilation.yml +++ b/.github/workflows/linux_conditional_compilation.yml @@ -314,6 +314,7 @@ jobs: -DSELECTIVE_BUILD=ON \ -DENABLE_TEMPLATE=OFF \ -DENABLE_INTEL_GPU=OFF \ + -DENABLE_INTEL_NPU=OFF \ -DENABLE_OV_TF_FRONTEND=OFF \ -DENABLE_OV_TF_LITE_FRONTEND=OFF \ -DENABLE_OV_PADDLE_FRONTEND=OFF \ diff --git a/.github/workflows/windows_conditional_compilation.yml b/.github/workflows/windows_conditional_compilation.yml index 8a2aa8fdf2d399..07ec15cae62795 100644 --- a/.github/workflows/windows_conditional_compilation.yml +++ b/.github/workflows/windows_conditional_compilation.yml @@ -171,7 +171,6 @@ jobs: -DSELECTIVE_BUILD=COLLECT ` -DENABLE_FASTER_BUILD=ON ` -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON ` - -DCMAKE_TOOLCHAIN_FILE=${{ env.ONECORE_TOOLCHAIN }} ` -S ${{ env.OPENVINO_REPO }} ` -B ${{ env.BUILD_DIR }} @@ -192,7 +191,7 @@ jobs: - name: Build C++ samples - OpenVINO build tree run: | - cmake -G "${{ env.CMAKE_GENERATOR }}" -DOpenVINO_DIR=${{ env.BUILD_DIR }} -S ${{ env.INSTALL_DIR }}/samples/cpp -B ${{ env.BUILD_DIR }}/cpp_samples -DCMAKE_TOOLCHAIN_FILE=${{ env.ONECORE_TOOLCHAIN }} + cmake -G "${{ env.CMAKE_GENERATOR }}" -DOpenVINO_DIR=${{ env.BUILD_DIR }} -S ${{ env.INSTALL_DIR }}/samples/cpp -B ${{ env.BUILD_DIR }}/cpp_samples cmake --build ${{ env.BUILD_DIR }}/cpp_samples --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target hello_query_device - name: Build C samples - OpenVINO install tree @@ -272,6 +271,7 @@ jobs: runs-on: aks-win-32-cores-128gb env: CMAKE_BUILD_TYPE: 'Release' + CMAKE_TOOLCHAIN_FILE: "${{ github.workspace }}\\openvino\\cmake\\toolchains\\onecoreuap.toolchain.cmake" OPENVINO_REPO: "${{ github.workspace }}\\openvino" BUILD_DIR: "${{ github.workspace }}\\openvino_build" MODELS_PATH: "${{ github.workspace }}\\testdata" @@ -317,6 +317,7 @@ jobs: -DSELECTIVE_BUILD=ON ` -DENABLE_TEMPLATE=OFF ` -DENABLE_INTEL_GPU=OFF ` + -DENABLE_INTEL_NPU=OFF ` -DENABLE_OV_TF_FRONTEND=OFF ` -DENABLE_OV_TF_LITE_FRONTEND=OFF ` -DENABLE_OV_PADDLE_FRONTEND=OFF ` @@ -328,7 +329,7 @@ jobs: -B ${{ env.BUILD_DIR }} - name: Cmake build - CC ON - run: cmake --build ${{ env.BUILD_DIR }} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target benchmark_app + run: cmake --build ${{ env.BUILD_DIR }} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target benchmark_app --verbose - name: List bin files shell: cmd