Skip to content

Commit

Permalink
Update to latest master (#26683)
Browse files Browse the repository at this point in the history
Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nashez Zubair <nashezzubair@gmail.com>
Co-authored-by: mei, yang <yang.mei@intel.com>
Co-authored-by: Ivan Tikhonov <ivan.tikhonov@intel.com>
Co-authored-by: Damian Kurek <damian.kurek@intel.com>
Co-authored-by: Sergey E. Losev <sergey.e.losev@intel.com>
Co-authored-by: Alexander Kozlov <alexander.kozlov@intel.com>
Co-authored-by: Tatiana Savina <tatiana.savina@intel.com>
Co-authored-by: Roman Kazantsev <roman.kazantsev@intel.com>
Co-authored-by: Karol Blaszczak <karol.blaszczak@intel.com>
Co-authored-by: Sebastian Golebiewski <sebastianx.golebiewski@intel.com>
Co-authored-by: Egor Duplenskii <egor.duplensky@gmail.com>
Co-authored-by: Vladislav Golubev <vladislav.golubev@intel.com>
Co-authored-by: Aleksandr Voron <aleksandr.voron@intel.com>
Co-authored-by: Anastasia Kuporosova <anastasia.kuporosova@intel.com>
Co-authored-by: Andrei Kashchikhin <andrey.kashchikhin@intel.com>
Co-authored-by: Pavel Durandin <pavel.durandin@intel.com>
Co-authored-by: Jade Cho <jade.cho@intel.com>
Co-authored-by: Mateusz Tabaka <mateusz.tabaka@intel.com>
Co-authored-by: Alina Kladieva <alina.kladieva@intel.com>
Co-authored-by: Zaixing Wang <zaixing.wang@intel.com>
Co-authored-by: Zhang Yi <yi3.zhang@intel.com>
Co-authored-by: Taylor Yeonbok Lee <taylor.lee@intel.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: tadamczx <156996781+tadamczx@users.noreply.github.com>
Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
Co-authored-by: Nashez Zubair <35090095+nashez@users.noreply.github.com>
Co-authored-by: Alicja Miloszewska <alicja.miloszewska@intel.com>
Co-authored-by: Andrey Babushkin <andrey.babushkin@intel.com>
Co-authored-by: Denis Orlov <denis.orlov@intel.com>
Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
Co-authored-by: David Nam <david.nam@intel.com>
Co-authored-by: Sergey Shlyapnikov <sergey.shlyapnikov@intel.com>
Co-authored-by: Alexey Smirnov <alexey.smirnov@intel.com>
Co-authored-by: Anastasiia Pnevskaia <anastasiia.pnevskaia@intel.com>
Co-authored-by: Mikhail Ryzhov <mikhail.ryzhov@intel.com>
Co-authored-by: Hubert Błaszczyk <56601011+hub-bla@users.noreply.github.com>
Co-authored-by: Andrzej Kopytko <andrzejx.kopytko@intel.com>
Co-authored-by: Yury Gaydaychuk <yury.gaydaychuk@intel.com>
Co-authored-by: Maxim Vafin <maxim.vafin@intel.com>
Co-authored-by: Roman Lyamin <Roman.Lyamin@intel.com>
Co-authored-by: Alexandra Sidorova <alexandra.sidorova@intel.com>
Co-authored-by: Alexandru Enache <alexandru.enache@intel.com>
Co-authored-by: Bogdan Pereanu <bogdan.pereanu@intel.com>
Co-authored-by: Pawel Raasz <pawel.raasz@intel.com>
Co-authored-by: Anastasiya(Asya) Pronina <anastasiya.pronina@intel.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 560 changed files with 38,593 additions and 49,766 deletions.
7 changes: 4 additions & 3 deletions .github/actions/common/artifact_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import argparse
import os
from pathlib import Path
from .constants import EventType
from .constants import EventType, ProductType


def add_common_args(parser: argparse.ArgumentParser):
Expand All @@ -12,7 +12,8 @@ def add_common_args(parser: argparse.ArgumentParser):
default=os.getenv('GITHUB_BASE_REF') 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_dir', help='Subdirectory name for artifacts, same as product type', required=True)
parser.add_argument('--storage_dir', help='Subdirectory name for artifacts, same as product type', required=True,
choices=[product_type.value for product_type in ProductType])
parser.add_argument('--storage_root', help='Root path of the artifacts storage', required=False,
default=os.getenv('ARTIFACTS_SHARE'))

Expand All @@ -39,7 +40,7 @@ def get_storage_dir(product_type: str, commit_hash: str, storage_root: str | Pat
# branch_name = merge_queue_matcher.group(1)

storage_event_dir = get_storage_event_dir(storage_root, branch_name, event_name, product_name)
storage = storage_event_dir / commit_hash / product_type
storage = storage_event_dir / commit_hash / product_type.lower()
return storage


Expand Down
14 changes: 13 additions & 1 deletion .github/actions/common/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,16 @@ class EventType(Enum):
pre_commit = 'pre_commit'
commit = 'commit'

# TODO: add enum for product type to validate it

productTypes = (
'public_linux_debian_10_arm_release',
'public_linux_fedora_29_x86_64_release',
'public_linux_ubuntu_20_04_x86_64_release',
'public_linux_ubuntu_20_04_arm64_release',
'public_linux_ubuntu_22_04_x86_64_release',
'public_linux_ubuntu_22_04_dpcpp_x86_64_release',
'public_linux_ubuntu_24_04_x86_64_release',
'public_windows_vs2019_Release',
'public_windows_vs2019_Debug',
)
ProductType = Enum('ProductType', {t.upper(): t for t in productTypes})
77 changes: 50 additions & 27 deletions .github/actions/openvino_provider/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,35 @@ inputs:
description: 'Source URL hosting OpenVINO nightly archives'
required: false
default: 'https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/latest.json'
nightly_pip_extra_url:
description: 'Source URL hosting OpenVINO nightly wheels, for passing to pip as --extra-index-url'
pip_extra_url:
description: 'Source URL hosting OpenVINO wheels, for passing to pip as --extra-index-url'
required: false
default: 'https://storage.openvinotoolkit.org/simple/wheels'
package_url:
description: 'Direct URL to OpenVINO archive to use, if neither post-commit nor nightly archives are required'
required: false
default: 'https://storage.openvinotoolkit.org/simple/wheels/nightly'
outputs:
ov_artifact_name:
description: "Name of the artifact to upload OpenVINO build artifacts under"
value: ${{ steps.openvino_nightly_download.outputs.ov_artifact_name || steps.openvino_commit_output.outputs.ov_artifact_name }}
value: ${{ steps.openvino_download.outputs.ov_artifact_name || steps.openvino_commit_output.outputs.ov_artifact_name }}
ov_package_path:
description: "Path to OpenVINO core package relative to the root of uploaded artifacts"
value: ${{ steps.openvino_nightly_download.outputs.ov_package_path || steps.openvino_commit_output.outputs.ov_package_path }}
value: ${{ steps.openvino_download.outputs.ov_package_path || steps.openvino_commit_output.outputs.ov_package_path }}
ov_wheel_input:
description: "Input for pip to install OpenVINO python wheel"
value: ${{ steps.openvino_nightly_wheel.outputs.ov_wheel_input || steps.openvino_commit_wheel.outputs.ov_wheel_input }}
value: ${{ steps.openvino_wheel.outputs.ov_wheel_input || steps.openvino_commit_wheel.outputs.ov_wheel_input }}
ov_wheel_source:
description: "Pip option for custom OV wheel location (--find-links or --extra-index-url)"
value: ${{ steps.openvino_wheel.outputs.ov_wheel_source || steps.openvino_commit_wheel.outputs.ov_wheel_source }}

runs:
using: "composite"
steps:
- name: Verify parameters
if: ${{ !inputs.nightly_build_key && !inputs.commit_build_key || inputs.nightly_build_key && inputs.commit_build_key }}
if: ${{ !inputs.package_url && !inputs.nightly_build_key && !inputs.commit_build_key }}
shell: bash
run: |
echo "Please, set one parameter for action - nightly_build_key or commit_build_key"
echo "Please, set one parameter for action - nightly_build_key, commit_build_key or package_url"
exit 1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down Expand Up @@ -113,25 +119,31 @@ runs:
cd ${{ steps.openvino_commit_download.outputs.artifacts_workspace_path }}
version=$(yq eval '.components.dldt.custom_params.wheel_product_version' manifest.yml)
wheel_path=${{ steps.openvino_commit_output.outputs.ov_package_path }}/tools
find_links_cmd=$([[ -n "$PIP_FIND_LINKS" ]] && echo "" || echo "--find-links=./$wheel_path")
default_find_links_cmd="--find-links=./$wheel_path"
find_links_cmd=$([[ -n "$PIP_FIND_LINKS" ]] && echo "" || echo "$default_find_links_cmd")
wheel_input="$find_links_cmd openvino==$version"
echo "ov_wheel_input=$wheel_input" >> $GITHUB_OUTPUT
echo "ov_wheel_source=$default_find_links_cmd" >> $GITHUB_OUTPUT
# --- Nightly case ---
- name: Verify nightly parameters
if: inputs.nightly_build_key && inputs.revision != 'latest_available'
# --- S3 case (nightly or direct URL) ---
- name: Verify parameters
if: (inputs.nightly_build_key || inputs.package_url) && inputs.revision != 'latest_available'
shell: bash
run: |
echo "Nightly build source provides only 'latest' artifacts, specific revision not yet supported"
echo "Nightly and package_url build sources provide only 'latest' artifacts, specific revision not supported"
exit 1
- name: Download nightly OpenVINO archives
id: openvino_nightly_download
if: inputs.nightly_build_key
- name: Download OpenVINO archives
id: openvino_download
if: inputs.nightly_build_key || inputs.package_url
shell: bash
run: |
ov_package_url=$(curl -s ${{ inputs.nightly_package_source }} | jq -r '.${{ inputs.nightly_build_key }}')
if [ ${{ inputs.package_url }} ]; then
ov_package_url=${{ inputs.package_url }}
else
ov_package_url=$(curl -s ${{ inputs.nightly_package_source }} | jq -r '.${{ inputs.nightly_build_key }}')
fi
package_basename=$(basename $ov_package_url)
wget $ov_package_url --progress=bar:force:noscroll -O $package_basename
package_folder=${package_basename%.*} && mkdir $package_folder
Expand All @@ -140,20 +152,31 @@ runs:
echo "ov_artifact_name=$ov_artifact_name" >> $GITHUB_OUTPUT
echo "ov_package_path=$package_folder" >> $GITHUB_OUTPUT
- name: Upload nightly OpenVINO archives
if: steps.openvino_nightly_download.outcome == 'success'
- name: Upload OpenVINO archives
if: steps.openvino_download.outcome == 'success'
uses: actions/upload-artifact@v4
with:
name: ${{ steps.openvino_nightly_download.outputs.ov_artifact_name }}
path: ${{ steps.openvino_nightly_download.outputs.ov_package_path }}
name: ${{ steps.openvino_download.outputs.ov_artifact_name }}
path: ${{ steps.openvino_download.outputs.ov_package_path }}
if-no-files-found: 'error'

- name: Get nightly wheel
id: openvino_nightly_wheel
if: steps.openvino_nightly_download.outcome == 'success'
- name: Get wheel
id: openvino_wheel
if: steps.openvino_download.outcome == 'success'
shell: bash
run: |
version=$(echo ${{ steps.openvino_nightly_download.outputs.ov_package_path }} |
grep -oP '(?<=_)\d{4}\.\d\.\d\.dev\d{8}(?=_)')
wheel_input="--pre --extra-index-url ${{ inputs.nightly_pip_extra_url }} openvino==$version"
rc_version=$(echo ${{ inputs.package_url }} |
grep -oP '(?<=pre-release\/)\d{4}\.\d+\.\d+rc\d+' || true)
release_version=$(echo ${{ steps.openvino_download.outputs.ov_package_path }} |
grep -oP '_\K\d{4}\.\d+\.\d+')
dev_version=$(echo ${{ steps.openvino_download.outputs.ov_package_path }} |
grep -oP "${release_version//./\\.}\.dev\d{8}" || true)
version=${rc_version:-${dev_version:-$release_version}}
extra_index="--pre --extra-index-url ${{ inputs.pip_extra_url }}/nightly \
--extra-index-url ${{ inputs.pip_extra_url }}/pre-release"
wheel_input="$extra_index openvino==$version"
echo "ov_wheel_input=$wheel_input" >> $GITHUB_OUTPUT
echo "ov_wheel_source=$extra_index" >> $GITHUB_OUTPUT
2 changes: 1 addition & 1 deletion .github/dockerfiles/docker_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pr-26448
pr-26683
69 changes: 69 additions & 0 deletions .github/dockerfiles/ov_build/fedora_29/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
ARG REGISTRY="docker.io"
FROM ${REGISTRY}/library/fedora:29

USER root

RUN yum update -y && yum install -y \
git \
curl \
python3 \
# To build Python from source
openssl-devel \
sqlite-devel \
bzip2-devel \
libffi-devel \
zlib-devel \
wget \
make \
tar \
gcc \
gcc-c++ \
xz

# 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/*

# Setup Python
RUN cd /usr/src && \
wget https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz && \
tar xvf Python-3.9.9.tar.xz
RUN cd /usr/src/Python-3.9.9 && \
./configure --enable-optimizations --enable-loadable-sqlite-extensions --prefix=/usr && \
make altinstall

# Install sscache
ARG SCCACHE_VERSION="v0.7.5"
ENV SCCACHE_HOME="/opt/sccache" \
SCCACHE_PATH="/opt/sccache/sccache"

RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \
SCCACHE_ARCHIVE="sccache-${SCCACHE_VERSION}-x86_64-unknown-linux-musl.tar.gz" && \
curl -SLO https://github.com/mozilla/sccache/releases/download/${SCCACHE_VERSION}/${SCCACHE_ARCHIVE} && \
tar -xzf ${SCCACHE_ARCHIVE} --strip-components=1 && rm ${SCCACHE_ARCHIVE}

ENV PATH="$SCCACHE_HOME:$PATH"

# Use Python 3.9 as default
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$PATH"
RUN alternatives --install /usr/bin/python python /usr/bin/python3.9 10

# Setup pip
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}

# Install Node
ENV NODE_VERSION=21.7.3
ENV NVM_DIR=/.nvm
RUN mkdir -p $NVM_DIR
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
ENV PATH="$NVM_DIR/versions/node/v${NODE_VERSION}/bin/:${PATH}"

24 changes: 0 additions & 24 deletions .github/dockerfiles/ov_build/fedora_33/Dockerfile

This file was deleted.

13 changes: 12 additions & 1 deletion .github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# Pythons
python3.9-dev \
python3.9-venv \
python3.9-distutils \
# For Java API
default-jdk \
# Compiler \
Expand Down Expand Up @@ -51,10 +55,17 @@ RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \
tar -xzf ${SCCACHE_ARCHIVE} --strip-components=1 && rm ${SCCACHE_ARCHIVE}

ENV PATH="$SCCACHE_HOME:$PATH"

# Setup pip
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

# Use Python 3.9 as default instead of Python 3.8
# Using venv here 'cause other methods to switch the default Python on Ubuntu 20 break both system and wheels build
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$SCCACHE_HOME:$PATH"

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}
18 changes: 18 additions & 0 deletions .github/dockerfiles/ov_test/fedora_33/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ARG REGISTRY="docker.io"
FROM ${REGISTRY}/library/fedora:33

