Skip to content

Commit 058fbf0

Browse files
WovchenaWovchena
authored
Merge branch 'master' into bapp_logs
2 parents be3de93 + 41036c1 commit 058fbf0

File tree

222 files changed

+2879
-1549
lines changed

Some content is hidden

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

222 files changed

+2879
-1549
lines changed

‎.github/actions/common/constants.py

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class EventType(Enum):
1919
'public_windows_vs2022_release',
2020
'public_windows_vs2022_debug',
2121
'public_manylinux2014_x86_64_release',
22+
'public_macos_x86_64_release',
2223
)
2324
ProductType = Enum('ProductType', {t.upper(): t for t in productTypes})
2425

@@ -44,4 +45,5 @@ class EventType(Enum):
4445
PlatformKey.UBUNTU22_X86_64: ProductType.PUBLIC_LINUX_UBUNTU_22_04_X86_64_RELEASE,
4546
PlatformKey.UBUNTU24_X86_64: ProductType.PUBLIC_LINUX_UBUNTU_24_04_X86_64_RELEASE,
4647
PlatformKey.WINDOWS_X86_64: ProductType.PUBLIC_WINDOWS_VS2022_RELEASE,
48+
PlatformKey.MACOS_12_6_X86_64: ProductType.PUBLIC_MACOS_X86_64_RELEASE,
4749
}

‎.github/actions/store_artifacts/store_artifacts.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,10 @@ def main():
134134
if github_server: # If running from GHA context
135135
# TODO: write an exact job link, but it's not trivial to get
136136
workflow_link = f"{github_server}/{os.getenv('GITHUB_REPOSITORY')}/actions/runs/{os.getenv('GITHUB_RUN_ID')}"
137-
with open(storage / 'workflow_link.txt', 'w') as file:
137+
workflow_link_file = storage / 'workflow_link.txt'
138+
with open(workflow_link_file, 'w') as file:
138139
file.write(workflow_link)
140+
store_checksums(workflow_link_file)
139141

