Skip to content

Commit

Permalink
Merge branch 'master' into pfn_build_log
Browse files Browse the repository at this point in the history
  • Loading branch information
ShaojieZhuIntel authored Oct 12, 2024
2 parents fc66e1a + 591c7ac commit 321ae93
Show file tree
Hide file tree
Showing 209 changed files with 5,677 additions and 1,206 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
4 changes: 2 additions & 2 deletions .github/actions/openvino_provider/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ runs:
- 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 +188,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 }}"
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: ""
2 changes: 1 addition & 1 deletion .github/dockerfiles/docker_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pr-26954
pr-26656
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
24 changes: 23 additions & 1 deletion .github/workflows/debian_10_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ jobs:
with:
images: |
ov_build/debian_10_arm
ov_test/debian_10_arm
registry: 'openvinogithubactions.azurecr.io'
dockerfiles_root_dir: '.github/dockerfiles'
changed_components: ${{ needs.smart_ci.outputs.changed_components }}
Expand Down Expand Up @@ -98,9 +99,30 @@ jobs:
-DENABLE_TESTS=ON \
-DENABLE_PYTHON=OFF
CXX_Unit_Tests:
name: C++ unit tests
needs: [ Docker, Build, Smart_CI ]
uses: ./.github/workflows/job_cxx_unit_tests.yml
with:
runner: 'aks-linux-16-cores-arm'
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.debian_10_arm }}
affected-components: ${{ needs.smart_ci.outputs.affected_components }}
os: 'debian_10'

CPU_Functional_Tests:
name: CPU functional tests
if: ${{ 'false' }} # Ticket: 153289
# if: fromJSON(needs.smart_ci.outputs.affected_components).CPU.test
needs: [ Docker, Build, Smart_CI ]
uses: ./.github/workflows/job_cpu_functional_tests.yml
with:
runner: 'aks-linux-16-cores-arm'
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.debian_10_arm }}
python-version: '3.7'

Overall_Status:
name: ci/gha_overall_status_debian_10_arm
needs: [Smart_CI, Build]
needs: [Smart_CI, Build, CXX_Unit_Tests]
if: ${{ always() }}
runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/fedora_29.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ jobs:
python3 -c 'from openvino import Core; Core().get_property("MULTI", "SUPPORTED_PROPERTIES")'
python3 -c 'from openvino import Core; Core().get_property("HETERO", "SUPPORTED_PROPERTIES")'
python3 -c 'from openvino import Core; Core().get_property("BATCH", "SUPPORTED_PROPERTIES")'
python3 -c 'from openvino.frontend import FrontEndManager; assert len(FrontEndManager().get_available_front_ends()) == 7'
python3 -c 'from openvino.frontend import FrontEndManager; assert len(FrontEndManager().get_available_front_ends()) == 6'
benchmark_app --help
opt_in_out --help
ovc --help
Expand All @@ -160,6 +160,7 @@ jobs:
runner: 'aks-linux-4-cores-16gb'
image: ${{ fromJSON(needs.docker.outputs.images).ov_build.fedora_29 }}
affected-components: ${{ needs.smart_ci.outputs.affected_components }}
os: 'fedora_29'

Overall_Status:
name: ci/gha_overall_status_fedora
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/job_build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ jobs:
DEVELOPER_PACKAGE_DIR: /__w/openvino/openvino/developer_package_install
BUILD_DIR: /__w/openvino/openvino/openvino_build
SCCACHE_AZURE_KEY_PREFIX: ${{ inputs.os }}_${{ inputs.arch }}_Release
ONNX_RUNTIME_UTILS: /__w/openvino/openvino/openvino/src/frontends/onnx/tests/ci_utils/onnxruntime
ARTIFACTS_SHARE: "/mount/build-artifacts"
MANIFEST_PATH: '/__w/openvino/openvino/manifest.yml'
PRODUCT_TYPE: public_linux_${{ inputs.os }}_${{ inputs.arch }}_release
Expand Down Expand Up @@ -182,12 +181,6 @@ jobs:
- name: Pack Artifacts
run: |
# Add the ONNX Runtime version and skip tests list to the archive to use in the ONNX Runtime Job
# w/o the need to checkout repository
cp -R ${ONNX_RUNTIME_UTILS} ${INSTALL_DIR}
pushd ${INSTALL_DIR}
tar -I pigz -cvf ${BUILD_DIR}/openvino_package.tar.gz *
popd
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/job_cpu_functional_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ on:
type: string
required: false
default: null
python-version:
description: 'Python version to setup. E.g., "3.11"'
type: string
required: true

permissions: read-all