USER root

RUN yum update -y && yum install -y \
git \
curl \
python3

# Install Node
ENV NODE_VERSION=21.7.3
ENV NVM_DIR=/.nvm
RUN mkdir -p $NVM_DIR
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
ENV PATH="$NVM_DIR/versions/node/v${NODE_VERSION}/bin/:${PATH}"

11 changes: 11 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,10 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# Python
python3.9-dev \
python3.9-venv \
python3.9-distutils \
libhdf5-dev \
&& \
rm -rf /var/lib/apt/lists/*
Expand All @@ -36,6 +40,13 @@ RUN chmod +x /install_openvino_dependencies.sh && \
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

# Use Python 3.9 as default instead of Python 3.8
# Using venv here 'cause other methods to switch the default Python on Ubuntu 20 break both system and wheels build
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$PATH"

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}
ENV PIP_INSTALL_PATH=/venv/lib/python3.9/site-packages
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 @@ -28,6 +28,8 @@ RUN apt-get update && \
python3.11-venv \
python3.11-distutils \
libhdf5-dev \
# For TF Models tests
wget \
&& \
rm -rf /var/lib/apt/lists/*

Expand Down
9 changes: 7 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@
- 'tests/layer_tests/tensorflow2_keras_tests/**/*'
- 'tests/layer_tests/jax_tests/**/*'
- any: ['tests/model_hub_tests/**',
'!tests/model_hub_tests/pytorch/**/*']
'!tests/model_hub_tests/pytorch/**/*',
'!tests/model_hub_tests/jax/**/*']

