IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Linux CC + static build + clang compiler (#20243)

Browse Source 
* Merge Linux CC + static build + clang compiler

* Improvements

* Fixes
This commit is contained in:
Ilya Lavrenov 2023-10-06 00:30:11 +04:00 committed by GitHub
parent 471295420f
commit d6c2a10b38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 362 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/fedora.yml vendored
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:

33
.github/workflows/linux.yml vendored
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:

269
.github/workflows/linux_conditional_compilation.yml vendored
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'

2
.github/workflows/linux_cuda.yml vendored
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 \

1
CMakeLists.txt
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

6
cmake/developer_package/IEDevScriptsConfig.cmake
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()

29
cmake/developer_package/add_ie_target.cmake
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()

5
cmake/features.cmake
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()

2
docs/requirements.txt
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

2
src/common/conditional_compilation/tests/CMakeLists.txt
View File

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

2
src/common/low_precision_transformations/tests/CMakeLists.txt
View File

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

4
src/common/snippets/tests/CMakeLists.txt
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

2
src/common/transformations/tests/CMakeLists.txt
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)

4
src/core/tests/CMakeLists.txt
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)

3
src/frontends/ir/tests/CMakeLists.txt
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
)

4
src/frontends/onnx/tests/CMakeLists.txt
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)

5
src/frontends/paddle/tests/CMakeLists.txt
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

3
src/frontends/tensorflow/tests/CMakeLists.txt
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

3
src/frontends/tensorflow_common/tests/CMakeLists.txt
View File

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

3
src/frontends/tensorflow_lite/tests/CMakeLists.txt
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

2
src/inference/tests/functional/CMakeLists.txt
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})

2
src/inference/tests/unit/CMakeLists.txt
View File

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

4
src/plugins/auto/tests/unit/CMakeLists.txt
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})

4
src/plugins/auto_batch/tests/functional/CMakeLists.txt
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})

6
src/plugins/auto_batch/tests/unit/CMakeLists.txt
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})

2
src/plugins/hetero/tests/functional/CMakeLists.txt
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\")

2
src/plugins/hetero/tests/unit/CMakeLists.txt
View File

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

4
src/plugins/intel_cpu/tests/functional/CMakeLists.txt
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})

2
src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp
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

5
src/plugins/intel_cpu/tests/functional/specific_tests.cmake
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})

10
src/plugins/intel_cpu/tests/functional/target_per_test.cmake
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})

4
src/plugins/intel_cpu/tests/unit/CMakeLists.txt
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

2
src/plugins/intel_gna/legacy/tests/CMakeLists.txt
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)

2
src/plugins/intel_gna/tests/deprecated/unit/CMakeLists.txt
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

4
src/plugins/intel_gna/tests/functional/CMakeLists.txt
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}

4
src/plugins/intel_gna/tests/unit/CMakeLists.txt
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")

4
src/plugins/intel_gpu/tests/functional/CMakeLists.txt
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)

2
src/plugins/proxy/tests/CMakeLists.txt
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})

2
src/plugins/template/tests/functional/CMakeLists.txt
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)

5
src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt
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"

10
src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt
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)

4
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/CMakeLists.txt
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)

2
src/tests/functional/plugin/conformance/test_runner/conformance_infra/CMakeLists.txt
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"

4
src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/CMakeLists.txt
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)

2
src/tests/functional/plugin/shared/CMakeLists.txt
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}

2
src/tests/functional/shared_test_classes/CMakeLists.txt
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"

2
src/tests/ov_helpers/ov_lpt_models/CMakeLists.txt
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}

2
src/tests/ov_helpers/ov_models/CMakeLists.txt
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}

3
src/tests/ov_helpers/ov_snippets_models/CMakeLists.txt
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}

2
src/tests/test_utils/common_test_utils/CMakeLists.txt
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}

4
src/tests/test_utils/common_test_utils/tests/CMakeLists.txt
View File

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

2
src/tests/test_utils/functional_test_utils/CMakeLists.txt
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}

2
src/tests/test_utils/unit_test_utils/CMakeLists.txt
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}