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

Openvino autogenerated cmake (#5484)

Browse Source 
* Exclude xbyak from install

* Added automatically generated InferenceEngineConfig.cmake

* Reverted a version back

* Fixed issues with target aliases

* Make TBB dependency private

* Made ie_parallel.cmake self-sufficient

* Don't expose ie_paralle.cmake to end users

* Fixed compilation with TBB

* Fixes for TBB

* Fixed vpu_graph_transformer compilation

* Fixed tests compilation

* Added install of ie_parallel.cmake

* Switched ENABLE_ALTERNATIVE_TEMP to OFF. Fixed COMPONENTS for TBB

* Fixed file name in install rules

* Added find_dependency for TBB in ie_parallel.cmake

* WA for cmake bug with PACKAGE_PREFIX_DIR

* Fixed no-deprecation to fix speech-library build

* Reverted version from 2.1.0 to 2.1

* Revert "Reverted version from 2.1.0 to 2.1"

This reverts commit 7cb5d1563c.

* Returned custom version file back

* Added InferenceEngineConfig-version.cmake to share as well

* Disabled one more GPU test

* Added one more WA for CI

* WA for CI issue for C API

* WIP
This commit is contained in:
Ilya Lavrenov 2021-05-07 11:57:51 +03:00 committed by GitHub
parent 8a3d826d69
commit 349e2910fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 189 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -30,7 +30,7 @@ message (STATUS "CMAKE_C_COMPILER_ID ................... " ${CMAKE_C_COMPILER_ID
message (STATUS "CMAKE_BUILD_TYPE ...................... " ${CMAKE_BUILD_TYPE})
# remove file with exported developer targets to force its regeneration
file(REMOVE "${CMAKE_BINARY_DIR}/inference_engine_targets.cmake")
file(REMOVE "${CMAKE_BINARY_DIR}/InferenceEngineTargets.cmake")
foreach(component IN LISTS openvino_export_components)
file(REMOVE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
unset(${component} CACHE)

3
cmake/developer_package/FindTBB.cmake → cmake/developer_package/TBBConfig.cmake
View File

@ -12,7 +12,7 @@
# 2) ${TBBROOT} with IE own version of TBBConfig.cmake (actual for TBB < 2017.7)
#
## Path to IE own version of TBBConfig.cmake old TBB version without cmake config.
# Path to IE own version of TBBConfig.cmake old TBB version without cmake config.
if(APPLE)
set(IE_OWN_TBB_CONFIG tbb/mac)
elseif(UNIX)
@ -27,6 +27,7 @@ find_package(TBB
CONFIG
PATHS ${TBBROOT}/cmake
${IEDevScripts_DIR}/${IE_OWN_TBB_CONFIG}
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH
)

2
cmake/developer_package/features.cmake
View File

@ -56,7 +56,7 @@ ie_option (VERBOSE_BUILD "shows extra information about build" OFF)
ie_option (ENABLE_UNSAFE_LOCATIONS "skip check for MD5 for dependency" OFF)
ie_option (ENABLE_ALTERNATIVE_TEMP "in case of dependency conflict, to avoid modification in master, use local copy of dependency" ON)
ie_option (ENABLE_ALTERNATIVE_TEMP "in case of dependency conflict, to avoid modification in master, use local copy of dependency" OFF)
ie_dependent_option (ENABLE_FUZZING "instrument build for fuzzing" OFF "CMAKE_CXX_COMPILER_ID MATCHES ^(Apple)?Clang$; NOT WIN32" OFF)

6
inference-engine/CMakeLists.txt
View File

@ -32,6 +32,8 @@ add_subdirectory(thirdparty)
add_subdirectory(src)
add_subdirectory(ie_bridges/c)
if(ENABLE_TESTS)
add_subdirectory(tests_deprecated)
add_subdirectory(tests)
@ -58,12 +60,10 @@ endfunction()
# they must be built even if samples build is disabled (required for tests and tools).
ie_build_samples()
if (ENABLE_PYTHON)
if(ENABLE_PYTHON)
add_subdirectory(ie_bridges/python)
endif()
add_subdirectory(ie_bridges/c)
#
# Install
#

3
inference-engine/cmake/dependencies.cmake
View File

@ -18,7 +18,6 @@ else()
set(MODELS_BRANCH "master")
endif()
if (ENABLE_DATA)
add_models_repo(${ENABLE_DATA} "data:https://github.com/openvinotoolkit/testdata.git")
set(MODELS_PATH "${TEMP}/models/src/data")
@ -294,8 +293,6 @@ else()
reset_deps_cache(OpenCV_DIR)
endif()
# TODO: remove global CMAKE_MODULE_PATH
list(APPEND CMAKE_MODULE_PATH "${IEDevScripts_DIR}")
include(cmake/ie_parallel.cmake)
if (ENABLE_GNA)

36
inference-engine/cmake/ie_parallel.cmake
View File

@ -3,8 +3,28 @@
#
function(set_ie_threading_interface_for TARGET_NAME)
macro(ext_message TRACE_LEVEL)
if (TRACE_LEVEL STREQUAL FATAL_ERROR)
if(InferenceEngine_FIND_REQUIRED)
message(FATAL_ERROR "${ARGN}")
elseif(NOT InferenceEngine_FIND_QUIETLY)
message(WARNING "${ARGN}")
endif()
return()
elseif(NOT InferenceEngine_FIND_QUIETLY)
message(${TRACE_LEVEL} "${ARGN}")
endif ()
endmacro()
if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
find_package(TBB COMPONENTS tbb tbbmalloc)
if(IEDevScripts_DIR)
find_package(TBB COMPONENTS tbb tbbmalloc
PATHS IEDevScripts_DIR
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
else()
find_dependency(TBB COMPONENTS tbb tbbmalloc)
endif()
set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE)
set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE)
@ -15,12 +35,22 @@ function(set_ie_threading_interface_for TARGET_NAME)
endif()
get_target_property(target_type ${TARGET_NAME} TYPE)
if(target_type STREQUAL "INTERFACE_LIBRARY")
set(LINK_TYPE "INTERFACE")
elseif(target_type STREQUAL "EXECUTABLE" OR target_type STREQUAL "OBJECT_LIBRARY")
elseif(target_type STREQUAL "EXECUTABLE" OR target_type STREQUAL "OBJECT_LIBRARY" OR
target_type STREQUAL "MODULE_LIBRARY")
set(LINK_TYPE "PRIVATE")
elseif(target_type STREQUAL "STATIC_LIBRARY")
# Affected libraries: inference_engine_s, inference_engine_preproc_s
# they don't have TBB in public headers => PRIVATE
set(LINK_TYPE "PRIVATE")
elseif(target_type STREQUAL "SHARED_LIBRARY")
# TODO: inference_engine only
# Why TBB propogates its headers to inference_engine?
set(LINK_TYPE "PRIVATE")
else()
set(LINK_TYPE "PUBLIC")
ext_message(WARNING "Unknown target type")
endif()
function(ie_target_link_libraries TARGET_NAME LINK_TYPE)

62
inference-engine/cmake/templates/InferenceEngineConfig-build.cmake.in
View File

@ -1,62 +0,0 @@
# Copyright (C) 2018-2021 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#
#
# FindIE
# ------
#
# This will define the following variables:
#
# InferenceEngine_FOUND - True if the system has the Inference Engine library
# InferenceEngine_INCLUDE_DIRS - Inference Engine include directories
# InferenceEngine_LIBRARIES - Inference Engine libraries
#
# and the following imported targets:
#
# IE::inference_engine - The Inference Engine library
# IE::inference_engine_c_api - The Inference Engine C API library
#
if(DEFINED IE_MAIN_SOURCE_DIR AND TARGET inference_engine)
set(InferenceEngine_LIBRARIES inference_engine inference_engine_c_api)
if(NOT TARGET IE::inference_engine)
add_library(IE::inference_engine ALIAS inference_engine)
endif()
if(TARGET inference_engine_c_api AND NOT TARGET IE::inference_engine_c_api)
add_library(IE::inference_engine_c_api ALIAS inference_engine_c_api)
endif()
else()
include("${CMAKE_CURRENT_LIST_DIR}/inference_engine_targets.cmake")
file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path)
set (ie_options THREADING)
load_cache("${cache_path}" READ_WITH_PREFIX "" ${ie_options})
message(STATUS "The following CMake options are exported from the Inference Engine build tree")
message("")
foreach(option IN LISTS ie_options)
message(" ${option}: ${${option}}")
endforeach()
message("")
# inherit TBB from main IE project if enabled
if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
load_cache("${cache_path}" READ_WITH_PREFIX "" TBB_DIR;ENABLE_TBB_RELEASE_ONLY)
set(TBB_FIND_RELEASE_ONLY ${ENABLE_TBB_RELEASE_ONLY})
find_package(TBB)
endif()
get_target_property(InferenceEngine_INCLUDE_DIRS IE::inference_engine INTERFACE_INCLUDE_DIRECTORIES)
set(InferenceEngine_LIBRARIES IE::inference_engine IE::inference_engine_c_api)
foreach(library IN LISTS InferenceEngine_LIBRARIES)
if(CMAKE_CROSSCOMPILING AND NOT MSVC)
set_property(TARGET ${library} PROPERTY
INTERFACE_LINK_OPTIONS "-Wl,--allow-shlib-undefined")
endif()
endforeach()
if(NOT MSVC)
set_target_properties(${InferenceEngine_LIBRARIES} PROPERTIES
INTERFACE_COMPILE_OPTIONS "-Wno-error=deprecated-declarations")
endif()
endif()

18
inference-engine/cmake/templates/InferenceEngineConfig-version.cmake.in
View File

@ -2,17 +2,23 @@
# SPDX-License-Identifier: Apache-2.0
#
set(InferenceEngine_VERSION 2.1.0)
set(PACKAGE_VERSION ${InferenceEngine_VERSION})
# TODO: hardcode will be fixed separatelly
set(PACKAGE_VERSION_MAJOR 2)
set(PACKAGE_VERSION_MINOR 1)
set(PACKAGE_VERSION_PATCH 0)
set(PACKAGE_VERSION_COUNT 3)
set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
set(PACKAGE_VERSION_EXACT False)
set(PACKAGE_VERSION_COMPATIBLE False)
if(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
set(PACKAGE_VERSION_EXACT True)
set(PACKAGE_VERSION_COMPATIBLE True)
set(PACKAGE_VERSION_EXACT True)
set(PACKAGE_VERSION_COMPATIBLE True)
endif()
if(PACKAGE_FIND_VERSION VERSION_LESS PACKAGE_VERSION)
set(PACKAGE_VERSION_COMPATIBLE True)
if(PACKAGE_FIND_VERSION_MAJOR EQUAL PACKAGE_VERSION_MAJOR AND
PACKAGE_FIND_VERSION VERSION_LESS PACKAGE_VERSION)
set(PACKAGE_VERSION_COMPATIBLE True)
endif()

197
inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
View File

@ -1,12 +1,10 @@
# Copyright (C) 2018-2020 Intel Corporation
# Copyright (C) 2018-2021 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#
#
# FindIE
# Inference Engine cmake config
# ------
#
# You can specify the path to Inference Engine files in IE_ROOT_DIR
#
# This will define the following variables:
#
# InferenceEngine_FOUND - True if the system has the Inference Engine library
@ -19,150 +17,55 @@
# IE::inference_engine_c_api - The Inference Engine C API library
#
macro(ext_message TRACE_LEVEL)
if (${TRACE_LEVEL} STREQUAL FATAL_ERROR)
if(InferenceEngine_FIND_REQUIRED)
message(FATAL_ERROR "${ARGN}")
elseif(NOT InferenceEngine_FIND_QUIETLY)
message(WARNING "${ARGN}")
endif()
return()
elseif(NOT InferenceEngine_FIND_QUIETLY)
message(${TRACE_LEVEL} "${ARGN}")
endif ()
endmacro()
@PACKAGE_INIT@
set(InferenceEngine_FOUND FALSE)
include(CMakeFindDependencyMacro)
if(TARGET IE::inference_engine)
set(InferenceEngine_FOUND TRUE)
get_target_property(InferenceEngine_INCLUDE_DIRS IE::inference_engine INTERFACE_INCLUDE_DIRECTORIES)
set(InferenceEngine_LIBRARIES IE::inference_engine
IE::inference_engine_c_api)
else()
if (WIN32)
set(_ARCH intel64)
else()
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} _ARCH)
if(_ARCH STREQUAL "x86_64" OR _ARCH STREQUAL "amd64") # Windows detects Intel's 64-bit CPU as AMD64
set(_ARCH intel64)
elseif(_ARCH STREQUAL "i386")
set(_ARCH ia32)
endif()
endif()
# need to store current PACKAGE_PREFIX_DIR, because it's overwritten by ngraph one
set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")
set(THREADING "@THREADING@")
# check whether setvars.sh is sourced
if(NOT IE_ROOT_DIR AND (DEFINED ENV{InferenceEngine_DIR} OR InferenceEngine_DIR OR DEFINED ENV{INTEL_OPENVINO_DIR}))
if (EXISTS "${InferenceEngine_DIR}")
# InferenceEngine_DIR manually set via command line params
set(IE_ROOT_DIR "${InferenceEngine_DIR}/..")
elseif (EXISTS "$ENV{InferenceEngine_DIR}")
# InferenceEngine_DIR manually set via env
set(IE_ROOT_DIR "$ENV{InferenceEngine_DIR}/..")
elseif (EXISTS "$ENV{INTEL_OPENVINO_DIR}/inference_engine")
# if we installed DL SDK
set(IE_ROOT_DIR "$ENV{INTEL_OPENVINO_DIR}/inference_engine")
elseif (EXISTS "$ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine")
# CV SDK is installed
set(IE_ROOT_DIR "$ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine")
endif()
endif()
if(NOT IE_ROOT_DIR)
ext_message(FATAL_ERROR "inference_engine root directory is not found")
endif()
find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include" NO_DEFAULT_PATH)
set(IE_LIB_DIR "${IE_ROOT_DIR}/lib/${_ARCH}")
set(IE_LIB_REL_DIR "${IE_LIB_DIR}/Release")
set(IE_LIB_DBG_DIR "${IE_LIB_DIR}/Debug")
include(FindPackageHandleStandardArgs)
if(WIN32)
find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_WIN@ "${IE_LIB_REL_DIR}" NO_DEFAULT_PATH)
find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_WIN@ "${IE_LIB_REL_DIR}" NO_DEFAULT_PATH)
elseif(APPLE)
find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH)
find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH)
else()
find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}" NO_DEFAULT_PATH)
find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}" NO_DEFAULT_PATH)
endif()
find_package_handle_standard_args( InferenceEngine
FOUND_VAR INFERENCEENGINE_FOUND
REQUIRED_VARS IE_RELEASE_LIBRARY IE_C_API_RELEASE_LIBRARY IE_INCLUDE_DIR
FAIL_MESSAGE "Some of mandatory Inference Engine components are not found. Please consult InferenceEgnineConfig.cmake module's help page.")
if(INFERENCEENGINE_FOUND)
# to keep this line for successful execution in CMake 2.8
set(InferenceEngine_FOUND TRUE)
foreach(ie_library_suffix "" "_c_api")
string(TOUPPER "${ie_library_suffix}" ie_library_usuffix)
add_library(IE::inference_engine${ie_library_suffix} SHARED IMPORTED GLOBAL)
if (WIN32)
set_target_properties(IE::inference_engine${ie_library_suffix} PROPERTIES
IMPORTED_CONFIGURATIONS RELEASE
IMPORTED_IMPLIB_RELEASE "${IE${ie_library_usuffix}_RELEASE_LIBRARY}"
MAP_IMPORTED_CONFIG_RELEASE Release
MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
INTERFACE_INCLUDE_DIRECTORIES "${IE_INCLUDE_DIR}")
# Debug binaries are optional
find_library(IE${ie_library_usuffix}_DEBUG_LIBRARY inference_engine${ie_library_suffix}@IE_DEBUG_POSTFIX_WIN@
"${IE_LIB_DBG_DIR}" NO_DEFAULT_PATH)
if (IE${ie_library_usuffix}_DEBUG_LIBRARY)
set_property(TARGET IE::inference_engine${ie_library_suffix} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(IE::inference_engine${ie_library_suffix} PROPERTIES
IMPORTED_IMPLIB_DEBUG "${IE${ie_library_usuffix}_DEBUG_LIBRARY}"
MAP_IMPORTED_CONFIG_DEBUG Debug)
else()
ext_message(WARNING "Inference Engine DEBUG binaries are missed.")
endif()
elseif (APPLE)
set_target_properties(IE::inference_engine${ie_library_suffix} PROPERTIES
IMPORTED_LOCATION_RELEASE "${IE${ie_library_usuffix}_RELEASE_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${IE_INCLUDE_DIR}"
INTERFACE_COMPILE_OPTIONS "-Wno-error=deprecated-declarations")
# Debug binaries are optional
find_library(IE${ie_library_usuffix}_DEBUG_LIBRARY inference_engine${ie_library_suffix}@IE_DEBUG_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH)
if (IE${ie_library_usuffix}_DEBUG_LIBRARY)
set_target_properties(IE::inference_engine${ie_library_suffix} PROPERTIES
IMPORTED_LOCATION_DEBUG "${IE${ie_library_usuffix}_DEBUG_LIBRARY}")
else()
ext_message(WARNING "Inference Engine DEBUG binaries are missed")
endif()
else()
# Only Release binaries are distributed for Linux systems
set_target_properties(IE::inference_engine${ie_library_suffix} PROPERTIES
IMPORTED_LOCATION "${IE${ie_library_usuffix}_RELEASE_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${IE_INCLUDE_DIR}")
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set_target_properties(IE::inference_engine${ie_library_suffix} PROPERTIES
INTERFACE_COMPILE_OPTIONS "-diag-warning=1786")
else()
set_target_properties(IE::inference_engine${ie_library_suffix} PROPERTIES
INTERFACE_COMPILE_OPTIONS "-Wno-error=deprecated-declarations")
if(CMAKE_CROSSCOMPILING AND NOT MSVC)
set_property(TARGET IE::inference_engine${ie_library_suffix} PROPERTY
INTERFACE_LINK_OPTIONS "-Wl,--allow-shlib-undefined")
endif()
endif()
endif()
endforeach()
set(InferenceEngine_INCLUDE_DIRS ${IE_INCLUDE_DIR})
set(InferenceEngine_LIBRARIES IE::inference_engine
IE::inference_engine_c_api)
set(IE_EXTERNAL_DIR "${IE_ROOT_DIR}/external")
include("${IE_ROOT_DIR}/share/ie_parallel.cmake")
endif()
set(THREADING "@THREADING@")
if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
find_dependency(TBB
COMPONENTS tbb tbbmalloc
CONFIG
PATHS ${TBBROOT}/cmake
${_tbb_dir}
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
endif()
set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@")
find_dependency(ngraph
CONFIG
PATHS ${_ngraph_dir}
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
function(_ie_target_no_deprecation_error)
if(NOT MSVC)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(flags "-diag-warning=1786")
else()
set(flags "-Wno-error=deprecated-declarations")
endif()
set_target_properties(${ARGV} PROPERTIES INTERFACE_COMPILE_OPTIONS ${flags})
endif()
endfunction()
if(TARGET inference_engine)
set(InferenceEngine_LIBRARIES inference_engine inference_engine_c_api)
else()
include("${CMAKE_CURRENT_LIST_DIR}/InferenceEngineTargets.cmake")
set(InferenceEngine_LIBRARIES IE::inference_engine IE::inference_engine_c_api)
_ie_target_no_deprecation_error(${InferenceEngine_LIBRARIES})
endif()
# restore PACKAGE_PREFIX_DIR
set(PACKAGE_PREFIX_DIR ${IE_PACKAGE_PREFIX_DIR})
set_and_check(InferenceEngine_INCLUDE_DIRS "@PACKAGE_IE_INCLUDE_DIR@")
check_required_components(InferenceEngine)

12
inference-engine/ie_bridges/c/src/CMakeLists.txt
View File

@ -13,7 +13,9 @@ add_library(${TARGET_NAME} SHARED ${HEADERS} ${SOURCES})
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine)
target_include_directories(${TARGET_NAME} PUBLIC "${InferenceEngine_C_API_SOURCE_DIR}/include")
target_include_directories(${TARGET_NAME} PUBLIC
$<INSTALL_INTERFACE:${IE_CPACK_IE_DIR}/include>
$<BUILD_INTERFACE:${InferenceEngine_C_API_SOURCE_DIR}/include>)
add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@ -25,13 +27,17 @@ ie_add_vs_version_file(NAME ${TARGET_NAME}
# export
export(TARGETS ${TARGET_NAME} NAMESPACE IE::
APPEND FILE "${CMAKE_BINARY_DIR}/inference_engine_targets.cmake")
APPEND FILE "${CMAKE_BINARY_DIR}/InferenceEngineTargets.cmake")
# WA for CI issue
export(TARGETS ${TARGET_NAME} NAMESPACE IE::
APPEND FILE "${CMAKE_BINARY_DIR}/share/InferenceEngineTargets.cmake")
# install
ie_cpack_add_component(core_c DEPENDS core)
install(TARGETS ${TARGET_NAME}
install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c)

10
inference-engine/samples/CMakeLists.txt
View File

@ -133,15 +133,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
endif()
if(IE_NOT_FOUND_MESSAGE)
# the flag is used to throw a custom message in case if the IE package is not found.
find_package(InferenceEngine 2.1 QUIET)
if (NOT(InferenceEngine_FOUND))
message(FATAL_ERROR ${IE_NOT_FOUND_MESSAGE})
endif()
else()
find_package(InferenceEngine 2.1 REQUIRED)
endif()
find_package(InferenceEngine 2.1.0 EXACT REQUIRED)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/common/utils")
add_subdirectory(common/utils)

2
inference-engine/src/CMakeLists.txt
View File

@ -21,7 +21,7 @@ if(ENABLE_CLDNN)
endif()
if(ENABLE_VPU)
add_subdirectory(vpu)
add_subdirectory(vpu)
endif()
if(ENABLE_GNA)

99
inference-engine/src/inference_engine/CMakeLists.txt
View File

@ -164,7 +164,9 @@ endif()
target_link_libraries(${TARGET_NAME} PRIVATE pugixml openvino::itt ${CMAKE_DL_LIBS} Threads::Threads
${NGRAPH_LIBRARIES} inference_engine_transformations)
target_include_directories(${TARGET_NAME} INTERFACE ${PUBLIC_HEADERS_DIR}
target_include_directories(${TARGET_NAME} INTERFACE
$<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
$<INSTALL_INTERFACE:${IE_CPACK_IE_DIR}/include>
PRIVATE $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:${TARGET_NAME}_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
@ -213,31 +215,10 @@ set_target_properties(${TARGET_NAME}_s PROPERTIES EXCLUDE_FROM_ALL ON)
set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj ${TARGET_NAME}_s
PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
# InferenceEngineConfig.cmake for install tree
configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
"${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" @ONLY)
configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
"${CMAKE_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
COPYONLY)
configure_file("${IE_MAIN_SOURCE_DIR}/cmake/ie_parallel.cmake"
"${CMAKE_BINARY_DIR}/share/ie_parallel.cmake"
COPYONLY)
# Export Inference Engine targets
# Export for build tree
export(TARGETS ${TARGET_NAME} NAMESPACE IE::
APPEND FILE "${CMAKE_BINARY_DIR}/inference_engine_targets.cmake")
configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-build.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake"
COPYONLY)
configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
COPYONLY)
APPEND FILE "${CMAKE_BINARY_DIR}/InferenceEngineTargets.cmake")
# Export for developer package
@ -246,6 +227,8 @@ ie_developer_export_targets(${TARGET_NAME} ${TARGET_NAME}_plugin_api)
# install TBB
list(APPEND core_components ngraph)
list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR"
"IE_PARALLEL_CMAKE")
if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP})
ie_cpack_add_component(tbb REQUIRED)
@ -258,16 +241,21 @@ if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCH
DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
COMPONENT tbb)
if(EXISTS "${TBB}/bin")
install(DIRECTORY "${TBB}/bin"
DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
COMPONENT tbb)
install(DIRECTORY "${TBB}/bin"
DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
COMPONENT tbb)
endif()
install(FILES "${TBB}/LICENSE"
DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
COMPONENT tbb)
set(IE_TBB_DIR_INSTALL "external/tbb/cmake")
set(IE_TBB_DIR "${TBB_DIR}")
list(APPEND PATH_VARS "IE_TBB_DIR")
install(FILES "${TBB}/cmake/TBBConfig.cmake"
"${TBB}/cmake/TBBConfigVersion.cmake"
DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake
DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL}
COMPONENT tbb)
endif()
@ -277,15 +265,58 @@ ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
install(DIRECTORY "${IE_MAIN_SOURCE_DIR}/include" DESTINATION ${IE_CPACK_IE_DIR}
COMPONENT core)
install(TARGETS ${TARGET_NAME}
install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
"${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
"${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
DESTINATION ${IE_CPACK_IE_DIR}/share
COMPONENT core)
install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
DESTINATION ${IE_CPACK_RUNTIME_PATH}
COMPONENT core)
# Install cmake scripts
install(EXPORT InferenceEngineTargets
FILE InferenceEngineTargets.cmake
NAMESPACE IE::
DESTINATION ${IE_CPACK_IE_DIR}/share
COMPONENT core)
include(CMakePackageConfigHelpers)
set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph")
set(IE_INCLUDE_DIR "${PUBLIC_HEADERS_DIR}")
set(IE_PARALLEL_CMAKE "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake")
configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}"
PATH_VARS ${PATH_VARS})
set(IE_INCLUDE_DIR "include")
set(IE_NGRAPH_DIR "../ngraph/cmake")
set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}")
set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake")
configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
"${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
INSTALL_DESTINATION share
PATH_VARS ${PATH_VARS})
configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
COPYONLY)
# WA for CI
configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
"${CMAKE_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
COPYONLY)
export(TARGETS ${TARGET_NAME} NAMESPACE IE::
APPEND FILE "${CMAKE_BINARY_DIR}/share/InferenceEngineTargets.cmake")
install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
"${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake"
DESTINATION ${IE_CPACK_IE_DIR}/share
COMPONENT core)