Expand Down Expand Up @@ -70,10 +74,10 @@ jobs:
sparse-checkout-cone-mode: false
path: 'openvino'

- name: Setup Python 3.11
- name: Setup Python ${{ inputs.python-version }}
uses: ./openvino/.github/actions/setup_python
with:
version: '3.11'
version: ${{ inputs.python-version }}
should-setup-pip-paths: 'false'
self-hosted-runner: ${{ runner.os == 'Linux' }}

Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/job_cxx_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ on:
description: 'Components that are affected by changes in the commit defined by the Smart CI Action'
type: string
required: true
os:
description: 'OS that is used for testing in the form of "ubuntu_20_04"'
type: string
required: true

permissions: read-all

Expand Down Expand Up @@ -85,13 +89,13 @@ jobs:
#

- name: OpenVINO Core Unit Tests
if: fromJSON(inputs.affected-components).Core.test
if: ${{ fromJSON(inputs.affected-components).Core.test && inputs.os != 'debian_10' }} # Ticket: 153150
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_core_unit_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-OVCoreUT.xml
- name: OpenVINO Inference Functional Tests
if: fromJSON(inputs.affected-components).inference.test
if: ${{ fromJSON(inputs.affected-components).inference.test && inputs.os != 'debian_10' }} # Ticket: 153151
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_inference_functional_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-InferenceFunc.xml
Expand Down Expand Up @@ -128,7 +132,7 @@ jobs:
${{ env.INSTALL_TEST_DIR }}/paddle_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-PaddleTests.xml
- name: ONNX frontend tests
if: ${{ fromJSON(inputs.affected-components).ONNX_FE.test && runner.arch != 'ARM64' }} # Ticket for macOS ARM64: 122663, for Linux ARM64: 126280
if: ${{ fromJSON(inputs.affected-components).ONNX_FE.test && runner.arch != 'ARM64' }} # Ticket for macOS ARM64: 122663, for Linux ARM64: 126280, 153161
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_onnx_frontend_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-ONNXFrontend.xml
Expand All @@ -145,7 +149,6 @@ jobs:
if: fromJSON(inputs.affected-components).TF_FE.test
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-TensorFlowFrontend.xml
- name: TensorFlow Lite frontend tests
Expand Down Expand Up @@ -214,7 +217,7 @@ jobs:
${{ env.INSTALL_TEST_DIR }}/ov_util_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-ov_util_tests.xml
- name: OpenVINO C API tests
if: fromJSON(inputs.affected-components).C_API.test
if: ${{ fromJSON(inputs.affected-components).C_API.test && inputs.os != 'debian_10' }} # Ticket: 153169
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_capi_test --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-OpenVINOCAPITests.xml
Expand Down Expand Up @@ -244,7 +247,7 @@ jobs:
${{ env.INSTALL_TEST_DIR }}/ov_hetero_unit_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-OVHeteroUnitTests.xml
- name: Hetero func tests
if: fromJSON(inputs.affected-components).HETERO.test
if: ${{ fromJSON(inputs.affected-components).HETERO.test && inputs.os != 'debian_10' }} # Ticket: 153170
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_hetero_func_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-OVHeteroFuncTests.xml --gtest_filter="*smoke*"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_debian_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
python3 -c 'from openvino import Core; Core().get_property("MULTI", "SUPPORTED_PROPERTIES")'
python3 -c 'from openvino import Core; Core().get_property("HETERO", "SUPPORTED_PROPERTIES")'
python3 -c 'from openvino import Core; Core().get_property("BATCH", "SUPPORTED_PROPERTIES")'
python3 -c 'from openvino.frontend import FrontEndManager; assert len(FrontEndManager().get_available_front_ends()) == 7'
python3 -c 'from openvino.frontend import FrontEndManager; assert len(FrontEndManager().get_available_front_ends()) == 6'
benchmark_app --help
opt_in_out --help
ovc --help
34 changes: 24 additions & 10 deletions .github/workflows/job_onnx_runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ jobs:
SCCACHE_SERVER_PORT: 35555
SCCACHE_AZURE_KEY_PREFIX: ${{ inputs.sccache-azure-key-prefix }}
ONNX_RUNTIME_REPO: ${{ github.workspace }}/onnxruntime
ONNX_RUNTIME_UTILS: ${{ github.workspace }}/install/onnxruntime
ONNX_RUNTIME_BUILD_DIR: ${{ github.workspace }}/onnxruntime/build
ONNX_RUNTIME_UTILS: ${{ github.workspace }}/openvino/src/frontends/onnx/tests/ci_utils/onnxruntime

