Skip to content

Commit 7c84f61

Browse files
authored
Merge branch 'master' into torchfx_gptq_accuracy_fix
2 parents f8f6ce9 + 324a282 commit 7c84f61

File tree

686 files changed

+22782
-7966
lines changed

Some content is hidden

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

686 files changed

+22782
-7966
lines changed

.github/actions/common/artifact_utils.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
def add_common_args(parser: argparse.ArgumentParser):
1010
parser.add_argument('-s', '--commit_sha', help='Commit hash for which artifacts were generated', required=True)
1111
parser.add_argument('-b', '--branch_name', help='Name of GitHub branch', required=False,
12-
default=os.getenv('GITHUB_BASE_REF') or os.getenv('GITHUB_REF_NAME'))
12+
default=os.getenv('GITHUB_BASE_REF') or
13+
os.getenv('MERGE_QUEUE_BASE_REF').replace('refs/heads/', '') or
14+
os.getenv('GITHUB_REF_NAME'))
1315
parser.add_argument('-e', '--event_name', help='Name of GitHub event', required=False,
1416
default=os.getenv('GITHUB_EVENT_NAME'))
1517
parser.add_argument('--storage_root', help='Root path of the artifacts storage', required=False,

.github/actions/openvino_provider/action.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ inputs:
99
description: 'Branch of OpenVINO to take the revision from if no specific hash was provided.
1010
Taken from github context by default'
1111
required: false
12+
event_name:
13+
description: 'Even name from which artifacts were generated. "push" by default; overwrite it with "pull_request"
14+
if revision/branch is from PR'
15+
default: "push"
16+
required: false
1217
ov_artifact_name:
1318
description: "Name under which to upload provided OpenVINO build artifacts, set automatically by default"
1419
required: false
@@ -107,7 +112,7 @@ runs:
107112
with:
108113
platform: ${{ inputs.platform }}_${{ inputs.arch }}
109114
storage_root: ${{ inputs.commit_share_path }}
110-
event_name: "commit"
115+
event_name: ${{ inputs.event_name }}
111116
trigger_repo_sha: ${{ env.OV_REVISION }}
112117
branch_name: ${{ inputs.branch_name }}
113118
to_restore: ${{ inputs.commit_packages_to_provide }}
@@ -137,15 +142,15 @@ runs:
137142
artifacts_path=${{ steps.openvino_commit_download.outputs.artifacts_path }}
138143
cd $artifacts_path
139144
version=$(yq eval '.components.dldt.custom_params.wheel_product_version' manifest.yml)
140-
wheel_path=${{ inputs.install_dir && '$artifacts_path/tools' || './tools' }}
145+
wheel_path=${{ inputs.install_dir && '$artifacts_path/wheels' || './wheels' }}
141146
default_find_links_cmd="--find-links=$wheel_path"
142147
find_links_cmd=$([[ -n "$PIP_FIND_LINKS" ]] && echo "" || echo "$default_find_links_cmd")
143148
echo "ov_version=$version" >> $GITHUB_OUTPUT
144149
echo "ov_wheel_source=$default_find_links_cmd" >> $GITHUB_OUTPUT
145150
146151
- name: Upload commit OpenVINO archives
147152
if: steps.openvino_commit_download.outcome == 'success' && !inputs.install_dir
148-
uses: actions/upload-artifact@v4
153+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
149154
with:
150155
name: ${{ steps.openvino_commit_output.outputs.ov_artifact_name }}
151156
path: ${{ steps.openvino_commit_output.outputs.ov_package_path }}
@@ -188,7 +193,7 @@ runs:
188193
189194
- name: Upload OpenVINO archives
190195
if: steps.openvino_s3_download.outcome == 'success' && !inputs.install_dir
191-
uses: actions/upload-artifact@v4
196+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
192197
with:
193198
name: ${{ steps.openvino_s3_download.outputs.ov_artifact_name }}
194199
path: ${{ steps.openvino_s3_download.outputs.ov_package_path }}

.github/actions/restore_artifacts/action.yml

+1
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ runs:
6060
EVENT_PARAM: "-e ${{ inputs.event_name }}"
6161
TO_RESTORE: "-r ${{ inputs.to_restore }}"
6262
DEFAULT_TARGET_DIR: "${{ env.GITHUB_WORKSPACE }}/${{ inputs.storage_dir || inputs.platform }}"
63+
MERGE_QUEUE_BASE_REF: "${{ github.event.merge_group.base_ref }}"

.github/actions/restore_artifacts/restore_artifacts.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ def include_filter(include_list: set | list):
3333
"""
3434
Returns input for shutil.copytree ignore - to copy only files from include list
3535
"""
36-
def _filter(_, files: list):
36+
def _filter(root, files: list):
3737
if not include_list:
3838
return []
39-
return [f for f in files if f not in include_list]
39+
return [f for f in files if f not in include_list and Path(root).name not in include_list]
4040

4141
return _filter
4242

.github/actions/store_artifacts/action.yml

+1
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ runs:
6060
EVENT_PARAM: "-e ${{ inputs.event_name }}"
6161
STORAGE_PARAM: "--storage_dir ${{ inputs.storage_dir }}"
6262
PLATFORM_PARAM: "--platform ${{ inputs.platform }}"
63+
MERGE_QUEUE_BASE_REF: ""

.github/actions/store_artifacts/store_artifacts.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,14 @@ def main():
9898
with open(storage / 'workflow_link.txt', 'w') as file:
9999
file.write(workflow_link)
100100

101-
latest_artifacts_for_branch = artifact_utils.get_latest_artifacts_link(storage_dir, args.storage_root,
102-
args.branch_name, args.event_name)
103-
# Overwrite path to "latest" built artifacts only if a given commit is the head of a given branch
104-
if args.event_name != 'pull_request' and args.commit_sha == os.getenv('GITHUB_SHA'):
105-
# TODO: lock to avoid corruption in case of a parallel build (unlikely event for now, but still)
106-
with open(latest_artifacts_for_branch, 'w') as file:
107-
file.write(str(storage.relative_to(storage_root)))
101+
if not error_found:
102+
latest_artifacts_for_branch = artifact_utils.get_latest_artifacts_link(storage_dir, args.storage_root,
103+
args.branch_name, args.event_name)
104+
# Overwrite path to "latest" built artifacts only if a given commit is the head of a given branch
105+
if args.event_name != 'pull_request' and args.commit_sha == os.getenv('GITHUB_SHA'):
106+
# TODO: lock to avoid corruption in case of a parallel build (unlikely event for now, but still)
107+
with open(latest_artifacts_for_branch, 'w') as file:
108+
file.write(str(storage.relative_to(storage_root)))
108109

109110
logger.debug(f"Copying finished")
110111
(storage / 'copying_finished').touch()

.github/dockerfiles/docker_tag

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pr-26586
1+
pr-26993

.github/dockerfiles/ov_build/debian_10_arm/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ RUN apt-get update && \
1919
git \
2020
gpg-agent \
2121
tzdata \
22+
# parallel gzip
23+
pigz \
2224
# Pythons \
2325
python3 \
2426
python3-pip \

.github/dockerfiles/ov_build/fedora_29/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ RUN yum update -y && yum install -y \
1818
tar \
1919
gcc \
2020
gcc-c++ \
21+
# parallel gzip
22+
pigz \
2123
xz
2224

2325
# Install build dependencies

.github/dockerfiles/ov_build/ubuntu_20_04_arm64/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ RUN apt-get update && \
2323
ca-certificates \
2424
gpg-agent \
2525
tzdata \
26+
# parallel gzip
27+
pigz \
2628
# Pythons
2729
python3.8-dev \
2830
python3.8-venv \
@@ -33,7 +35,7 @@ RUN apt-get update && \
3335
libhdf5-dev \
3436
# For Java API
3537
default-jdk \
36-
# Compiler
38+
# Compiler, required for multi-isa build
3739
gcc-10 \
3840
g++-10 \
3941
&& \

.github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@ RUN apt-get update && \
2222
git \
2323
gpg-agent \
2424
tzdata \
25+
# parallel gzip
26+
pigz \
2527
# Pythons
2628
python3.9-dev \
2729
python3.9-venv \
2830
python3.9-distutils \
2931
# For Java API
3032
default-jdk \
31-
# Compiler \
32-
gcc-10 \
33-
g++-10 \
3433
&& \
3534
rm -rf /var/lib/apt/lists/*
3635

@@ -40,10 +39,6 @@ RUN chmod +x /install_build_dependencies.sh && \
4039
/install_build_dependencies.sh && \
4140
rm -rf /var/lib/apt/lists/*
4241

43-
# Set gcc-10 as a default compiler
44-
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30 && \
45-
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 30
46-
4742
# Install sscache
4843
ARG SCCACHE_VERSION="v0.7.5"
4944
ENV SCCACHE_HOME="/opt/sccache" \

.github/dockerfiles/ov_build/ubuntu_20_04_x64_nvidia/Dockerfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ RUN apt-get update && \
2424
ca-certificates \
2525
gpg-agent \
2626
tzdata \
27+
# parallel gzip
28+
pigz \
2729
# Pythons
2830
python3.8-dev \
2931
python3.8-venv \
@@ -33,9 +35,6 @@ RUN apt-get update && \
3335
python3.11-distutils \
3436
# For Java API
3537
default-jdk \
36-
# Compiler \
37-
gcc-10 \
38-
g++-10 \
3938
&& \
4039
rm -rf /var/lib/apt/lists/*
4140

@@ -45,10 +44,6 @@ RUN chmod +x /install_build_dependencies.sh && \
4544
/install_build_dependencies.sh && \
4645
rm -rf /var/lib/apt/lists/*
4746

48-
# Set gcc-10 as a default compiler
49-
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30 && \
50-
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 30
51-
5247
# Install sscache
5348
ARG SCCACHE_VERSION="v0.7.5"
5449
ENV SCCACHE_HOME="/opt/sccache" \

.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ RUN apt-get update && \
3030
ca-certificates \
3131
gpg-agent \
3232
tzdata \
33+
# parallel gzip
34+
pigz \
3335
# Python \
3436
python3-dev \
3537
python3-pip \

.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ RUN apt-get update && \
2323
gpg-agent \
2424
tzdata \
2525
libtbb2 \
26+
# parallel gzip
27+
pigz \
2628
# Pythons \
2729
python3.11-dev \
2830
python3.11-venv \

.github/dockerfiles/ov_build/ubuntu_22_04_x64_cc/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ RUN apt-get update && \
2424
gpg-agent \
2525
tzdata \
2626
libtbb2 \
27+
# parallel gzip
28+
pigz \
2729
# Pythons
2830
python3.8-dev \
2931
python3.8-venv \

.github/dockerfiles/ov_build/ubuntu_22_04_x64_dpcpp/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ RUN apt-get update && \
2525
gpg-agent \
2626
tzdata \
2727
libtbb2 \
28+
# parallel gzip
29+
pigz \
2830
# Pythons \
2931
python3.11-dev \
3032
python3.11-venv \

.github/dockerfiles/ov_build/ubuntu_22_04_x64_nvidia/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ RUN apt-get update && \
2323
git \
2424
gpg-agent \
2525
tzdata \
26+
# parallel gzip
27+
pigz \
2628
# Python
2729
python3.11-dev \
2830
python3.11-venv \

.github/dockerfiles/ov_build/ubuntu_24_04_x64/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ RUN apt-get update && \
2222
git \
2323
gpg-agent \
2424
tzdata \
25+
# parallel gzip
26+
pigz \
2527
# Python
2628
python3-dev \
2729
python3-venv \
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
ARG REGISTRY="docker.io"
2+
FROM ${REGISTRY}/library/debian:10.13
3+
4+
USER root
5+
6+
# APT configuration
7+
RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf && \
8+
echo 'APT::Get::Assume-Yes "true";' >> /etc/apt/apt.conf && \
9+
echo 'APT::Get::Fix-Broken "true";' >> /etc/apt/apt.conf && \
10+
echo 'APT::Get::no-install-recommends "true";' >> /etc/apt/apt.conf
11+
12+
ENV DEBIAN_FRONTEND="noninteractive" \
13+
TZ="Europe/London"
14+
15+
RUN apt-get update && \
16+
apt-get install \
17+
git \
18+
libc6-dev \
19+
# parallel gzip
20+
pigz \
21+
# Python for running C++ Functional tests via parallelization script \
22+
python3 \
23+
python3-pip \
24+
python3-dev \
25+
python3-venv \
26+
python3-distutils \
27+
# Compilers
28+
gcc-arm-linux-gnueabihf \
29+
g++-arm-linux-gnueabihf \
30+
&& \
31+
rm -rf /var/lib/apt/lists/*
32+
33+
# Install build dependencies
34+
ADD install_build_dependencies.sh /install_build_dependencies.sh
35+
RUN chmod +x /install_build_dependencies.sh && \
36+
/install_build_dependencies.sh && \
37+
rm -rf /var/lib/apt/lists/*
38+
39+
ENV LD_LIBRARY_PATH="/usr/arm-linux-gnueabihf/:/usr/arm-linux-gnueabihf/lib/:$LD_LIBRARY_PATH"
40+
RUN ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib/ld-linux-armhf.so.3

.github/dockerfiles/ov_test/ubuntu_20_04_arm64/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ RUN apt-get update && \
2323
ca-certificates \
2424
gpg-agent \
2525
tzdata \
26+
# parallel gzip
27+
pigz \
2628
# Python
2729
python3.11-dev \
2830
python3.11-venv \

.github/dockerfiles/ov_test/ubuntu_20_04_x64/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ RUN apt-get update && \
2222
git \
2323
gpg-agent \
2424
tzdata \
25+
# parallel gzip
26+
pigz \
2527
# Python
2628
python3.9-dev \
2729
python3.9-venv \

.github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ RUN apt-get update && \
2323
ca-certificates \
2424
gpg-agent \
2525
tzdata \
26+
# parallel gzip
27+
pigz \
2628
# Python
2729
python3.11-dev \
2830
python3.11-venv \

.github/dockerfiles/ov_test/ubuntu_24_04_x64/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ RUN apt-get update && \
2020
git \
2121
gpg-agent \
2222
tzdata \
23+
# parallel gzip
24+
pigz \
2325
# Python
2426
python3-full \
2527
libhdf5-dev \

.github/github_org_control/configs.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
from pathlib import Path
1515

1616

17-
if sys.version_info[:2] < (3, 8):
18-
raise Exception("Python version must be >= 3.8")
17+
if sys.version_info[:2] < (3, 9):
18+
raise Exception("Python version must be >= 3.9")
1919

2020

2121
class ConfigException(Exception):

.github/labeler.yml

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676

7777
'category: NPUW':
7878
- 'src/plugins/intel_npu/src/plugin/npuw/**/*'
79+
- 'src/plugins/intel_npu/tests/functional/behavior/npuw/**/*'
80+
- 'src/plugins/intel_npu/tests/unit/behavior/npuw/**/*'
7981

8082
'category: HETERO':
8183
- 'src/plugins/hetero/**/*'
@@ -150,6 +152,7 @@
150152
- 'tests/layer_tests/tensorflow_tests/**/*'
151153
- 'tests/layer_tests/tensorflow2_keras_tests/**/*'
152154
- 'tests/layer_tests/jax_tests/**/*'
155+
- 'tests/requirements_tensorflow'
153156
- any: ['tests/model_hub_tests/**',
154157
'!tests/model_hub_tests/pytorch/**/*',
155158
'!tests/model_hub_tests/jax/**/*']
@@ -165,6 +168,7 @@
165168
- 'src/bindings/python/src/openvino/frontend/pytorch/**/*'
166169
- 'tests/layer_tests/py_frontend_tests/test_torch_decoder.py'
167170
- 'tests/layer_tests/py_frontend_tests/test_torch_frontend.py'
171+
- 'tests/requirements_pytorch'
168172
- any: ['tests/model_hub_tests/**',
169173
'!tests/model_hub_tests/tensorflow/**/*',
170174
'!tests/model_hub_tests/jax/**/*']

.github/workflows/build_doc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
run: |
4949
# install doxygen
5050
wget https://www.doxygen.nl/files/doxygen-$DOXY_VER.linux.bin.tar.gz
51-
tar -xzf doxygen-$DOXY_VER.linux.bin.tar.gz
51+
tar -I pigz -xf doxygen-$DOXY_VER.linux.bin.tar.gz
5252
echo "$(pwd)/doxygen-$DOXY_VER/bin/" >> $GITHUB_PATH
5353
5454
- name: Validate benchmarks files

.github/workflows/coverity.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
rm -rf ${COVERITY_TOOL_DIR} && mkdir -p ${COVERITY_TOOL_DIR}
104104
pushd ${COVERITY_TOOL_DIR}
105105
wget https://scan.coverity.com/download/linux64 --progress=bar:force:noscroll --post-data "token=${{ secrets.COVERITY_TOKEN }}&project=openvino" -O coverity_tool.tgz
106-
tar xvf coverity_tool.tgz && rm coverity_tool.tgz
106+
tar -I pigz -xf coverity_tool.tgz && rm coverity_tool.tgz
107107
popd
108108
109109
- name: Cmake build - OpenVINO with Coverity
@@ -112,7 +112,7 @@ jobs:
112112
- name: Pack Artefacts
113113
run: |
114114
pushd ${BUILD_DIR}
115-
tar -C ${BUILD_DIR} -czvf openvino.tgz cov-int
115+
tar -cvf - cov-int | pigz > openvino.tgz
116116
popd
117117
118118
- name: Submit artefacts

0 commit comments

Comments
 (0)