Skip to content

Commit

Permalink
Merge branch 'mateuszm/slicescatter/unsupported_decomposition' of htt…
Browse files Browse the repository at this point in the history
…ps://github.com/mmikolajcz/openvino into mateuszm/slicescatter/unsupported_decomposition
  • Loading branch information
mmikolajcz committed Oct 23, 2024
2 parents 40bf304 + b92d5af commit ba2aa1b
Show file tree
Hide file tree
Showing 458 changed files with 19,083 additions and 5,251 deletions.
9 changes: 7 additions & 2 deletions .github/actions/openvino_provider/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ inputs:
description: 'Branch of OpenVINO to take the revision from if no specific hash was provided.
Taken from github context by default'
required: false
event_name:
description: 'Even name from which artifacts were generated. "push" by default; overwrite it with "pull_request"
if revision/branch is from PR'
default: "push"
required: false
ov_artifact_name:
description: "Name under which to upload provided OpenVINO build artifacts, set automatically by default"
required: false
Expand Down Expand Up @@ -107,7 +112,7 @@ runs:
with:
platform: ${{ inputs.platform }}_${{ inputs.arch }}
storage_root: ${{ inputs.commit_share_path }}
event_name: "commit"
event_name: ${{ inputs.event_name }}
trigger_repo_sha: ${{ env.OV_REVISION }}
branch_name: ${{ inputs.branch_name }}
to_restore: ${{ inputs.commit_packages_to_provide }}
Expand Down Expand Up @@ -137,7 +142,7 @@ runs:
artifacts_path=${{ steps.openvino_commit_download.outputs.artifacts_path }}
cd $artifacts_path
version=$(yq eval '.components.dldt.custom_params.wheel_product_version' manifest.yml)
wheel_path=${{ inputs.install_dir && '$artifacts_path/tools' || './tools' }}
wheel_path=${{ inputs.install_dir && '$artifacts_path/wheels' || './wheels' }}
default_find_links_cmd="--find-links=$wheel_path"
find_links_cmd=$([[ -n "$PIP_FIND_LINKS" ]] && echo "" || echo "$default_find_links_cmd")
echo "ov_version=$version" >> $GITHUB_OUTPUT
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/restore_artifacts/restore_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ def include_filter(include_list: set | list):
"""
Returns input for shutil.copytree ignore - to copy only files from include list
"""
def _filter(_, files: list):
def _filter(root, files: list):
if not include_list:
return []
return [f for f in files if f not in include_list]
return [f for f in files if f not in include_list and Path(root).name not in include_list]

return _filter

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-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/android_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
# Upload build logs
#
- name: Upload build logs
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: build_logs
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 @@ -152,7 +152,7 @@ jobs:
# Upload build logs
#
- name: Upload build logs
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: build_logs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Cache documentation
id: cache_sphinx_docs
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
with:
path: build/docs/_build/.doctrees
key: sphinx-docs-cache
Expand All @@ -77,13 +77,13 @@ jobs:
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
- name: 'Upload sphinx.log'
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: sphinx_build_log_${{ env.PR_NUMBER }}.log
path: build/docs/sphinx.log

- name: 'Upload docs html'
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: openvino_docs_html_${{ env.PR_NUMBER }}.zip
path: build/docs/openvino_docs_html.zip
Expand All @@ -100,7 +100,7 @@ jobs:
- name: 'Upload test results'
if: failure()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: openvino_docs_pytest
path: build/docs/_artifacts/
6 changes: 3 additions & 3 deletions .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 Expand Up @@ -144,15 +144,15 @@ jobs:
run: ${COVERITY_TOOL_DIR}/cov-analysis*/bin/cov-configure -c ${COVERITY_TOOL_DIR}/cov-analysis-linux64-2023.6.2/config/coverity_config.xml -lscc text

- name: Upload Coverity build log
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: coverity_logs
path: ${{ env.BUILD_DIR }}/cov-int/build-log.txt
if-no-files-found: 'error'

- name: Upload Coverity build archive
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: coverity_archive
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/dev_cpu_linux_snippets_libxsmm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,18 @@ 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
#
# Upload build artifacts and logs
#
- name: Upload build logs
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: build_logs
Expand All @@ -178,15 +178,15 @@ jobs:

- name: Upload openvino package
if: ${{ always() }}
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: openvino_package
path: ${{ env.BUILD_DIR }}/openvino_package.tar.gz
if-no-files-found: 'error'

- name: Upload openvino tests package
if: ${{ always() }}
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: openvino_tests
path: ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
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 Expand Up @@ -325,7 +325,7 @@ jobs:
timeout-minutes: 25

- name: Upload Test Results
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: test-results-functional-cpu
Expand Down
Loading

0 comments on commit ba2aa1b

Please sign in to comment.