Merge remote-tracking branch 'upstream/master' into remove_ngraph_namespace_from_ops

This commit is contained in:
Ilya Churaev 2023-10-06 07:11:43 +04:00
commit 7df8041367
80 changed files with 535 additions and 216 deletions

View File

@ -178,9 +178,6 @@ jobs:
RPM_PACKAGES_DIR: /__w/openvino/packages/
steps:
- name: Create Directories
run: mkdir -p ${RPM_PACKAGES_DIR}
- name: Download OpenVINO RPM packages
uses: actions/download-artifact@v3
with:

View File

@ -90,6 +90,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Setup pip cache dir
run: |
PIP_VER=$(python3 -c "import pip; print(pip.__version__)")
@ -232,9 +233,6 @@ jobs:
DEBIAN_PACKAGES_DIR: /__w/openvino/packages/
steps:
- name: Create Directories
run: mkdir -p ${DEBIAN_PACKAGES_DIR}
- name: Download OpenVINO debian packages
uses: actions/download-artifact@v3
with:
@ -290,13 +288,6 @@ jobs:
BUILD_DIR: /__w/openvino/openvino/build
steps:
- name: Create Directories
run: mkdir -p ${INSTALL_DIR} ${INSTALL_TEST_DIR}
#
# Initialize OpenVINO
#
- name: Download OpenVINO package
uses: actions/download-artifact@v3
with:
@ -324,6 +315,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Setup pip cache dir
run: |
PIP_VER=$(python3 -c "import pip; print(pip.__version__)")
@ -615,13 +607,6 @@ jobs:
INSTALL_TEST_DIR: /__w/openvino/openvino/install/tests
steps:
- name: Create Directories
run: mkdir -p ${INSTALL_DIR} ${INSTALL_TEST_DIR}
#
# Initialize OpenVINO
#
- name: Download OpenVINO package
uses: actions/download-artifact@v3
with:
@ -812,9 +797,6 @@ jobs:
LAYER_TESTS_INSTALL_DIR: /__w/openvino/openvino/install/tests/layer_tests
steps:
- name: Create Directories
run: mkdir -p ${INSTALL_DIR} ${INSTALL_TEST_DIR}
- name: Install git
run: |
apt update
@ -832,6 +814,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Setup pip cache dir
run: |
PIP_VER=$(python3 -c "import pip; print(pip.__version__)")
@ -1033,9 +1016,6 @@ jobs:
PARALLEL_TEST_CACHE: /__w/openvino/openvino/install/tests/test_cache.lst
steps:
- name: Create Directories
run: mkdir -p ${INSTALL_DIR} ${INSTALL_TEST_DIR}
- name: Download OpenVINO package
uses: actions/download-artifact@v3
with:
@ -1121,15 +1101,13 @@ jobs:
MODEL_HUB_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/model_hub_tests
steps:
- name: Create Directories
run: mkdir -p ${INSTALL_DIR} ${INSTALL_TEST_DIR}
- name: Install 'actions/setup-python@v4' dependencies
run: apt-get update && apt-get install -y libssl1.1 ca-certificates
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Setup pip cache dir
run: |
PIP_VER=$(python3 -c "import pip; print(pip.__version__)")
@ -1209,9 +1187,6 @@ jobs:
# install 'g++' to build 'detectron2' and 'natten' wheels
sudo apt-get install --assume-yes --no-install-recommends g++ git ca-certificates
- name: Create Directories
run: mkdir -p ${INSTALL_DIR} ${INSTALL_TEST_DIR}
- name: Download OpenVINO package
uses: actions/download-artifact@v3
with:

View File

