From 38e8a19f50ceef1bd7ba792f5e029a0fccd24dae Mon Sep 17 00:00:00 2001 From: Ravi Panchumarthy Date: Wed, 15 Oct 2025 13:25:31 -0700 Subject: [PATCH] Apply CISC review and update CI to OV2025.3 --- .../actions/linux-setup-openvino/action.yml | 6 +-- .github/workflows/build-cache.yml | 9 +---- .github/workflows/build.yml | 24 ++++++------ .github/workflows/release.yml | 39 ++++++++++++------- 4 files changed, 41 insertions(+), 37 deletions(-) diff --git a/.github/actions/linux-setup-openvino/action.yml b/.github/actions/linux-setup-openvino/action.yml index e4177407ab..7cd136548f 100644 --- a/.github/actions/linux-setup-openvino/action.yml +++ b/.github/actions/linux-setup-openvino/action.yml @@ -5,10 +5,10 @@ inputs: description: "Installation path" required: true version_major: - description: "OpenVINO major version (e.g., 2025.2)" + description: "OpenVINO major version (e.g., 2025.3)" required: true version_full: - description: "OpenVINO full version (e.g., 2025.2.0.19140.c01cd93e24d)" + description: "OpenVINO full version (e.g., 2025.3.0.19807.44526285f24)" required: true runs: @@ -20,7 +20,7 @@ runs: with: url: https://storage.openvinotoolkit.org/repositories/openvino/packages/${{ inputs.version_major }}/linux/openvino_toolkit_ubuntu24_${{ inputs.version_full }}_x86_64.tgz path: ${{ inputs.path }} - type: "z" + type: z strip: 1 - name: Install OpenVINO dependencies diff --git a/.github/workflows/build-cache.yml b/.github/workflows/build-cache.yml index 43d2355472..3d8b2b2eaf 100644 --- a/.github/workflows/build-cache.yml +++ b/.github/workflows/build-cache.yml @@ -68,19 +68,14 @@ jobs: env: # Make sure this is in sync with build.yml - OPENVINO_VERSION_MAJOR: "2025.2" - OPENVINO_VERSION_FULL: "2025.2.0.19140.c01cd93e24d" + OPENVINO_VERSION_MAJOR: "2025.3" + OPENVINO_VERSION_FULL: "2025.3.0.19807.44526285f24" steps: - name: Clone id: checkout uses: actions/checkout@v4 - - name: Dependencies - run: | - sudo apt-get update - sudo apt-get install -y libtbb12 - - name: Setup Cache uses: actions/cache@v4 id: cache-openvino diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2f99bf95b..06d6105a8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -742,8 +742,8 @@ jobs: env: # Make sure this is in sync with build-cache.yml - OPENVINO_VERSION_MAJOR: "2025.2" - OPENVINO_VERSION_FULL: "2025.2.0.19140.c01cd93e24d" + OPENVINO_VERSION_MAJOR: "2025.3" + OPENVINO_VERSION_FULL: "2025.3.0.19807.44526285f24" steps: - name: Clone @@ -751,7 +751,7 @@ jobs: uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.16 + uses: ggml-org/ccache-action@v1.2.16 with: key: ubuntu-24-cmake-openvino-no-preset-v1 evict-old-files: 1d @@ -1764,12 +1764,12 @@ jobs: GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp ggml-ci-arm64-cpu-kleidiai: - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-22.04-arm - steps: - - name: Clone - id: checkout - uses: actions/checkout@v4 + steps: + - name: Clone + id: checkout + uses: actions/checkout@v4 - name: ccache uses: ggml-org/ccache-action@v1.2.16 @@ -1784,10 +1784,10 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential - - name: Test - id: ggml-ci - run: | - GG_BUILD_KLEIDIAI=1 GG_BUILD_EXTRA_TESTS_0=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt + - name: Test + id: ggml-ci + run: | + GG_BUILD_KLEIDIAI=1 GG_BUILD_EXTRA_TESTS_0=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt ubuntu-cpu-cmake-riscv64-native: runs-on: RISCV64 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f67885ac7..25ac9ed156 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -234,6 +234,11 @@ jobs: ubuntu-24-openvino: runs-on: ubuntu-24.04 + env: + # Make sure this is in sync with build.yml + OPENVINO_VERSION_MAJOR: "2025.3" + OPENVINO_VERSION_FULL: "2025.3.0.19807.44526285f24" + steps: - name: Clone id: checkout @@ -242,31 +247,35 @@ jobs: fetch-depth: 0 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.16 + uses: ggml-org/ccache-action@v1.2.16 with: - key: ubuntu-24-cmake-openvino-release-no-preset-v1 + key: ubuntu-24-cmake-openvino-release-no-preset-v1 evict-old-files: 1d - name: Dependencies - id: depends run: | - export OPENVINO_VERSION_MAJOR=2025.2 - export OPENVINO_VERSION_FULL=2025.2.0.19140.c01cd93e24d sudo apt-get update - sudo apt-get install -y build-essential libcurl4-openssl-dev libtbb12 cmake ninja-build python3-pip curl wget tar - sudo mkdir -p /opt/intel - wget -O openvino_${OPENVINO_VERSION_MAJOR}.tgz https://storage.openvinotoolkit.org/repositories/openvino/packages/${OPENVINO_VERSION_MAJOR}/linux/openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64.tgz - tar -xf openvino_${OPENVINO_VERSION_MAJOR}.tgz - sudo mv openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64 /opt/intel/openvino_${OPENVINO_VERSION_MAJOR} - rm openvino_${OPENVINO_VERSION_MAJOR}.tgz - cd /opt/intel/openvino_${OPENVINO_VERSION_MAJOR} - echo "Y" | sudo -E ./install_dependencies/install_openvino_dependencies.sh && cd - - sudo ln -s /opt/intel/openvino_${OPENVINO_VERSION_MAJOR} /opt/intel/openvino + sudo apt-get install -y build-essential libcurl4-openssl-dev libtbb12 cmake ninja-build python3-pip + + - name: Use OpenVINO Toolkit Cache + uses: actions/cache@v4 + id: cache-openvino + with: + path: ./openvino_toolkit + key: openvino-toolkit-v${{ env.OPENVINO_VERSION_FULL }}-${{ runner.os }} + + - name: Setup OpenVINO Toolkit + if: steps.cache-openvino.outputs.cache-hit != 'true' + uses: ./.github/actions/linux-setup-openvino + with: + path: ./openvino_toolkit + version_major: ${{ env.OPENVINO_VERSION_MAJOR }} + version_full: ${{ env.OPENVINO_VERSION_FULL }} - name: Build id: cmake_build run: | - source /opt/intel/openvino/setupvars.sh + source ./openvino_toolkit/setupvars.sh cmake -B build/ReleaseOV -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DGGML_OPENVINO=ON