'category: TFL FE':
- 'src/frontends/tensorflow_lite/**/*'
Expand All @@ -165,12 +166,16 @@
- 'tests/layer_tests/py_frontend_tests/test_torch_decoder.py'
- 'tests/layer_tests/py_frontend_tests/test_torch_frontend.py'
- any: ['tests/model_hub_tests/**',
'!tests/model_hub_tests/tensorflow/**/*']
'!tests/model_hub_tests/tensorflow/**/*',
'!tests/model_hub_tests/jax/**/*']

'category: JAX FE':
- 'src/frontends/jax/**/*'
- 'src/bindings/python/src/openvino/frontend/jax/**/*'
- 'tests/layer_tests/jax_tests/**/*'
- any: ['tests/model_hub_tests/**',
'!tests/model_hub_tests/tensorflow/**/*',
'!tests/model_hub_tests/pytorch/**/*']

'category: tools':
- any: ['tools/**',
Expand Down
4 changes: 4 additions & 0 deletions .github/scripts/workflow_rerun/errors_to_look_for.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,9 @@
{
"error_text": "Unable to make request: ECONNRESET",
"ticket": 148702
},
{
"error_text": "json.decoder.JSONDecodeError: Unterminated string starting at",
"ticket": 151796
}
]
Loading

0 comments on commit f14c8eb

Please sign in to comment.