Skip to content

Commit cfd40a9

Browse files
ravi9wine99
authored andcommitted
Apply CISC review and update CI to OV2025.3
1 parent 509c5f4 commit cfd40a9

File tree

4 files changed

+55
-51
lines changed

4 files changed

+55
-51
lines changed

.github/actions/linux-setup-openvino/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ inputs:
55
description: "Installation path"
66
required: true
77
version_major:
8-
description: "OpenVINO major version (e.g., 2025.2)"
8+
description: "OpenVINO major version (e.g., 2025.3)"
99
required: true
1010
version_full:
11-
description: "OpenVINO full version (e.g., 2025.2.0.19140.c01cd93e24d)"
11+
description: "OpenVINO full version (e.g., 2025.3.0.19807.44526285f24)"
1212
required: true
1313

1414
runs:
@@ -20,7 +20,7 @@ runs:
2020
with:
2121
url: https://storage.openvinotoolkit.org/repositories/openvino/packages/${{ inputs.version_major }}/linux/openvino_toolkit_ubuntu24_${{ inputs.version_full }}_x86_64.tgz
2222
path: ${{ inputs.path }}
23-
type: "z"
23+
type: z
2424
strip: 1
2525

2626
- name: Install OpenVINO dependencies

.github/workflows/build-cache.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,14 @@ jobs:
6868

6969
env:
7070
# Make sure this is in sync with build.yml
71-
OPENVINO_VERSION_MAJOR: "2025.2"
72-
OPENVINO_VERSION_FULL: "2025.2.0.19140.c01cd93e24d"
71+
OPENVINO_VERSION_MAJOR: "2025.3"
72+
OPENVINO_VERSION_FULL: "2025.3.0.19807.44526285f24"
7373

7474
steps:
7575
- name: Clone
7676
id: checkout
7777
uses: actions/checkout@v4
7878

79-
- name: Dependencies
80-
run: |
81-
sudo apt-get update
82-
sudo apt-get install -y libtbb12
83-
8479
- name: Setup Cache
8580
uses: actions/cache@v4
8681
id: cache-openvino

.github/workflows/build.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -705,16 +705,16 @@ jobs:
705705

706706
env:
707707
# Make sure this is in sync with build-cache.yml
708-
OPENVINO_VERSION_MAJOR: "2025.2"
709-
OPENVINO_VERSION_FULL: "2025.2.0.19140.c01cd93e24d"
708+
OPENVINO_VERSION_MAJOR: "2025.3"
709+
OPENVINO_VERSION_FULL: "2025.3.0.19807.44526285f24"
710710

711711
steps:
712712
- name: Clone
713713
id: checkout
714714
uses: actions/checkout@v4
715715

716716
- name: ccache
717-
uses: hendrikmuhs/[email protected]
717+
uses: ggml-org/[email protected]
718718
with:
719719
key: ubuntu-24-cmake-openvino-no-preset-v1
720720
evict-old-files: 1d
@@ -1674,27 +1674,27 @@ jobs:
16741674
GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp
16751675
16761676
ggml-ci-arm64-cpu-kleidiai:
1677-
runs-on: ubuntu-22.04-arm
1678-
1679-
steps:
1680-
- name: Clone
1681-
id: checkout
1682-
uses: actions/checkout@v4
1683-
1684-
- name: ccache
1685-
uses: ggml-org/[email protected]
1686-
with:
1687-
key: ggml-ci-arm64-cpu-kleidiai
1688-
evict-old-files: 1d
1689-
1690-
- name: Dependencies
1691-
id: depends
1692-
run: |
1693-
sudo apt-get update
1694-
sudo apt-get install -y build-essential libcurl4-openssl-dev
1695-
1696-
- name: Test
1697-
id: ggml-ci
1698-
run: |
1699-
GG_BUILD_KLEIDIAI=1 GG_BUILD_EXTRA_TESTS_0=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt
1677+
runs-on: ubuntu-22.04-arm
1678+
1679+
steps:
1680+
- name: Clone
1681+
id: checkout
1682+
uses: actions/checkout@v4
1683+
1684+
- name: ccache
1685+
uses: ggml-org/[email protected]
1686+
with:
1687+
key: ggml-ci-arm64-cpu-kleidiai
1688+
evict-old-files: 1d
1689+
1690+
- name: Dependencies
1691+
id: depends
1692+
run: |
1693+
sudo apt-get update
1694+
sudo apt-get install -y build-essential libcurl4-openssl-dev
1695+
1696+
- name: Test
1697+
id: ggml-ci
1698+
run: |
1699+
GG_BUILD_KLEIDIAI=1 GG_BUILD_EXTRA_TESTS_0=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt
17001700