4
inference-engine/src/legacy_api/CMakeLists.txt
View File

@ -34,8 +34,6 @@ ie_faster_build(${TARGET_NAME}_obj
PCH PRIVATE "src/precomp.hpp"
)
set_ie_threading_interface_for(${TARGET_NAME}_obj)
target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API)
target_include_directories(${TARGET_NAME}_obj PRIVATE
@ -63,8 +61,6 @@ add_library(${TARGET_NAME} SHARED
ie_add_vs_version_file(NAME ${TARGET_NAME}
FILEDESCRIPTION "Inference Engine Legacy library")
set_ie_threading_interface_for(${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PUBLIC inference_engine inference_engine_snippets
PRIVATE pugixml openvino::itt
${NGRAPH_LIBRARIES} inference_engine_transformations)

4
inference-engine/src/transformations/CMakeLists.txt
View File

@ -30,7 +30,7 @@ ie_add_vs_version_file(NAME ${TARGET_NAME}
target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES}
PRIVATE ${NGRAPH_REF_LIBRARIES} openvino::itt ngraph::builder pugixml)
target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@ -49,7 +49,7 @@ ie_developer_export_targets(${TARGET_NAME})
# install
install(TARGETS ${TARGET_NAME}
install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)

2
inference-engine/src/vpu/common/CMakeLists.txt
View File

@ -11,8 +11,6 @@ function(add_common_target TARGET_NAME STATIC_IE)
UNITY
)
set_ie_threading_interface_for(${TARGET_NAME})
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# TODO: enable some day and fix all warnings
# target_compile_options(${TARGET_NAME} PRIVATE "-Wall")

1
inference-engine/src/vpu/graph_transformer/src/frontend/pre_process.cpp
View File

@ -11,7 +11,6 @@
#include <cpp/ie_cnn_network.h>
#include <precision_utils.h>
#include <ie_parallel.hpp>
#include <vector>
#include <memory>

2
inference-engine/src/vpu/graph_transformer/src/middleend/hw/utility.cpp
View File

@ -8,8 +8,6 @@
#include <unordered_map>
#include <algorithm>
#include <ie_parallel.hpp>
#include <vpu/model/stage.hpp>
#include <vpu/utils/numeric.hpp>
#include <vpu/utils/profiling.hpp>

1
inference-engine/src/vpu/graph_transformer/src/middleend/passes/hw_extra_split.cpp
View File

@ -14,7 +14,6 @@
#include <vpu/model/data_contents/hw_const_data_content.hpp>
#include <precision_utils.h>
#include <ie_parallel.hpp>
#include <utility>
#include <memory>

2
inference-engine/src/vpu/graph_transformer/src/middleend/passes/merge_parallel_fc.cpp
View File

@ -6,8 +6,6 @@
#include <vpu/stages/stub_stage.hpp>
#include <vpu/model/data_contents/merge_fc_content.hpp>
#include <ie_parallel.hpp>
#include <memory>
#include <utility>
#include <vector>

1
inference-engine/src/vpu/graph_transformer/src/middleend/passes/replace_priorbox_with_const.cpp
View File

@ -7,7 +7,6 @@
#include <vpu/stages/stub_stage.hpp>
#include <vpu/model/data_contents/priorbox_contents.hpp>
#include <ie_parallel.hpp>
#include <precision_utils.h>
#include <cmath>

1
inference-engine/src/vpu/graph_transformer/src/middleend/passes/replace_with_reduce_mean.cpp
View File

@ -89,6 +89,7 @@ void PassImpl::run(const Model& model) {
}
} // namespace
Pass::Ptr PassManager::replaceWithReduceMean() {
return std::make_shared<PassImpl>(_stageBuilder);
}