steps:
- name: Download OpenVINO package
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
Expand All @@ -51,25 +52,38 @@ jobs:
# Needed as ${{ github.workspace }} is not working correctly when using Docker
- name: Setup Variables
run: |
echo "OPENVINO_REPO=$GITHUB_WORKSPACE/openvino" >> "$GITHUB_ENV"
echo "INSTALL_DIR=$GITHUB_WORKSPACE/install" >> "$GITHUB_ENV"
echo "ONNX_RUNTIME_REPO=$GITHUB_WORKSPACE/onnxruntime" >> "$GITHUB_ENV"
echo "ONNX_RUNTIME_UTILS=$GITHUB_WORKSPACE/install/onnxruntime" >> "$GITHUB_ENV"
echo "ONNX_RUNTIME_BUILD_DIR=$GITHUB_WORKSPACE/onnxruntime/build" >> "$GITHUB_ENV"
- name: Extract OpenVINO package
run: |
pushd ${INSTALL_DIR}
tar -I pigz -xf openvino_package.tar.gz -C ${INSTALL_DIR}
popd
- name: Clone ONNX Runtime
- name: Fetch ONNX runtime version and skip tests list
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
sparse-checkout: |
src/frontends/onnx/tests/ci_utils/onnxruntime
sparse-checkout-cone-mode: false
path: ${{ env.OPENVINO_REPO }}

- name: Get ONNX runtime version
run: |
hash=`tr -s '\n ' < ${ONNX_RUNTIME_UTILS}/version`
git clone --recursive https://github.com/microsoft/onnxruntime.git ${ONNX_RUNTIME_REPO}
cd ${ONNX_RUNTIME_REPO}
git checkout $hash
hash=`tr -s '\n ' < ./version`
echo "ONNX_RUNTIME_VERSION=$hash" >> "$GITHUB_ENV"
working-directory: ${{ env.ONNX_RUNTIME_UTILS }}

- name: Clone ONNX Runtime
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
repository: 'microsoft/onnxruntime'
path: ${{ env.ONNX_RUNTIME_REPO }}
ref: ${{ env.ONNX_RUNTIME_VERSION }}
submodules: 'recursive'

#
# Tests
#
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_pytorch_layer_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
jobs:
PyTorch_Layer_Tests:
name: PyTorch Layer Tests
timeout-minutes: 30
timeout-minutes: 40
runs-on: ${{ inputs.runner }}
container: ${{ fromJSON(inputs.container) }}
defaults:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/linux_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ jobs:
runner: 'aks-linux-16-cores-arm'
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}
affected-components: ${{ needs.smart_ci.outputs.affected_components }}
os: 'ubuntu_20_04'

Python_Unit_Tests:
name: Python unit tests
Expand Down Expand Up @@ -195,6 +196,7 @@ jobs:
with:
runner: 'aks-linux-16-cores-arm'
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}
python-version: '3.11'

TensorFlow_Models_Tests:
name: TensorFlow Models tests
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linux_conditional_compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ jobs:
with:
runner: 'aks-linux-8-cores-32gb'
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}
python-version: '3.11'

Overall_Status:
name: ci/gha_overall_status_linux_cc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_sanitizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:

CXX_Unit_Tests:
name: C++ unit tests
if: always()
if: ${{ github.repository_owner == 'openvinotoolkit' }}
needs: Build
timeout-minutes: 100
runs-on: 'aks-linux-16-cores-32gb'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ jobs:
with:
runner: 'macos-13'
affected-components: ${{ needs.smart_ci.outputs.affected_components }}
os: 'mac_13'

Python_Unit_Tests:
name: Python unit tests
Expand Down Expand Up @@ -296,3 +297,4 @@ jobs:
uses: ./.github/workflows/job_cpu_functional_tests.yml
with:
runner: 'macos-13'
python-version: '3.11'
2 changes: 2 additions & 0 deletions .github/workflows/mac_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ jobs:
with:
runner: 'macos-13-xlarge'
affected-components: ${{ needs.smart_ci.outputs.affected_components }}
os: 'mac_13'

Python_Unit_Tests:
name: Python unit tests
Expand Down Expand Up @@ -294,3 +295,4 @@ jobs:
uses: ./.github/workflows/job_cpu_functional_tests.yml
with:
runner: 'macos-13-xlarge'
python-version: '3.11'
1 change: 1 addition & 0 deletions .github/workflows/ubuntu_20.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ jobs:
runner: 'aks-linux-4-cores-16gb'
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_x64 }}
affected-components: ${{ needs.smart_ci.outputs.affected_components }}
os: 'ubuntu_20_04'

Debian_Packages:
name: Debian Packages
Expand Down
Loading

0 comments on commit 321ae93

Please sign in to comment.