Skip to content

Commit 2931403

Browse files
authored
Merge branch 'master' into an/arm-sve-illegal-instruction-guard
2 parents 432da2f + e267686 commit 2931403

179 files changed

Lines changed: 29477 additions & 5424 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/aw/actions-lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"version": "v9.0.0",
1111
"sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
1212
},
13-
"github/gh-aw-actions/setup-cli@v0.79.4": {
13+
"github/gh-aw-actions/setup-cli@v0.79.6": {
1414
"repo": "github/gh-aw-actions/setup-cli",
15-
"version": "v0.79.4",
16-
"sha": "d059700c6a8ec3b5fd798b9ea60f5d048447b918"
15+
"version": "v0.79.6",
16+
"sha": "5c2fe865bb4dc46e1450f6ee0d0541d759aea73a"
1717
},
18-
"github/gh-aw-actions/setup@v0.79.4": {
18+
"github/gh-aw-actions/setup@v0.79.6": {
1919
"repo": "github/gh-aw-actions/setup",
20-
"version": "v0.79.4",
21-
"sha": "d059700c6a8ec3b5fd798b9ea60f5d048447b918"
20+
"version": "v0.79.6",
21+
"sha": "5c2fe865bb4dc46e1450f6ee0d0541d759aea73a"
2222
},
2323
"github/gh-aw/actions/setup@v0.51.5": {
2424
"repo": "github/gh-aw/actions/setup",

.github/dockerfiles/docker_tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pr-36097
1+
pr-34599

.github/dockerfiles/ov_test/ubuntu_24_04_x64_dgpu/Dockerfile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,19 @@ RUN wget https://raw.githubusercontent.com/google/gtest-parallel/master/gtest_pa
4545
chmod +x /usr/local/bin/gtest_parallel.py
4646

4747
# Install dgpu drivers
48-
RUN add-apt-repository -y ppa:kobuk-team/intel-graphics && \
49-
apt-get update && \
50-
apt-get install -y libze-intel-gpu1 libze1 intel-metrics-discovery intel-opencl-icd clinfo intel-gsc \
51-
intel-media-va-driver-non-free libmfx-gen1 libvpl2 libvpl-tools libva-glx2 va-driver-all vainfo \
52-
libze-dev intel-ocloc libze-intel-gpu-raytracing
48+
RUN apt-get update && apt-get install ocl-icd-libopencl1 && \
49+
mkdir drivers && \
50+
cd drivers && \
51+
wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.32.7/intel-igc-core-2_2.32.7+21184_amd64.deb && \
52+
wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.32.7/intel-igc-opencl-2_2.32.7+21184_amd64.deb && \
53+
wget https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/intel-ocloc-dbgsym_26.14.37833.4-0_amd64.ddeb && \
54+
wget https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/intel-ocloc_26.14.37833.4-0_amd64.deb && \
55+
wget https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/intel-opencl-icd-dbgsym_26.14.37833.4-0_amd64.ddeb && \
56+
wget https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/intel-opencl-icd_26.14.37833.4-0_amd64.deb && \
57+
wget https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/libigdgmm12_22.9.0_amd64.deb && \
58+
wget https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/libze-intel-gpu1-dbgsym_26.14.37833.4-0_amd64.ddeb && \
59+
wget https://github.com/intel/compute-runtime/releases/download/26.14.37833.4/libze-intel-gpu1_26.14.37833.4-0_amd64.deb && \
60+
dpkg -i *.deb && cd .. && rm -rf drivers
5361

5462
# Create a virtual environment for the system Python as Python in Ubuntu 24 complains about installing
5563
# packages into the system Python

.github/workflows/android.yml

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@ jobs:
293293
cmake --install ${BUILD_DIR} --config ${{ env.BUILD_TYPE }} --prefix ${INSTALL_DIR} --component cpu
294294
cmake --install ${BUILD_DIR} --config ${{ env.BUILD_TYPE }} --prefix ${INSTALL_DIR} --component template
295295
296-
# If tests were installed under tests/, move CPU test binaries to expected path
296+
# mv (not cp) so CPU test binaries are not duplicated into both tests/ and bin/ in the artifact
297297
if [ -d "${INSTALL_TEST_DIR}/tests" ]; then
298298
echo "Moving tests from ${INSTALL_TEST_DIR}/tests/ to ${INSTALL_TEST_DIR}/bin/intel64/Release/"
299-
find ${INSTALL_TEST_DIR}/tests -name "*cpu*test*" -type f -exec cp {} ${INSTALL_TEST_DIR}/bin/intel64/Release/ \;
299+
find ${INSTALL_TEST_DIR}/tests -name "*cpu*test*" -type f -exec mv {} ${INSTALL_TEST_DIR}/bin/intel64/Release/ \;
300300
# Copy Template plugin library from tests installation into runtime package so tests can load it
301301
find ${INSTALL_TEST_DIR}/tests -name "libopenvino_template_plugin*.so*" -type f -exec cp {} ${INSTALL_DIR}/runtime/lib/intel64/ \; 2>/dev/null || true
302302
fi
@@ -305,6 +305,26 @@ jobs:
305305
find ${TBB_INSTALL}/lib -name "*.so*" -type f -exec cp {} ${INSTALL_DIR}/lib/ \; 2>/dev/null || echo "No .so files in TBB_INSTALL/lib"
306306
cp "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/${{ env.ANDROID_ABI_CONFIG }}-linux-android/libc++_shared.so" ${INSTALL_DIR}/lib/ || echo "libc++_shared.so not found"
307307
308+
# Release build keeps -g (NDK default); strip unused debug symbols to shrink every download
309+
- name: Strip debug symbols from test binaries and runtime libraries
310+
run: |
311+
STRIP="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip"
312+
if [ ! -x "$STRIP" ]; then
313+
STRIP="$(command -v llvm-strip || true)"
314+
fi
315+
if [ -z "$STRIP" ]; then
316+
echo "Error: llvm-strip not found (NDK path or PATH)"; exit 1
317+
fi
318+
echo "Using strip: $STRIP"
319+
echo "Size before strip:"; du -shc ${INSTALL_TEST_DIR} ${INSTALL_DIR}
320+
find ${INSTALL_TEST_DIR} -type f \
321+
\( -name "ov_cpu_func_tests" -o -name "ov_cpu_unit_tests" \) \
322+
-exec "$STRIP" --strip-all {} +
323+
# --strip-unneeded keeps the dynamic symbol table needed to load .so's
324+
find ${INSTALL_DIR} -type f -name "*.so*" \
325+
-exec "$STRIP" --strip-unneeded {} +
326+
echo "Size after strip:"; du -shc ${INSTALL_TEST_DIR} ${INSTALL_DIR}
327+
308328
- name: Pack openvino_package
309329
run: tar -cvf - * | pigz > ${BUILD_DIR}/openvino_package.tar.gz
310330
working-directory: ${{ env.INSTALL_DIR }}
@@ -313,11 +333,19 @@ jobs:
313333
run: tar -cvf - * | pigz > ${BUILD_DIR}/openvino_tests.tar.gz
314334
working-directory: ${{ env.INSTALL_TEST_DIR }}
315335

316-
- name: Upload CPU test binaries
336+
# One artifact per test binary so each emulator job downloads only the binary it runs
337+
- name: Upload CPU functional test binary
338+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
339+
with:
340+
name: ov_cpu_func_tests_android_${{ matrix.arch }}
341+
path: ${{ env.INSTALL_TEST_DIR }}/bin/intel64/Release/ov_cpu_func_tests
342+
if-no-files-found: 'error'
343+
344+
- name: Upload CPU unit test binary
317345
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
318346
with:
319-
name: ov_cpu_tests_android_${{ matrix.arch }}
320-
path: ${{ env.INSTALL_TEST_DIR }}/
347+
name: ov_cpu_unit_tests_android_${{ matrix.arch }}
348+
path: ${{ env.INSTALL_TEST_DIR }}/bin/intel64/Release/ov_cpu_unit_tests
321349
if-no-files-found: 'error'
322350

323351
- name: Upload OpenVINO runtime package (Android)
@@ -360,11 +388,11 @@ jobs:
360388
uses: ababushk/checkout@dd591a6a2ac25618db4eda86e7e0d938f88cf01b # cherry_pick_retries
361389
timeout-minutes: 15
362390

363-
- name: Download CPU test binaries
391+
- name: Download CPU unit test binary
364392
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
365393
with:
366-
name: ov_cpu_tests_android_x64
367-
path: ${{ env.INSTALL_TEST_DIR }}
394+
name: ov_cpu_unit_tests_android_x64
395+
path: ${{ env.INSTALL_TEST_DIR }}/bin/intel64/Release
368396

369397
- name: Download OpenVINO runtime package (Android)
370398
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
@@ -454,11 +482,11 @@ jobs:
454482
uses: ababushk/checkout@dd591a6a2ac25618db4eda86e7e0d938f88cf01b # cherry_pick_retries
455483
timeout-minutes: 15
456484

457-
- name: Download CPU test binaries
485+
- name: Download CPU functional test binary
458486
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
459487
with:
460-
name: ov_cpu_tests_android_x64
461-
path: ${{ env.INSTALL_TEST_DIR }}
488+
name: ov_cpu_func_tests_android_x64
489+
path: ${{ env.INSTALL_TEST_DIR }}/bin/intel64/Release
462490

463491
- name: Download OpenVINO runtime package (Android)
464492
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0

0 commit comments

Comments
 (0)