2
inference-engine/src/vpu/graph_transformer/src/middleend/passes/sw_deconv_adaptation.cpp
View File

@ -8,8 +8,6 @@
#include <vpu/utils/numeric.hpp>
#include <vpu/model/data_contents/deconvolution_contents.hpp>
#include <ie_parallel.hpp>
#include <vector>
#include <string>
#include <memory>

1
inference-engine/src/vpu/graph_transformer/src/model/data.cpp
View File

@ -12,7 +12,6 @@
#include <vpu/compile_env.hpp>
#include <precision_utils.h>
#include <ie_parallel.hpp>
#include <array>
#include <algorithm>

1
inference-engine/src/vpu/graph_transformer/src/model/data_contents/mean_contents.cpp
View File

@ -7,7 +7,6 @@
#include <vpu/utils/profiling.hpp>
#include <vpu/middleend/sw/utility.hpp>
#include <ie_parallel.hpp>
#include <precision_utils.h>
namespace vpu {

1
inference-engine/src/vpu/graph_transformer/src/stages/batch_norm.cpp
View File

@ -10,7 +10,6 @@
#include <vpu/model/data_contents/batch_norm_contents.hpp>
#include <precision_utils.h>
#include <ie_parallel.hpp>
#include <cmath>
#include <vector>

2
inference-engine/src/vpu/graph_transformer/src/stages/prelu.cpp
View File

@ -9,8 +9,6 @@
#include <vpu/utils/profiling.hpp>
#include <vpu/model/data_contents/prelu_blob_content.hpp>
#include <ie_parallel.hpp>
#include <vector>
#include <memory>

2
inference-engine/tests/functional/inference_engine/CMakeLists.txt
View File

@ -45,6 +45,8 @@ addIeTargetTest(
IE
)
set_ie_threading_interface_for(${TARGET_NAME})
if(NGRAPH_ONNX_IMPORT_ENABLE)
target_compile_definitions(${TARGET_NAME} PRIVATE
NGRAPH_ONNX_IMPORT_ENABLE

2
inference-engine/tests_deprecated/functional/mkldnn/CMakeLists.txt
View File

@ -48,6 +48,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
target_link_libraries(${TARGET_NAME} PRIVATE ${LIBRARIES})
set_ie_threading_interface_for(${TARGET_NAME})
add_dependencies(${TARGET_NAME} ${DEPENDENCIES})
add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})

