Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into automate_mlir
Browse files Browse the repository at this point in the history
  • Loading branch information
slyalin committed Oct 21, 2024
2 parents 12859a0 + 1f41cba commit fbfa9f9
Show file tree
Hide file tree
Showing 868 changed files with 34,241 additions and 9,657 deletions.
4 changes: 3 additions & 1 deletion .github/actions/common/artifact_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
def add_common_args(parser: argparse.ArgumentParser):
parser.add_argument('-s', '--commit_sha', help='Commit hash for which artifacts were generated', required=True)
parser.add_argument('-b', '--branch_name', help='Name of GitHub branch', required=False,
default=os.getenv('GITHUB_BASE_REF') or os.getenv('GITHUB_REF_NAME'))
default=os.getenv('GITHUB_BASE_REF') or
os.getenv('MERGE_QUEUE_BASE_REF').replace('refs/heads/', '') or
os.getenv('GITHUB_REF_NAME'))
parser.add_argument('-e', '--event_name', help='Name of GitHub event', required=False,
default=os.getenv('GITHUB_EVENT_NAME'))
parser.add_argument('--storage_root', help='Root path of the artifacts storage', required=False,
Expand Down
13 changes: 9 additions & 4 deletions .github/actions/openvino_provider/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ inputs:
description: 'Branch of OpenVINO to take the revision from if no specific hash was provided.
Taken from github context by default'
required: false
event_name:
description: 'Even name from which artifacts were generated. "push" by default; overwrite it with "pull_request"
if revision/branch is from PR'
default: "push"
required: false
ov_artifact_name:
description: "Name under which to upload provided OpenVINO build artifacts, set automatically by default"
required: false
Expand Down Expand Up @@ -107,7 +112,7 @@ runs:
with:
platform: ${{ inputs.platform }}_${{ inputs.arch }}
storage_root: ${{ inputs.commit_share_path }}
event_name: "commit"
event_name: ${{ inputs.event_name }}
trigger_repo_sha: ${{ env.OV_REVISION }}
branch_name: ${{ inputs.branch_name }}
to_restore: ${{ inputs.commit_packages_to_provide }}
Expand Down Expand Up @@ -137,15 +142,15 @@ runs:
artifacts_path=${{ steps.openvino_commit_download.outputs.artifacts_path }}
cd $artifacts_path
version=$(yq eval '.components.dldt.custom_params.wheel_product_version' manifest.yml)
wheel_path=${{ inputs.install_dir && '$artifacts_path/tools' || './tools' }}
wheel_path=${{ inputs.install_dir && '$artifacts_path/wheels' || './wheels' }}
default_find_links_cmd="--find-links=$wheel_path"
find_links_cmd=$([[ -n "$PIP_FIND_LINKS" ]] && echo "" || echo "$default_find_links_cmd")
echo "ov_version=$version" >> $GITHUB_OUTPUT
echo "ov_wheel_source=$default_find_links_cmd" >> $GITHUB_OUTPUT
- name: Upload commit OpenVINO archives
if: steps.openvino_commit_download.outcome == 'success' && !inputs.install_dir
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: ${{ steps.openvino_commit_output.outputs.ov_artifact_name }}
path: ${{ steps.openvino_commit_output.outputs.ov_package_path }}
Expand Down Expand Up @@ -188,7 +193,7 @@ runs:
- name: Upload OpenVINO archives
if: steps.openvino_s3_download.outcome == 'success' && !inputs.install_dir
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: ${{ steps.openvino_s3_download.outputs.ov_artifact_name }}
path: ${{ steps.openvino_s3_download.outputs.ov_package_path }}
Expand Down
1 change: 1 addition & 0 deletions .github/actions/restore_artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ runs:
EVENT_PARAM: "-e ${{ inputs.event_name }}"
TO_RESTORE: "-r ${{ inputs.to_restore }}"
DEFAULT_TARGET_DIR: "${{ env.GITHUB_WORKSPACE }}/${{ inputs.storage_dir || inputs.platform }}"
MERGE_QUEUE_BASE_REF: "${{ github.event.merge_group.base_ref }}"
4 changes: 2 additions & 2 deletions .github/actions/restore_artifacts/restore_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ def include_filter(include_list: set | list):
"""
Returns input for shutil.copytree ignore - to copy only files from include list
"""
def _filter(_, files: list):
def _filter(root, files: list):
if not include_list:
return []
return [f for f in files if f not in include_list]
return [f for f in files if f not in include_list and Path(root).name not in include_list]

return _filter

Expand Down
1 change: 1 addition & 0 deletions .github/actions/store_artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ runs:
EVENT_PARAM: "-e ${{ inputs.event_name }}"
STORAGE_PARAM: "--storage_dir ${{ inputs.storage_dir }}"
PLATFORM_PARAM: "--platform ${{ inputs.platform }}"
MERGE_QUEUE_BASE_REF: ""
15 changes: 8 additions & 7 deletions .github/actions/store_artifacts/store_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,14 @@ def main():
with open(storage / 'workflow_link.txt', 'w') as file:
file.write(workflow_link)

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

logger.debug(f"Copying finished")
(storage / 'copying_finished').touch()
Expand Down
2 changes: 1 addition & 1 deletion .github/dockerfiles/docker_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pr-26586
pr-26993
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/debian_10_arm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Pythons \
python3 \
python3-pip \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/fedora_29/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ RUN yum update -y && yum install -y \
tar \
gcc \
gcc-c++ \
# parallel gzip
pigz \
xz

# Install build dependencies
Expand Down
4 changes: 3 additions & 1 deletion .github/dockerfiles/ov_build/ubuntu_20_04_arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Pythons
python3.8-dev \
python3.8-venv \
Expand All @@ -33,7 +35,7 @@ RUN apt-get update && \
libhdf5-dev \
# For Java API
default-jdk \
# Compiler
# Compiler, required for multi-isa build
gcc-10 \
g++-10 \
&& \
Expand Down
9 changes: 2 additions & 7 deletions .github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Pythons
python3.9-dev \
python3.9-venv \
python3.9-distutils \
# For Java API
default-jdk \
# Compiler \
gcc-10 \
g++-10 \
&& \
rm -rf /var/lib/apt/lists/*

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

# Set gcc-10 as a default compiler
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 30

# Install sscache
ARG SCCACHE_VERSION="v0.7.5"
ENV SCCACHE_HOME="/opt/sccache" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Pythons
python3.8-dev \
python3.8-venv \
Expand All @@ -33,9 +35,6 @@ RUN apt-get update && \
python3.11-distutils \
# For Java API
default-jdk \
# Compiler \
gcc-10 \
g++-10 \
&& \
rm -rf /var/lib/apt/lists/*

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

# Set gcc-10 as a default compiler
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 30

# Install sscache
ARG SCCACHE_VERSION="v0.7.5"
ENV SCCACHE_HOME="/opt/sccache" \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python \
python3-dev \
python3-pip \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
gpg-agent \
tzdata \
libtbb2 \
# parallel gzip
pigz \
# Pythons \
python3.11-dev \
python3.11-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_22_04_x64_cc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ RUN apt-get update && \
gpg-agent \
tzdata \
libtbb2 \
# parallel gzip
pigz \
# Pythons
python3.8-dev \
python3.8-venv \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ RUN apt-get update && \
gpg-agent \
tzdata \
libtbb2 \
# parallel gzip
pigz \
# Pythons \
python3.11-dev \
python3.11-venv \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3.11-dev \
python3.11-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_24_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3-dev \
python3-venv \
Expand Down
40 changes: 40 additions & 0 deletions .github/dockerfiles/ov_test/debian_10_arm/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
ARG REGISTRY="docker.io"
FROM ${REGISTRY}/library/debian:10.13

USER root

# APT configuration
RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf && \
echo 'APT::Get::Assume-Yes "true";' >> /etc/apt/apt.conf && \
echo 'APT::Get::Fix-Broken "true";' >> /etc/apt/apt.conf && \
echo 'APT::Get::no-install-recommends "true";' >> /etc/apt/apt.conf

ENV DEBIAN_FRONTEND="noninteractive" \
TZ="Europe/London"

RUN apt-get update && \
apt-get install \
git \
libc6-dev \
# parallel gzip
pigz \
# Python for running C++ Functional tests via parallelization script \
python3 \
python3-pip \
python3-dev \
python3-venv \
python3-distutils \
# Compilers
gcc-arm-linux-gnueabihf \
g++-arm-linux-gnueabihf \
&& \
rm -rf /var/lib/apt/lists/*

# Install build dependencies
ADD install_build_dependencies.sh /install_build_dependencies.sh
RUN chmod +x /install_build_dependencies.sh && \
/install_build_dependencies.sh && \
rm -rf /var/lib/apt/lists/*

ENV LD_LIBRARY_PATH="/usr/arm-linux-gnueabihf/:/usr/arm-linux-gnueabihf/lib/:$LD_LIBRARY_PATH"
RUN ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib/ld-linux-armhf.so.3
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_test/ubuntu_20_04_arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3.11-dev \
python3.11-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_test/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3.9-dev \
python3.9-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3.11-dev \
python3.11-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_test/ubuntu_24_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3-full \
libhdf5-dev \
Expand Down
4 changes: 2 additions & 2 deletions .github/github_org_control/configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
from pathlib import Path


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


class ConfigException(Exception):
Expand Down
4 changes: 4 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@

'category: NPUW':
- 'src/plugins/intel_npu/src/plugin/npuw/**/*'
- 'src/plugins/intel_npu/tests/functional/behavior/npuw/**/*'
- 'src/plugins/intel_npu/tests/unit/behavior/npuw/**/*'

'category: HETERO':
- 'src/plugins/hetero/**/*'
Expand Down Expand Up @@ -150,6 +152,7 @@
- 'tests/layer_tests/tensorflow_tests/**/*'
- 'tests/layer_tests/tensorflow2_keras_tests/**/*'
- 'tests/layer_tests/jax_tests/**/*'
- 'tests/requirements_tensorflow'
- any: ['tests/model_hub_tests/**',
'!tests/model_hub_tests/pytorch/**/*',
'!tests/model_hub_tests/jax/**/*']
Expand All @@ -165,6 +168,7 @@
- 'src/bindings/python/src/openvino/frontend/pytorch/**/*'
- 'tests/layer_tests/py_frontend_tests/test_torch_decoder.py'
- 'tests/layer_tests/py_frontend_tests/test_torch_frontend.py'
- 'tests/requirements_pytorch'
- any: ['tests/model_hub_tests/**',
'!tests/model_hub_tests/tensorflow/**/*',
'!tests/model_hub_tests/jax/**/*']
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
# Upload build logs
#
- name: Upload build logs
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: build_logs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ jobs:
# Upload build logs
#
- name: Upload build logs
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: build_logs
Expand Down
Loading

0 comments on commit fbfa9f9

Please sign in to comment.