Skip to content

Commit

Permalink
Merge branch 'master' into e2e_oss
Browse files Browse the repository at this point in the history
  • Loading branch information
rnugmanx authored Feb 8, 2024
2 parents fadca26 + 46a2734 commit 2e254ba
Show file tree
Hide file tree
Showing 2,679 changed files with 24,140 additions and 54,327 deletions.
5 changes: 4 additions & 1 deletion .github/actions/setup_python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ runs:
- if: ${{ runner.os == 'Linux' && inputs.self-hosted-runner == 'true' }}
name: Install 'actions/setup-python@v4' dependencies
shell: bash
run: apt-get update && apt-get install -y ca-certificates software-properties-common
run: apt-get update && apt-get install -y ca-certificates software-properties-common gpg-agent tzdata
env:
DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
TZ: "Europe/London" # to prevent tzdata from waiting user input

- if: ${{ runner.os == 'Linux' && runner.arch == 'ARM64' }}
name: Setup sudo and python3
Expand Down
4 changes: 2 additions & 2 deletions .github/components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ TEMPLATE:
- C_API
- Python_API
- NVIDIA
- TOKENIZERS
build:
- IR_FE

Expand Down Expand Up @@ -130,6 +129,7 @@ TF_FE:
build:
- CPU
- Python_API
- TOKENIZERS

TFL_FE:
revalidate:
Expand All @@ -144,6 +144,7 @@ PyTorch_FE:
build:
- CPU
- Python_API
- TOKENIZERS

C_API:
build:
Expand Down Expand Up @@ -196,7 +197,6 @@ IE_Tests:
- TEMPLATE
- AUTO
- NVIDIA
- TOKENIZERS
build:
- IR_FE

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 @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
- master
# - master
- 'releases/**'

concurrency:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,15 @@ jobs:
--form description="https://github.com/openvinotoolkit/openvino/runs/${{ github.run_number }}" \
https://scan.coverity.com/builds?project=openvino
popd
- name: Show Coverity configure logs
continue-on-error: true
run: cov-configure -c ${COVERITY_TOOL_DIR}/cov-analysis-linux64-2023.6.2/config/coverity_config.xml -lscc text

- name: Upload Coverity logs
uses: actions/upload-artifact@v3
if: always()
with:
name: coverity_logs
path: ${{ env.BUILD_DIR }}/cov-int/build-log.txt
if-no-files-found: 'error'
2 changes: 1 addition & 1 deletion .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
- master
# - master
- 'releases/**'

concurrency:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/job_cpu_functional_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
PARALLEL_TEST_SCRIPT: ${{ github.workspace }}/install/tests/functional_test_utils/layer_tests_summary/run_parallel.py
PARALLEL_TEST_CACHE: ${{ github.workspace }}/install/tests/test_cache.lst
if: ${{ github.event_name != 'merge_group' }}
steps:
- name: Set apt retries
run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/job_cxx_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
INSTALL_DIR: ${{ github.workspace }}/install
INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
if: ${{ github.event_name != 'merge_group' }}
steps:
- name: Set apt retries
run: echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries
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 @@ -29,7 +29,7 @@ jobs:
INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
ONNX_MODELS_PATH: ${{ github.workspace }}/onnx_test_models
MODELS_SHARE_PATH: "/mount/onnxtestdata"
ONNX_MODEL_ZOO_SHA: "d58213534f2a4d1c4b19ba62b3bb5f544353256e"
ONNX_MODEL_ZOO_SHA: "5faef4c33eba0395177850e1e31c4a6a9e634c82"
if: ${{ github.event_name != 'merge_group' }}
steps:
- name: Set apt retries
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/job_pytorch_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ jobs:
name: openvino_package
path: ${{ env.INSTALL_DIR }}

- name: Download OpenVINO tokenizers extension
uses: actions/download-artifact@v3
with:
name: openvino_tokenizers_wheel
path: ${{ env.INSTALL_DIR }}

- name: Download OpenVINO tests package
uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -98,7 +104,9 @@ jobs:
self-hosted-runner: ${{ contains(inputs.runner, 'aks') }}

- name: Install OpenVINO Python wheels
run: python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
run: |
python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
python3 -m pip install ${INSTALL_DIR}/openvino_tokenizers-*
- name: Install PyTorch tests requirements
run: |
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/job_tensorflow_hub_models_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ jobs:
name: openvino_package
path: ${{ env.INSTALL_DIR }}

- name: Download OpenVINO tokenizers extension
uses: actions/download-artifact@v3
with:
name: openvino_tokenizers_wheel
path: ${{ env.INSTALL_DIR }}

- name: Download OpenVINO tests package
uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -97,7 +103,9 @@ jobs:
self-hosted-runner: ${{ contains(inputs.runner, 'aks') }}

- name: Install OpenVINO Python wheels
run: python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
run: |
python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
python3 -m pip install ${INSTALL_DIR}/openvino_tokenizers-*
- name: Install TF Hub tests requirements
run: python3 -m pip install -r ${MODEL_HUB_TESTS_INSTALL_DIR}/tf_hub_tests/requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ jobs:
name: TensorFlow Hub Models tests
if: fromJSON(needs.smart_ci.outputs.affected_components).TF_FE.test ||
fromJSON(needs.smart_ci.outputs.affected_components).TFL_FE.test
needs: [ Build, Smart_CI ]
needs: [ Build, Smart_CI, Openvino_tokenizers ]
uses: ./.github/workflows/job_tensorflow_hub_models_tests.yml
with:
runner: ${{ github.event_name == 'schedule' && 'ubuntu-20.04-16-cores' || 'ubuntu-20.04-8-cores' }}
Expand All @@ -493,7 +493,7 @@ jobs:
PyTorch_Models_Tests:
name: PyTorch Models tests
if: fromJSON(needs.smart_ci.outputs.affected_components).PyTorch_FE.test
needs: [ Build, Smart_CI ]
needs: [ Build, Smart_CI, Openvino_tokenizers ]
uses: ./.github/workflows/job_pytorch_models_tests.yml
with:
runner: ${{ github.event_name == 'schedule' && 'ubuntu-20.04-16-cores' || 'ubuntu-20.04-8-cores' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
- master
# - master
- 'releases/**'

concurrency:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux_riscv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ jobs:
OPENVINO_REPO: /__w/openvino/openvino/openvino
OPENVINO_BUILD_DIR: /__w/openvino/openvino/openvino_build
INSTALL_DIR: /__w/openvino/openvino/openvino_install
CONAN_USER_HOME: /mount/caches/ccache/ubuntu22_riscv64_master_release/.conan
CCACHE_DIR: /mount/caches/ccache/ubuntu22_riscv64_master_release
CONAN_USER_HOME: /mount/caches/ccache/ubuntu22_riscv64_master/.conan
CCACHE_DIR: /mount/caches/ccache/ubuntu22_riscv64_master
CCACHE_TEMPDIR: /__w/openvino/openvino/ccache_temp
CCACHE_MAXSIZE: 50G
if: ${{ !needs.smart_ci.outputs.skip_workflow && github.event_name != 'merge_group' }}
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
- name: Check status of all jobs
if: >-
${{
contains(needs.*.result, 'failure') ||
contains(needs.*.result, 'failure') ||
contains(needs.*.result, 'cancelled')
}}
run: exit 1
6 changes: 1 addition & 5 deletions .github/workflows/mo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,4 @@ jobs:

- name: Pylint-MO
run: pylint -d C,R,W openvino/tools/mo
working-directory: tools/mo

- name: Pylint-OVC
run: pylint -d C,R,W openvino/tools/ovc
working-directory: tools/ovc
working-directory: tools/mo
54 changes: 54 additions & 0 deletions .github/workflows/ovc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: OVC
on:
merge_group:
push:
paths:
- 'tools/ovc/**'
- '.github/workflows/ovc.yml'
branches:
- 'master'
- 'releases/**'
pull_request:
paths:
- 'tools/ovc/**'
- '.github/workflows/ovc.yml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Pylint-UT:
runs-on: ubuntu-22.04
steps:
- name: Clone OpenVINO
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Cache pip
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('src/bindings/python/requirements*.txt') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
# For UT
pip install unittest-xml-reporting==3.0.2
pip install pylint>=2.7.0
pip install pyenchant>=3.0.0
pip install -r requirements.txt
working-directory: src/bindings/python/

- name: Pylint-OVC
run: pylint -d C,R,W openvino/tools/ovc
working-directory: tools/ovc
42 changes: 42 additions & 0 deletions .github/workflows/send_workflows_to_opentelemetry.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Send workflows to OpenTelemetry (BETA)

on:
workflow_run:
workflows:
- Android ARM64 with vcpkg
- Documentation
- Cleanup PIP caches
- Code snippets
- Code Style
- Code coverage
- Coverity (Ubuntu 20.04, Python 3.11)
- Fedora (RHEL), Python 3.9
- Linux (Ubuntu 20.04, Python 3.11)
- Linux ARM64 (Ubuntu 20.04, Python 3.11)
- Linux Static CC (Ubuntu 22.04, Python 3.11, Clang)
- Linux RISC-V with Conan (Ubuntu 22.04, Python 3.10)
- macOS (Python 3.11)
- macOS ARM64 (Python 3.11)
- MO
- Python API Checks
- Webassembly
- Windows (VS 2019, Python 3.11)
- Windows Conditional Compilation (VS 2022, Python 3.11)
types:
- completed

permissions: read-all

jobs:
otel-export-trace:
name: OpenTelemetry Export Trace
runs-on: ubuntu-latest

steps:
- name: Export Workflow Trace
uses: inception-health/otel-export-trace-action@7eabc7de1f4753f0b45051b44bb0ba46d05a21ef
with:
otlpEndpoint: grpc://api.honeycomb.io:443/
otlpHeaders: ${{ secrets.OTLP_HEADERS }}
githubToken: ${{ secrets.GITHUB_TOKEN }}
runId: ${{ github.event.workflow_run.id }}
2 changes: 1 addition & 1 deletion .github/workflows/webassembly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
- master
# - master
- 'releases/**'

concurrency:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,7 @@ jobs:
if-no-files-found: 'error'

- name: Upload openvino js package
if: ${{ 'false' }} # 128689
# if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API
if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API
uses: actions/upload-artifact@v3
with:
name: openvino_js_package
Expand Down Expand Up @@ -364,8 +363,7 @@ jobs:
env:
OPENVINO_JS_DIR: "${{ github.workspace }}\\openvino\\src\\bindings\\js"
OPENVINO_JS_LIBS_DIR: "${{ github.workspace }}\\openvino\\src\\bindings\\js\\node\\bin"
if: ${{ 'false' }} # 128689
# if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API
if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API

steps:
- name: Fetch OpenVINO JS sources
Expand Down
30 changes: 16 additions & 14 deletions cmake/developer_package/cross_compile/cross_compiled_disp_gen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Generates cpp file with dispatcher for cross compiled function
# Parameters:
# XARCH_API_HEADER -- path to header with function declaration
# XARCH_FUNC_NAME -- name of function to dispatch
# XARCH_FUNC_NAMES -- names of functions to dispatch
# XARCH_NAMESPACES -- full namespace used to keep ODR
# XARCH_DISP_FILE -- dispatcher file name to generate
# XARCH_SET -- set of ARCH supported by dispatcher. semicolon-delimited
Expand All @@ -21,9 +21,6 @@ set(_CPU_CHECK_AVX2 "with_cpu_x86_avx2()")
set(_CPU_CHECK_AVX512F "with_cpu_x86_avx512f()")

function(_generate_dispatcher)
_find_signature_in_file(${XARCH_API_HEADER} ${XARCH_FUNC_NAME} SIGNATURE)
_generate_call_line_from_signature("${SIGNATURE}" CALL_LINE)

string(REPLACE "::" ";" XARCH_NAMESPACES "${XARCH_NAMESPACES}")

list(GET XARCH_NAMESPACES -1 XARCH_CURRENT_NAMESPACE)
Expand All @@ -46,20 +43,25 @@ function(_generate_dispatcher)
"namespace ${_namespace} {\n")
endforeach()

foreach(_arch ${XARCH_SET})
string(APPEND DISP_CONTENT
"namespace ${_arch} {\n ${SIGNATURE}\; \n}\n")
endforeach()
foreach(_func_name ${XARCH_FUNC_NAMES})
_find_signature_in_file(${XARCH_API_HEADER} ${_func_name} SIGNATURE)
_generate_call_line_from_signature("${SIGNATURE}" CALL_LINE)

string(APPEND DISP_CONTENT
"namespace ${XARCH_CURRENT_NAMESPACE} {\n\n${SIGNATURE} {\n")
foreach(_arch ${XARCH_SET})
string(APPEND DISP_CONTENT
"namespace ${_arch} {\n ${SIGNATURE}\; \n}\n")
endforeach()

foreach(_arch ${XARCH_SET})
string(APPEND DISP_CONTENT
" if (${_CPU_CHECK_${_arch}}) {\n return ${_arch}::${CALL_LINE}\;\n }\n")
endforeach()
"namespace ${XARCH_CURRENT_NAMESPACE} {\n\n${SIGNATURE} {\n")

foreach(_arch ${XARCH_SET})
string(APPEND DISP_CONTENT
" if (${_CPU_CHECK_${_arch}}) {\n return ${_arch}::${CALL_LINE}\;\n }\n")
endforeach()

string(APPEND DISP_CONTENT "}\n\n}\n")
string(APPEND DISP_CONTENT "}\n\n}\n")
endforeach()

foreach(_namespace ${PARENT_NAMESPACES})
string(APPEND DISP_CONTENT "} // namespace ${_namespace}\n")
Expand Down
Loading

0 comments on commit 2e254ba

Please sign in to comment.