.github/workflows/release.yml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,11 @@ jobs:
246246
ubuntu-24-openvino:
247247
runs-on: ubuntu-24.04
248248

249+
env:
250+
# Make sure this is in sync with build.yml
251+
OPENVINO_VERSION_MAJOR: "2025.3"
252+
OPENVINO_VERSION_FULL: "2025.3.0.19807.44526285f24"
253+
249254
steps:
250255
- name: Clone
251256
id: checkout
@@ -254,31 +259,35 @@ jobs:
254259
fetch-depth: 0
255260

256261
- name: ccache
257-
uses: hendrikmuhs/[email protected]
262+
uses: ggml-org/[email protected]
258263
with:
259-
key: ubuntu-24-cmake-openvino-release-no-preset-v1
264+
key: ubuntu-24-cmake-openvino-release-no-preset-v1
260265
evict-old-files: 1d
261266

262267
- name: Dependencies
263-
id: depends
264268
run: |
265-
export OPENVINO_VERSION_MAJOR=2025.2
266-
export OPENVINO_VERSION_FULL=2025.2.0.19140.c01cd93e24d
267269
sudo apt-get update
268-
sudo apt-get install -y build-essential libcurl4-openssl-dev libtbb12 cmake ninja-build python3-pip curl wget tar
269-
sudo mkdir -p /opt/intel
270-
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
271-
tar -xf openvino_${OPENVINO_VERSION_MAJOR}.tgz
272-
sudo mv openvino_toolkit_ubuntu24_${OPENVINO_VERSION_FULL}_x86_64 /opt/intel/openvino_${OPENVINO_VERSION_MAJOR}
273-
rm openvino_${OPENVINO_VERSION_MAJOR}.tgz
274-
cd /opt/intel/openvino_${OPENVINO_VERSION_MAJOR}
275-
echo "Y" | sudo -E ./install_dependencies/install_openvino_dependencies.sh && cd -
276-
sudo ln -s /opt/intel/openvino_${OPENVINO_VERSION_MAJOR} /opt/intel/openvino
270+
sudo apt-get install -y build-essential libcurl4-openssl-dev libtbb12 cmake ninja-build python3-pip
271+
272+
- name: Use OpenVINO Toolkit Cache
273+
uses: actions/cache@v4
274+
id: cache-openvino
275+
with:
276+
path: ./openvino_toolkit
277+
key: openvino-toolkit-v${{ env.OPENVINO_VERSION_FULL }}-${{ runner.os }}
278+
279+
- name: Setup OpenVINO Toolkit
280+
if: steps.cache-openvino.outputs.cache-hit != 'true'
281+
uses: ./.github/actions/linux-setup-openvino
282+
with:
283+
path: ./openvino_toolkit
284+
version_major: ${{ env.OPENVINO_VERSION_MAJOR }}
285+
version_full: ${{ env.OPENVINO_VERSION_FULL }}
277286

278287
- name: Build
279288
id: cmake_build
280289
run: |
281-
source /opt/intel/openvino/setupvars.sh
290+
source ./openvino_toolkit/setupvars.sh
282291
cmake -B build/ReleaseOV -G Ninja \
283292
-DCMAKE_BUILD_TYPE=Release \
284293
-DGGML_OPENVINO=ON

0 commit comments

Comments
 (0)