Skip to content

Commit

Permalink
Merge branch 'master' into ilya-lavrenov-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-lavrenov authored Nov 21, 2024
2 parents 427134a + 5c2b9ac commit c3ab428
Show file tree
Hide file tree
Showing 551 changed files with 16,561 additions and 18,817 deletions.
2 changes: 0 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@
/tools/ @openvinotoolkit/openvino-tools-maintainers
/tools/benchmark_tool/ @openvinotoolkit/openvino-ie-python-api-maintainers
/tools/legacy/ @openvinotoolkit/openvino-samples-maintainers
/tools/openvino_dev/ @openvinotoolkit/openvino-tools-maintainers @openvinotoolkit/openvino-ie-python-api-maintainers
/tools/mo/ @openvinotoolkit/openvino-mo-maintainers
/tools/ovc/ @openvinotoolkit/openvino-ovc-maintainers
/thirdparty/open_model_zoo/ @openvinotoolkit/omz-maintainers

Expand Down
1 change: 1 addition & 0 deletions .github/actions/common/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class EventType(Enum):
'public_linux_ubuntu_24_04_x86_64_release',
'public_windows_vs2019_Release',
'public_windows_vs2019_Debug',
'public_manylinux2014_x86_64_release',
)
ProductType = Enum('ProductType', {t.upper(): t for t in productTypes})

Expand Down
10 changes: 9 additions & 1 deletion .github/actions/setup_python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ runs:
env:
PIP_CACHE_DIR: ${{ inputs.self-hosted-runner == 'true' && inputs.pip-cache-path || '' }}

- if: ${{ inputs.should-setup-pip-paths == 'true' }}
- if: ${{ inputs.should-setup-pip-paths == 'true' && runner.os != 'Windows' }}
name: Setup pip variables (cache and install path)
shell: bash
run: |
Expand All @@ -71,6 +71,14 @@ runs:
echo "PIP_CACHE_DIR=${{ inputs.pip-cache-path }}/${PIP_VER}" >> $GITHUB_ENV
echo "PIP_INSTALL_PATH=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')" >> $GITHUB_ENV
- if: ${{ inputs.should-setup-pip-paths == 'true' && runner.os == 'Windows' }}
name: Setup pip cache path
shell: pwsh
run: |
$pipVersion = python3 -c "import pip; print(pip.__version__)"
Write-Host "Using pip version: $pipVersion"
"PIP_CACHE_DIR=${{ inputs.pip-cache-path }}/$pipVersion" >> $env:GITHUB_ENV
- if: ${{ inputs.show-cache-info == 'true' }}
name: Get pip cache info
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ updates:
- "rkazants"
versioning-strategy: increase-if-necessary

# Model Optimizer, openvino_dev and Benchmark tool
# ovc and Benchmark tools
- package-ecosystem: pip
directory: "/tools"
schedule:
Expand Down
5 changes: 1 addition & 4 deletions .github/dependency_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ fail-on-severity: 'low'
allow-licenses:
- 'BSD-2-Clause'
- 'BSD-3-Clause'
- 'BSD-2-Clause AND BSD-3-Clause'
- 'BSD-3-Clause AND BSD-3-Clause-Clear'
- 'BSD-3-Clause-Clear'
- 'MIT'
- 'Apache-2.0'
- 'Apache-2.0 AND BSD-3-Clause'
- 'ISC'
- 'Apache-2.0 AND MIT'
- 'BlueOak-1.0.0'
- '0BSD'
- 'Python-2.0'
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-27384
pr-27430
20 changes: 20 additions & 0 deletions .github/dockerfiles/ov_build/manylinux2014_x86_64/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ARG REGISTRY="quay.io"
FROM openvinogithubactions.azurecr.io/quayio/pypa/manylinux2014_x86_64

USER root

# Install build dependencies
ADD install_build_dependencies.sh /install_build_dependencies.sh
RUN chmod +x /install_build_dependencies.sh && /install_build_dependencies.sh

# 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"
42 changes: 42 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_22_04_x64_docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
ARG REGISTRY="docker.io"
FROM ${REGISTRY}/library/ubuntu:22.04

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 software-properties-common && \
add-apt-repository --yes --no-update ppa:git-core/ppa && \
add-apt-repository --yes --no-update ppa:deadsnakes/ppa && \
apt-get update && \
apt-get install \
curl \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
python3 \
python3-pip \
&& \
rm -rf /var/lib/apt/lists/*

# Install docker
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | \
gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] \
https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | \
tee /etc/apt/sources.list.d/docker.list > /dev/null

RUN apt-get update && \
apt-get install -y docker-ce docker-ce-cli containerd.io

ENV DOCKER_BUILDKIT=1
6 changes: 0 additions & 6 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@
'category: LP transformations':
- 'src/common/low_precision_transformations/**/*'

'category: MO':
- 'tools/mo/**/*'
- 'tests/layer_tests/mo_python_api_tests/**/*'

