Skip to content

Commit 89b8212

Browse files
authored
Apply CISC review and update CI to OV2025.3
1 parent f89292d commit 89b8212

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
@@ -1599,27 +1599,27 @@ jobs:
15991599
GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp
16001600
16011601
ggml-ci-arm64-cpu-kleidiai:
1602-
runs-on: ubuntu-22.04-arm
1603-
1604-
steps:
1605-
- name: Clone
1606-
id: checkout
1607-
uses: actions/checkout@v4
1608-
1609-
- name: ccache
1610-
uses: ggml-org/[email protected]
1611-
with:
1612-
key: ggml-ci-arm64-cpu-kleidiai
1613-
evict-old-files: 1d
1614-
1615-
- name: Dependencies
1616-
id: depends
1617-
run: |
1618-
sudo apt-get update
1619-
sudo apt-get install -y build-essential libcurl4-openssl-dev
1620-
1621-
- name: Test
1622-
id: ggml-ci
1623-
run: |
1624-
GG_BUILD_KLEIDIAI=1 GG_BUILD_EXTRA_TESTS_0=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt
1602+
runs-on: ubuntu-22.04-arm
1603+
1604+
steps:
1605+
- name: Clone
1606+
id: checkout
1607+
uses: actions/checkout@v4
1608+
1609+
- name: ccache
1610+
uses: ggml-org/[email protected]
1611+
with:
1612+
key: ggml-ci-arm64-cpu-kleidiai
1613+
evict-old-files: 1d
1614+
1615+
- name: Dependencies
1616+
id: depends
1617+
run: |
1618+
sudo apt-get update
1619+
sudo apt-get install -y build-essential libcurl4-openssl-dev
1620+
1621+
- name: Test
1622+
id: ggml-ci
1623+
run: |
1624+
GG_BUILD_KLEIDIAI=1 GG_BUILD_EXTRA_TESTS_0=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt
16251625

.github/workflows/release.yml

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

247+
env:
248+
# Make sure this is in sync with build.yml
249+
OPENVINO_VERSION_MAJOR: "2025.3"
250+
OPENVINO_VERSION_FULL: "2025.3.0.19807.44526285f24"
251+
247252
steps:
248253
- name: Clone
249254
id: checkout
@@ -252,31 +257,35 @@ jobs:
252257
fetch-depth: 0
253258

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

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

276285
- name: Build
277286
id: cmake_build
278287
run: |
279-
source /opt/intel/openvino/setupvars.sh
288+
source ./openvino_toolkit/setupvars.sh
280289
cmake -B build/ReleaseOV -G Ninja \
281290
-DCMAKE_BUILD_TYPE=Release \
282291
-DGGML_OPENVINO=ON

0 commit comments

Comments
 (0)