Skip to content

Commit

Permalink
Merge branch 'master' into paddle_convert
Browse files Browse the repository at this point in the history
  • Loading branch information
yuxu42 authored Jan 22, 2025
2 parents acbf415 + 7f56fcd commit 41ca9a0
Show file tree
Hide file tree
Showing 436 changed files with 2,377 additions and 3,599 deletions.
9 changes: 0 additions & 9 deletions .github/actions/setup_python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ inputs:
description: 'If the runner is self-hosted'
required: false
default: 'true'
show-cache-info:
description: 'If the action should show the share space occupied by cache'
required: false
default: 'false'
runs:
using: 'composite'
steps:
Expand Down Expand Up @@ -75,8 +71,3 @@ runs:
$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
run: python3 -m pip cache info
2 changes: 1 addition & 1 deletion .github/github_org_control/check_org.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2018-2021 Intel Corporation
# Copyright (C) 2018-2025 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

"""
Expand Down
2 changes: 1 addition & 1 deletion .github/github_org_control/check_pr.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2018-2021 Intel Corporation
# Copyright (C) 2018-2025 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

"""
Expand Down
2 changes: 1 addition & 1 deletion .github/github_org_control/configs.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2018-2021 Intel Corporation
# Copyright (C) 2018-2025 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

"""
Expand Down
2 changes: 1 addition & 1 deletion .github/github_org_control/github_api.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2018-2021 Intel Corporation
# Copyright (C) 2018-2025 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

"""
Expand Down
2 changes: 1 addition & 1 deletion .github/github_org_control/ldap_api.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2018-2021 Intel Corporation
# Copyright (C) 2018-2025 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

