Skip to content

Commit

Permalink
Merge branch 'master' into gpu_unit_fixes3
Browse files Browse the repository at this point in the history
  • Loading branch information
p-durandin authored Sep 12, 2024
2 parents bb30574 + a4f8e52 commit 70874e6
Show file tree
Hide file tree
Showing 122 changed files with 2,191 additions and 1,215 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})
11 changes: 9 additions & 2 deletions .github/actions/openvino_provider/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ outputs:
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 }}
ov_wheel_source:
description: "Pip option for custom OV wheel location (--find-links or --extra-index-url)"
value: ${{ steps.openvino_nightly_wheel.outputs.ov_wheel_source || steps.openvino_commit_wheel.outputs.ov_wheel_source }}

runs:
using: "composite"
Expand Down Expand Up @@ -113,9 +116,11 @@ 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 ---
Expand Down Expand Up @@ -155,5 +160,7 @@ runs:
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"
extra_index="--pre --extra-index-url ${{ inputs.nightly_pip_extra_url }}"
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-26336
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.8.9/Python-3.8.9.tar.xz && \
tar xvf Python-3.8.9.tar.xz
RUN cd /usr/src/Python-3.8.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.8 as default
RUN python3.8 -m venv venv
ENV PATH="/venv/bin:$PATH"
RUN alternatives --install /usr/bin/python python /usr/bin/python3.8 10

# Setup pip
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3.8 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.

18 changes: 18 additions & 0 deletions .github/dockerfiles/ov_test/fedora_32/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ARG REGISTRY="docker.io"
FROM ${REGISTRY}/library/fedora:32

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}"

12 changes: 11 additions & 1 deletion .github/workflows/android_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,12 @@ jobs:
SCCACHE_ERROR_LOG: /__w/openvino/sccache_log.txt
SCCACHE_LOG: warn
OPENVINO_REPO: '/__w/openvino/openvino/openvino'
OPENVINO_GENAI_REPO: '/__w/openvino/openvino/openvino.genai'
VCPKG_ROOT: '/__w/openvino/openvino/vcpkg'
BUILD_DIR: '/__w/openvino/openvino/build'
ANDROID_TOOLS: '/deps/android_tools'
ANDROID_NDK_HOME: '/deps/android_tools/ndk-bundle'
ANDROID_SDK_VERSION: 29
ANDROID_SDK_VERSION: 33
ANDROID_ABI_CONFIG: arm64-v8a
VCPKG_TARGET_TRIPLET: arm64-android
VCPKG_DEFAULT_BINARY_CACHE: '/mount/caches/ccache/android_arm64/vcpkg_cache'
Expand All @@ -115,6 +116,14 @@ jobs:
git submodule update --init -- ${OPENVINO_REPO}/thirdparty/gflags
popd
- name: Clone OpenVINO GenAI
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
repository: 'openvinotoolkit/openvino.genai'
path: ${{ env.OPENVINO_GENAI_REPO }}
submodules: 'true'
ref: 'master'

- name: Clone vcpkg
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
Expand Down Expand Up @@ -162,6 +171,7 @@ jobs:
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CMAKE_CXX_COMPILER_LAUNCHER }} \
-DCMAKE_C_COMPILER_LAUNCHER=${{ env.CMAKE_C_COMPILER_LAUNCHER }} \
-DOPENVINO_EXTRA_MODULES=${{ env.OPENVINO_GENAI_REPO }} \
-S ${OPENVINO_REPO} \
-B ${BUILD_DIR}
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/android_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ jobs:
SCCACHE_ERROR_LOG: /__w/openvino/sccache_log.txt
SCCACHE_LOG: warn
OPENVINO_REPO: '/__w/openvino/openvino/openvino'
OPENVINO_GENAI_REPO: '/__w/openvino/openvino/openvino.genai'
BUILD_DIR: '/__w/openvino/openvino/build'
ANDROID_TOOLS: '/deps/android_tools'
ANDROID_NDK_HOME: '/deps/android_tools/ndk-bundle'
Expand All @@ -98,6 +99,14 @@ jobs:
path: 'openvino'
submodules: 'true'

- name: Clone OpenVINO GenAI
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
repository: 'openvinotoolkit/openvino.genai'
path: ${{ env.OPENVINO_GENAI_REPO }}
submodules: 'true'
ref: 'master'

#
# Print system info
#
Expand All @@ -117,13 +126,13 @@ jobs:
-DANDROID_STL=c++_shared \
-DANDROID_PLATFORM=${{ env.ANDROID_SDK_VERSION }} \
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_STRICT_DEPENDENCIES=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CMAKE_CXX_COMPILER_LAUNCHER }} \
-DCMAKE_C_COMPILER_LAUNCHER=${{ env.CMAKE_C_COMPILER_LAUNCHER }} \
-DENABLE_LTO=ON \
-DENABLE_PYTHON=OFF \
-DOPENVINO_EXTRA_MODULES=${{ env.OPENVINO_GENAI_REPO }} \
-S ${OPENVINO_REPO} \
-B ${BUILD_DIR}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ jobs:
tar -xzf doxygen-$DOXY_VER.linux.bin.tar.gz
echo "$(pwd)/doxygen-$DOXY_VER/bin/" >> $GITHUB_PATH
- name: Validate benchmarks files
run: |
python3 docs/scripts/tests/validate_benchmarks.py docs/sphinx_setup/_static/benchmarks_files/
- name: Build docs
run: |
rm -rf build && mkdir build && cd build
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/debian_10_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ jobs:
build-js: false
build-debian-packages: false
build-contrib: false
build-rpm-packages: false
cmake-options: |-
-DCMAKE_TOOLCHAIN_FILE=${OPENVINO_REPO}/cmake/arm.toolchain.cmake \
-DTHREADS_PTHREAD_ARG="-pthread" \
Expand Down
Loading

0 comments on commit 70874e6

Please sign in to comment.