140142
if not error_found:
141143
latest_artifacts_for_branch = artifact_utils.get_latest_artifacts_link(storage_dir, args.storage_root,

‎.github/dockerfiles/docker_tag

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pr-29066
1+
pr-28972

‎.github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile

+7
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ RUN apt-get update && \
3232
libhdf5-dev \
3333
# For TF Models tests
3434
wget \
35+
# libGL for PyTorch Models tests
36+
ffmpeg \
37+
libsm6 \
38+
libxext6 \
39+
libgl1 \
40+
libgl1-mesa-glx \
41+
libglib2.0-0 \
3542
&& \
3643
rm -rf /var/lib/apt/lists/*
3744

‎.github/workflows/build_doc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
packages: graphviz texlive liblua5.2-0 libclang1-9 libclang-cpp9
3131
version: 3.0
3232

33-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
33+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
3434
id: cp310
3535
with:
3636
python-version: '3.10'

‎.github/workflows/cleanup_caches.yml

+29-2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,33 @@ jobs:
3535
echo "Cache info: "
3636
du -h -d2 ${PIP_CACHE_PATH}
3737
38+
Cleanup_HF_Cache:
39+
name: Cleanup HuggingFace cache
40+
runs-on: aks-linux-4-cores-16gb
41+
if: ${{ github.repository_owner == 'openvinotoolkit' }}
42+
container:
43+
image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04
44+
volumes:
45+
- /mount:/mount
46+
env:
47+
HF_CACHE_PATH: /mount/caches/huggingface
48+
49+
steps:
50+
- name: Checkout cache action
51+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
52+
timeout-minutes: 15
53+
with:
54+
sparse-checkout: .github/actions/cache
55+
56+
- name: Cleanup HF cache
57+
uses: ./.github/actions/cache/cleanup
58+
with:
59+
cache-size: 1700
60+
max-cache-size: 2000
61+
cache-path: ${{ env.HF_CACHE_PATH }}
62+
recursive: true
63+
key: '.'
64+
3865
Cleanup_ccache_lin:
3966
name: Cleanup Linux ccache
4067
runs-on: aks-linux-2-cores-8gb
@@ -47,7 +74,7 @@ jobs:
4774
CCACHE_PATH: /mount/caches/ccache
4875

4976
steps:
50-
- name: Checkout cach action
77+
- name: Checkout cache action
5178
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5279
timeout-minutes: 15
5380
with:
@@ -70,7 +97,7 @@ jobs:
7097
CCACHE_PATH: C:\\mount\\caches\\ccache
7198

7299
steps:
73-
- name: Checkout cach action
100+
- name: Checkout cache action
74101
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
75102
timeout-minutes: 15
76103
with:

‎.github/workflows/coverage.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020

2121
steps:
2222
- name: Setup python
23-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
23+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
2424
with:
2525
python-version: '3.10.10'
2626
architecture: 'x64'
2727

2828

2929
- name: Setup ccache
30-
uses: hendrikmuhs/ccache-action@53911442209d5c18de8a31615e0923161e435875 # v1.2.16
30+
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
3131
with:
3232
max-size: 50G
3333

@@ -130,6 +130,6 @@ jobs:
130130
lcov --capture --directory ${{ github.workspace }}/. --output-file coverage.info
131131
genhtml coverage.info --output-directory coverage-report
132132
- name: Collect coverage
133-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
133+
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
134134
with:
135135
verbose: true

‎.github/workflows/job_gpu_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
7575
TZ: "Europe/London" # to prevent tzdata from waiting user input
7676
- name: Setup Python ${{ env.PYTHON_VERSION }}
77-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
77+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
7878
with:
7979
python-version: ${{ env.PYTHON_VERSION }}
8080

‎.github/workflows/mac.yml

+110-13
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,16 @@ permissions: read-all
3333

3434
env:
3535
PYTHON_VERSION: '3.11'
36+
MANIFEST_FILE: manifest.yml
37+
PRODUCT_TYPE: public_macos_x86_64_release
3638

3739
jobs:
40+
3841
Smart_CI:
3942
runs-on: ubuntu-latest
4043
outputs:
4144
affected_components: "${{ steps.smart_ci.outputs.affected_components }}"
45+
changed_components: "${{ steps.smart_ci.outputs.changed_components }}"
4246
skip_workflow: "${{ steps.smart_ci.outputs.skip_workflow }}"
4347
steps:
4448
- name: checkout action
@@ -59,7 +63,7 @@ jobs:
5963
repo_token: ${{ secrets.GITHUB_TOKEN }}
6064
skip_when_only_listed_labels_set: 'docs'
6165
skip_when_only_listed_files_changed: '*.md,*.rst,*.png,*.jpg,*.svg'
62-
66+
6367
Build:
6468
needs: Smart_CI
6569
timeout-minutes: 150
@@ -78,6 +82,7 @@ jobs:
7882
INSTALL_DIR: ${{ github.workspace }}/openvino_install
7983
INSTALL_DIR_JS: ${{ github.workspace }}/openvino_install/js
8084
INSTALL_TEST_DIR: ${{ github.workspace }}/tests_install
85+
DEVELOPER_PACKAGE_DIR: ${{ github.workspace }}/developer_package_install
8186
INSTALL_WHEELS_DIR: ${{ github.workspace }}/install/wheels
8287
BUILD_DIR: ${{ github.workspace }}/build
8388
if: "!needs.smart_ci.outputs.skip_workflow"
@@ -136,7 +141,7 @@ jobs:
136141
#
137142

138143
- name: Setup ccache
139-
uses: hendrikmuhs/ccache-action@53911442209d5c18de8a31615e0923161e435875 # v1.2.16
144+
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
140145
with:
141146
max-size: "2000M"
142147
# Should save cache only if run in the master branch of the base repo
@@ -147,6 +152,18 @@ jobs:
147152
restore-keys: |
148153
${{ runner.os }}-${{ runner.arch }}-main
149154
155+
- name: Generate product manifest and set CI_BUILD_NUMBER & CI_BUILD_DEV_TAG
156+
id: create_manifest
157+
uses: ./openvino/.github/actions/create_manifest
158+
with:
159+
repos: |
160+
${{ env.OPENVINO_REPO }}
161+
${{ env.OPENVINO_CONTRIB_REPO }}
162+
product_type: ${{ env.PRODUCT_TYPE }}
163+
target_arch: ${{ runner.arch }}
164+
build_type: 'release'
165+
save_to: ${{ github.workspace }}/${{ env.MANIFEST_FILE }}
166+
150167
- name: CMake configure
151168
run: |
152169
cmake \
@@ -171,17 +188,22 @@ jobs:
171188

172189
- name: Cmake install - OpenVINO
173190
run: |
174-
cmake -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -P ${{ env.BUILD_DIR }}/cmake_install.cmake
175-
cmake -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_TEST_DIR }} -DCOMPONENT=tests -P ${{ env.BUILD_DIR }}/cmake_install.cmake
191+
cmake --install . --config ${{ env.CMAKE_BUILD_TYPE }} --prefix ${{ env.INSTALL_DIR }}
192+
cmake --install . --config ${{ env.CMAKE_BUILD_TYPE }} --prefix ${{ env.INSTALL_TEST_DIR }} --component tests
193+
cmake --install . --config ${{ env.CMAKE_BUILD_TYPE }} --prefix ${{ env.DEVELOPER_PACKAGE_DIR }} --component developer_package
194+
working-directory: ${{ env.BUILD_DIR }}
176195

177-
- name: Pack Artifacts
178-
run: |
179-
pushd ${{ env.INSTALL_DIR }}
180-
tar -cvf - * | pigz > ${{ env.BUILD_DIR }}/openvino_package.tar.gz
181-
popd
182-
pushd ${{ env.INSTALL_TEST_DIR }}
183-
tar -cvf - * | pigz > ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
184-
popd
196+
- name: Pack openvino_package
197+
run: tar -cvf - * | pigz > ${{ env.BUILD_DIR }}/openvino_package.tar.gz
198+
working-directory: ${{ env.INSTALL_DIR }}
199+
200+
- name: Pack openvino_developer_package
201+
run: tar -cvf - * | pigz > ${{ env.BUILD_DIR }}/openvino_developer_package.tar.gz
202+
working-directory: ${{ env.DEVELOPER_PACKAGE_DIR }}
203+
204+
- name: Pack openvino_tests
205+
run: tar -cvf - * | pigz > ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
206+
working-directory: ${{ env.INSTALL_TEST_DIR }}
185207

186208
# Setup additional Python versions for wheels building
187209
- name: Setup Python 3.9
@@ -224,7 +246,7 @@ jobs:
224246
version: ${{ env.PYTHON_VERSION }}
225247
should-setup-pip-paths: 'false'
226248
self-hosted-runner: 'false'
227-
249+
228250
- name: Cmake & Build - OpenVINO Contrib
229251
run: |
230252
cmake \
@@ -275,13 +297,30 @@ jobs:
275297
name: openvino_tests
276298
path: ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
277299
if-no-files-found: 'error'
300+
301+
- name: Upload openvino developer package
302+
if: ${{ always() }}
303+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
304+
with:
305+
name: openvino_developer_package
306+
path: ${{ env.BUILD_DIR }}/openvino_developer_package.tar.gz
307+
if-no-files-found: 'error'
308+
278309
- name: Upload openvino js package
279310
if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API
280311
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
281312
with:
282313
name: openvino_js_package
283314
path: ${{ env.BUILD_DIR }}/openvino_js_package.tar.gz
284315
if-no-files-found: 'error'
316+
317+
- name: Upload product manifest
318+
if: ${{ always() }}
319+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
320+
with:
321+
name: openvino_package_manifest
322+
path: ${{ github.workspace }}/${{ env.MANIFEST_FILE }}
323+
if-no-files-found: 'error'
285324

286325
Samples:
287326
needs: [ Build, Smart_CI ]
@@ -377,3 +416,61 @@ jobs:
377416
with:
378417
runner: 'macos-13'
379418
python-version: '3.11'
419+
420+
upload_artifacts:
421+
name: Upload OpenVINO artifacts
422+
timeout-minutes: 10
423+
needs: [Build, Smart_CI]
424+
defaults:
425+
run:
426+
shell: bash
427+
runs-on: aks-linux-2-cores-8gb
428+
container:
429+
image: 'openvinogithubactions.azurecr.io/library/python:3.12-slim'
430+
volumes:
431+
- /mount:/mount
432+
- ${{ github.workspace }}:${{ github.workspace }}
433+
env:
434+
OPENVINO_REPO: ${{ github.workspace }}/openvino
435+
OPENVINO_CONTRIB_REPO: ${{ github.workspace }}/openvino_contrib
436+
ARTIFACTS_DIR: ${{ github.workspace }}/artifacts
437+
WHEELS_DIR: ${{ github.workspace }}/wheels
438+
ARTIFACTS_SHARE: "/mount/build-artifacts"
439+
440+
steps:
441+
- name: Checkout OpenVINO actions
442+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
443+
timeout-minutes: 15
444+
with:
445+
sparse-checkout: |
446+
.github/actions/common
447+
.github/actions/store_artifacts
448+
path: ${{ env.OPENVINO_REPO }}
449+
450+
- name: Download OpenVINO artifacts
451+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
452+
with:
453+
pattern: "{openvino_package,openvino_developer_package,openvino_js_package,openvino_package_manifest}"
454+
path: ${{ env.ARTIFACTS_DIR }}
455+
merge-multiple: true
456+
457+
- name: Download OpenVINO wheels
458+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
459+
with:
460+
name: openvino_wheels
461+
path: ${{ env.WHEELS_DIR }}
462+
merge-multiple: true
463+
464+
- name: Store artifacts to a shared drive
465+
id: store_artifacts
466+
if: ${{ always() }}
467+
uses: ./openvino/.github/actions/store_artifacts
468+
with:
469+
artifacts: |
470+
${{ env.ARTIFACTS_DIR }}/${{ env.MANIFEST_FILE }}
471+
${{ env.ARTIFACTS_DIR }}/openvino_package.tar.gz
472+
${{ env.ARTIFACTS_DIR }}/openvino_developer_package.tar.gz
473+
${{ env.WHEELS_DIR }}
474+
${{ fromJSON(needs.smart_ci.outputs.affected_components).JS_API && format('{0}/openvino_js_package.tar.gz', env.ARTIFACTS_DIR) || '' }}
475+
storage_dir: ${{ env.PRODUCT_TYPE }}
476+
storage_root: ${{ env.ARTIFACTS_SHARE }}

‎.github/workflows/mac_arm64.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
#
137137

138138
- name: Setup ccache
139-
uses: hendrikmuhs/ccache-action@53911442209d5c18de8a31615e0923161e435875 # v1.2.16
139+
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
140140
with:
141141
max-size: "2000M"
142142
# Should save cache only if run in the master branch of the base repo

‎.github/workflows/ovc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
timeout-minutes: 15
2424

2525
- name: Setup Python
26-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
26+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
2727
with:
2828
python-version: '3.10'
2929

‎.github/workflows/py_checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
timeout-minutes: 15
3333

3434
- name: Setup Python
35-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
35+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
3636
with:
3737
python-version: '3.9'
3838

0 commit comments

Comments
 (0)