Skip to content

Commit

Permalink
Merge branch 'master' into dm/npuw_spatial
Browse files Browse the repository at this point in the history
  • Loading branch information
dmatveev authored Oct 9, 2024
2 parents 16e4588 + 46736bc commit 25371d4
Show file tree
Hide file tree
Showing 358 changed files with 14,018 additions and 4,714 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: ""
15 changes: 8 additions & 7 deletions .github/actions/store_artifacts/store_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,14 @@ def main():
with open(storage / 'workflow_link.txt', 'w') as file:
file.write(workflow_link)

latest_artifacts_for_branch = artifact_utils.get_latest_artifacts_link(storage_dir, args.storage_root,
args.branch_name, args.event_name)
# Overwrite path to "latest" built artifacts only if a given commit is the head of a given branch
if args.event_name != 'pull_request' and args.commit_sha == os.getenv('GITHUB_SHA'):
# TODO: lock to avoid corruption in case of a parallel build (unlikely event for now, but still)
with open(latest_artifacts_for_branch, 'w') as file:
file.write(str(storage.relative_to(storage_root)))
if not error_found:
latest_artifacts_for_branch = artifact_utils.get_latest_artifacts_link(storage_dir, args.storage_root,
args.branch_name, args.event_name)
# Overwrite path to "latest" built artifacts only if a given commit is the head of a given branch
if args.event_name != 'pull_request' and args.commit_sha == os.getenv('GITHUB_SHA'):
# TODO: lock to avoid corruption in case of a parallel build (unlikely event for now, but still)
with open(latest_artifacts_for_branch, 'w') as file:
file.write(str(storage.relative_to(storage_root)))

logger.debug(f"Copying finished")
(storage / 'copying_finished').touch()
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-26586
pr-26954
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/debian_10_arm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Pythons \
python3 \
python3-pip \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/fedora_29/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ RUN yum update -y && yum install -y \
tar \
gcc \
gcc-c++ \
# parallel gzip
pigz \
xz

# Install build dependencies
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_20_04_arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Pythons
python3.8-dev \
python3.8-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Pythons
python3.9-dev \
python3.9-venv \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Pythons
python3.8-dev \
python3.8-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python \
python3-dev \
python3-pip \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
gpg-agent \
tzdata \
libtbb2 \
# parallel gzip
pigz \
# Pythons \
python3.11-dev \
python3.11-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_22_04_x64_cc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ RUN apt-get update && \
gpg-agent \
tzdata \
libtbb2 \
# parallel gzip
pigz \
# Pythons
python3.8-dev \
python3.8-venv \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ RUN apt-get update && \
gpg-agent \
tzdata \
libtbb2 \
# parallel gzip
pigz \
# Pythons \
python3.11-dev \
python3.11-venv \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3.11-dev \
python3.11-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_24_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3-dev \
python3-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_test/ubuntu_20_04_arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3.11-dev \
python3.11-venv \
Expand Down
2 changes: 2 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,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3.9-dev \
python3.9-venv \
Expand Down
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 @@ -23,6 +23,8 @@ RUN apt-get update && \
ca-certificates \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3.11-dev \
python3.11-venv \
Expand Down
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_test/ubuntu_24_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# parallel gzip
pigz \
# Python
python3-full \
libhdf5-dev \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: |
# install doxygen
wget https://www.doxygen.nl/files/doxygen-$DOXY_VER.linux.bin.tar.gz
tar -xzf doxygen-$DOXY_VER.linux.bin.tar.gz
tar -I pigz -xf doxygen-$DOXY_VER.linux.bin.tar.gz
echo "$(pwd)/doxygen-$DOXY_VER/bin/" >> $GITHUB_PATH
- name: Validate benchmarks files
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
rm -rf ${COVERITY_TOOL_DIR} && mkdir -p ${COVERITY_TOOL_DIR}
pushd ${COVERITY_TOOL_DIR}
wget https://scan.coverity.com/download/linux64 --progress=bar:force:noscroll --post-data "token=${{ secrets.COVERITY_TOKEN }}&project=openvino" -O coverity_tool.tgz
tar xvf coverity_tool.tgz && rm coverity_tool.tgz
tar -I pigz -xf coverity_tool.tgz && rm coverity_tool.tgz
popd
- name: Cmake build - OpenVINO with Coverity
Expand All @@ -112,7 +112,7 @@ jobs:
- name: Pack Artefacts
run: |
pushd ${BUILD_DIR}
tar -C ${BUILD_DIR} -czvf openvino.tgz cov-int
tar -C ${BUILD_DIR} -I pigz -cvf openvino.tgz cov-int
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 -czvf ${BUILD_DIR}/openvino_package.tar.gz *
tar -I pigz -cvf ${BUILD_DIR}/openvino_package.tar.gz *
popd
pushd ${INSTALL_TEST_DIR}
tar -czvf ${BUILD_DIR}/openvino_tests.tar.gz *
tar -I pigz -cvf ${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 -xzf openvino_package.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
popd
pushd $INSTALL_TEST_DIR
tar -xzf openvino_tests.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_tests.tar.gz -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 -xzf openvino_package.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
popd
pushd $INSTALL_TEST_DIR
tar -xzf openvino_tests.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_tests.tar.gz -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 @@ -189,15 +189,15 @@ jobs:
cp -R ${ONNX_RUNTIME_UTILS} ${INSTALL_DIR}
pushd ${INSTALL_DIR}
tar -czvf ${BUILD_DIR}/openvino_package.tar.gz *
tar -I pigz -cvf ${BUILD_DIR}/openvino_package.tar.gz *
popd
pushd ${DEVELOPER_PACKAGE_DIR}
tar -czvf ${BUILD_DIR}/openvino_developer_package.tar.gz *
tar -I pigz -cvf ${BUILD_DIR}/openvino_developer_package.tar.gz *
popd
pushd ${INSTALL_TEST_DIR}
tar -czvf ${BUILD_DIR}/openvino_tests.tar.gz *
tar -I pigz -cvf ${BUILD_DIR}/openvino_tests.tar.gz *
popd
- name: Build Debian packages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job_cpu_functional_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ jobs:
- name: Extract OpenVINO packages
run: |
pushd $INSTALL_DIR
tar -xzf openvino_package.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
popd
pushd $INSTALL_TEST_DIR
tar -xzf openvino_tests.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_tests.tar.gz -C $INSTALL_DIR
popd
- name: Fetch setup_python action
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job_cxx_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ jobs:
if: ${{ runner.os != 'Windows' }}
run: |
pushd $INSTALL_DIR
tar -xzf openvino_package.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
popd
pushd $INSTALL_TEST_DIR
tar -xzf openvino_tests.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_tests.tar.gz -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 -xzf openvino_package.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
popd
pushd $INSTALL_TEST_DIR
tar -xzf openvino_tests.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_tests.tar.gz -C $INSTALL_DIR
popd
- name: Install dependencies (Linux)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job_jax_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ jobs:
- name: Extract OpenVINO packages
run: |
pushd ${INSTALL_DIR}
tar -xzf openvino_package.tar.gz -C ${INSTALL_DIR}
tar -I pigz -xf openvino_package.tar.gz -C ${INSTALL_DIR}
popd
pushd ${INSTALL_TEST_DIR}
tar -xzf openvino_tests.tar.gz -C ${INSTALL_DIR}
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
popd
- name: Fetch setup_python action
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job_onnx_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ jobs:
- name: Extract OpenVINO packages
run: |
pushd ${INSTALL_DIR}
tar -xzf openvino_package.tar.gz -C ${INSTALL_DIR}
tar -I pigz -xf openvino_package.tar.gz -C ${INSTALL_DIR}
popd
pushd ${INSTALL_TEST_DIR}
tar -xzf openvino_tests.tar.gz -C ${INSTALL_DIR}
tar -I pigz -xf openvino_tests.tar.gz -C ${INSTALL_DIR}
popd
# 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 @@ -60,7 +60,7 @@ jobs:
- name: Extract OpenVINO package
run: |
pushd ${INSTALL_DIR}
tar -xzf openvino_package.tar.gz -C ${INSTALL_DIR}
tar -I pigz -xf openvino_package.tar.gz -C ${INSTALL_DIR}
popd
- name: Clone ONNX Runtime
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job_python_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ jobs:
- name: Extract OpenVINO packages
run: |
pushd $INSTALL_DIR
tar -xzf openvino_package.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_package.tar.gz -C $INSTALL_DIR
popd
pushd $INSTALL_TEST_DIR
tar -xzf openvino_tests.tar.gz -C $INSTALL_DIR
tar -I pigz -xf openvino_tests.tar.gz -C $INSTALL_DIR
popd
- name: Fetch setup_python action
Expand Down
Loading

0 comments on commit 25371d4

Please sign in to comment.