2
inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt
View File

@ -21,6 +21,8 @@ file(GLOB SHARED_TESTS_SRC
add_library(${TARGET_NAME} STATIC ${SHARED_TESTS_SRC})
add_dependencies(${TARGET_NAME} inference_engine_preproc MultiDevicePlugin mock_engine)
set_ie_threading_interface_for(${TARGET_NAME})
ie_faster_build(${TARGET_NAME}
UNITY
PCH PRIVATE "precomp.hpp"

2
inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/cropResize_tests.hpp
View File

@ -25,8 +25,6 @@
#include <ngraph_functions/builders.hpp>
#include <functional_test_utils/blob_utils.hpp>
#include "ie_parallel.hpp"
using namespace ::testing;
using namespace InferenceEngine;

1
inference-engine/tests_deprecated/unit/CMakeLists.txt
View File

@ -83,7 +83,6 @@ source_group("include" FILES ${TEST_INCLUDE})
# create target
add_executable(${TARGET_NAME} ${TEST_SRC} ${TEST_INCLUDE})
set_ie_threading_interface_for(${TARGET_NAME})
target_include_directories(${TARGET_NAME} PRIVATE
${IE_MAIN_SOURCE_DIR}/src/gna_plugin

1
ngraph/cmake/share/ngraphConfig.cmake.in
View File

@ -23,6 +23,7 @@
# ngraph_FOUND - True if the system has the nGraph library
# NGRAPH_LIBRARIES - nGraph libraries
# ngraph::ngraph - nGraph core target
#
# ngraph_onnx_importer_FOUND - True if the system has onnx_importer library
# ONNX_IMPORTER_LIBRARIES - ONNX importer libraries
# ngraph::onnx_importer - ONNX importer target

2
thirdparty/CMakeLists.txt vendored
View File

@ -4,6 +4,6 @@
add_subdirectory(ittapi)
add_subdirectory(itt_collector)
add_subdirectory(xbyak)
add_subdirectory(xbyak EXCLUDE_FROM_ALL)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak)