Skip to content

Commit aaff25c

Browse files
authored
Merge branch 'master' into attribute_pattern_matching
2 parents 74453e1 + 871ab4a commit aaff25c

File tree

368 files changed

+16109
-3892
lines changed

Some content is hidden

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

368 files changed

+16109
-3892
lines changed

.github/actions/store_artifacts/store_artifacts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def main():
139139
file.write(workflow_link)
140140
store_checksums(workflow_link_file)
141141

142-
if not error_found:
142+
if not error_found and os.getenv('GITHUB_REPOSITORY') == 'openvinotoolkit/openvino':
143143
latest_artifacts_for_branch = artifact_utils.get_latest_artifacts_link(storage_dir, args.storage_root,
144144
args.branch_name, args.event_name)
145145
# Overwrite path to "latest" built artifacts only if a given commit is the head of a given branch

.github/dependabot.yml

-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@ updates:
1515
timezone: "Poland"
1616
open-pull-requests-limit: 3
1717
assignees:
18-
- "jiwaszki"
1918
- "p-wysocki"
2019
- "akuporos"
2120
- "rkazants"
2221
- "ceciliapeng2011"
2322
- "meiyang-intel"
24-
- "mbencer"
25-
- "tomdol"
2623
- "jane-intel"
2724
versioning-strategy: increase-if-necessary
2825

.github/workflows/cleanup_caches.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions: read-all
1010
jobs:
1111
Cleanup_PIP:
1212
name: Cleanup PIP cache
13-
runs-on: aks-linux-2-cores-8gb
13+
runs-on: aks-linux-small
1414
if: ${{ github.repository_owner == 'openvinotoolkit' }}
1515
container:
1616
image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04
@@ -64,7 +64,7 @@ jobs:
6464

6565
Cleanup_ccache_lin:
6666
name: Cleanup Linux ccache
67-
runs-on: aks-linux-2-cores-8gb
67+
runs-on: aks-linux-small
6868
if: ${{ github.repository_owner == 'openvinotoolkit' }}
6969
container:
7070
image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04

.github/workflows/debian_10_arm.yml

-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ jobs:
122122
runner: 'aks-linux-16-cores-arm'
123123
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.debian_10_arm }}
124124
python-version: '3.7'
125-
scope: ${{ github.event_name == 'workflow_dispatch' && 'nightly' || 'smoke' }}
126125

127126
Overall_Status:
128127
name: ci/gha_overall_status_debian_10_arm

.github/workflows/export_workflow_metrics.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ permissions: read-all
3434
jobs:
3535
export-workflow-metrics:
3636
name: Export finished workflow metrics
37-
runs-on: aks-linux-smallworker
37+
runs-on: aks-linux-small
3838
if: ${{ github.repository_owner == 'openvinotoolkit' }}
3939

4040
steps:

.github/workflows/job_cpu_functional_tests.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ on:
1616
description: 'Python version to setup. E.g., "3.11"'
1717
type: string
1818
required: true
19-
scope:
20-
description: 'Defines tests scope {nightly | smoke}'
21-
type: string
22-
required: false
23-
default: 'smoke'
2419

2520
permissions: read-all
2621

@@ -40,7 +35,6 @@ jobs:
4035
INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
4136
PARALLEL_TEST_SCRIPT: ${{ github.workspace }}/install/tests/functional_test_utils/layer_tests_summary/run_parallel.py
4237
PARALLEL_TEST_CACHE: ${{ github.workspace }}/install/tests/test_cache.lst
43-
GTEST_FILTER: ${{ inputs.scope == 'nightly' && '' || '--gtest_filter=smoke' }}
4438
steps:
4539
- name: Download OpenVINO package
4640
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -112,8 +106,8 @@ jobs:
112106
# Needed as ze_loader.so is under INSTALL_TEST_DIR
113107
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${INSTALL_TEST_DIR}
114108
115-
python3 ${PARALLEL_TEST_SCRIPT} -e ${INSTALL_TEST_DIR}/ov_cpu_func_tests -c ${PARALLEL_TEST_CACHE} -w ${INSTALL_TEST_DIR} -s suite -rf 0 -- --gtest_print_time=1 ${{ env.GTEST_FILTER }}
116-
timeout-minutes: ${{ inputs.scope == 'nightly' && 125 || 25 }}
109+
python3 ${PARALLEL_TEST_SCRIPT} -e ${INSTALL_TEST_DIR}/ov_cpu_func_tests -c ${PARALLEL_TEST_CACHE} -w ${INSTALL_TEST_DIR} -s suite -rf 0 -- --gtest_print_time=1 --gtest_filter=*smoke*
110+
timeout-minutes: 25
117111

118112
- name: Save tests execution time
119113
uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2

.github/workflows/job_pytorch_models_tests.yml

-20
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,6 @@ jobs:
3737
MODEL_HUB_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/model_hub_tests
3838
USE_SYSTEM_CACHE: False # Using remote HuggingFace cache
3939
steps:
40-
- name: Check sudo
41-
if: ${{ runner.os == 'Linux' }}
42-
run: if [ "$(id -u)" -eq 0 ]; then apt update && apt --assume-yes install sudo; fi
43-
44-
- name: Set apt retries
45-
if: runner.os == 'Linux'
46-
run: |
47-
if [ "$(id -u)" -eq 0 ]; then
48-
echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries
49-
else
50-
sudo sh -c "echo 'Acquire::Retries \"10\";' >> /etc/apt/apt.conf.d/80-retries"
51-
fi
52-
5340
- name: Download OpenVINO artifacts (tarballs)
5441
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
5542
with:
@@ -92,13 +79,6 @@ jobs:
9279
sparse-checkout-cone-mode: false
9380
path: 'openvino'
9481

95-
- name: Install dependencies
96-
if: ${{ runner.os == 'Linux' }}
97-
run: |
98-
# install git (required to build pip deps from the sources)
99-
# install 'g++' to build 'detectron2' and 'natten' wheels
100-
sudo apt-get install --assume-yes --no-install-recommends g++ git ca-certificates
101-
10282
- name: Setup Python 3.11
10383
uses: ./openvino/.github/actions/setup_python
10484
with:

.github/workflows/linux_arm64.yml

-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ jobs:
223223
runner: 'aks-linux-16-cores-arm'
224224
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}
225225
python-version: '3.11'
226-
scope: ${{ github.event_name == 'workflow_dispatch' && 'nightly' || 'smoke' }}
227226

228227
TensorFlow_Models_Tests:
229228
name: TensorFlow Models tests

.github/workflows/mac.yml

+17-18
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ env:
3737
PRODUCT_TYPE: public_macos_x86_64_release
3838

3939
jobs:
40-
40+
4141
Smart_CI:
4242
runs-on: ubuntu-latest
4343
outputs:
@@ -63,7 +63,7 @@ jobs:
6363
repo_token: ${{ secrets.GITHUB_TOKEN }}
6464
skip_when_only_listed_labels_set: 'docs'
6565
skip_when_only_listed_files_changed: '*.md,*.rst,*.png,*.jpg,*.svg'
66-
66+
6767
Build:
6868
needs: Smart_CI
6969
timeout-minutes: 150
@@ -162,8 +162,8 @@ jobs:
162162
product_type: ${{ env.PRODUCT_TYPE }}
163163
target_arch: ${{ runner.arch }}
164164
build_type: 'release'
165-
save_to: ${{ github.workspace }}/${{ env.MANIFEST_FILE }}
166-
165+
save_to: ${{ github.workspace }}/${{ env.MANIFEST_FILE }}
166+
167167
- name: CMake configure
168168
run: |
169169
cmake \
@@ -230,10 +230,10 @@ jobs:
230230
- name: Build additional Python wheels
231231
run: |
232232
for py_version in "3.9" "3.10" "3.11" "3.12"
233-
do
233+
do
234234
python_exec_path=$(python$py_version -c "import sys; print(sys.executable)")
235235
$python_exec_path -m pip install -r ${{ env.OPENVINO_REPO }}/src/bindings/python/wheel/requirements-dev.txt
236-
236+
237237
cmake -DPython3_EXECUTABLE=$python_exec_path -DENABLE_WHEEL=ON -DOpenVINODeveloperPackage_DIR=${{ env.BUILD_DIR }} -S ${{ env.OPENVINO_REPO }}/src/bindings/python -B ${{ github.workspace }}/py$py_version
238238
cmake --build ${{ github.workspace }}/py$py_version --parallel
239239
cmake --install ${{ github.workspace }}/py$py_version --config ${{ env.CMAKE_BUILD_TYPE }} --prefix ${{ env.INSTALL_WHEELS_DIR }} --component python_wheels
@@ -246,7 +246,7 @@ jobs:
246246
version: ${{ env.PYTHON_VERSION }}
247247
should-setup-pip-paths: 'false'
248248
self-hosted-runner: 'false'
249-
249+
250250
- name: Cmake & Build - OpenVINO Contrib
251251
run: |
252252
cmake \
@@ -297,23 +297,23 @@ jobs:
297297
name: openvino_tests
298298
path: ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
299299
if-no-files-found: 'error'
300-
300+
301301
- name: Upload OpenVINO developer package
302302
if: ${{ always() }}
303303
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
304304
with:
305305
name: openvino_developer_package
306306
path: ${{ env.BUILD_DIR }}/openvino_developer_package.tar.gz
307307
if-no-files-found: 'error'
308-
308+
309309
- name: Upload OpenVINO js package
310310
if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API
311311
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
312312
with:
313313
name: openvino_js_package
314314
path: ${{ env.BUILD_DIR }}/openvino_js_package.tar.gz
315315
if-no-files-found: 'error'
316-
316+
317317
- name: Upload product manifest
318318
if: ${{ always() }}
319319
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
@@ -416,7 +416,6 @@ jobs:
416416
with:
417417
runner: 'macos-13'
418418
python-version: '3.11'
419-
scope: ${{ contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name) && 'nightly' || 'smoke' }}
420419

421420
upload_artifacts:
422421
name: Upload OpenVINO artifacts
@@ -425,10 +424,10 @@ jobs:
425424
defaults:
426425
run:
427426
shell: bash
428-
runs-on: aks-linux-2-cores-8gb
427+
runs-on: aks-linux-medium
429428
container:
430429
image: 'openvinogithubactions.azurecr.io/library/python:3.12-slim'
431-
volumes:
430+
volumes:
432431
- /mount:/mount
433432
- ${{ github.workspace }}:${{ github.workspace }}
434433
env:
@@ -438,7 +437,7 @@ jobs:
438437
WHEELS_DIR: ${{ github.workspace }}/wheels
439438
ARTIFACTS_SHARE: "/mount/build-artifacts"
440439

441-
steps:
440+
steps:
442441
- name: Checkout OpenVINO actions
443442
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
444443
timeout-minutes: 15
@@ -447,21 +446,21 @@ jobs:
447446
.github/actions/common
448447
.github/actions/store_artifacts
449448
path: ${{ env.OPENVINO_REPO }}
450-
449+
451450
- name: Download OpenVINO artifacts
452451
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
453452
with:
454453
pattern: "{openvino_package,openvino_developer_package,openvino_js_package,openvino_package_manifest}"
455454
path: ${{ env.ARTIFACTS_DIR }}
456455
merge-multiple: true
457-
456+
458457
- name: Download OpenVINO wheels
459458
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
460459
with:
461460
name: openvino_wheels
462461
path: ${{ env.WHEELS_DIR }}
463-
merge-multiple: true
464-
462+
merge-multiple: true
463+
465464
- name: Store artifacts to a shared drive
466465
id: store_artifacts
467466
if: ${{ always() }}

.github/workflows/mac_arm64.yml

-1
Original file line numberDiff line numberDiff line change
@@ -376,4 +376,3 @@ jobs:
376376
with:
377377
runner: 'macos-13-xlarge'
378378
python-version: '3.11'
379-
scope: ${{ contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name) && 'nightly' || 'smoke' }}

.github/workflows/ubuntu_22.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,7 @@ jobs:
204204
self-hosted-runner: 'false'
205205

206206
- name: Install Dependencies
207-
run: |
208-
sudo -E ${INSTALL_DIR}/install_dependencies/install_openvino_dependencies.sh -c=core -y
209-
210-
python3 -m pip install -r ${CONFORMANCE_TOOLS_DIR}/requirements.txt
207+
run: python3 -m pip install -r ${CONFORMANCE_TOOLS_DIR}/requirements.txt
211208

212209
#
213210
# Tests
@@ -365,7 +362,6 @@ jobs:
365362
runner: 'aks-linux-8-cores-32gb'
366363
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}
367364
python-version: '3.11'
368-
scope: ${{ contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name) && 'nightly' || 'smoke' }}
369365

370366
TensorFlow_Models_Tests_Precommit:
371367
name: TensorFlow Models tests

.github/workflows/workflow_rerunner.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: Rerun Workflow
3333
# Run only for the failed workflows in openvinotoolkit org
3434
if: ${{ github.event.workflow_run.conclusion == 'failure' && github.repository_owner == 'openvinotoolkit' }}
35-
runs-on: aks-linux-smallworker
35+
runs-on: aks-linux-small
3636
permissions:
3737
actions: write
3838
contents: read
@@ -73,7 +73,7 @@ jobs:
7373
rerunner_tests:
7474
name: Rerunner Tests
7575
if: ${{ github.event_name == 'pull_request' && github.repository_owner == 'openvinotoolkit' }}
76-
runs-on: aks-linux-2-cores-8gb-stats
76+
runs-on: aks-linux-small
7777
steps:
7878
- name: Checkout
7979
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
42+
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
4343
with:
4444
languages: "actions"
4545
build-mode: "none"
4646

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

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,6 @@
9090
[submodule "src/plugins/intel_cpu/thirdparty/kleidiai"]
9191
path = src/plugins/intel_cpu/thirdparty/kleidiai
9292
url = https://github.com/ARM-software/kleidiai.git
93+
[submodule "src/plugins/intel_cpu/thirdparty/xbyak_riscv"]
94+
path = src/plugins/intel_cpu/thirdparty/xbyak_riscv
95+
url = https://github.com/herumi/xbyak_riscv.git

cmake/dependencies.cmake

+6-6
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ function(ov_download_tbb)
101101
# TODO: add target_path to be platform specific as well, to avoid following if
102102
# build oneTBB 2021.2.1 with Visual Studio 2019 (MSVC 14.21)
103103
RESOLVE_DEPENDENCY(TBB
104-
ARCHIVE_WIN "oneapi-tbb-2021.2.5-win-trim-cfg-simplify.zip"
104+
ARCHIVE_WIN "oneapi-tbb-2021.2.5-win-pdb.zip"
105105
TARGET_PATH "${TEMP}/tbb"
106106
ENVIRONMENT "TBBROOT"
107-
SHA256 "63bf0992406d69dfb3c402f46466face2388ca55b6678f29072ba304f3622fe7"
107+
SHA256 "8acb2bd35769aac20597bc0ce1f7608e993b48dee18ee1cc144a05406b6b2613"
108108
USE_NEW_LOCATION TRUE)
109109
elseif(ANDROID AND X86_64)
110110
RESOLVE_DEPENDENCY(TBB
@@ -131,10 +131,10 @@ function(ov_download_tbb)
131131
elseif(APPLE AND X86_64)
132132
# build oneTBB 2021.2.1 with OS version 11.4
133133
RESOLVE_DEPENDENCY(TBB
134-
ARCHIVE_MAC "oneapi-tbb-2021.13.0-mac.tgz"
134+
ARCHIVE_MAC "oneapi-tbb-2021.13.0-mac-canary.tgz"
135135
TARGET_PATH "${TEMP}/tbb"
136136
ENVIRONMENT "TBBROOT"
137-
SHA256 "86e07127bfead5c4aad456c765de845013502342bda33d249d8097ed57afe945"
137+
SHA256 "f26a8ae579c4e843781b139c6b74325ae48b58cb2a7a31a0982acda5343f0dd8"
138138
USE_NEW_LOCATION TRUE)
139139
elseif(WIN32 AND AARCH64)
140140
# build oneTBB 2021.2.1 with Visual Studio 2022 (MSVC 14.35)
@@ -155,10 +155,10 @@ function(ov_download_tbb)
155155
elseif(APPLE AND AARCH64)
156156
# build oneTBB with export MACOSX_DEPLOYMENT_TARGET=11.0
157157
RESOLVE_DEPENDENCY(TBB
158-
ARCHIVE_MAC "oneapi-tbb-2021.13.0-mac-arm64-release.tgz"
158+
ARCHIVE_MAC "oneapi-tbb-2021.13.0-mac-arm64-canary.tgz"
159159
TARGET_PATH "${TEMP}/tbb"
160160
ENVIRONMENT "TBBROOT"
161-
SHA256 "de9893f8699c15b1c8b46daa7fc51e112e84353d66d5baf1c35574932747c64c"
161+
SHA256 "fb4be1dd03044a97475c45a0cf4576e502b4b64048e98e019520b0720fc255aa"
162162
USE_NEW_LOCATION TRUE)
163163
else()
164164
message(WARNING "Prebuilt TBB is not available on current platform")

cmake/developer_package/compile_flags/os_flags.cmake

+14-5
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,21 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
122122
#
123123
# PDB related flags
124124
#
125-
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi")
126-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
127125

128-
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
129-
set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
130-
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
126+
if(ENABLE_PDB_IN_RELEASE)
127+
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi")
128+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
129+
130+
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG")
131+
set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /DEBUG")
132+
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG")
133+
endif()
134+
135+
# need to set extra flags after /DEBUG to ensure that binary size is not bloated
136+
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
137+
set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
138+
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
139+
131140
elseif(OV_COMPILER_IS_INTEL_LLVM AND WIN32)
132141
#
133142
# Warnings as errors

0 commit comments

Comments
 (0)