"""
Expand Down
8 changes: 8 additions & 0 deletions .github/scripts/workflow_rerun/errors_to_look_for.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,13 @@
{
"error_text": "download failed after attempts",
"ticket": 159547
},
{
"error_text": "Failed to connect to github.com port 443: Connection refused",
"ticket": 156593
},
{
"error_text": "file DOWNLOAD cannot compute hash on failed download",
"ticket": 156593
}
]
8 changes: 4 additions & 4 deletions .github/workflows/build_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Cache documentation
id: cache_sphinx_docs
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: build/docs/_build/.doctrees
key: sphinx-docs-cache
Expand All @@ -78,13 +78,13 @@ jobs:
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
- name: 'Upload sphinx.log'
uses: actions/upload-artifact@v4.6.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@v4.6.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 @@ -101,7 +101,7 @@ jobs:
- name: 'Upload test results'
if: failure()
uses: actions/upload-artifact@v4.6.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: openvino_docs_pytest
path: build/docs/_artifacts/
2 changes: 1 addition & 1 deletion .github/workflows/code_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
# always provide suggestions even for skipped scripts in ov_shellcheck tagret
- name: ShellCheck action
if: always()
uses: reviewdog/action-shellcheck@ccaafec556ffa154f112bfcb7b9c9574190b7091 # v1.27.0
uses: reviewdog/action-shellcheck@6e0e63d1750d02d761b3df0f2c5ba9f9ac4a9ed7 # v1.29.0
with:
level: style
reporter: github-pr-review
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/job_build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,11 @@ jobs:
-DENABLE_WHEEL=OFF
cmake --build ${BUILD_DIR} --parallel $(nproc)
cmake --install ${BUILD_DIR} --prefix ${INSTALL_DIR_JS}
- name: Pack openvino_js_package
if: ${{ fromJSON(inputs.affected-components).JS_API && inputs.build-js }}
run: tar -cvf - * | pigz > ${BUILD_DIR}/openvino_js_package.tar.gz
working-directory: ${{ env.INSTALL_DIR_JS }}

- name: Build RPM packages
if: ${{ inputs.build-rpm-packages }}
Expand Down Expand Up @@ -279,7 +284,7 @@ jobs:
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: openvino_js_package
path: ${{ env.INSTALL_DIR_JS }}
path: ${{ env.BUILD_DIR }}/openvino_js_package.tar.gz
if-no-files-found: 'error'

- name: Upload openvino developer package
Expand Down Expand Up @@ -333,8 +338,10 @@ jobs:
${{ env.BUILD_DIR }}/openvino_tests.tar.gz
${{ env.BUILD_DIR }}/deb
${{ env.MANIFEST_PATH }}
${{ env.STORE_JS == 'true' && format('{0}/openvino_js_package.tar.gz', env.BUILD_DIR) || '' }}
${{ env.STORE_WHEELS == 'true' && format('{0}/wheels', env.INSTALL_WHEELS_DIR) || '' }}
storage_dir: ${{ env.PRODUCT_TYPE }}
storage_root: ${{ env.ARTIFACTS_SHARE }}
env:
STORE_WHEELS: ${{ inputs.os != 'debian_10' && inputs.arch != 'arm' }}
STORE_JS: ${{ fromJSON(inputs.affected-components).JS_API && inputs.build-js }}
16 changes: 14 additions & 2 deletions .github/workflows/job_build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ jobs:
pip-cache-path: ${{ env.PIP_CACHE_PATH }}
should-setup-pip-paths: 'true'
self-hosted-runner: 'true'
show-cache-info: 'true'

- name: Generate product manifest and set CI_BUILD_NUMBER & CI_BUILD_DEV_TAG
id: create_manifest
Expand Down Expand Up @@ -265,6 +264,17 @@ jobs:
-DENABLE_WHEEL=OFF
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 }}
- name: Pack JS Artifacts
if: ${{ fromJSON(inputs.affected-components).JS_API }}
run: |
$file = Get-ChildItem -Path "${{ env.INSTALL_DIR_JS }}"
$compress = @{
Path = $file
CompressionLevel = "Optimal"
DestinationPath = "${{ env.BUILD_DIR }}/openvino_js_package.zip"
}
Compress-Archive @compress
#
# Upload build artifacts and logs
Expand Down Expand Up @@ -297,7 +307,7 @@ jobs:
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: openvino_js_package
path: ${{ env.INSTALL_DIR_JS }}
path: ${{ env.BUILD_DIR }}/openvino_js_package.zip
if-no-files-found: 'error'

- name: Store artifacts to a shared drive
Expand All @@ -309,8 +319,10 @@ jobs:
${{ env.BUILD_DIR }}/openvino_package.zip
${{ env.BUILD_DIR }}/openvino_tests.zip
${{ env.MANIFEST_PATH }}
${{ env.STORE_JS == 'true' && format('{0}/openvino_js_package.zip', env.BUILD_DIR) || '' }}
${{ env.STORE_WHEELS == 'true' && format('{0}/wheels', env.INSTALL_WHEELS_DIR) || '' }}
storage_dir: ${{ env.PRODUCT_TYPE }}
storage_root: ${{ env.ARTIFACTS_SHARE }}
env:
STORE_WHEELS: ${{ inputs.build-type != 'Debug' }}
STORE_JS: ${{ fromJSON(inputs.affected-components).JS_API && inputs.build-js }}
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 @@ -90,7 +90,7 @@ jobs:
run: python3 -m pip install -r ${INSTALL_TEST_DIR}/functional_test_utils/layer_tests_summary/requirements.txt

- name: Restore tests execution time
uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: ${{ env.PARALLEL_TEST_CACHE }}
key: ${{ runner.os }}-${{ runner.arch }}-tests-functional-cpu-stamp-${{ github.sha }}
Expand All @@ -110,7 +110,7 @@ jobs:
timeout-minutes: 25

- name: Save tests execution time
uses: actions/cache/save@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
if: github.ref_name == 'master'
with:
path: ${{ env.PARALLEL_TEST_CACHE }}
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/job_openvino_js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,16 @@ jobs:
echo "OPENVINO_JS_DIR=$GITHUB_WORKSPACE/openvino/src/bindings/js" >> "$GITHUB_ENV"
echo "OPENVINO_JS_LIBS_DIR=$GITHUB_WORKSPACE/openvino/src/bindings/js/node/bin" >> "$GITHUB_ENV"
- name: Download OpenVINO JS package
- name: Download OpenVINO artifacts (JS)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: openvino_js_package
pattern: openvino_[js]*
path: ${{ env.OPENVINO_JS_LIBS_DIR }}
merge-multiple: true

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

- name: Setup Node ${{ env.NODE_VERSION }}
if: runner.os != 'Linux' # Node is already installed in the Docker image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ovc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
python-version: '3.10'

- name: Cache pip
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('src/bindings/python/requirements*.txt') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_conditional_compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ jobs:
run: python3 -m pip install -r ${{ env.INSTALL_TEST_DIR }}/layer_tests_summary/requirements.txt

- name: Restore tests execution time
uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: ${{ env.PARALLEL_TEST_CACHE }}
key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/windows_vs2019_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,17 @@ jobs:
sparse-checkout: |
src/bindings/js
path: 'openvino'

- name: Download OpenVINO js package
- name: Download OpenVINO artifacts (JS)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: openvino_js_package
pattern: openvino_[js]*
path: ${{ env.OPENVINO_JS_LIBS_DIR }}
merge-multiple: true

- name: Extract OpenVINO packages
run: Expand-Archive openvino_js_package.zip -DestinationPath .
working-directory: ${{ env.OPENVINO_JS_LIBS_DIR }}

- name: Setup Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
Expand Down Expand Up @@ -576,7 +581,7 @@ jobs:
run: python3 -m pip install -r ${{ github.workspace }}\install\tests\functional_test_utils\layer_tests_summary\requirements.txt

- name: Restore tests execution time
uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: ${{ env.PARALLEL_TEST_CACHE }}
key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}
Expand All @@ -590,7 +595,7 @@ jobs:
timeout-minutes: 60

- name: Save tests execution time
uses: actions/cache/save@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
if: github.ref_name == 'master'
with:
path: ${{ env.PARALLEL_TEST_CACHE }}
Expand Down
Loading

0 comments on commit 41ca9a0

Please sign in to comment.