'category: OVC':
- 'tools/ovc/**/*'
- 'tests/layer_tests/ovc_python_api_tests/**/*'
Expand All @@ -119,7 +115,6 @@
- any: ['src/bindings/js/node/CMakeLists.txt',
'src/bindings/js/node/package.json',
'src/bindings/js/node/package-lock.json']
- 'tools/openvino_dev/**/*'

'category: PDPD FE':
- 'src/frontends/paddle/**/*'
Expand Down Expand Up @@ -183,7 +178,6 @@

'category: tools':
- any: ['tools/**',
'!tools/mo/**/*',
'!tools/ovc/**/*']

'category: transformations':
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 @@ -169,7 +169,7 @@ jobs:
run: ${SCCACHE_PATH} --zero-stats

- name: Cmake - build
run: cmake --build ${BUILD_DIR} --parallel
run: cmake --build ${BUILD_DIR} --parallel $(nproc)

- name: Show ccache stats
run: ${SCCACHE_PATH} --show-stats
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 @@ -144,7 +144,7 @@ jobs:
run: ${SCCACHE_PATH} --zero-stats

- name: Cmake - build
run: cmake --build ${BUILD_DIR} --parallel
run: cmake --build ${BUILD_DIR} --parallel $(nproc)

- name: Show ccache stats
run: ${SCCACHE_PATH} --show-stats
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ jobs:
python3 -m pip install -r ${{ github.workspace }}/src/frontends/onnx/tests/requirements.txt
# For running TensorFlow frontend unit tests
python3 -m pip install -r ${{ github.workspace }}/src/frontends/tensorflow/tests/requirements.txt
# For MO unit tests
python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_caffe.txt
python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_kaldi.txt
python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_onnx.txt
python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_tf2.txt
python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_dev.txt
- name: Build OpenVINO with CMake
uses: ashutoshvarma/action-cmake-build@ade188313bc7eaa6f14349569a64d8bc716342ff # master
Expand Down Expand Up @@ -84,9 +78,6 @@ jobs:
- name: Install wheel packages
run: cmake -DCOMPONENT=python_wheels -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install_pkg -P '${{ github.workspace }}/build/cmake_install.cmake'

- name: Install python wheels
run: python3 -m pip install openvino-dev --find-links=${{ github.workspace }}/install_pkg/tools

- name: List binaries
run: ls -la ${{ github.workspace }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}

Expand Down Expand Up @@ -138,6 +129,6 @@ jobs:
lcov --capture --directory ${{ github.workspace }}/. --output-file coverage.info
genhtml coverage.info --output-directory coverage-report
- name: Collect coverage
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
verbose: true
16 changes: 1 addition & 15 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ jobs:
image: ${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_20_04_x64 }}
volumes:
- /mount:/mount
options: -e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING
env:
DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
CMAKE_BUILD_TYPE: 'Release'
Expand All @@ -95,14 +94,6 @@ jobs:
OPENVINO_CONTRIB_REPO: /__w/openvino/openvino/openvino_contrib
BUILD_DIR: /__w/openvino/openvino/openvino_build
COVERITY_TOOL_DIR: /__w/openvino/openvino/coverity_tool
CMAKE_CXX_COMPILER_LAUNCHER: sccache
CMAKE_C_COMPILER_LAUNCHER: sccache
SCCACHE_IGNORE_SERVER_IO_ERROR: 1
SCCACHE_SERVER_PORT: 35555
SCCACHE_ERROR_LOG: /__w/openvino/sccache_log.txt
SCCACHE_LOG: warn
SCCACHE_AZURE_KEY_PREFIX: coverity_lin
SCCACHE_CACHE_SIZE: 50G

steps:
- name: Clone OpenVINO
Expand Down Expand Up @@ -141,8 +132,6 @@ jobs:
#
# Build
#
- name: Clean sccache stats
run: ${SCCACHE_PATH} --zero-stats

- name: CMake configure - OpenVINO
run: |
Expand All @@ -164,10 +153,7 @@ jobs:
popd
- name: Cmake build - OpenVINO with Coverity
run: ${COVERITY_TOOL_DIR}/cov-analysis*/bin/cov-build --dir ${BUILD_DIR}/cov-int cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }}

- name: Show sccache stats
run: ${SCCACHE_PATH} --show-stats
run: ${COVERITY_TOOL_DIR}/cov-analysis*/bin/cov-build --dir ${BUILD_DIR}/cov-int cmake --build ${BUILD_DIR} --parallel $(nproc) --config ${{ env.CMAKE_BUILD_TYPE }}

- name: Pack Artefacts
run: tar -cvf - cov-int | pigz > openvino.tgz
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev_cpu_linux_snippets_libxsmm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
run: ${SCCACHE_PATH} --zero-stats

- name: Cmake build - OpenVINO
run: cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }}
run: cmake --build ${BUILD_DIR} --parallel $(nproc) --config ${{ env.CMAKE_BUILD_TYPE }}

- name: Show sccache stats
run: ${SCCACHE_PATH} --show-stats
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fedora_29.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
# - master
- master
- 'releases/**'

concurrency:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/job_build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ jobs:
run: ${SCCACHE_PATH} --zero-stats

- name: Cmake build - OpenVINO
run: cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }}
run: cmake --build ${BUILD_DIR} --parallel $(nproc) --config ${{ env.CMAKE_BUILD_TYPE }}

- name: Show sccache stats
run: ${SCCACHE_PATH} --show-stats
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
-DPython3_EXECUTABLE=$python_exec \
-DCPACK_GENERATOR=DEB \
${BUILD_DIR}
cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target package
cmake --build ${BUILD_DIR} --parallel $(nproc) --config ${{ env.CMAKE_BUILD_TYPE }} --target package
- name: Cmake & Build - OpenVINO Contrib
if: ${{ inputs.build-contrib }}
Expand All @@ -221,7 +221,7 @@ jobs:
-DENABLE_WHEEL=OFF \
-S ${OPENVINO_REPO} \
-B ${BUILD_DIR}
cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }}
cmake --build ${BUILD_DIR} --parallel $(nproc) --config ${{ env.CMAKE_BUILD_TYPE }}
- name: CMake configure, build and install - OpenVINO JS API
if: ${{ fromJSON(inputs.affected-components).JS_API && inputs.build-js }}
Expand All @@ -230,7 +230,7 @@ jobs:
-DCPACK_GENERATOR=NPM \
-DENABLE_SYSTEM_TBB=OFF \
-DENABLE_WHEEL=OFF
cmake --build ${BUILD_DIR} --parallel
cmake --build ${BUILD_DIR} --parallel $(nproc)
cmake --install ${BUILD_DIR} --prefix ${INSTALL_DIR_JS}
- name: Build RPM packages
Expand All @@ -243,7 +243,7 @@ jobs:
-DENABLE_WHEEL=OFF \
-DENABLE_TESTS=OFF \
${BUILD_DIR}
cmake --build ${BUILD_DIR} --parallel --target package --verbose
cmake --build ${BUILD_DIR} --parallel $(nproc) --target package --verbose
#
# Upload build artifacts and logs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/job_build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
permissions: read-all

env:
PIP_CACHE_PATH: /mount/caches/pip/win
PIP_CACHE_PATH: "C:\\mount\\caches\\pip\\win"
PYTHON_VERSION: '3.11'

jobs:
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
run: '& ccache --zero-stats'

- name: Cmake build - OpenVINO
run: cmake --build ${{ env.BUILD_DIR }} --config ${{ env.CMAKE_BUILD_TYPE }} --parallel --verbose
run: cmake --build ${{ env.BUILD_DIR }} --config ${{ env.CMAKE_BUILD_TYPE }} --parallel $ENV:NUMBER_OF_PROCESSORS --verbose

- name: Show ccache stats
run: '& ccache --show-stats'
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
-DCPACK_GENERATOR=NPM `
-DENABLE_SYSTEM_TBB=OFF `
-DENABLE_WHEEL=OFF
cmake --build ${{ env.BUILD_DIR }} --parallel
cmake --build ${{ env.BUILD_DIR }} --parallel $ENV:NUMBER_OF_PROCESSORS
cmake --install ${{ env.BUILD_DIR }} --config ${{ env.CMAKE_BUILD_TYPE }} --prefix ${{ env.INSTALL_DIR_JS }}
#
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_cxx_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
description: 'Timeout in minutes for the job'
type: number
required: false
default: 35
default: 45

permissions: read-all

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/job_debian_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ jobs:
# Install debian packages from previous release
apt-get install --no-install-recommends -y gnupg wget ca-certificates lsb-release
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
gpg --output /etc/apt/trusted.gpg.d/intel.gpg --dearmor GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
# Yields only the number, e.g., "20"
ubuntu_version=$(lsb_release -r -s)
ubuntu_version=${ubuntu_version%.*}
echo "deb https://apt.repos.intel.com/openvino/2024 ubuntu$ubuntu_version main" | tee /etc/apt/sources.list.d/intel-openvino-2024.list
apt-get update -y
apt-get install -y openvino
fi
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/job_onnx_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,11 @@ jobs:
run: |
# Install the core OV wheel
python3 -m pip install ./openvino-*.whl
extras_to_install="onnx"
# Find and install OV dev wheel
ov_dev_wheel_name=$(find . -name 'openvino_dev*.whl')
python3 -m pip install $ov_dev_wheel_name[$extras_to_install]
working-directory: ${{ env.INSTALL_WHEELS_DIR }}

- name: Install ONNX Models tests requirements
run: python3 -m pip install -r ${INSTALL_TEST_DIR}/requirements_onnx

- name: Install Python tests dependencies
run: |
# To enable pytest parallel features
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_onnx_runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
--config RelWithDebInfo \
--use_openvino CPU \
--build_shared_lib \
--parallel \
--parallel $(nproc) \
--skip_tests \
--compile_no_warning_as_error \
--allow_running_as_root \
Expand Down
Loading

0 comments on commit c3ab428

Please sign in to comment.