diff --git a/.github/actions/setup_python/action.yml b/.github/actions/setup_python/action.yml index 2b77ba5282f350..76c4d02757fd67 100644 --- a/.github/actions/setup_python/action.yml +++ b/.github/actions/setup_python/action.yml @@ -39,13 +39,13 @@ runs: - if: ${{ runner.os == 'Linux' && runner.arch == 'ARM64' }} name: Setup Python ${{ inputs.version }} - uses: akashchi/deadsnakes-action@f01521a69eee61eaca3a34440bea3ce838317846 + uses: akashchi/deadsnakes-action@92417281055a5878a0450f240a5b95883eb2d7e2 with: python-version: ${{ inputs.version }} - if: ${{ runner.os == 'macOS' || runner.os == 'Windows' || (runner.os == 'Linux' && runner.arch != 'ARM64') }} name: Setup Python ${{ inputs.version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.version }} env: diff --git a/.github/workflows/android_arm64.yml b/.github/workflows/android_arm64.yml index a8deb0e3d476e1..2dc6cac5fe7685 100644 --- a/.github/workflows/android_arm64.yml +++ b/.github/workflows/android_arm64.yml @@ -53,6 +53,8 @@ jobs: CMAKE_GENERATOR: 'Ninja' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 OPENVINO_REPO: '/__w/openvino/openvino/openvino' VCPKG_ROOT: '/__w/openvino/openvino/vcpkg' BUILD_DIR: '/__w/openvino/openvino/build' @@ -123,9 +125,9 @@ jobs: echo "yes" | ./cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_TOOLS} --install "ndk-bundle" "platform-tools" "platforms;android-${{ env.ANDROID_SDK_VERSION }}" - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" # # Build diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 40e12d507cba54..24c0644ce1055d 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -54,7 +54,7 @@ jobs: - name: Cache documentation id: cache_sphinx_docs - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: build/docs/_build/.doctrees key: sphinx-docs-cache diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 4b6363a930450c..2a28b802787cf6 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -36,6 +36,8 @@ jobs: CMAKE_GENERATOR: 'Ninja Multi-Config' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 GITHUB_WORKSPACE: '/__w/openvino/openvino' OPENVINO_REPO: /__w/openvino/openvino/openvino OPENVINO_CONTRIB_REPO: /__w/openvino/openvino/openvino_contrib @@ -75,9 +77,9 @@ jobs: apt install --assume-yes --no-install-recommends default-jdk - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Setup Python ${{ env.PYTHON_VERSION }} uses: ./openvino/.github/actions/setup_python diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml index 19d32ef74e07c9..7a1b78f92f3db6 100644 --- a/.github/workflows/fedora.yml +++ b/.github/workflows/fedora.yml @@ -53,6 +53,8 @@ jobs: CMAKE_GENERATOR: 'Ninja' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 GITHUB_WORKSPACE: '/__w/openvino/openvino' OPENVINO_REPO: /__w/openvino/openvino/openvino INSTALL_DIR: /__w/openvino/openvino/openvino_install @@ -85,9 +87,9 @@ jobs: run: bash ${OPENVINO_REPO}/install_build_dependencies.sh - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Install python dependencies run: | diff --git a/.github/workflows/job_cpu_functional_tests.yml b/.github/workflows/job_cpu_functional_tests.yml index 7c1b29e085331f..33ae2fa691e363 100644 --- a/.github/workflows/job_cpu_functional_tests.yml +++ b/.github/workflows/job_cpu_functional_tests.yml @@ -30,6 +30,9 @@ jobs: PARALLEL_TEST_SCRIPT: ${{ github.workspace }}/install/tests/functional_test_utils/layer_tests_summary/run_parallel.py PARALLEL_TEST_CACHE: ${{ github.workspace }}/install/tests/test_cache.lst steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Download OpenVINO package uses: actions/download-artifact@v3 with: @@ -83,7 +86,7 @@ jobs: run: python3 -m pip install -r ${INSTALL_TEST_DIR}/functional_test_utils/layer_tests_summary/requirements.txt - name: Restore tests execution time - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ${{ env.PARALLEL_TEST_CACHE }} key: ${{ runner.os }}-${{ runner.arch }}-tests-functional-cpu-stamp-${{ github.sha }} @@ -101,7 +104,7 @@ jobs: timeout-minutes: 25 - name: Save tests execution time - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: github.ref_name == 'master' with: path: ${{ env.PARALLEL_TEST_CACHE }} diff --git a/.github/workflows/job_cxx_unit_tests.yml b/.github/workflows/job_cxx_unit_tests.yml index dd911edaa80341..367ed3b1b294ff 100644 --- a/.github/workflows/job_cxx_unit_tests.yml +++ b/.github/workflows/job_cxx_unit_tests.yml @@ -32,6 +32,9 @@ jobs: INSTALL_DIR: ${{ github.workspace }}/install INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Download OpenVINO package uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/job_debian_packages.yml b/.github/workflows/job_debian_packages.yml index f063a7734b8aec..3e4d78d3f3f50f 100644 --- a/.github/workflows/job_debian_packages.yml +++ b/.github/workflows/job_debian_packages.yml @@ -26,6 +26,8 @@ jobs: DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input DEBIAN_PACKAGES_DIR: ${{ github.workspace }}/packages steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries - name: Download OpenVINO debian packages uses: actions/download-artifact@v3 diff --git a/.github/workflows/job_onnx_models_tests.yml b/.github/workflows/job_onnx_models_tests.yml index 07d8d12d48a386..929af40bbc4928 100644 --- a/.github/workflows/job_onnx_models_tests.yml +++ b/.github/workflows/job_onnx_models_tests.yml @@ -31,6 +31,9 @@ jobs: MODELS_SHARE_PATH: "/mount/onnxtestdata" ONNX_MODEL_ZOO_SHA: "d58213534f2a4d1c4b19ba62b3bb5f544353256e" steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Download OpenVINO package uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/job_onnx_runtime.yml b/.github/workflows/job_onnx_runtime.yml index 5a6f5cb27eceae..05d545fb99729a 100644 --- a/.github/workflows/job_onnx_runtime.yml +++ b/.github/workflows/job_onnx_runtime.yml @@ -33,11 +33,16 @@ jobs: CMAKE_GENERATOR: 'Ninja Multi-Config' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 SCCACHE_AZURE_KEY_PREFIX: ${{ inputs.sccache-azure-key-prefix }} ONNX_RUNTIME_REPO: ${{ github.workspace }}/onnxruntime ONNX_RUNTIME_UTILS: ${{ github.workspace }}/install/onnxruntime ONNX_RUNTIME_BUILD_DIR: ${{ github.workspace }}/onnxruntime/build steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Download OpenVINO package uses: actions/download-artifact@v3 with: @@ -95,9 +100,9 @@ jobs: run: bash ${OPENVINO_REPO}/install_build_dependencies.sh - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Build Lin ONNX Runtime run: | diff --git a/.github/workflows/job_python_unit_tests.yml b/.github/workflows/job_python_unit_tests.yml index 38b35d17623f38..63b6b0d648139b 100644 --- a/.github/workflows/job_python_unit_tests.yml +++ b/.github/workflows/job_python_unit_tests.yml @@ -37,6 +37,9 @@ jobs: INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests LAYER_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/layer_tests steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Download OpenVINO package uses: actions/download-artifact@v3 with: @@ -68,7 +71,7 @@ jobs: - name: Install OpenVINO dependencies (Linux) if: runner.os == 'Linux' - run: $INSTALL_DIR/install_dependencies/install_openvino_dependencies.sh -c=core -c=dev -y + run: $INSTALL_DIR/install_dependencies/install_openvino_dependencies.sh -c=core -c=dev -y -c=gpu - name: Fetch setup_python action uses: actions/checkout@v4 diff --git a/.github/workflows/job_pytorch_models_tests.yml b/.github/workflows/job_pytorch_models_tests.yml index 8904b2212e9e33..f2a651e6727533 100644 --- a/.github/workflows/job_pytorch_models_tests.yml +++ b/.github/workflows/job_pytorch_models_tests.yml @@ -33,11 +33,18 @@ jobs: INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests MODEL_HUB_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/model_hub_tests steps: - - name: Check sudo if: ${{ runner.os == 'Linux' }} run: if [ "$(id -u)" -eq 0 ]; then apt update && apt --assume-yes install sudo; fi + - name: Set apt retries + run: | + if [ "$(id -u)" -eq 0 ]; then + echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + else + sudo sh -c "echo 'Acquire::Retries \"10\";' >> /etc/apt/apt.conf.d/80-retries" + fi + - name: Download OpenVINO package uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/job_samples_tests.yml b/.github/workflows/job_samples_tests.yml index 8c1401a819d845..cb939af4cfe7f3 100644 --- a/.github/workflows/job_samples_tests.yml +++ b/.github/workflows/job_samples_tests.yml @@ -31,6 +31,9 @@ jobs: INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests BUILD_DIR: ${{ github.workspace }}/build steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Download OpenVINO package uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/job_tensorflow_hub_models_tests.yml b/.github/workflows/job_tensorflow_hub_models_tests.yml index 6dcecaa267e8c4..54302b7cfbef58 100644 --- a/.github/workflows/job_tensorflow_hub_models_tests.yml +++ b/.github/workflows/job_tensorflow_hub_models_tests.yml @@ -33,11 +33,18 @@ jobs: INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests MODEL_HUB_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/model_hub_tests steps: - - name: Check sudo if: ${{ runner.os == 'Linux' }} run: if [ "$(id -u)" -eq 0 ]; then apt update && apt --assume-yes install sudo; fi + - name: Set apt retries + run: | + if [ "$(id -u)" -eq 0 ]; then + echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + else + sudo sh -c "echo 'Acquire::Retries \"10\";' >> /etc/apt/apt.conf.d/80-retries" + fi + - name: Download OpenVINO package uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4c7701fc444292..86f2de30af3a68 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -61,6 +61,8 @@ jobs: CMAKE_GENERATOR: 'Ninja Multi-Config' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 GITHUB_WORKSPACE: '/__w/openvino/openvino' OPENVINO_REPO: /__w/openvino/openvino/openvino OPENVINO_CONTRIB_REPO: /__w/openvino/openvino/openvino_contrib @@ -74,6 +76,9 @@ jobs: if: "!needs.smart_ci.outputs.skip_workflow" steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Install git run: | apt-get update @@ -111,9 +116,9 @@ jobs: apt install --assume-yes --no-install-recommends default-jdk - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Setup Python ${{ env.PYTHON_VERSION }} uses: ./openvino/.github/actions/setup_python @@ -500,6 +505,8 @@ jobs: CMAKE_CUDA_COMPILER_LAUNCHER: sccache CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 INSTALL_DIR: /__w/openvino/openvino/install OPENVINO_DEVELOPER_PACKAGE: /__w/openvino/openvino/install/developer_package OPENVINO_REPO: /__w/openvino/openvino/openvino @@ -510,6 +517,9 @@ jobs: if: fromJSON(needs.smart_ci.outputs.affected_components).NVIDIA steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Fetch install_build_dependencies.sh uses: actions/checkout@v4 with: @@ -560,9 +570,9 @@ jobs: apt -y --no-install-recommends install software-properties-common curl - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Install CUDA run: | diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml index e069352e07b4e3..43c0f4099ba649 100644 --- a/.github/workflows/linux_arm64.yml +++ b/.github/workflows/linux_arm64.yml @@ -63,6 +63,8 @@ jobs: CMAKE_GENERATOR: 'Ninja Multi-Config' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 GITHUB_WORKSPACE: '/__w/openvino/openvino' OPENVINO_REPO: /__w/openvino/openvino/openvino OPENVINO_CONTRIB_REPO: /__w/openvino/openvino/openvino_contrib @@ -76,6 +78,9 @@ jobs: if: "!needs.smart_ci.outputs.skip_workflow" steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Install git run: apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates @@ -111,9 +116,9 @@ jobs: apt install --assume-yes --no-install-recommends default-jdk - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Setup Python ${{ env.PYTHON_VERSION }} uses: ./openvino/.github/actions/setup_python diff --git a/.github/workflows/linux_conditional_compilation.yml b/.github/workflows/linux_conditional_compilation.yml index 06338c835b44fc..341d72c04bb1a7 100644 --- a/.github/workflows/linux_conditional_compilation.yml +++ b/.github/workflows/linux_conditional_compilation.yml @@ -58,6 +58,8 @@ jobs: CMAKE_GENERATOR: 'Ninja Multi-Config' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 GITHUB_WORKSPACE: '/__w/openvino/openvino' OPENVINO_REPO: /__w/openvino/openvino/openvino INSTALL_DIR: /__w/openvino/openvino/openvino_install @@ -69,6 +71,9 @@ jobs: if: "!needs.smart_ci.outputs.skip_workflow" steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Install git run: | apt-get update @@ -109,9 +114,9 @@ jobs: update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100 - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Setup Python ${{ env.PYTHON_VERSION }} uses: ./openvino/.github/actions/setup_python @@ -232,7 +237,7 @@ jobs: CC_Build: name: Conditional Compilation needs: Build - timeout-minutes: 10 + timeout-minutes: 20 defaults: run: shell: bash @@ -246,6 +251,8 @@ jobs: DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 GITHUB_WORKSPACE: '/__w/openvino/openvino' OPENVINO_REPO: /__w/openvino/openvino/openvino BUILD_DIR: /__w/openvino/openvino/openvino_build @@ -254,6 +261,9 @@ jobs: SCCACHE_AZURE_KEY_PREFIX: ubuntu22_x86_64_cc_Release steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Install git run: apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates git-lfs @@ -288,9 +298,9 @@ jobs: run: bash ${OPENVINO_REPO}/install_build_dependencies.sh - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" # # Build # diff --git a/.github/workflows/linux_riscv.yml b/.github/workflows/linux_riscv.yml index 5db7ed22a02707..f464fc2fe53991 100644 --- a/.github/workflows/linux_riscv.yml +++ b/.github/workflows/linux_riscv.yml @@ -64,6 +64,9 @@ jobs: CCACHE_MAXSIZE: 50G if: "!needs.smart_ci.outputs.skip_workflow" steps: + - name: Set apt retries + run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries + - name: Install git run: apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates diff --git a/.github/workflows/mo.yml b/.github/workflows/mo.yml index f8956969b6a403..5720855255636a 100644 --- a/.github/workflows/mo.yml +++ b/.github/workflows/mo.yml @@ -29,7 +29,7 @@ jobs: python-version: '3.10' - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('tools/mo/requirements*.txt') }} diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index c5d94f267e4298..df05f34ac167d3 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -51,6 +51,8 @@ jobs: CMAKE_BUILD_TYPE: 'Release' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 OPENVINO_REPO: /__w/openvino/openvino/openvino OPENVINO_BUILD_DIR: /__w/openvino/openvino/openvino_build SCCACHE_AZURE_KEY_PREFIX: webassembly_Release @@ -66,9 +68,9 @@ jobs: submodules: 'true' - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: emcmake cmake - configure run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index da4528fe77322e..7e3fb40a03084b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -51,6 +51,8 @@ jobs: CMAKE_GENERATOR: 'Ninja Multi-Config' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 OPENVINO_REPO: "${{ github.workspace }}\\openvino" OPENVINO_CONTRIB_REPO: "${{ github.workspace }}\\openvino_contrib" INSTALL_DIR: "${{ github.workspace }}\\openvino_install" @@ -118,12 +120,16 @@ jobs: python3 -m pip install certifi - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Install build dependencies - run: choco install --no-progress ninja + run: | + Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip -OutFile ninja-win.zip -MaximumRetryCount 10 + Expand-Archive -Force ninja-win.zip + # Add it to the GitHub Path so it would be available in the subsequent steps + Add-Content -Path $env:GITHUB_PATH -Value "${{ github.workspace }}/ninja-win" # # Build @@ -852,7 +858,7 @@ jobs: run: python3 -m pip install -r ${{ github.workspace }}\install\tests\functional_test_utils\layer_tests_summary\requirements.txt - name: Restore tests execution time - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ${{ env.PARALLEL_TEST_CACHE }} key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }} @@ -866,7 +872,7 @@ jobs: timeout-minutes: 60 - name: Save tests execution time - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: github.ref_name == 'master' with: path: ${{ env.PARALLEL_TEST_CACHE }} diff --git a/.github/workflows/windows_conditional_compilation.yml b/.github/workflows/windows_conditional_compilation.yml index faf086842cb00a..d9c00cd10e888d 100644 --- a/.github/workflows/windows_conditional_compilation.yml +++ b/.github/workflows/windows_conditional_compilation.yml @@ -48,12 +48,14 @@ jobs: defaults: run: shell: pwsh - runs-on: aks-win-16-cores-32gb + runs-on: aks-win-8-cores-64gb env: CMAKE_BUILD_TYPE: 'Release' CMAKE_GENERATOR: 'Ninja Multi-Config' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 OPENVINO_REPO: "${{ github.workspace }}\\openvino" INSTALL_DIR: "${{ github.workspace }}\\openvino_install" INSTALL_TEST_DIR: "${{ github.workspace }}\\tests_install" @@ -98,12 +100,16 @@ jobs: self-hosted-runner: 'false' - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: - version: "v0.5.4" + version: "v0.7.5" - name: Install build dependencies - run: choco install --no-progress ninja + run: | + Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip -OutFile ninja-win.zip -MaximumRetryCount 10 + Expand-Archive -Force ninja-win.zip + # Add it to the GitHub Path so it would be available in the subsequent steps + Add-Content -Path $env:GITHUB_PATH -Value "${{ github.workspace }}/ninja-win" - name: Install python dependencies run: | @@ -250,11 +256,13 @@ jobs: defaults: run: shell: pwsh - runs-on: aks-win-16-cores-32gb + runs-on: aks-win-8-cores-64gb env: CMAKE_BUILD_TYPE: 'Release' CMAKE_CXX_COMPILER_LAUNCHER: sccache CMAKE_C_COMPILER_LAUNCHER: sccache + SCCACHE_IGNORE_SERVER_IO_ERROR: 1 + SCCACHE_SERVER_PORT: 35555 OPENVINO_REPO: "${{ github.workspace }}\\openvino" BUILD_DIR: "${{ github.workspace }}\\openvino_build" MODELS_PATH: "${{ github.workspace }}\\testdata" @@ -294,7 +302,7 @@ jobs: self-hosted-runner: 'false' - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.3 + uses: mozilla-actions/sccache-action@v0.0.4 with: version: "v0.5.4" diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt index b0c66a435d6470..e48c985ad753bf 100644 --- a/src/plugins/intel_gpu/CMakeLists.txt +++ b/src/plugins/intel_gpu/CMakeLists.txt @@ -47,10 +47,6 @@ add_subdirectory(src/graph) file(GLOB_RECURSE PLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/plugin/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/include/intel_gpu/plugin/*.hpp) -if(ENABLE_PROXY) - set(PLUGIN_DEFAULT_CONFIG "PROXY_CONFIGURATION_ALIAS:GPU;PROXY_CONFIGURATION_PRIORITY:0;PROXY_CONFIGURATION_INTERNAL_NAME:OCL_GPU") -endif() - ov_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "GPU" SOURCES ${PLUGIN_SOURCES} diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake index 2f3a5383528a66..6f25a5e4fda04c 100644 --- a/thirdparty/dependencies.cmake +++ b/thirdparty/dependencies.cmake @@ -363,7 +363,15 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND # otherwise, fallback to existing default find_package(Protobuf 3.20.3 REQUIRED ${protobuf_config}) endif() - set(PROTOC_EXECUTABLE protobuf::protoc) + + # with newer protobuf versions (4.22 and newer), we use CONFIG first + # so, the Protobuf_PROTOC_EXECUTABLE variable must be checked explicitly, + # because it's not used in this case (oppositely to MODULE case) + if(Protobuf_VERSION VERSION_GREATER_EQUAL 22 AND DEFINED Protobuf_PROTOC_EXECUTABLE) + set(PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE}) + else() + set(PROTOC_EXECUTABLE protobuf::protoc) + endif() else() add_subdirectory(thirdparty/protobuf EXCLUDE_FROM_ALL) endif()