Skip to content

Commit e7ccae0

Browse files
jane-inteljane-intel
committed
Merge remote-tracking branch 'upstream/master' into attribute_pattern_matching
Signed-off-by: Evgeniia Nugmanova <evgeniia.nugmanova@intel.com>
2 parents 113efdd + 63fc0ab commit e7ccae0

File tree

152 files changed

+3414
-682
lines changed

Some content is hidden

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

152 files changed

+3414
-682
lines changed

‎.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
@@ -64,7 +64,7 @@ jobs:
6464
6565
- name: Cache documentation
6666
id: cache_sphinx_docs
67-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
67+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
6868
with:
6969
path: build/docs/_build/.doctrees
7070
key: sphinx-docs-cache

‎.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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
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_cpu_functional_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
run: python3 -m pip install -r ${INSTALL_TEST_DIR}/functional_test_utils/layer_tests_summary/requirements.txt
9191

9292
- name: Restore tests execution time
93-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
93+
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
9494
with:
9595
path: ${{ env.PARALLEL_TEST_CACHE }}
9696
key: ${{ runner.os }}-${{ runner.arch }}-tests-functional-cpu-stamp-${{ github.sha }}
@@ -110,7 +110,7 @@ jobs:
110110
timeout-minutes: 25
111111

112112
- name: Save tests execution time
113-
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
113+
uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
114114
if: github.ref_name == 'master'
115115
with:
116116
path: ${{ env.PARALLEL_TEST_CACHE }}

‎.github/workflows/job_pytorch_layer_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ env:
3030
jobs:
3131
PyTorch_Layer_Tests:
3232
name: PyTorch Layer Tests
33-
timeout-minutes: 40
33+
timeout-minutes: 50
3434
runs-on: ${{ inputs.runner }}
3535
container: ${{ fromJSON(inputs.container) }}
3636
defaults:

‎.github/workflows/mac.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
#
142142

143143
- name: Setup ccache
144-
uses: hendrikmuhs/ccache-action@53911442209d5c18de8a31615e0923161e435875 # v1.2.16
144+
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
145145
with:
146146
max-size: "2000M"
147147
# Should save cache only if run in the master branch of the base repo
@@ -152,6 +152,18 @@ jobs:
152152
restore-keys: |
153153
${{ runner.os }}-${{ runner.arch }}-main
154154
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+
155167
- name: CMake configure
156168
run: |
157169
cmake \
@@ -234,18 +246,6 @@ jobs:
234246
version: ${{ env.PYTHON_VERSION }}
235247
should-setup-pip-paths: 'false'
236248
self-hosted-runner: 'false'
237-
238-
- name: Generate product manifest and set CI_BUILD_NUMBER & CI_BUILD_DEV_TAG
239-
id: create_manifest
240-
uses: ./openvino/.github/actions/create_manifest
241-
with:
242-
repos: |
243-
${{ env.OPENVINO_REPO }}
244-
${{ env.OPENVINO_CONTRIB_REPO }}
245-
product_type: ${{ env.PRODUCT_TYPE }}
246-
target_arch: ${{ runner.arch }}
247-
build_type: 'release'
248-
save_to: ${{ github.workspace }}/${{ env.MANIFEST_FILE }}
249249

250250
- name: Cmake & Build - OpenVINO Contrib
251251
run: |

‎.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
@@ -28,7 +28,7 @@ jobs:
2828
python-version: '3.10'
2929

3030
- name: Cache pip
31-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
31+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
3232
with:
3333
path: ~/.cache/pip
3434
key: ${{ runner.os }}-pip-${{ hashFiles('src/bindings/python/requirements*.txt') }}

‎.github/workflows/ubuntu_22.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -395,37 +395,35 @@ jobs:
395395
model_scope: 'nightly_hf'
396396
container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}", "volumes": ["/mount:/mount"]}'
397397

398-
# TODO: Switch back to self-hosted runners
399-
# container:
400-
# image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
401-
# volumes:
402-
# - /mount:/mount
403398
PyTorch_Models_Tests:
404399
name: PyTorch Models tests
405400
if: ${{ github.event_name != 'schedule' && fromJSON(needs.smart_ci.outputs.affected_components).PyTorch_FE.test }}
406-
needs: [ Build, Smart_CI, Openvino_tokenizers ]
401+
needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ]
407402
uses: ./.github/workflows/job_pytorch_models_tests.yml
408403
with:
409-
runner: 'ubuntu-22.04-8-cores'
404+
runner: 'aks-linux-8-cores-64gb'
410405
model_scope: 'precommit'
406+
container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}", "volumes": ["/mount:/mount"]}'
411407

412408
PyTorch_Models_Tests_Nightly_Scope1:
413409
name: PyTorch Models Nightly Scope1 tests
414410
if: ${{ github.event_name == 'schedule' }}
415-
needs: [ Build, Smart_CI, Openvino_tokenizers ]
411+
needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ]
416412
uses: ./.github/workflows/job_pytorch_models_tests.yml
417413
with:
418-
runner: 'ubuntu-22.04-16-cores'
414+
runner: 'aks-linux-16-cores-64gb'
419415
model_scope: 'nightly_scope1'
416+
container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}", "volumes": ["/mount:/mount"]}'
420417

421418
PyTorch_Models_Tests_Nightly_Scope2:
422419
name: PyTorch Models Nightly Scope2 tests
423420
if: ${{ github.event_name == 'schedule' }}
424-
needs: [ Build, Smart_CI, Openvino_tokenizers ]
421+
needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ]
425422
uses: ./.github/workflows/job_pytorch_models_tests.yml
426423
with:
427-
runner: 'ubuntu-22.04-16-cores'
424+
runner: 'aks-linux-16-cores-64gb'
428425
model_scope: 'nightly_scope2'
426+
container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}", "volumes": ["/mount:/mount"]}'
429427

430428
JAX_Models_Tests_Precommit:
431429
name: JAX/Flax Models tests

‎.github/workflows/windows_conditional_compilation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ jobs:
393393
run: python3 -m pip install -r ${{ env.INSTALL_TEST_DIR }}/layer_tests_summary/requirements.txt
394394

395395
- name: Restore tests execution time
396-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
396+
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
397397
with:
398398
path: ${{ env.PARALLEL_TEST_CACHE }}
399399
key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}

‎.github/workflows/windows_vs2022_release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ jobs:
581581
run: python3 -m pip install -r ${{ github.workspace }}\install\tests\functional_test_utils\layer_tests_summary\requirements.txt
582582

583583
- name: Restore tests execution time
584-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
584+
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
585585
with:
586586
path: ${{ env.PARALLEL_TEST_CACHE }}
587587
key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}
@@ -595,7 +595,7 @@ jobs:
595595
timeout-minutes: 60
596596

597597
- name: Save tests execution time
598-
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
598+
uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
599599
if: github.ref_name == 'master'
600600
with:
601601
path: ${{ env.PARALLEL_TEST_CACHE }}

‎.github/workflows/workflow_rerunner.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ name: Rerun Workflow with Known Errors
33
on:
44
workflow_run:
55
workflows:
6-
- Linux (Ubuntu 20.04, Python 3.9)
7-
- Linux (Ubuntu 22.04, Python 3.11)
8-
- Linux (Ubuntu 24.04, Python 3.12)
9-
- Debian 10 ARM
10-
- Android ARM64 with vcpkg
11-
- Android x64
12-
- Linux ARM64 (Ubuntu 20.04, Python 3.11)
13-
- Linux Static CC (Ubuntu 22.04, Python 3.11, Clang)
14-
- Linux RISC-V with Conan (Ubuntu 22.04, Python 3.10)
15-
- Linux (Ubuntu 22.04, Python 3.11, Intel DPC++ Compiler)
16-
- Fedora 29 (RHEL 8.4), Python 3.9
17-
- Windows (VS 2022, Python 3.11, Release)
18-
- Windows (VS 2022, Python 3.11, Debug)
19-
- Windows Conditional Compilation (VS 2022, Python 3.11)
20-
- Manylinux 2014
6+
- "Linux (Ubuntu 20.04, Python 3.9)"
7+
- "Linux (Ubuntu 22.04, Python 3.11)"
8+
- "Linux (Ubuntu 24.04, Python 3.12)"
9+
- "Debian 10 ARM"
10+
- "Android ARM64 with vcpkg"
11+
- "Android x64"
12+
- "Linux ARM64 (Ubuntu 20.04, Python 3.11)"
13+
- "Linux Static CC (Ubuntu 22.04, Python 3.11, Clang)"
14+
- "Linux RISC-V with Conan (Ubuntu 22.04, Python 3.10)"
15+
- "Linux (Ubuntu 22.04, Python 3.11, Intel DPC\\+\\+ Compiler)"
16+
- "Fedora 29 (RHEL 8.4), Python 3.9"
17+
- "Windows (VS 2022, Python 3.11, Release)"
18+
- "Windows (VS 2022, Python 3.11, Debug)"
19+
- "Windows Conditional Compilation (VS 2022, Python 3.11)"
20+
- "Manylinux 2014"
2121
types:
2222
- completed
2323
pull_request:

