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 17, 2024
2 parents 6db5c1c + 324a282 commit 9673977
Show file tree
Hide file tree
Showing 171 changed files with 3,627 additions and 1,719 deletions.
2 changes: 1 addition & 1 deletion .github/dockerfiles/docker_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pr-26656
pr-26993
2 changes: 1 addition & 1 deletion .github/dockerfiles/ov_build/ubuntu_20_04_arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,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
7 changes: 0 additions & 7 deletions .github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ RUN apt-get update && \
python3.9-distutils \
# For Java API
default-jdk \
# Compiler \
gcc-10 \
g++-10 \
&& \
rm -rf /var/lib/apt/lists/*

Expand All @@ -42,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 @@ -35,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 @@ -47,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
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
2 changes: 2 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
2 changes: 1 addition & 1 deletion .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
- name: Pack Artefacts
run: |
pushd ${BUILD_DIR}
tar -C ${BUILD_DIR} -I pigz -cvf openvino.tgz cov-int
tar -cvf - cov-int | pigz > openvino.tgz
popd
- name: Submit artefacts
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/dev_cpu_linux_snippets_libxsmm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ jobs:
run: |
pushd ${INSTALL_DIR}
tar -I pigz -cvf ${BUILD_DIR}/openvino_package.tar.gz *
tar -cvf - * | pigz > ${BUILD_DIR}/openvino_package.tar.gz
popd
pushd ${INSTALL_TEST_DIR}
tar -I pigz -cvf ${BUILD_DIR}/openvino_tests.tar.gz *
tar -cvf - * | pigz > ${BUILD_DIR}/openvino_tests.tar.gz
popd
#
Expand Down Expand Up @@ -230,11 +230,11 @@ jobs:
- name: Extract OpenVINO packages
run: |
pushd $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
pigz -dc openvino_package.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
pushd $INSTALL_TEST_DIR
tar -I pigz -xf openvino_tests.tar.gz -C $INSTALL_DIR
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
- name: Snippets func tests
Expand Down Expand Up @@ -287,11 +287,11 @@ jobs:
- name: Extract OpenVINO packages
run: |
pushd $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
pigz -dc openvino_package.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
pushd $INSTALL_TEST_DIR
tar -I pigz -xf openvino_tests.tar.gz -C $INSTALL_DIR
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
- name: Fetch setup_python action
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/job_build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,15 @@ jobs:
working-directory: ${{ env.BUILD_DIR }}

- name: Pack openvino_package
run: tar -I pigz -cvf ${BUILD_DIR}/openvino_package.tar.gz *
run: tar -cvf - * | pigz > ${BUILD_DIR}/openvino_package.tar.gz
working-directory: ${{ env.INSTALL_DIR }}

- name: Pack openvino_developer_package
run: tar -I pigz -cvf ${BUILD_DIR}/openvino_developer_package.tar.gz *
run: tar -cvf - * | pigz > ${BUILD_DIR}/openvino_developer_package.tar.gz
working-directory: ${{ env.DEVELOPER_PACKAGE_DIR }}

- name: Pack openvino_tests
run: tar -I pigz -cvf ${BUILD_DIR}/openvino_tests.tar.gz *
run: tar -cvf - * | pigz > ${BUILD_DIR}/openvino_tests.tar.gz
working-directory: ${{ env.INSTALL_TEST_DIR }}

- name: Build Debian packages
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/job_cpu_functional_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,19 @@ jobs:
echo "INSTALL_TEST_DIR=$GITHUB_WORKSPACE/install/tests" >> "$GITHUB_ENV"
echo "PARALLEL_TEST_SCRIPT=$GITHUB_WORKSPACE/install/tests/functional_test_utils/layer_tests_summary/run_parallel.py" >> "$GITHUB_ENV"
echo "PARALLEL_TEST_CACHE=$GITHUB_WORKSPACE/install/tests/test_cache.lst" >> "$GITHUB_ENV"
- name: Install OpenVINO dependencies (mac)
if: runner.os == 'macOS'
run: brew install pigz

- name: Extract OpenVINO packages
run: |
pushd $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
pigz -dc openvino_package.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
pushd $INSTALL_TEST_DIR
tar -I pigz -xf openvino_tests.tar.gz -C $INSTALL_DIR
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
- name: Fetch setup_python action
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/job_cxx_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ jobs:
echo "INSTALL_TEST_DIR=$GITHUB_WORKSPACE/install/tests" >> "$GITHUB_ENV"
echo "SETUPVARS_COMMAND=${{ env.SOURCE_COMMAND }} $GITHUB_WORKSPACE/install/${{ env.SETUPVARS }}" >> "$GITHUB_ENV"
- name: Install OpenVINO dependencies (mac)
if: runner.os == 'macOS'
run: brew install pigz

- name: Setup Variables (Windows)
if: ${{ runner.os == 'Windows' }}
run: Add-Content -Path $env:GITHUB_ENV -Value "SETUPVARS_COMMAND=${{ env.SOURCE_COMMAND }} ${{ github.workspace }}/install/${{ env.SETUPVARS }}"
Expand All @@ -68,10 +72,10 @@ jobs:
if: ${{ runner.os != 'Windows' }}
run: |
pushd $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
pigz -dc openvino_package.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
pushd $INSTALL_TEST_DIR
tar -I pigz -xf openvino_tests.tar.gz -C $INSTALL_DIR
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
- name: Extract OpenVINO packages (Windows)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job_gpu_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ jobs:
- name: Extract OpenVINO packages
run: |
pushd $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
pigz -dc openvino_package.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
pushd $INSTALL_TEST_DIR
tar -I pigz -xf openvino_tests.tar.gz -C $INSTALL_DIR
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
- name: Install dependencies (Linux)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_jax_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Extract OpenVINO packages and tests
run: |
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
working-directory: ${{ env.INSTALL_DIR }}

- name: Fetch setup_python action
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_onnx_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Extract OpenVINO packages and tests
run: |
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
working-directory: ${{ env.INSTALL_DIR }}

# Issue 148922
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 @@ -59,7 +59,7 @@ jobs:
- name: Extract OpenVINO package
run: |
pushd ${INSTALL_DIR}
tar -I pigz -xf openvino_package.tar.gz -C ${INSTALL_DIR}
pigz -dc openvino_package.tar.gz | tar -xf - -C ${INSTALL_DIR}
popd
- name: Fetch ONNX runtime version and skip tests list
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/job_python_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,13 @@ jobs:
echo "INSTALL_TEST_DIR=$GITHUB_WORKSPACE/install/tests" >> "$GITHUB_ENV"
echo "LAYER_TESTS_INSTALL_DIR=$GITHUB_WORKSPACE/install/tests/layer_tests" >> "$GITHUB_ENV"
- name: Extract OpenVINO artifacts
- name: Install OpenVINO dependencies (mac)
if: runner.os == 'macOS'
run: brew install pigz

- name: Extract OpenVINO packages
run: |
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
working-directory: ${{ env.INSTALL_DIR }}

- name: Fetch setup_python action
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/job_pytorch_layer_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,15 @@ jobs:
echo "INSTALL_DIR=$GITHUB_WORKSPACE/install" >> "$GITHUB_ENV"
echo "INSTALL_TEST_DIR=$GITHUB_WORKSPACE/install/tests" >> "$GITHUB_ENV"
echo "LAYER_TESTS_INSTALL_DIR=$GITHUB_WORKSPACE/install/tests/layer_tests" >> "$GITHUB_ENV"
- name: Extract OpenVINO artifacts (Linux, macOS)
- name: Install OpenVINO dependencies (mac)
if: runner.os == 'macOS'
run: brew install pigz

- name: Extract OpenVINO packages (Linux, macOS)
if: runner.os != 'Windows'
run: |
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
working-directory: ${{ env.INSTALL_DIR }}

- name: Extract OpenVINO artifacts (Windows)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_pytorch_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Extract OpenVINO artifacts
run: |
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
working-directory: ${{ env.INSTALL_DIR }}

- name: Fetch setup_python action
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/job_samples_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@ jobs:
echo "INSTALL_DIR=$GITHUB_WORKSPACE/install" >> "$GITHUB_ENV"
echo "INSTALL_TEST_DIR=$GITHUB_WORKSPACE/install/tests" >> "$GITHUB_ENV"
echo "BUILD_DIR=$GITHUB_WORKSPACE/build" >> "$GITHUB_ENV"
- name: Install OpenVINO dependencies (mac)
if: runner.os == 'macOS'
run: brew install coreutils pigz

- name: Extract OpenVINO packages, wheels and tests
- name: Extract OpenVINO packages and tests
run: |
tar -I pigz -xf openvino_package.tar.gz -C ${INSTALL_DIR}
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
pigz -dc openvino_package.tar.gz | tar -xf - -C ${INSTALL_DIR}
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
working-directory: ${{ env.INSTALL_DIR }}

- name: Install OpenVINO dependencies (mac)
if: runner.os == 'macOS'
run: brew install coreutils

- name: Fetch setup_python action
# Python is already installed on Ubuntu within Dockerfile
if: runner.os != 'Linux'
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/job_tensorflow_layer_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,14 @@ jobs:
echo "INSTALL_TEST_DIR=$GITHUB_WORKSPACE/install/tests" >> "$GITHUB_ENV"
echo "LAYER_TESTS_INSTALL_DIR=$GITHUB_WORKSPACE/install/tests/layer_tests" >> "$GITHUB_ENV"
- name: Extract OpenVINO artifacts (Linux and macOS)
- name: Install OpenVINO dependencies (mac)
if: runner.os == 'macOS'
run: brew install pigz

- name: Extract OpenVINO packages (Linux, macOS)
if: runner.os != 'Windows'
run: |
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
working-directory: ${{ env.INSTALL_DIR }}

- name: Extract OpenVINO artifacts (Windows)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_tensorflow_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Extract OpenVINO artifacts (Linux and macOS)
run: |
tar -I pigz -xf openvino_tests.tar.gz -C .
pigz -dc openvino_tests.tar.gz | tar -xf - -C ${INSTALL_DIR}
working-directory: ${{ env.INSTALL_DIR }}

- name: Fetch setup_python action
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/job_tokenizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ jobs:
.github/actions/setup_python
.github/actions/cache
install_build_dependencies.sh
- name: Install OpenVINO dependencies (mac)
if: runner.os == 'macOS'
run: brew install pigz

- name: Setup Python ${{ env.PYTHON_VERSION }}
uses: ./.github/actions/setup_python
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/linux_conditional_compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,23 +200,23 @@ jobs:
- name: Pack Artifacts
run: |
pushd ${SELECTIVE_BUILD_STAT_DIR}
tar -I pigz -cvf ${BUILD_DIR}/openvino_selective_build_stat.tar.gz *
tar -cvf - * | pigz > ${BUILD_DIR}/openvino_selective_build_stat.tar.gz
popd
pushd ${INSTALL_DIR}
tar -I pigz -cvf ${BUILD_DIR}/openvino_package.tar.gz \
install_dependencies/install_openvino_dependencies.sh
tar -cvf - install_dependencies/install_openvino_dependencies.sh | pigz > ${BUILD_DIR}/openvino_package.tar.gz
popd
cp -v ${OPENVINO_REPO}/temp/tbb/lib/lib* ${INSTALL_TEST_DIR}/tests
pushd ${INSTALL_TEST_DIR}
tar -I pigz -cvf ${BUILD_DIR}/openvino_tests.tar.gz \
tar -cvf - \
tests/ov_cpu_func_tests \
tests/libopenvino_template_extension.so \
tests/libze_loader.so* \
tests/libhwloc* \
tests/libtbb* \
tests/functional_test_utils/layer_tests_summary/*
tests/functional_test_utils/layer_tests_summary/* \
| pigz > ${BUILD_DIR}/openvino_tests.tar.gz
popd
#
Expand Down Expand Up @@ -302,7 +302,8 @@ jobs:
path: ${{ env.SELECTIVE_BUILD_STAT_DIR }}

- name: Extract selective build statistics package
run: tar -I pigz -xvf ${SELECTIVE_BUILD_STAT_DIR}/openvino_selective_build_stat.tar.gz -C ${SELECTIVE_BUILD_STAT_DIR}
run: |
pigz -dc ${SELECTIVE_BUILD_STAT_DIR}/openvino_selective_build_stat.tar.gz | tar -xf - -C ${SELECTIVE_BUILD_STAT_DIR}
#
# Build
Expand Down
Loading

0 comments on commit 9673977

Please sign in to comment.