@ -1,4 +1,4 @@
name: Linux Conditional Compilation (Ubuntu 22.04, Python 3.11)
name: Linux Static CC (Ubuntu 22.04, Python 3.11, Clang)
on:
workflow_dispatch:
pull_request:
@ -25,6 +25,10 @@ concurrency:
group: ${{ github.event_name == 'push' && github.run_id || github.ref }}-linux-cc
cancel-in-progress: true
env:
PIP_CACHE_PATH: /mount/caches/pip/linux
PYTHON_VERSION: '3.11'
jobs:
Build:
defaults:
@ -43,13 +47,15 @@ jobs:
CMAKE_C_COMPILER_LAUNCHER: ccache
GITHUB_WORKSPACE: '/__w/openvino/openvino'
OPENVINO_REPO: /__w/openvino/openvino/openvino
INSTALL_DIR: /__w/openvino/openvino/openvino_install
BUILD_DIR: /__w/openvino/openvino/openvino_build
SELECTIVE_BUILD_STAT_DIR: /__w/openvino/openvino/selective_build_stat
MODELS_PATH: /__w/openvino/openvino/testdata
CCACHE_DIR: /mount/caches/ccache/ubuntu22_x86_64_cc_Release
CCACHE_DIR: /mount/caches/ccache/ubuntu22_x86_64_itt_clang_Release
CCACHE_TEMPDIR: /__w/openvino/openvino/ccache_temp
CCACHE_MAXSIZE: 50G
steps:
CCACHE_MAXSIZE: 20G
steps:
- name: Install git
run: |
apt-get update
@ -76,44 +82,265 @@ jobs:
run: |
bash ${OPENVINO_REPO}/install_build_dependencies.sh
# use clang as a default compiler
apt --assume-yes install clang
update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Setup pip cache dir
run: |
PIP_VER=$(python3 -c "import pip; print(pip.__version__)")
echo "Using pip version: ${PIP_VER}"
echo "PIP_CACHE_DIR=${PIP_CACHE_PATH}/${PIP_VER}" >> $GITHUB_ENV
- name: Install python dependencies
run: |
# For running ONNX frontend unit tests
python3 -m pip install --force-reinstall -r ${OPENVINO_REPO}/src/frontends/onnx/tests/requirements.txt
# For running TensorFlow frontend unit tests
python3 -m pip install -r ${OPENVINO_REPO}/src/frontends/tensorflow/tests/requirements.txt
# For running TensorFlow Lite frontend unit tests
python3 -m pip install -r ${OPENVINO_REPO}/src/frontends/tensorflow_lite/tests/requirements.txt
# For running Paddle frontend unit tests
python3 -m pip install -r ${OPENVINO_REPO}/src/frontends/paddle/tests/requirements.txt
#
# Build
#
- name: CMake configure CC COLLECT
- name: CMake configure - CC COLLECT
run: |
cmake \
-G "${{ env.CMAKE_GENERATOR }}" \
-DBUILD_SHARED_LIBS=OFF \
-DENABLE_TESTS=ON \
-DENABLE_CPPLINT=OFF \
-DENABLE_GAPI_PREPROCESSING=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DENABLE_NCC_STYLE=OFF \
-DENABLE_INTEL_GNA=OFF \
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
-DENABLE_FASTER_BUILD=ON \
-DENABLE_PROFILING_ITT=ON \
-DSELECTIVE_BUILD=COLLECT \
-DCMAKE_C_COMPILER_LAUNCHER=${{ env.CMAKE_C_COMPILER_LAUNCHER }} \
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CMAKE_CXX_COMPILER_LAUNCHER }} \
-S ${OPENVINO_REPO} \
-B ${BUILD_DIR}
- name: Build CC COLLECT
run: cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target openvino_intel_cpu_plugin openvino_ir_frontend benchmark_app sea_itt_lib
- name: Cmake build - CC COLLECT
run: |
cmake --build ${BUILD_DIR} --parallel 8 --config ${{ env.CMAKE_BUILD_TYPE }}
cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target sea_itt_lib
- name: Show ccache stats
run: ccache --show-stats
- name: Code usage analysis
- name: Cmake install - OpenVINO
run: cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -P ${BUILD_DIR}/cmake_install.cmake
- name: Build C++ samples - OpenVINO build tree
run: |
cmake -G "${{ env.CMAKE_GENERATOR }}" -DOpenVINO_DIR=${BUILD_DIR} -S ${INSTALL_DIR}/samples/cpp -B ${BUILD_DIR}/cpp_samples
cmake --build ${BUILD_DIR}/cpp_samples --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target hello_query_device
- name: Build C samples - OpenVINO install tree
run: ${INSTALL_DIR}/samples/c/build_samples.sh -i ${INSTALL_DIR} -b ${BUILD_DIR}/c_samples
- name: Ctest - OpenVINO unit tests
run: ctest -C ${{ env.CMAKE_BUILD_TYPE }} --test-dir ${BUILD_DIR} -V -L UNIT
- name: Perform code tracing via ITT collector
run: |
python3 ${OPENVINO_REPO}/thirdparty/itt_collector/runtool/sea_runtool.py \
--bindir ${OPENVINO_REPO}/bin/intel64/Release -o ${BUILD_DIR}/itt_stat ! \
--bindir ${OPENVINO_REPO}/bin/intel64/Release -o ${SELECTIVE_BUILD_STAT_DIR}/itt_stat ! \
${OPENVINO_REPO}/bin/intel64/Release/benchmark_app -niter 1 -nireq 1 \
-m ${MODELS_PATH}/models/test_model/test_model_fp32.xml -d CPU
- name: CMake configure with CC ON
run: cmake -DSELECTIVE_BUILD=ON -DSELECTIVE_BUILD_STAT=${BUILD_DIR}/*.csv -S ${OPENVINO_REPO} -B ${BUILD_DIR}
- name: Build with CC ON
run: cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target openvino_intel_cpu_plugin openvino_ir_frontend
- name: Use OpenVINO after CC
- name: Pack Artifacts
run: |
${OPENVINO_REPO}/bin/intel64/Release/benchmark_app -niter 1 -nireq 1 \
-m ${MODELS_PATH}/models/test_model/test_model_fp32.xml -d CPU
pushd ${SELECTIVE_BUILD_STAT_DIR}
tar -czvf ${BUILD_DIR}/openvino_selective_build_stat.tar.gz *
popd
pushd ${OPENVINO_REPO}
tar -czvf ${BUILD_DIR}/openvino_tests.tar.gz \
bin/intel64/Release/ov_cpu_func_tests \
src/tests/test_utils/functional_test_utils/layer_tests_summary/* \
scripts/install_dependencies/*
popd
- name: Upload selective build statistics package
if: ${{ always() }}
uses: actions/upload-artifact@v3
with:
name: openvino_selective_build_stat
path: ${{ env.BUILD_DIR }}/openvino_selective_build_stat.tar.gz
if-no-files-found: 'error'
- name: Upload OpenVINO tests package
if: ${{ always() }}
uses: actions/upload-artifact@v3
with:
name: openvino_tests
path: ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
if-no-files-found: 'error'
CC_Build:
name: Conditional Compilation
needs: Build
defaults:
run:
shell: bash
runs-on: aks-linux-16-cores
container:
image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
volumes:
- /mount/caches:/mount/caches
env:
DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
CMAKE_CXX_COMPILER_LAUNCHER: ccache
CMAKE_C_COMPILER_LAUNCHER: ccache
GITHUB_WORKSPACE: '/__w/openvino/openvino'
OPENVINO_REPO: /__w/openvino/openvino/openvino
BUILD_DIR: /__w/openvino/openvino/openvino_build
SELECTIVE_BUILD_STAT_DIR: /__w/openvino/openvino/selective_build_stat
MODELS_PATH: /__w/openvino/openvino/testdata
CCACHE_DIR: /mount/caches/ccache/ubuntu22_x86_64_cc_Release
CCACHE_TEMPDIR: /__w/openvino/openvino/ccache_temp
CCACHE_MAXSIZE: 20G
steps:
- name: Install git
run: apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates git-lfs
- name: Clone OpenVINO
uses: actions/checkout@v4
with:
path: ${{ env.OPENVINO_REPO }}
submodules: 'true'
- name: Clone test models
uses: actions/checkout@v4
with:
repository: 'openvinotoolkit/testdata'
path: ${{ env.MODELS_PATH }}
lfs: 'true'
- name: Download selective build statistics package
uses: actions/download-artifact@v3
with:
name: openvino_selective_build_stat
path: ${{ env.SELECTIVE_BUILD_STAT_DIR }}
- name: Extract selective build statistics package
run: tar -xvzf ${SELECTIVE_BUILD_STAT_DIR}/openvino_selective_build_stat.tar.gz -C ${SELECTIVE_BUILD_STAT_DIR}
#
# Dependencies
#
- name: Install build dependencies
run: bash ${OPENVINO_REPO}/install_build_dependencies.sh
#
# Build
#
- name: CMake configure - CC ON
run: |
cmake \
-DBUILD_SHARED_LIBS=OFF \
-DENABLE_CPPLINT=OFF \
-DSELECTIVE_BUILD=ON \
-DENABLE_LTO=OFF \
-DENABLE_TEMPLATE=OFF \
-DENABLE_INTEL_GPU=OFF \
-DENABLE_INTEL_GNA=OFF \
-DENABLE_OV_TF_FRONTEND=OFF \
-DENABLE_OV_TF_LITE_FRONTEND=OFF \
-DENABLE_OV_PADDLE_FRONTEND=OFF \
-DENABLE_OV_PYTORCH_FRONTEND=OFF \
-DENABLE_OV_ONNX_FRONTEND=OFF \
-DSELECTIVE_BUILD_STAT=${SELECTIVE_BUILD_STAT_DIR}/*.csv \
-DCMAKE_C_COMPILER_LAUNCHER=${{ env.CMAKE_C_COMPILER_LAUNCHER }} \
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CMAKE_CXX_COMPILER_LAUNCHER }} \
-S ${OPENVINO_REPO} \
-B ${BUILD_DIR}
- name: Cmake build - CC ON
run: cmake --build ${BUILD_DIR} --parallel 8 --target benchmark_app
- name: Show ccache stats
run: ccache --show-stats
- name: Run with CC-ed runtime
run: ${OPENVINO_REPO}/bin/intel64/Release/benchmark_app -niter 1 -nireq 1 -m ${MODELS_PATH}/models/test_model/test_model_fp32.xml -d CPU
CPU_Functional_Tests:
name: CPU functional tests
needs: Build
defaults:
run:
shell: bash
runs-on: aks-linux-8-cores
container:
image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
env:
DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
INSTALL_TEST_DIR: /__w/openvino/openvino/install/tests
PARALLEL_TEST_SCRIPT: /__w/openvino/openvino/install/tests/src/tests/test_utils/functional_test_utils/layer_tests_summary/run_parallel.py
PARALLEL_TEST_CACHE: /__w/openvino/openvino/install/tests/test_cache.lst
steps:
- name: Download OpenVINO tests package
uses: actions/download-artifact@v3
with:
name: openvino_tests
path: ${{ env.INSTALL_TEST_DIR }}
- name: Extract OpenVINO packages
run: tar -xvzf ${INSTALL_TEST_DIR}/openvino_tests.tar.gz -C ${INSTALL_TEST_DIR}
- name: Install OpenVINO dependencies
run: bash ${INSTALL_TEST_DIR}/scripts/install_dependencies/install_openvino_dependencies.sh -c=core -c=gpu -y
- name: Install 'actions/setup-python@v4' dependencies
run: apt-get install -y libssl3
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Install python dependencies for run_parallel.py
run: python3 -m pip install -r ${INSTALL_TEST_DIR}/src/tests/test_utils/functional_test_utils/layer_tests_summary/requirements.txt
- name: Restore tests execution time
uses: actions/cache/restore@v3
with:
path: ${{ env.PARALLEL_TEST_CACHE }}
key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}
restore-keys: |
${{ runner.os }}-tests-functional-cpu-stamp
- name: Intel CPU plugin func tests (parallel)
run: python3 ${PARALLEL_TEST_SCRIPT} -e ${INSTALL_TEST_DIR}/bin/intel64/Release/ov_cpu_func_tests -c ${PARALLEL_TEST_CACHE} -w ${INSTALL_TEST_DIR} -s suite -rf 0 -- --gtest_print_time=1 --gtest_filter=*smoke*
timeout-minutes: 40
- name: Upload Test Results
uses: actions/upload-artifact@v3
if: ${{ !cancelled() }}
with:
name: test-results-functional-cpu
path: |
${{ env.INSTALL_TEST_DIR }}/TEST*.xml
${{ env.INSTALL_TEST_DIR }}/logs/failed/*.log
${{ env.INSTALL_TEST_DIR }}/logs/crashed/*.log
${{ env.INSTALL_TEST_DIR }}/logs/hanged/*.log
${{ env.INSTALL_TEST_DIR }}/logs/interapted/*.log
${{ env.INSTALL_TEST_DIR }}/logs/disabled_tests.log
if-no-files-found: 'error'

View File

@ -115,7 +115,7 @@ jobs:
-DENABLE_INTEL_GPU=OFF \
-DENABLE_INTEL_GNA=OFF \
-DENABLE_OV_TF_FRONTEND=OFF \
-DENABLE_OV_TF_LITE=OFF \
-DENABLE_OV_TF_LITE_FRONTEND=OFF \
-DENABLE_OV_PADDLE_FRONTEND=OFF \
-DENABLE_OV_PYTORCH_FRONTEND=OFF \
-DENABLE_OV_ONNX_FRONTEND=OFF \

View File

@ -1,27 +1,28 @@
name: Tests on Windows (VS 2022, Python 3.11)
on:
workflow_dispatch:
# pull_request:
# paths-ignore:
# - '**/docs/**'
# - 'docs/**'
# - '**/**.md'
# - '**.md'
# - '**/layer_tests_summary/**'
# - '**/conformance/**'
# push:
# paths-ignore:
# - '**/docs/**'
# - 'docs/**'
# - '**/**.md'
# - '**.md'
# - '**/layer_tests_summary/**'
# - '**/conformance/**'
# branches:
# - master
pull_request:
paths-ignore:
- '**/docs/**'
- 'docs/**'
- '**/**.md'
- '**.md'
- '**/layer_tests_summary/**'
- '**/conformance/**'
push:
paths-ignore:
- '**/docs/**'
- 'docs/**'
- '**/**.md'
- '**.md'
- '**/layer_tests_summary/**'
- '**/conformance/**'
branches:
- master
concurrency:
group: ${{ github.head_ref || github.run_id }}-windows
# github.ref is not unique in post-commit
group: ${{ github.event_name == 'push' && github.run_id || github.ref }}-windows
cancel-in-progress: true
env:
@ -37,7 +38,7 @@ env:
LAYER_TESTS_INSTALL_DIR: "${{ github.workspace }}\\install\\tests\\layer_tests"
BUILD_DIR: "${{ github.workspace }}\\build"
OV_TEMP: "${{ github.workspace }}\\openvino_temp"
PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin"
PYTHON_STATIC_ARGS: -m "not dynamic_library"
VCVARSPATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
jobs:
@ -124,9 +125,10 @@ jobs:
# Should save cache only if run in the master branch of the base repo
# github.ref_name is 'ref/PR_#' in case of the PR, and 'branch_name' when executed on push
save: ${{ github.ref_name == 'master' && 'true' || 'false' }}
key: ${{ github.job }}-windows
append-timestamp: true
key: ${{ github.job }}-${{ runner.os }}-common
restore-keys: |
${{ github.job }}-windows
${{ github.job }}-${{ runner.os }}-common
- name: CMake configure
run: |
@ -222,7 +224,6 @@ jobs:
call "${{ env.INSTALL_DIR }}\\setupvars.bat" && ${{ env.INSTALL_TEST_DIR }}/ov_onnx_frontend_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-ONNXFrontend.xml
- name: List installed files
if: ${{ always() }}
run: |
Get-ChildItem -Recurse -Directory ${{ env.INSTALL_DIR }}
@ -316,6 +317,8 @@ jobs:
# For running Paddle frontend unit tests
python3 -m pip install -r ${{ env.OPENVINO_REPO }}/src/frontends/paddle/tests/requirements.txt
python3 -m pip install -r ${{ env.LAYER_TESTS_INSTALL_DIR }}/requirements.txt
- name: Install MO dependencies
run: |
python3 -m pip install -r ${{ env.OPENVINO_REPO }}/tools/mo/requirements_mxnet.txt `
@ -377,7 +380,6 @@ jobs:
# TEST_DEVICE: CPU
- name: TensorFlow 1 Layer Tests - TF FE
if: ${{ always() }}
shell: cmd
run: |
python3 -m pip install -r ${{ env.LAYER_TESTS_INSTALL_DIR }}/requirements.txt
@ -389,7 +391,6 @@ jobs:
TEST_DEVICE: CPU
- name: TensorFlow 2 Layer Tests - TF FE
if: ${{ always() }}
shell: cmd
run: |
python3 -m pip install -r ${{ env.LAYER_TESTS_INSTALL_DIR }}/requirements.txt
@ -401,7 +402,6 @@ jobs:
TEST_DEVICE: CPU
- name: TensorFlow 1 Layer Tests - Legacy FE
if: ${{ always() }}
shell: cmd
run: |
python3 -m pip install -r ${{ env.LAYER_TESTS_INSTALL_DIR }}/requirements.txt
@ -411,7 +411,6 @@ jobs:
call "${{ env.INSTALL_DIR }}\\setupvars.bat" && python3 -m pytest ${{ env.LAYER_TESTS_INSTALL_DIR }}/tensorflow_tests/test_tf_Roll.py --ir_version=10 --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-tf_Roll.xml
- name: TensorFlow 2 Layer Tests - Legacy FE
if: ${{ always() }}
shell: cmd
run: |
python3 -m pip install -r ${{ env.LAYER_TESTS_INSTALL_DIR }}/requirements.txt
@ -423,7 +422,6 @@ jobs:
TEST_DEVICE: CPU
- name: TensorFlow Lite Layer Tests - TFL FE
if: ${{ always() }}
shell: cmd
run: |
python3 -m pip install -r ${{ env.LAYER_TESTS_INSTALL_DIR }}/requirements.txt
@ -442,7 +440,6 @@ jobs:
TEST_DEVICE: CPU
- name: MO Python API Tests
if: ${{ always() }}
shell: cmd
run: |
python3 -m pip install -r ${{ env.LAYER_TESTS_INSTALL_DIR }}/requirements.txt
@ -454,7 +451,6 @@ jobs:
TEST_DEVICE: CPU
- name: Python Frontend tests
if: ${{ always() }}
shell: cmd
run: |
python3 -m pip install -r ${{ env.LAYER_TESTS_INSTALL_DIR }}/requirements.txt
@ -465,7 +461,7 @@ jobs:
- name: Upload Test Results
uses: actions/upload-artifact@v3
if: ${{ always() }}
if: ${{ !cancelled() }}
with:
name: test-results-python
path: ${{ env.INSTALL_TEST_DIR }}/TEST*.xml
@ -636,7 +632,7 @@ jobs:
- name: Upload Test Results
uses: actions/upload-artifact@v3
if: ${{ always() }}
if: ${{ !cancelled() }}
with:
name: test-results-cpp
path: ${{ env.INSTALL_TEST_DIR }}/TEST*.xml
@ -647,10 +643,12 @@ jobs:
defaults:
run:
shell: pwsh
runs-on: windows-latest
runs-on: windows-latest-8-cores
env:
INSTALL_DIR: "${{ github.workspace }}\\install"
INSTALL_TEST_DIR: "${{ github.workspace }}\\install\\tests"
PARALLEL_TEST_SCRIPT: "${{ github.workspace }}\\install\\tests\\functional_test_utils\\run_parallel.py"
PARALLEL_TEST_CACHE: "${{ github.workspace }}\\install\\tests\\test_cache.lst"
steps:
- name: Create Directories
@ -685,15 +683,43 @@ jobs:
ls "${{ env.INSTALL_DIR }}"
ls "${{ env.INSTALL_TEST_DIR }}"
- name: Intel CPU plugin func tests
- name: Install python dependencies
shell: cmd
run: |
call "${{ env.INSTALL_DIR }}\\setupvars.bat" && ${{ env.INSTALL_TEST_DIR }}/ov_cpu_func_tests --gtest_print_time=1 --gtest_filter=*smoke* --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-CPUFuncTests.xml
python3 -m pip install --upgrade pip
python3 -m pip install -r ${{ github.workspace }}\install\tests\functional_test_utils\requirements.txt
- name: Restore tests execution time
uses: actions/cache/restore@v3
with:
path: ${{ env.PARALLEL_TEST_CACHE }}
key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}
restore-keys: |
${{ runner.os }}-tests-functional-cpu-stamp
- name: Intel CPU plugin func tests (parallel)
shell: cmd
run: |
call "${{ env.INSTALL_DIR }}\\setupvars.bat" && python3 ${{ env.PARALLEL_TEST_SCRIPT }} -e ${{ env.INSTALL_TEST_DIR }}\ov_cpu_func_tests.exe -c ${{ env.PARALLEL_TEST_CACHE }} -w ${{ env.INSTALL_TEST_DIR }} -s suite -- --gtest_filter=*smoke*"
timeout-minutes: 45
- name: Save tests execution time
uses: actions/cache/save@v3
if: github.ref_name == 'master'
with:
path: ${{ env.PARALLEL_TEST_CACHE }}
key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}
- name: Upload Test Results
uses: actions/upload-artifact@v3
if: ${{ always() }}
if: ${{ !cancelled() }}
with:
name: test-results-functional-cpu
path: ${{ env.INSTALL_TEST_DIR }}/TEST*.xml
path: |
${{ env.INSTALL_TEST_DIR }}/temp/*.log
${{ env.INSTALL_TEST_DIR }}/logs/failed/*.log
${{ env.INSTALL_TEST_DIR }}/logs/crashed/*.log
${{ env.INSTALL_TEST_DIR }}/logs/hanged/*.log
${{ env.INSTALL_TEST_DIR }}/logs/interapted/*.log
${{ env.INSTALL_TEST_DIR }}/logs/*.log
if-no-files-found: 'error'

View File

@ -35,7 +35,6 @@ find_package(IEDevScripts REQUIRED
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
include(CTest)
include(cmake/features.cmake)
# These options are shared with 3rdparty plugins by means of developer package

View File

@ -118,7 +118,11 @@ if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
# https://cmake.org/cmake/help/latest/variable/CMAKE_DEFAULT_BUILD_TYPE.html
set(CMAKE_DEFAULT_BUILD_TYPE "Release" CACHE STRING "CMake default build type")
elseif(NOT OV_GENERATOR_MULTI_CONFIG)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "CMake build type")
if(NOT CMAKE_BUILD_TYPE)
# default value
set(CMAKE_BUILD_TYPE "Release")
endif()
set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "CMake build type")
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Release;Debug;RelWithDebInfo;MinSizeRel")
endif()

View File

@ -5,9 +5,10 @@
#[[
function to create CMake target and setup its options in a declarative style.
Example:
addIeTarget(
ov_add_target(
NAME core_lib
ADD_CPPLINT
ADD_CLANG_FORMAT
DEVELOPER_PACKAGE <component>
TYPE <SHARED / STATIC / EXECUTABLE>
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
@ -25,9 +26,15 @@ addIeTarget(
ie::important_plugin
OBJECT_FILES
object libraries
DEFINES
DEF1 DEF2
LINK_LIBRARIES_WHOLE_ARCHIVE
lib1 lib2
LINK_FLAGS
flag1 flag2
)
#]]
function(addIeTarget)
function(ov_add_target)
set(options
ADD_CPPLINT # Enables code style checks for the target
ADD_CLANG_FORMAT # Enables code style checks for the target
@ -54,7 +61,7 @@ function(addIeTarget)
cmake_parse_arguments(ARG "${options}" "${oneValueRequiredArgs};${oneValueOptionalArgs}" "${multiValueArgs}" ${ARGN} )
# sanity checks
foreach(argName ${oneValueRequiredArgs})
foreach(argName IN LISTS oneValueRequiredArgs)
if (NOT ARG_${argName})
message(SEND_ERROR "Argument '${argName}' is required.")
endif()
@ -133,18 +140,19 @@ function(addIeTarget)
endif()
endfunction()
function(ov_add_target)
addIeTarget(${ARGV})
function(addIeTarget)
message(WARNING "'addIeTarget' is deprecated, please, use 'ov_add_target' instead")
ov_add_target(${ARGV})
endfunction()
#[[
Wrapper function over addIeTarget, that also adds a test with the same name.
You could use
addIeTargetTest( ... LABELS labelOne labelTwo )
ov_add_test_target( ... LABELS labelOne labelTwo )
also to provide labels for that test.
Important: you MUST pass LABELS as last argument, otherwise it will consume any parameters that come after.
#]]
function(addIeTargetTest)
function(ov_add_test_target)
set(options
)
set(oneValueRequiredArgs
@ -161,7 +169,7 @@ function(addIeTargetTest)
set(ARG_COMPONENT tests)
endif()
addIeTarget(TYPE EXECUTABLE NAME ${ARG_NAME} ${ARG_UNPARSED_ARGUMENTS})
ov_add_target(TYPE EXECUTABLE NAME ${ARG_NAME} ${ARG_UNPARSED_ARGUMENTS})
if(EMSCRIPTEN)
set(JS_BIN_NAME "${ARG_NAME}.js")
@ -187,6 +195,7 @@ function(addIeTargetTest)
EXCLUDE_FROM_ALL)
endfunction()
function(ov_add_test_target)
addIeTargetTest(${ARGV})
function(addIeTargetTest)
message(WARNING "'addIeTargetTest' is deprecated, please, use 'ov_add_test_target' instead")
ov_add_test_target(${ARGV})
endfunction()

View File

@ -388,9 +388,12 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
ov_add_compiler_flags(/wd4275)
# Enable __FILE__ trim, use path with forward and backward slash as directory separator
add_compile_options(
"$<$<COMPILE_LANGUAGE:CXX>:/d1trimfile:${OV_NATIVE_PROJECT_ROOT_DIR}\\>"
"$<$<COMPILE_LANGUAGE:CXX>:/d1trimfile:${OpenVINO_SOURCE_DIR}/>")
# github actions use sccache which doesn't support /d1trimfile compile option
if(NOT DEFINED ENV{GITHUB_ACTIONS})
add_compile_options(
"$<$<COMPILE_LANGUAGE:CXX>:/d1trimfile:${OV_NATIVE_PROJECT_ROOT_DIR}\\>"
"$<$<COMPILE_LANGUAGE:CXX>:/d1trimfile:${OpenVINO_SOURCE_DIR}/>")
endif()
#
# Debug information flags, by default CMake adds /Zi option

View File

@ -21,6 +21,11 @@ ie_dependent_option (ENABLE_ARM_COMPUTE_CMAKE "Enable ARM Compute build via cmak
ie_option (ENABLE_TESTS "unit, behavior and functional tests" OFF)
if(ENABLE_TESTS)
include(CTest)
enable_testing()
endif()
if(X86_64)
set(ENABLE_INTEL_GPU_DEFAULT ON)
else()

View File

@ -32,11 +32,80 @@ Please file a github Issue on these with the label “pre-release” so we can g
.. dropdown:: OpenVINO Toolkit 2023.1.0.dev20230811
.. dropdown:: OpenVINO Toolkit 2023.2 Dev 22.09.2023
:animate: fade-in-slide-down
:color: primary
:open:
**What's Changed:**
* CPU runtime:
* Optimized Yolov8n and YoloV8s models on BF16/FP32.
* Optimized Falcon model on 4th Generation Intel® Xeon® Scalable Processors.
* GPU runtime:
* int8 weight compression further improves LLM performance. PR #19548
* Optimization for gemm & fc in iGPU. PR #19780
* TensorFlow FE:
* Added support for Selu operation. PR #19528
* Added support for XlaConvV2 operation. PR #19466
* Added support for TensorListLength and TensorListResize operations. PR #19390
* PyTorch FE:
* New operations supported
* aten::minimum aten::maximum. PR #19996
* aten::broadcast_tensors. PR #19994
* added support aten::logical_and, aten::logical_or, aten::logical_not, aten::logical_xor. PR #19981
* aten::scatter_reduce and extend aten::scatter. PR #19980
* prim::TupleIndex operation. PR #19978
* mixed precision in aten::min/max. PR #19936
* aten::tile op PR #19645
* aten::one_hot PR #19779
* PReLU. PR #19515
* aten::swapaxes. PR #19483
* non-boolean inputs for __or__ and __and__ operations. PR #19268
* Torchvision NMS can accept negative scores. PR #19826
* New openvino_notebooks:
* Visual Question Answering and Image Captioning using BLIP
**Fixed GitHub issues**
* Fixed #19784 “[Bug]: Cannot install libprotobuf-dev along with libopenvino-2023.0.2 on Ubuntu 22.04” with PR #19788
* Fixed #19617 “Add a clear error message when creating an empty Constant” with PR #19674
* Fixed #19616 “Align openvino.compile_model and openvino.Core.compile_model functions” with PR #19778
* Fixed #19469 “[Feature Request]: Add SeLu activation in the OpenVino IR (TensorFlow Conversion)” with PR #19528
* Fixed #19019 “[Bug]: Low performance of the TF quantized model.” With PR #19735
* Fixed #19018 “[Feature Request]: Support aarch64 python wheel for Linux” with PR #19594
* Fixed #18831 “Question: openvino support for Nvidia Jetson Xavier ?” with PR #19594
* Fixed #18786 “OpenVINO Wheel does not install Debug libraries when CMAKE_BUILD_TYPE is Debug #18786” with PR #19197
* Fixed #18731 “[Bug] Wrong output shapes of MaxPool” with PR #18965
* Fixed #18091 “[Bug] 2023.0 Version crashes on Jetson Nano - L4T - Ubuntu 18.04” with PR #19717
* Fixed #7194 “Conan for simplifying dependency management” with PR #17580
**Acknowledgements:**
Thanks for contributions from the OpenVINO developer community:
* @siddhant-0707,
* @PRATHAM-SPS,
* @okhovan
.. dropdown:: OpenVINO Toolkit 2023.1.0.dev20230728
:animate: fade-in-slide-down
:color: secondary
`Check on GitHub <https://github.com/openvinotoolkit/openvino/releases/tag/2023.1.0.dev20230811>`__
**New features:**

View File

@ -6,6 +6,8 @@ repo_owner = "openvinotoolkit"
repo_name = "openvino_notebooks"
repo_branch = "tree/main"
artifacts_link = "http://repository.toolbox.iotg.sclab.intel.com/projects/ov-notebook/0.1.0-latest/20230815220807/dist/rst_files/"
blacklisted_extensions = ['.xml', '.bin']
@ -29,7 +31,7 @@ To run without installing anything, click the "launch binder" button.
.. |github_link| raw:: html
<a href="https://github.com/{{ owner }}/{{ repo }}" target="_blank"><img src="https://badgen.net/badge/icon/github?icon=github&label" alt="Github"></a>
<a href="https://github.com/{{ owner }}/{{ repo }}/{{ branch }}/{{ folder }}/{{ notebook }}" target="_blank"><img src="https://badgen.net/badge/icon/github?icon=github&label" alt="Github"></a>
\n
"""
@ -50,7 +52,7 @@ To run without installing anything, click the "Open in Colab" button.
.. |github_link| raw:: html
<a href="https://github.com/{{ owner }}/{{ repo }}" target="_blank"><img src="https://badgen.net/badge/icon/github?icon=github&label" alt="Github"></a>
<a href="https://github.com/{{ owner }}/{{ repo }}/{{ branch }}/{{ folder }}/{{ notebook }}" target="_blank"><img src="https://badgen.net/badge/icon/github?icon=github&label" alt="Github"></a>
\n
"""
@ -75,7 +77,7 @@ To run without installing anything, click the "launch binder" or "Open in Colab"
.. |github_link| raw:: html
<a href="https://github.com/{{ owner }}/{{ repo }}" target="_blank"><img src="https://badgen.net/badge/icon/github?icon=github&label" alt="Github"></a>
<a href="https://github.com/{{ owner }}/{{ repo }}/{{ branch }}/{{ folder }}/{{ notebook }}" target="_blank"><img src="https://badgen.net/badge/icon/github?icon=github&label" alt="Github"></a>
\n
"""
@ -91,7 +93,7 @@ See the |installation_link| for instructions to run this tutorial locally on Win
.. |github_link| raw:: html
<a href="https://github.com/{{ owner }}/{{ repo }}" target="_blank"><img src="https://badgen.net/badge/icon/github?icon=github&label" alt="Github"></a>
<a href="https://github.com/{{ owner }}/{{ repo }}/{{ branch }}/{{ folder }}/{{ notebook }}" target="_blank"><img src="https://badgen.net/badge/icon/github?icon=github&label" alt="Github"></a>
\n
"""

View File

@ -16,6 +16,7 @@ from consts import (
no_binder_template,
repo_directory,
repo_name,
repo_branch,
repo_owner,
)
from notebook import Notebook
@ -79,6 +80,7 @@ class NbProcessor:
"owner": repo_owner,
"repo": repo_name,
"folder": repo_directory,
"branch": repo_branch,
}
self.colab_data = {
"owner": repo_owner,

View File

@ -44,6 +44,6 @@ sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
toml==0.10.2
urllib3==1.26.5
urllib3==1.26.17
zipp==3.4.1
docs/openvino_custom_sphinx_sitemap

View File

@ -98,6 +98,7 @@ def test_node_factory_validate_missing_arguments():
@pytest.mark.template_extension()
@pytest.mark.dynamic_library()
def test_extension_added_from_library():
if platform == "win32":
library_path = "openvino_template_extension.dll"

View File

@ -344,6 +344,7 @@ def test_unload_plugin(device):
@pytest.mark.template_extension()
@pytest.mark.dynamic_library()
def test_add_extension_template_extension(device):
core, model = get_model_with_template_extension()
assert isinstance(model, Model)

View File

@ -17,5 +17,5 @@ ov_add_test_target(
"${CMAKE_CURRENT_SOURCE_DIR}/../include"
ADD_CLANG_FORMAT
LABELS
OV
OV UNIT
)

View File

@ -17,5 +17,5 @@ ov_add_test_target(
gmock
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
LABELS
LP_TRANSFORMATIONS
OV UNIT LP_TRANSFORMATIONS
)

View File

@ -4,7 +4,7 @@
set(TARGET_NAME ov_snippets_func_tests)
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES
@ -16,7 +16,7 @@ addIeTargetTest(
ov_snippets_models
ADD_CPPLINT
LABELS
IE OV SNIPPETS
OV UNIT SNIPPETS
)
# LTO

View File

@ -22,7 +22,7 @@ ov_add_test_target(
INCLUDES
$<TARGET_PROPERTY:inference_engine_obj,SOURCE_DIR>/src
LABELS
TRANSFORMATIONS
OV UNIT TRANSFORMATIONS
)
if(WIN32)

View File

@ -47,9 +47,7 @@ ov_add_test_target(
openvino::runtime::dev
ADD_CLANG_FORMAT
LABELS
OV
IE
CORE
OV UNIT CORE
)
get_target_property(OV_CORE_SRC_DIR ngraph_obj SOURCE_DIR)

View File

@ -49,6 +49,10 @@ TEST(check, check_with_explanation) {
}
TEST(check, ov_throw_exception_check_relative_path_to_source) {
// github actions use sccache which doesn't support /d1trimfile compile option
if (std::getenv("GITHUB_ACTIONS")) {
GTEST_SKIP();
}
using namespace testing;
const auto path = ov::util::path_join({"src", "core", "tests", "check.cpp"});
const auto exp_native_slash = "Exception from " + path + ":";

View File

@ -18,6 +18,5 @@ ov_add_test_target(
"${CMAKE_CURRENT_SOURCE_DIR}/../include"
ADD_CLANG_FORMAT
LABELS
OV
IR_FE
OV UNIT IR_FE
)

View File

@ -123,8 +123,8 @@ foreach(BACKEND_NAME IN LISTS ACTIVE_BACKEND_LIST)
endforeach()
add_executable(ov_onnx_frontend_tests ${SRC})
add_test(NAME ov_onnx_frontend_tests COMMAND ov_onnx_frontend_tests)
set_property(TEST ov_onnx_frontend_tests PROPERTY LABELS OV ONNX_FE)
add_test(NAME ov_onnx_frontend_tests COMMAND ov_onnx_frontend_tests --gtest_filter=-*IE_GPU*)
set_property(TEST ov_onnx_frontend_tests PROPERTY LABELS OV UNIT ONNX_FE)
add_dependencies(ov_onnx_frontend_tests template_extension)

View File

@ -19,9 +19,8 @@ ov_add_test_target(
gtest_main_manifest
func_test_utils
ADD_CLANG_FORMAT
LABELS
OV
PADDLE_FE
# LABELS
# OV UNIT PADDLE_FE
)
# Test model generating

View File

@ -22,8 +22,7 @@ ov_add_test_target(
openvino_tensorflow_common
ADD_CLANG_FORMAT
LABELS
OV
TF_FE
OV UNIT TF_FE
)
# Test model generating

View File

@ -13,6 +13,5 @@ ov_add_test_target(
openvino_tensorflow_common
ADD_CLANG_FORMAT
LABELS
OV
TF_COMMON
OV UNIT TF_COMMON
)

View File

@ -16,8 +16,7 @@ ov_add_test_target(
openvino_tensorflow_lite_frontend
ADD_CLANG_FORMAT
LABELS
OV
TFL_FE
OV UNIT TFL_FE
)
# Test model generating

View File

@ -49,7 +49,7 @@ ov_add_test_target(
${CMAKE_CURRENT_SOURCE_DIR}
ADD_CLANG_FORMAT
LABELS
OV
OV UNIT RUNTIME
)
add_compile_definitions(${TARGET_NAME} ${COMPILE_DEFINITIONS})

View File

@ -17,5 +17,5 @@ ov_add_test_target(
unit_test_utils
ADD_CLANG_FORMAT
LABELS
OV
OV UNIT RUNTIME
)

View File

@ -26,9 +26,9 @@ ov_add_test_target(
mock_engine
ov_models
LABELS
Multi
Auto
OV UNIT MULTI AUTO
)
ov_add_version_defines(${OpenVINO_SOURCE_DIR}/src/plugins/auto/src/plugin.cpp ${TARGET_NAME})
ov_set_threading_interface_for(${TARGET_NAME})

View File

@ -5,7 +5,7 @@
set(TARGET_NAME ov_auto_batch_func_tests)
set(SHARED_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/tests/functional/plugin/shared/include")
addIeTargetTest(
ov_add_test_target(
NAME
${TARGET_NAME}
ROOT
@ -19,7 +19,7 @@ addIeTargetTest(
openvino_auto_batch_plugin
ADD_CPPLINT
LABELS
Auto_Batch
OV UNIT AUTO_BATCH
)
ov_set_threading_interface_for(${TARGET_NAME})

View File

@ -8,7 +8,8 @@ set(CI_BUILD_NUMBER "unittest")
add_definitions(-DAUTOBATCH_UNITTEST)
set(SHARED_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/tests/ie_test_util")
addIeTargetTest(
ov_add_test_target(
NAME
${TARGET_NAME}
ROOT
@ -27,8 +28,9 @@ addIeTargetTest(
ov_models
ADD_CPPLINT
LABELS
Auto_Batch
OV UNIT AUTO_BATCH
)
ov_add_version_defines(${OpenVINO_SOURCE_DIR}/src/plugins/auto_batch/src/plugin.cpp ${TARGET_NAME})
ov_set_threading_interface_for(${TARGET_NAME})

View File

@ -18,7 +18,7 @@ ov_add_test_target(
common_test_utils
ADD_CLANG_FORMAT
LABELS
HETERO
OV UNIT HETERO
)
target_compile_definitions(${TARGET_NAME} PRIVATE CI_BUILD_NUMBER=\"mock_version\")

View File

@ -27,5 +27,5 @@ ov_add_test_target(
ov_models
ADD_CLANG_FORMAT
LABELS
HETERO
OV UNIT HETERO
)

View File

@ -44,7 +44,7 @@ if(NOT X86_64)
${CMAKE_CURRENT_SOURCE_DIR}/subgraph_tests/src/x64)
endif()
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES ${INCLUDES}
@ -54,7 +54,7 @@ addIeTargetTest(
DEPENDENCIES ${DEPENDENCIES}
LINK_LIBRARIES ${LINK_LIBRARIES}
ADD_CPPLINT
LABELS CPU
LABELS OV CPU
)
ov_set_threading_interface_for(${TARGET_NAME})

View File

@ -181,6 +181,8 @@ std::vector<std::string> disabledTestPatterns() {
R"(.*smoke_Proposal_(Static|Dynamic)_Test_Case1/ProposalLayerCPUTest.*)",
// Issue: 111418
R"(.*smoke_Snippets_ConvertStub/ConvertStub\.CompareWithRefImpl/IS.*_OT=\(bf16\)_#N=2_#S=2_targetDevice=CPU.*)",
R"(.*smoke_Snippets_Convert/Convert\.CompareWithRefImpl/IS.*_IT=\(f32\)_OT=\(u8\)_#N=1_#S=1_targetDevice=CPU.*)",
R"(.*smoke_Snippets_ConvertManyOnInputs/ConvertManyOnInputs\.CompareWithRefImpl/IS.*_IT=\(f32\.u8\)_OT=\(\)_#N=1_#S=1_targetDevice=CPU.*)",
// Issue: 106939
R"(.*ScatterNDUpdateLayerCPUTest.*-1.-1.-1.-2.-2.-2.*)",
// New plugin API doesn't support changes of pre-processing

View File

@ -40,7 +40,7 @@ if(DEFINED ENABLE_CPU_SUBSET_TESTS_PATH)
${CMAKE_CURRENT_SOURCE_DIR}/test_utils/fusing_test_utils.cpp
${CPU_SUBSET_TEST_ABS_PATH})
addIeTargetTest(
ov_add_test_target(
NAME ${SUBSET_TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES ${INCLUDES}
@ -49,8 +49,7 @@ if(DEFINED ENABLE_CPU_SUBSET_TESTS_PATH)
DEFINES ${DEFINES}
DEPENDENCIES ${DEPENDENCIES}
LINK_LIBRARIES ${LINK_LIBRARIES}
LABELS
CPU
LABELS OV CPU
)
ov_set_threading_interface_for(${SUBSET_TARGET_NAME})

View File

@ -25,7 +25,7 @@ function(create_target_per_test_for_directory TEST_DIR TARGET_PREFIX)
set(TEST_TARGET_NAME ${TARGET_PREFIX}_${TEST_FILE_WE})
# create target
addIeTargetTest(
ov_add_test_target(
NAME ${TEST_TARGET_NAME}
ROOT ${TEST_DIR}
INCLUDES ${INCLUDES}
@ -35,8 +35,7 @@ function(create_target_per_test_for_directory TEST_DIR TARGET_PREFIX)
DEPENDENCIES ${DEPENDENCIES}
LINK_LIBRARIES ${LINK_LIBRARIES}
ADD_CPPLINT
LABELS
CPU
LABELS OV CPU
)
ov_set_threading_interface_for(${TEST_TARGET_NAME})
@ -65,7 +64,7 @@ function(create_target_per_test_for_directory TEST_DIR TARGET_PREFIX)
set(TEST_TARGET_NAME ${TARGET_PREFIX}_${TEST_CLASS})
# create target
addIeTargetTest(
ov_add_test_target(
NAME ${TEST_TARGET_NAME}
ROOT ${TEST_DIR}
INCLUDES ${INCLUDES}
@ -74,8 +73,7 @@ function(create_target_per_test_for_directory TEST_DIR TARGET_PREFIX)
DEFINES ${DEFINES}
DEPENDENCIES ${DEPENDENCIES}
LINK_LIBRARIES ${LINK_LIBRARIES}
LABELS
CPU
LABELS OV CPU
)
ov_set_threading_interface_for(${TEST_TARGET_NAME})

View File

@ -32,7 +32,7 @@ else()
set(MLAS_LIBRARY "mlas")
endif()
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES
@ -64,7 +64,7 @@ addIeTargetTest(
${MLAS_LIBRARY}
ADD_CPPLINT
LABELS
CPU
OV UNIT CPU
)
# LTO

View File

@ -23,7 +23,7 @@ ov_add_test_target(
INCLUDES
$<TARGET_PROPERTY:inference_engine_obj,SOURCE_DIR>/src
LABELS
TRANSFORMATIONS
OV UNIT TRANSFORMATIONS
)
if(WIN32)

View File

@ -91,7 +91,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE
ov_try_use_gold_linker()
add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
set_property(TEST ${TARGET_NAME} PROPERTY LABELS IE)
set_property(TEST ${TARGET_NAME} PROPERTY LABELS OV UNIT)
install(TARGETS ${TARGET_NAME}
RUNTIME DESTINATION tests

View File

@ -8,7 +8,7 @@ endif()
set(TARGET_NAME ov_gna_func_tests)
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES
@ -19,7 +19,7 @@ addIeTargetTest(
funcSharedTests
ADD_CLANG_FORMAT
LABELS
GNA
OV GNA
)
target_compile_definitions(${TARGET_NAME}

View File

@ -17,7 +17,7 @@ if(NOT BUILD_SHARED_LIBS)
set(exclude_path EXCLUDED_SOURCE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/(gna_api_stub|gna_wait_test|gna_export_import_test|gna_infer_request_test|gna_plugin_load_network_test|gna_mock_api_initializer|gna_extra_pwl_segments_tests).cpp")
endif()
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
${exclude_path}
@ -30,7 +30,7 @@ addIeTargetTest(
inference_engine_legacy_s
ADD_CLANG_FORMAT
LABELS
GNA
OV GNA
)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")

View File

@ -14,7 +14,7 @@ endif()
list(APPEND DEFINES TEST_CUSTOM_OP_CONFIG_PATH="${CMAKE_CURRENT_SOURCE_DIR}/custom_op/custom_op.xml")
addIeTargetTest(
ov_add_test_target(
NAME
${TARGET_NAME}
ROOT
@ -35,7 +35,7 @@ addIeTargetTest(
OpenCL::OpenCL
ADD_CPPLINT
LABELS
GPU
OV GPU
)
if(ENABLE_PROXY)

View File

@ -39,7 +39,7 @@ ov_add_test_target(
func_test_utils
ADD_CLANG_FORMAT
LABELS
PROXY_PLUGIN
OV UNIT PROXY
)
target_compile_definitions(${TARGET_NAME} PRIVATE ${COMPILE_DEFINITIONS})

View File

@ -22,7 +22,7 @@ ov_add_test_target(
"${CMAKE_CURRENT_SOURCE_DIR}/op_reference"
ADD_CLANG_FORMAT
LABELS
TEMPLATE
OV UNIT TEMPLATE
)
find_package(OpenCV QUIET COMPONENTS core imgproc)

View File

@ -12,8 +12,9 @@ list(APPEND LIBRARIES
)
# add subgraphs_dumpers tool
addIeTargetTest(
ov_add_target(
NAME ${TARGET_NAME}
TYPE EXECUTABLE
ROOT ${CMAKE_CURRENT_SOURCE_DIR}/src
INCLUDES
PRIVATE
@ -27,7 +28,7 @@ addIeTargetTest(
)
# add subgraphs_dumpers lib to get API
addIeTarget(
ov_add_target(
NAME "${TARGET_NAME}Util"
TYPE STATIC
ROOT "${CMAKE_CURRENT_SOURCE_DIR}/src"

View File

@ -11,11 +11,12 @@ using namespace ov::tools::subgraph_dumper;
bool ExtractorsManager::match(const std::shared_ptr<ov::Model> &model,
const std::shared_ptr<ov::Model> &ref) {
for (const auto &it : m_extractors) {
if (it.second->match(model, ref)) {
// `match` is not virtual method in base `SubgraphExtractor` class
// we can use function from any `extractor` to avoid of cycle
if (!m_extractors.empty()) {
if (m_extractors.begin()->second->match(model, ref)) {
return true;
}
return false;
}
return false;
}
@ -25,8 +26,10 @@ ExtractorsManager::is_subgraph(const std::shared_ptr<ov::Model> &model,
const std::shared_ptr<ov::Model> &ref_model,
const std::map<std::string, InputInfo> &in_info,
const std::map<std::string, InputInfo> &in_info_ref) {
for (const auto &it : m_extractors) {
auto extractor_res = it.second->is_subgraph(model, ref_model);
if (!m_extractors.empty()) {
// `is_subgraph` is not virtual method in base `SubgraphExtractor` class
// we can use function from any `extractor` to avoid of cycle
auto extractor_res = m_extractors.begin()->second->is_subgraph(model, ref_model);
if (std::get<0>(extractor_res)) {
std::map<std::string, InputInfo> graph_in_info, subgraph_in_info;
if (std::get<1>(extractor_res) == model && std::get<2>(extractor_res) == ref_model) {
@ -40,13 +43,13 @@ ExtractorsManager::is_subgraph(const std::shared_ptr<ov::Model> &model,
}
try {
subgraph_in_info = align_input_info(std::get<2>(extractor_res), std::get<1>(extractor_res), subgraph_in_info, graph_in_info);
} catch(...) {
} catch(std::exception) {
return { false, nullptr, nullptr, {}, {} };
}
return { true, std::get<1>(extractor_res), std::get<2>(extractor_res), graph_in_info, subgraph_in_info };
}
return { false, nullptr, nullptr, {}, {} };
}
return { false, nullptr, nullptr, {}, {} };
}
bool ExtractorsManager::match(const std::shared_ptr<ov::Model> &model,
@ -57,7 +60,7 @@ bool ExtractorsManager::match(const std::shared_ptr<ov::Model> &model,
try {
in_info = align_input_info(model, ref, in_info, in_info_ref);
return true;
} catch (...) {
} catch (std::exception) {
return false;
}
}

View File

@ -52,8 +52,7 @@ find_models(const std::vector<std::string> &dirs, const std::string& regexp) {
} else {
continue;
}
} catch (...) {
// } catch (std::exception& e) {
} catch (std::exception) {
not_read_model.emplace_back(model_file);
// std::cout << "[ ERROR ] Impossible to read model: " << model_file << std::endl << "Exception: " << e.what();
}
@ -101,13 +100,11 @@ std::map<ModelCacheStatus, std::vector<std::string>> cache_models(
cache_status[ModelCacheStatus::LARGE_MODELS_INCLUDED].push_back(model);
}
cache->update_cache(function, model, extract_body, from_cache);
} catch (...) {
// } catch (std::exception &e) {
} catch (std::exception) {
// std::cout << "[ ERROR ] Model processing failed with exception:" << std::endl << e.what() << std::endl;
model_status = ModelCacheStatus::NOT_FULLY_CACHED;
}
} catch (...) {
// } catch (std::exception &e) {
} catch (std::exception) {
model_status = ModelCacheStatus::NOT_READ;
// std::cout << "[ ERROR ] Model reading failed with exception:" << std::endl << e.what() << std::endl;
}

View File

@ -4,19 +4,17 @@
set(TARGET_NAME subgraphsDumperTests)
list(APPEND DEPENDENCIES subgraphsDumperUtil)
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}/
LINK_LIBRARIES
PRIVATE
${DEPENDENCIES}
DEPENDENCIES
${DEPENDENCIES}
subgraphsDumperUtil
ADD_CPPLINT
LABELS
OV UNIT
)
ov_build_target_faster(${TARGET_NAME} UNITY)

View File

@ -4,7 +4,7 @@
set(TARGET_NAME apiConformanceTests)
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include"
ADDITIONAL_SOURCE_DIRS
@ -17,7 +17,7 @@ addIeTargetTest(
PUBLIC
conformanceShared
LABELS
API_CONFORMANCE
OV API_CONFORMANCE
)
ov_build_target_faster(${TARGET_NAME} UNITY)

View File

@ -4,7 +4,7 @@
set(TARGET_NAME conformanceShared)
addIeTarget(
ov_add_target(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include"

View File

@ -4,7 +4,7 @@
set(TARGET_NAME conformanceTests)
addIeTargetTest(
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include"
ADDITIONAL_SOURCE_DIRS
@ -18,7 +18,7 @@ addIeTargetTest(
PUBLIC
conformanceShared
LABELS
OP_CONFORMANCE
OV OP_CONFORMANCE
)
ov_build_target_faster(${TARGET_NAME} UNITY)

View File

@ -45,7 +45,7 @@ else()
list(APPEND EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src/snippets)
endif()
addIeTarget(
ov_add_target(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT ${PUBLIC_HEADERS_DIR}

View File

@ -4,7 +4,7 @@
set(TARGET_NAME sharedTestClasses)
addIeTarget(
ov_add_target(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include"

View File

@ -6,7 +6,7 @@ set(TARGET_NAME ov_lpt_models)
set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
addIeTarget(
ov_add_target(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT ${PUBLIC_HEADERS_DIR}

View File

@ -6,7 +6,7 @@ set(TARGET_NAME ov_models)
set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
addIeTarget(
ov_add_target(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT ${PUBLIC_HEADERS_DIR}

View File

@ -7,7 +7,8 @@ set(TARGET_NAME ov_snippets_models)
set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
set(SNIPPETS_INCLUDES "$<TARGET_PROPERTY:openvino::snippets,SOURCE_DIR>/include")
set(COMMON_TEST_UTILS_INCLUDES "$<TARGET_PROPERTY:common_test_utils,INTERFACE_INCLUDE_DIRECTORIES>")
addIeTarget(
ov_add_target(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT ${PUBLIC_HEADERS_DIR}

View File

@ -16,7 +16,7 @@ function(add_common_utils ADD_TARGET_NAME)
endif()
# create target
addIeTarget(
ov_add_target(
NAME ${ADD_TARGET_NAME}
TYPE STATIC
ROOT ${CMAKE_CURRENT_SOURCE_DIR}

View File

@ -4,11 +4,13 @@
set(TARGET_NAME ov_util_tests)
addIeTargetTest(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDENCIES
LINK_LIBRARIES
common_test_utils
ADD_CPPLINT
ov_add_test_target(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDENCIES
LINK_LIBRARIES
common_test_utils
ADD_CPPLINT
LABELS
OV UNIT
)

View File

@ -4,7 +4,7 @@
set(TARGET_NAME func_test_utils)
addIeTarget(
ov_add_target(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT ${CMAKE_CURRENT_SOURCE_DIR}

View File

@ -305,7 +305,7 @@ class TestParallelRunner:
os.remove(test_list_file_name)
except Exception as err:
logger.warning(f"Imposible to remove {test_list_file_name}. Error: {err}")
command_to_get_test_list = self._command + f' --gtest_list_tests >> {test_list_file_name}'
command_to_get_test_list = self._command + f' --gtest_list_tests > {test_list_file_name}'
logger.info(f"Get test list using command: {command_to_get_test_list}")
run_res = run(command_to_get_test_list, check=True, shell=True)
if run_res.stderr != "" and run_res.stderr != None:

View File

@ -10,7 +10,7 @@ set(TARGET_NAME unit_test_utils)
add_subdirectory(mocks/mock_engine)
addIeTarget(
ov_add_target(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT ${CMAKE_CURRENT_SOURCE_DIR}

View File

@ -61,7 +61,7 @@ class TestConvertModel:
def compare_results(self, fw_outputs, ov_outputs):
assert len(fw_outputs) == len(ov_outputs), \
"Different number of outputs between TensorFlow and OpenVINO:" \
"Different number of outputs between framework and OpenVINO:" \
" {} vs. {}".format(len(fw_outputs), len(ov_outputs))
fw_eps = 5e-2
@ -73,13 +73,13 @@ class TestConvertModel:
"OpenVINO outputs does not contain tensor with name {}".format(out_name)
cur_ov_res = ov_outputs[out_name]
print(f"fw_re: {cur_fw_res};\n ov_res: {cur_ov_res}")
is_ok = compare_two_tensors(cur_ov_res, cur_fw_res, fw_eps)
is_ok = is_ok and compare_two_tensors(cur_ov_res, cur_fw_res, fw_eps)
else:
for i in range(len(ov_outputs)):
cur_fw_res = fw_outputs[i]
cur_ov_res = ov_outputs[i]
print(f"fw_res: {cur_fw_res};\n ov_res: {cur_ov_res}")
is_ok = compare_two_tensors(cur_ov_res, cur_fw_res, fw_eps)
is_ok = is_ok and compare_two_tensors(cur_ov_res, cur_fw_res, fw_eps)
assert is_ok, "Accuracy validation failed"
def teardown_method(self):

View File

@ -11,7 +11,6 @@ sacremoses
sentencepiece
datasets
pyctcdecode
pytorch-quantization<=2.1.3 --extra-index-url https://pypi.ngc.nvidia.com
protobuf
soundfile
pandas

View File

@ -1224,13 +1224,13 @@ class PathCheckerFunctions(unittest.TestCase):
self.assertEqual(__class__.WRITABLE_DIR, writable_dir(__class__.WRITABLE_DIR))
@unittest.skipIf(sys.platform.startswith("win"), "chmod() on Windows do nor support not writable dir")
@unittest.skipIf(os.geteuid() == 0, "root user does not support not writable dir")
@unittest.skipIf(sys.platform.startswith("lin") and os.geteuid() == 0, "root user does not support not writable dir")
def test_single_non_writable_dir(self):
with self.assertRaises(Error) as cm:
writable_dir(__class__.NOT_WRITABLE_DIR)
@unittest.skipIf(sys.platform.startswith("win"), "chmod() on Windows do nor support not writable dir")
@unittest.skipIf(os.geteuid() == 0, "root user does not support not writable dir")
@unittest.skipIf(sys.platform.startswith("lin") and os.geteuid() == 0, "root user does not support not writable dir")
def test_single_non_writable_sub_dir(self):
with self.assertRaises(Error) as cm:
writable_dir(__class__.NOT_WRITABLE_SUB_DIR)