‎.github/workflows/workflows_scans.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ jobs:
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
42+
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
4343
with:
4444
languages: "actions"
4545
build-mode: "none"
4646

4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
48+
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
4949
with:
5050
category: "/language:actions"
5151

‎cmake/developer_package/frontends/frontends.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ macro(ov_add_frontend)
228228
ov_add_vs_version_file(NAME ${TARGET_NAME}
229229
FILEDESCRIPTION ${OV_FRONTEND_FILEDESCRIPTION})
230230

231-
target_link_libraries(${TARGET_NAME} PRIVATE ${OV_FRONTEND_LINK_LIBRARIES} PUBLIC openvino::runtime)
231+
target_link_libraries(${TARGET_NAME} PRIVATE ${OV_FRONTEND_LINK_LIBRARIES} openvino::frontend::common_translators
232+
PUBLIC openvino::runtime)
232233
ov_add_library_version(${TARGET_NAME})
233234

234235
if(OV_FRONTEND_PROTOBUF_REQUIRED)

‎docs/articles_en/assets/snippets/ov_caching.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656
# ! [ov:caching:part5]
5757
import base64
5858

59-
def encrypt_base64(src):
60-
return base64.b64encode(bytes(src, "utf-8"))
59+
def encrypt_base64(src: bytes):
60+
return base64.b64encode(src)
6161

62-
def decrypt_base64(src):
63-
return base64.b64decode(bytes(src, "utf-8"))
62+
def decrypt_base64(src: bytes):
63+
return base64.b64decode(src)
6464

6565
core = ov.Core()
6666
core.set_property({props.cache_dir: path_to_cache_dir})
@@ -73,14 +73,14 @@ def decrypt_base64(src):
7373
# ! [ov:caching:part6]
7474
import base64
7575

76-
def encrypt_base64(src):
77-
return base64.b64encode(bytes(src, "utf-8"))
76+
def encrypt_base64(src: bytes):
77+
return base64.b64encode(src)
7878

79-
def decrypt_base64(src):
80-
return base64.b64decode(bytes(src, "utf-8"))
79+
def decrypt_base64(src: bytes):
80+
return base64.b64decode(src)
8181

8282
core = ov.Core()
83-
if "GPU" in core.available_devices:
83+
if any("GPU" in device for device in core.available_devices):
8484
core.set_property({props.cache_dir: path_to_cache_dir})
8585
config_cache = {}
8686
config_cache["CACHE_ENCRYPTION_CALLBACKS"] = [encrypt_base64, decrypt_base64]

‎docs/articles_en/get-started/learn-openvino/openvino-samples/benchmark-tool.rst

+3
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,9 @@ An example of running ``benchmark_app`` on CPU in latency mode and its output ar
726726
[ INFO ] output (node: output) : f32 / [...] / {1,100}
727727
[Step 7/11] Loading the model to the device
728728
[ INFO ] Compile model took 974.64 ms
729+
[ INFO ] Start of compilation memory usage: Peak 1000 KB
730+
[ INFO ] End of compilation memory usage: Peak 10000 KB
731+
[ INFO ] Compile model ram used 9000 KB
729732
[Step 8/11] Querying optimal runtime parameters
730733
[ INFO ] Model:
731734
[ INFO ] NETWORK_NAME: torch-jit-export

0 commit comments

Comments
 (0)