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

CVS-34900: updated pugixml to v1.11.4 (#6301)

Browse Source 
* Added pugixml as submodule

* CVS-34900: updated pugixml to v1.11.4

* Fixed link with pugixml

* USe pugixml::static

* Try to fix bug

* Removed GITHUB_PULL_REQUEST

* Replaced  OpenVINO_MAIN_SOURCE_DIR -> OpenVINO_SOURCE_DIR

* Removed some usages of IE_MAIN_SOURCE_DIR

* Use ngraph target directly
This commit is contained in:
Ilya Lavrenov authored and GitHub committed 2021-07-02 11:36:31 +03:00
1 parent 0c8147fdf8
commit fc7f80a34e
66 files changed
+177 -14422
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitmodules
+7
View File
@@ -10,6 +10,10 @@
path = thirdparty/zlib/zlib
url = https://github.com/madler/zlib.git
ignore = dirty
[submodule "thirdparty/pugixml"]
path = thirdparty/pugixml
url = https://github.com/zeux/pugixml.git
ignore = dirty
[submodule "thirdparty/ade"]
path = thirdparty/ade
url = https://github.com/opencv/ade.git
@@ -25,9 +29,12 @@
[submodule "thirdparty/ocl/icd_loader"]
path = thirdparty/ocl/icd_loader
url = https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
ignore = dirty
[submodule "thirdparty/ocl/cl_headers"]
path = thirdparty/ocl/cl_headers
url = https://github.com/KhronosGroup/OpenCL-Headers.git
ignore = dirty
[submodule "thirdparty/ocl/clhpp_headers"]
path = thirdparty/ocl/clhpp_headers
url = https://github.com/KhronosGroup/OpenCL-CLHPP.git
ignore = dirty
CMakeLists.txt
+4 -6
View File
@@ -4,13 +4,12 @@
cmake_minimum_required(VERSION 3.13)
project(OpenVINO)
project(OpenVINO DESCRIPTION "OpenVINO toolkit")
set(OpenVINO_MAIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(IE_MAIN_SOURCE_DIR ${OpenVINO_MAIN_SOURCE_DIR}/inference-engine)
set(IE_MAIN_SOURCE_DIR ${OpenVINO_SOURCE_DIR}/inference-engine)
find_package(IEDevScripts REQUIRED
PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
PATHS "${OpenVINO_SOURCE_DIR}/cmake/developer_package"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
@@ -27,7 +26,7 @@ endif()
# resolving dependencies for the project
message (STATUS "PROJECT ............................... " ${PROJECT_NAME})
message (STATUS "CMAKE_BINARY_DIR ...................... " ${CMAKE_BINARY_DIR})
message (STATUS "OpenVINO_MAIN_SOURCE_DIR .............. " ${OpenVINO_MAIN_SOURCE_DIR})
message (STATUS "OpenVINO_SOURCE_DIR .... .......... " ${OpenVINO_SOURCE_DIR})
message (STATUS "CMAKE_GENERATOR ....................... " ${CMAKE_GENERATOR})
message (STATUS "CMAKE_C_COMPILER_ID ................... " ${CMAKE_C_COMPILER_ID})
message (STATUS "CMAKE_BUILD_TYPE ...................... " ${CMAKE_BUILD_TYPE})
@@ -91,7 +90,6 @@ function(build_ngraph)
ie_cpack_add_component(ngraph_dev REQUIRED DEPENDS ngraph)
add_subdirectory(ngraph)
set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE)
endfunction()
function(openvino_developer_export_targets)
cmake/coverage.cmake
+1 -1
View File
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
#
set(OV_COVERAGE_BASE_DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}")
set(OV_COVERAGE_BASE_DIRECTORY "${OpenVINO_SOURCE_DIR}")
ie_coverage_clean(REPOSITORY "openvino"
DIRECTORY "${OV_COVERAGE_GCDA_DATA_DIRECTORY}")
cmake/developer_package/IEDevScriptsConfig.cmake
+3 -3
View File
@@ -121,10 +121,10 @@ endif()
# allow to override default OUTPUT_ROOT root
if(NOT DEFINED OUTPUT_ROOT)
if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined")
if(NOT DEFINED OpenVINO_SOURCE_DIR)
message(FATAL_ERROR "OpenVINO_SOURCE_DIR is not defined")
endif()
set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
set(OUTPUT_ROOT ${OpenVINO_SOURCE_DIR})
endif()
# Enable postfixes for Debug/Release builds
cmake/developer_package/download/dependency_solver.cmake
+2 -14
View File
@@ -25,15 +25,8 @@ function (resolve_archive_dependency VAR COMPONENT ARCHIVE ARCHIVE_UNIFIED ARCHI
set (${VAR} $ENV{${ENVIRONMENT}} PARENT_SCOPE)
endif ()
endif()
endfunction(resolve_archive_dependency)
function(resolve_pull_request GITHUB_PULL_REQUEST TARGET_PATH)
get_filename_component(FILE_NAME ${GITHUB_PULL_REQUEST} NAME)
set (PATCH_URL "")
DownloadAndApply("${PATCH_URL}/${GITHUB_PULL_REQUEST}" "${IE_MAIN_SOURCE_DIR}/${TARGET_PATH}/${FILE_NAME}")
endfunction(resolve_pull_request)
function(extract_version_from_filename filename regex version)
string(REGEX MATCH ${regex} match ${filename})
@@ -51,10 +44,8 @@ function(read_version archive regex version_var)
endfunction(read_version)
function (RESOLVE_DEPENDENCY NAME_OF_CMAKE_VAR)
list(REMOVE_AT ARGV 0)
set(SUPPORTED_ARGS FOLDER ARCHIVE ARCHIVE_UNIFIED ARCHIVE_WIN ARCHIVE_LIN ARCHIVE_MAC ARCHIVE_ANDROID TARGET_PATH ENVIRONMENT GITHUB_PULL_REQUEST VERSION_REGEX SHA256 FILES_TO_EXTRACT)
set(SUPPORTED_ARGS FOLDER ARCHIVE ARCHIVE_UNIFIED ARCHIVE_WIN ARCHIVE_LIN ARCHIVE_MAC ARCHIVE_ANDROID TARGET_PATH ENVIRONMENT VERSION_REGEX SHA256 FILES_TO_EXTRACT)
#unnecessary vars
foreach(arg ${ARGV})
@@ -134,11 +125,8 @@ function (RESOLVE_DEPENDENCY NAME_OF_CMAKE_VAR)
read_version(${archive} ${VERSION_REGEX} "${NAME_OF_CMAKE_VAR}_VERSION")
endif()
endif()
elseif (DEFINED GITHUB_PULL_REQUEST)
resolve_pull_request(${GITHUB_PULL_REQUEST} ${TARGET_PATH})
else()
message(FATAL_ERROR "Dependency of unknowntype, SHOULD set one of ARCHIVE_WIN, ARCHIVE, ARCHIVE_LIN, ARCHIVE_MAC, ARCHIVE_ANDROID, GITHUB_PULL_REQUEST")
message(FATAL_ERROR "Dependency of unknowntype, SHOULD set one of ARCHIVE_WIN, ARCHIVE, ARCHIVE_LIN, ARCHIVE_MAC, ARCHIVE_ANDROID")
endif()
endfunction(RESOLVE_DEPENDENCY)
cmake/extra_modules.cmake
+4 -4
View File
@@ -11,13 +11,13 @@ foreach(component IN LISTS openvino_export_components)
endforeach()
add_custom_target(ie_dev_targets ALL DEPENDS ${all_dev_targets})
configure_package_config_file("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
INSTALL_DESTINATION share # not used
PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;gflags_BINARY_DIR"
PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
configure_file("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
@ONLY)
endfunction()
@@ -54,7 +54,7 @@ generate_fake_dev_package()
# automatically import plugins from the 'plugins' folder
file(GLOB local_extra_modules "runtime/plugins/*")
# add template plugin
list(APPEND local_extra_modules "${OpenVINO_MAIN_SOURCE_DIR}/docs/template_plugin")
list(APPEND local_extra_modules "${OpenVINO_SOURCE_DIR}/docs/template_plugin")
# detect where IE_EXTRA_MODULES contains folders with CMakeLists.txt
# other folders are supposed to have sub-folders with CMakeLists.txt
cmake/features.cmake
+3 -1
View File
@@ -40,6 +40,8 @@ ie_dependent_option (ENABLE_PYTHON "enables ie python bridge build" OFF "PYTHONL
find_package(PythonInterp 3 QUIET)
ie_dependent_option (ENABLE_DOCS "Build docs using Doxygen" OFF "PYTHONINTERP_FOUND" OFF)
ie_option (ENABLE_SYSTEM_PUGIXML "use the system copy of pugixml" OFF)
#
# Inference Engine specific options
#
@@ -110,7 +112,7 @@ set(IE_EXTRA_MODULES "" CACHE STRING "Extra paths for extra modules to include i
ie_dependent_option(ENABLE_TBB_RELEASE_ONLY "Only Release TBB libraries are linked to the Inference Engine binaries" ON "THREADING MATCHES TBB;LINUX" OFF)
ie_option (USE_SYSTEM_PUGIXML "use the system copy of pugixml" OFF)
ie_option (ENABLE_SYSTEM_PUGIXML "use the system copy of pugixml" OFF)
ie_option (ENABLE_CPU_DEBUG_CAPS "enable CPU debug capabilities at runtime" OFF)
cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in
+5 -3
View File
@@ -7,7 +7,8 @@
include(CMakeFindDependencyMacro)
# TODO: remove after changing [private plugins]
set_and_check(OpenVINO_MAIN_SOURCE_DIR "@OpenVINO_MAIN_SOURCE_DIR@") # KMB
set_and_check(OpenVINO_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # KMB
set_and_check(OpenVINO_MAIN_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # KMB
set_and_check(IE_MAIN_SOURCE_DIR "@IE_MAIN_SOURCE_DIR@") # HDDL
# Variables to export in plugin's projects
@@ -33,7 +34,7 @@ set_and_check(gflags_DIR "@gflags_BINARY_DIR@")
#
find_dependency(IEDevScripts
PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
PATHS "${OpenVINO_SOURCE_DIR}/cmake/developer_package"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
@@ -51,9 +52,10 @@ foreach(component @openvino_export_components@)
include("${CMAKE_CURRENT_LIST_DIR}/${component}_dev_targets.cmake")
endforeach()
if(USE_SYSTEM_PUGIXML)
if(ENABLE_SYSTEM_PUGIXML)
find_dependency(PugiXML)
set_property(TARGET pugixml PROPERTY IMPORTED_GLOBAL TRUE)
add_library(IE::pugixml ALIAS pugixml)
endif()
# inherit OpenCV from main IE project if enabled
docs/CMakeLists.txt
+25 -25
View File
@@ -70,13 +70,13 @@ function(build_docs)
endif()
set(DOCS_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}")
set(DOXYGEN_DIR "${OpenVINO_MAIN_SOURCE_DIR}/docs/doxygen")
set(IE_SOURCE_DIR "${OpenVINO_MAIN_SOURCE_DIR}/inference-engine")
set(DOXYGEN_DIR "${OpenVINO_SOURCE_DIR}/docs/doxygen")
set(IE_SOURCE_DIR "${OpenVINO_SOURCE_DIR}/inference-engine")
set(PYTHON_API_IN "${IE_SOURCE_DIR}/ie_bridges/python/src/openvino/inference_engine/ie_api.pyx")
set(PYTHON_API_OUT "${DOCS_BUILD_DIR}/python_api/ie_api.pyx")
set(C_API "${IE_SOURCE_DIR}/ie_bridges/c/include")
set(PLUGIN_API_DIR "${DOCS_BUILD_DIR}/IE_PLUGIN_DG")
set(NGRAPH_DIR "${OpenVINO_MAIN_SOURCE_DIR}/ngraph")
set(NGRAPH_DIR "${OpenVINO_SOURCE_DIR}/ngraph")
set(NGRAPH_PY_DIR "${NGRAPH_DIR}/python/src/ngraph/")
set(NGRAPH_CPP_DIR "${NGRAPH_DIR}/core/include/" "${NGRAPH_DIR}/frontend/onnx_import/include")
@@ -99,17 +99,17 @@ function(build_docs)
configure_file(${FOOTER_SOURCE} ${FOOTER_BUILD} @ONLY)
file(GLOB_RECURSE doc_source_files
LIST_DIRECTORIES true RELATIVE ${OpenVINO_MAIN_SOURCE_DIR}
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.md"
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.png"
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.gif"
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.jpg"
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.svg"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.md"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.png"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.gif"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.jpg"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.svg")
LIST_DIRECTORIES true RELATIVE ${OpenVINO_SOURCE_DIR}
"${OpenVINO_SOURCE_DIR}/docs/*.md"
"${OpenVINO_SOURCE_DIR}/docs/*.png"
"${OpenVINO_SOURCE_DIR}/docs/*.gif"
"${OpenVINO_SOURCE_DIR}/docs/*.jpg"
"${OpenVINO_SOURCE_DIR}/docs/*.svg"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.md"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.png"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.gif"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.jpg"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.svg")
configure_file(${PYTHON_API_IN} ${PYTHON_API_OUT} @ONLY)
@@ -220,19 +220,19 @@ function(build_docs)
# ovino doc files
file(GLOB_RECURSE ovino_doc_files
LIST_DIRECTORIES true RELATIVE ${OpenVINO_MAIN_SOURCE_DIR}
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.md"
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.png"
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.gif"
"${OpenVINO_MAIN_SOURCE_DIR}/docs/*.jpg"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.md"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.png"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.gif"
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/*.jpg")
LIST_DIRECTORIES true RELATIVE ${OpenVINO_SOURCE_DIR}
"${OpenVINO_SOURCE_DIR}/docs/*.md"
"${OpenVINO_SOURCE_DIR}/docs/*.png"
"${OpenVINO_SOURCE_DIR}/docs/*.gif"
"${OpenVINO_SOURCE_DIR}/docs/*.jpg"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.md"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.png"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.gif"
"${OpenVINO_SOURCE_DIR}/inference-engine/*.jpg")
foreach(source_file ${ovino_doc_files})
list(APPEND commands COMMAND ${CMAKE_COMMAND} -E copy
"${OpenVINO_MAIN_SOURCE_DIR}/${source_file}" "${DOCS_BUILD_DIR}/openvino/${source_file}")
"${OpenVINO_SOURCE_DIR}/${source_file}" "${DOCS_BUILD_DIR}/openvino/${source_file}")
endforeach()
# omz doc files
@@ -367,7 +367,7 @@ function(build_docs)
find_program(browser NAMES xdg-open)
if(browser)
add_custom_target(ie_docs_open
COMMAND ${browser} "${OpenVINO_MAIN_SOURCE_DIR}/docs/html/index.html"
COMMAND ${browser} "${OpenVINO_SOURCE_DIR}/docs/html/index.html"
DEPENDS ie_docs
COMMENT "Open OpenVINO documentation"
VERBATIM)
docs/doxygen/ie_plugin_api.config
+1 -1
View File
@@ -26,7 +26,7 @@ EXTRACT_LOCAL_CLASSES = NO
INPUT = "@DOCS_BUILD_DIR@/docs/IE_PLUGIN_DG" \
"@IE_SOURCE_DIR@/src/plugin_api" \
"@IE_SOURCE_DIR@/src/transformations/include" \
"@OpenVINO_MAIN_SOURCE_DIR@/openvino/itt/include/openvino"
"@OpenVINO_SOURCE_DIR@/openvino/itt/include/openvino"
RECURSIVE = YES
inference-engine/cmake/ie_parallel.cmake
+1 -1
View File
@@ -105,7 +105,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
set(omp_lib_name iomp5)
endif ()
if (NOT IE_MAIN_SOURCE_DIR)
if (NOT OpenVINO_SOURCE_DIR)
if (WIN32)
set(lib_rel_path ${IE_LIB_REL_DIR})
set(lib_dbg_path ${IE_LIB_DBG_DIR})
inference-engine/samples/CMakeLists.txt
+1 -1
View File
@@ -33,7 +33,7 @@ endif()
if(OpenVINO_SOURCE_DIR)
# in case if samples are built from IE repo
set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
set(IE_MAIN_SAMPLES_DIR ${OpenVINO_SOURCE_DIR})
# hint for find_package(InferenceEngine in the samples folder)
set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
# hint for find_package(ngraph in the samples folder)
inference-engine/src/auto_plugin/CMakeLists.txt
+1 -1
View File
@@ -12,7 +12,7 @@ ie_add_plugin(NAME ${TARGET_NAME}
SOURCES ${SOURCES} ${HEADERS}
VERSION_DEFINES_FOR auto_plugin.cpp)
target_link_libraries(${TARGET_NAME} PRIVATE ${NGRAPH_LIBRARIES} inference_engine inference_engine_transformations)
target_link_libraries(${TARGET_NAME} PRIVATE ngraph inference_engine inference_engine_transformations)
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
inference-engine/src/cldnn_engine/CMakeLists.txt
+2 -2
View File
@@ -26,11 +26,11 @@ ie_add_plugin(NAME ${TARGET_NAME}
SOURCES ${MAIN_SRC} ${LIBRARY_HEADERS}
VERSION_DEFINES_FOR cldnn_engine.cpp)
target_link_libraries(${TARGET_NAME} PRIVATE clDNN_lib pugixml
target_link_libraries(${TARGET_NAME} PRIVATE clDNN_lib pugixml::static
inference_engine
inference_engine_transformations
inference_engine_lp_transformations
${NGRAPH_LIBRARIES})
ngraph)
target_include_directories(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
inference-engine/src/hetero_plugin/CMakeLists.txt
+1 -1
View File
@@ -17,7 +17,7 @@ ie_faster_build(${TARGET_NAME}
)
target_link_libraries(${TARGET_NAME} PRIVATE pugixml inference_engine
${NGRAPH_LIBRARIES} inference_engine_transformations)
ngraph inference_engine_transformations)
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
inference-engine/src/inference_engine/CMakeLists.txt
+9 -9
View File
@@ -99,7 +99,7 @@ target_include_directories(${TARGET_NAME}_plugin_api INTERFACE
$<TARGET_PROPERTY:${TARGET_NAME}_preproc,INTERFACE_INCLUDE_DIRECTORIES>
${PUBLIC_HEADERS_DIR})
target_link_libraries(${TARGET_NAME}_plugin_api INTERFACE openvino::itt)
target_link_libraries(${TARGET_NAME}_plugin_api INTERFACE pugixml::static openvino::itt)
set_ie_threading_interface_for(${TARGET_NAME}_plugin_api)
@@ -123,7 +123,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE
$<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_COMPILE_DEFINITIONS>)
target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml::static,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:xbyak,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -159,8 +159,8 @@ if (TBBBIND_2_4_FOUND)
target_link_libraries(${TARGET_NAME} PRIVATE ${TBBBIND_2_4_IMPORTED_TARGETS})
endif()
target_link_libraries(${TARGET_NAME} PRIVATE pugixml openvino::itt ${CMAKE_DL_LIBS} Threads::Threads
${NGRAPH_LIBRARIES} inference_engine_transformations)
target_link_libraries(${TARGET_NAME} PRIVATE pugixml::static openvino::itt ${CMAKE_DL_LIBS} Threads::Threads
ngraph inference_engine_transformations)
target_include_directories(${TARGET_NAME} INTERFACE
$<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
@@ -200,8 +200,8 @@ if(WIN32)
set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
endif()
target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt ${CMAKE_DL_LIBS} ${NGRAPH_LIBRARIES}
inference_engine_transformations pugixml)
target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt ${CMAKE_DL_LIBS} ngraph
inference_engine_transformations pugixml::static)
target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE)
@@ -294,7 +294,7 @@ 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("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}"
PATH_VARS ${PATH_VARS})
@@ -304,12 +304,12 @@ 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("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
"${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
INSTALL_DESTINATION share
PATH_VARS ${PATH_VARS})
configure_file("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
@ONLY)
inference-engine/src/legacy_api/CMakeLists.txt
+3 -3
View File
@@ -43,7 +43,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE
$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
$<TARGET_PROPERTY:pugixml::static,INTERFACE_INCLUDE_DIRECTORIES>)
target_compile_definitions(${TARGET_NAME}_obj PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_COMPILE_DEFINITIONS>)
@@ -61,8 +61,8 @@ ie_add_vs_version_file(NAME ${TARGET_NAME}
FILEDESCRIPTION "Inference Engine Legacy library")
target_link_libraries(${TARGET_NAME} PUBLIC inference_engine
PRIVATE pugixml openvino::itt
${NGRAPH_LIBRARIES} inference_engine_transformations)
PRIVATE pugixml::static openvino::itt
ngraph inference_engine_transformations)
target_include_directories(${TARGET_NAME} INTERFACE ${PUBLIC_HEADERS_DIR})
inference-engine/src/mkldnn_plugin/CMakeLists.txt
+1 -5
View File
@@ -22,11 +22,6 @@ file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h
addVersionDefines(mkldnn_plugin.cpp CI_BUILD_NUMBER)
include_directories(
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
${CMAKE_CURRENT_SOURCE_DIR}/mkldnn
${CMAKE_CURRENT_SOURCE_DIR})
# create plugin
ie_add_plugin(NAME ${TARGET_NAME}
@@ -51,6 +46,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE mkldnn
inference_engine_lp_transformations)
target_include_directories(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
$<TARGET_PROPERTY:mkldnn,INCLUDE_DIRECTORIES>)
# Cross compiled function
inference-engine/src/mkldnn_plugin/mkldnn_memory.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "mkldnn_extension_utils.h"
#include "nodes/common/cpu_memcpy.h"
#include "nodes/common/cpu_convert.h"
#include "ie_mkldnn.h"
#include "mkldnn/ie_mkldnn.h"
using namespace InferenceEngine;
using namespace mkldnn;
inference-engine/src/offline_transformations/CMakeLists.txt
+2 -2
View File
@@ -19,8 +19,8 @@ source_group("include" FILES ${PUBLIC_HEADERS})
add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES} inference_engine_transformations ngraph::reference
PRIVATE openvino::itt pugixml)
target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations ngraph::reference
PRIVATE openvino::itt pugixml::static)
target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
inference-engine/src/readers/ir_reader/CMakeLists.txt
+2 -2
View File
@@ -28,12 +28,12 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLU
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
target_link_libraries(${TARGET_NAME} PRIVATE ${NGRAPH_LIBRARIES}
target_link_libraries(${TARGET_NAME} PRIVATE ngraph
inference_engine_reader_api
inference_engine_plugin_api
inference_engine
inference_engine_transformations
pugixml
pugixml::static
openvino::itt)
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
inference-engine/src/readers/ir_reader_v7/CMakeLists.txt
+1 -1
View File
@@ -31,7 +31,7 @@ target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/"
"${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader")
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_reader_api inference_engine_plugin_api
inference_engine_legacy inference_engine pugixml openvino::itt)
inference_engine_legacy inference_engine pugixml::static openvino::itt)
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
inference-engine/src/snippets/CMakeLists.txt
+1 -1
View File
@@ -30,7 +30,7 @@ ie_add_vs_version_file(NAME ${TARGET_NAME}
target_compile_definitions(${TARGET_NAME} PRIVATE inference_engine_transformations_EXPORTS)
target_link_libraries(${TARGET_NAME} PUBLIC inference_engine_transformations ${NGRAPH_LIBRARIES}
target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations
PRIVATE ngraph_reference)
target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
inference-engine/src/transformations/CMakeLists.txt
+2 -2
View File
@@ -27,8 +27,8 @@ ie_faster_build(${TARGET_NAME}
ie_add_vs_version_file(NAME ${TARGET_NAME}
FILEDESCRIPTION "Inference Engine Transformations library")
target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES}
PRIVATE ngraph_reference openvino::itt ngraph::builder pugixml)
target_link_libraries(${TARGET_NAME} PUBLIC ngraph
PRIVATE ngraph_reference openvino::itt ngraph::builder pugixml::static)
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
inference-engine/src/vpu/CMakeLists.txt
-8
View File
@@ -14,14 +14,6 @@ add_subdirectory(common)
if(ENABLE_MYRIAD)
add_subdirectory(graph_transformer)
add_subdirectory(
"${IE_MAIN_SOURCE_DIR}/thirdparty/movidius"
"${CMAKE_CURRENT_BINARY_DIR}/thirdparty/movidius")
#
# Build plugins
#
add_subdirectory(myriad_plugin)
if(DEFINED VPU_CLC_MA2X8X_ROOT)
inference-engine/src/vpu/common/CMakeLists.txt
+2 -2
View File
@@ -32,7 +32,7 @@ function(add_common_target TARGET_NAME STATIC_IE)
"${CMAKE_CURRENT_SOURCE_DIR}/include")
target_include_directories(${TARGET_NAME} SYSTEM PUBLIC
$<TARGET_PROPERTY:${NGRAPH_LIBRARIES},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
@@ -48,7 +48,7 @@ function(add_common_target TARGET_NAME STATIC_IE)
openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES} inference_engine_transformations
target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations
PRIVATE openvino::itt)
if(NOT STATIC_IE)
inference-engine/src/vpu/graph_transformer/CMakeLists.txt
+4 -4
View File
@@ -37,19 +37,19 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
"${CMAKE_CURRENT_SOURCE_DIR}/include")
target_include_directories(${TARGET_NAME}
SYSTEM PUBLIC
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC
$<TARGET_PROPERTY:pugixml::static,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:mvnc,INTERFACE_INCLUDE_DIRECTORIES>)
if(STATIC_IE)
target_link_libraries(${TARGET_NAME} PUBLIC vpu_common_lib_test_static)
else()
target_link_libraries(${TARGET_NAME} PUBLIC pugixml vpu_common_lib)
target_link_libraries(${TARGET_NAME} PUBLIC pugixml::static vpu_common_lib)
endif()
target_link_libraries(${TARGET_NAME}
PUBLIC
${NGRAPH_LIBRARIES}
ngraph
inference_engine_plugin_api
PRIVATE
openvino::itt
inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
+1 -1
View File
@@ -54,7 +54,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
# install
if (LINUX)
install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
install(FILES ${mvnc_SOURCE_DIR}/src/97-myriad-usbboot.rules
DESTINATION ${IE_CPACK_IE_DIR}/external
COMPONENT myriad)
endif()
inference-engine/tests/functional/inference_engine/CMakeLists.txt
+4 -3
View File
@@ -18,6 +18,7 @@ set(LINK_LIBRARIES
inference_engine_snippets
offline_transformations
inference_engine
pugixml::static
)
set(DEPENDENCIES
@@ -149,12 +150,12 @@ function(ie_headers_compilation_with_custom_flags)
target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:inference_engine,INTERFACE_COMPILE_DEFINITIONS>)
if(IE_TEST_PLUGIN_API)
# ngraph, pugixml, openvino::itt, inference_engine_preproc headers
# ngraph, pugixml::static, openvino::itt, inference_engine_preproc headers
target_include_directories(${target_name} SYSTEM PRIVATE
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml::static,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(${target_name} PRIVATE
$<TARGET_PROPERTY:${NGRAPH_LIBRARIES},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_preproc,INTERFACE_INCLUDE_DIRECTORIES>)
else()
# OpenCL headers if any
inference-engine/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt
+4 -8
View File
@@ -4,12 +4,6 @@
set(TARGET_NAME subgraphsDumper)
list(APPEND DEPENDENCIES
gflags
inference_engine
commonTestUtils
)
addIeTargetTest(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
@@ -17,11 +11,13 @@ addIeTargetTest(
${CMAKE_CURRENT_SOURCE_DIR}/include
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
DEPENDENCIES
${DEPENDENCIES}
inference_engine_ir_reader
LINK_LIBRARIES
PRIVATE
${DEPENDENCIES}
gflags
inference_engine
commonTestUtils
pugixml::static
ADD_CPPLINT
)
inference-engine/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt
+5 -5
View File
@@ -12,15 +12,15 @@ list(APPEND DEPENDENCIES
addIeTargetTest(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
ADDITIONAL_SOURCE_DIRS ${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/tests/functional/plugin/conformance/subgraphs_dumper/src/matchers
ADDITIONAL_SOURCE_DIRS ${OpenVINO_SOURCE_DIR}/inference-engine/tests/functional/plugin/conformance/subgraphs_dumper/src/matchers
INCLUDES
${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/tests/functional/plugin/conformance/subgraphs_dumper/include
${OpenVINO_SOURCE_DIR}/inference-engine/tests/functional/plugin/conformance/subgraphs_dumper/include
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
DEPENDENCIES
${DEPENDENCIES}
LINK_LIBRARIES
PRIVATE
${DEPENDENCIES}
unitTestUtils
ngraph
pugixml::static
ADD_CPPLINT
)
inference-engine/tests/functional/plugin/conformance/test_runner/CMakeLists.txt
+2 -8
View File
@@ -4,11 +4,6 @@
set(TARGET_NAME conformanceTests)
list(APPEND EXPORT_DEPENDENCIES
gflags
funcSharedTests
)
addIeTargetTest(
NAME ${TARGET_NAME}
ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include"
@@ -20,9 +15,8 @@ addIeTargetTest(
"${CMAKE_CURRENT_SOURCE_DIR}/include"
LINK_LIBRARIES
PUBLIC
${EXPORT_DEPENDENCIES}
DEPENDENCIES
${EXPORT_DEPENDENCIES}
gflags
funcSharedTests
LABELS
CONFORMANCE
)
inference-engine/tests/functional/plugin/cpu/CMakeLists.txt
+2 -2
View File
@@ -6,13 +6,13 @@ set(TARGET_NAME cpuFuncTests)
add_library(cpuSpecificRtInfo STATIC ${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.hpp
${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.cpp)
target_link_libraries(cpuSpecificRtInfo PRIVATE ${NGRAPH_LIBRARIES})
target_link_libraries(cpuSpecificRtInfo PRIVATE ngraph)
set(INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin)
set(DEPENDENCIES MKLDNNPlugin AutoPlugin)
set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo)
if (NGRAPH_ONNX_IMPORT_ENABLE AND NOT NGRAPH_USE_PROTOBUF_LITE)
list(APPEND INCLUDES "${OpenVINO_MAIN_SOURCE_DIR}/docs/onnx_custom_op")
list(APPEND INCLUDES "${OpenVINO_SOURCE_DIR}/docs/onnx_custom_op")
list(APPEND LINK_LIBRARIES onnx_custom_op)
list(APPEND DEPENDENCIES template_extension onnx_custom_op)
else()
inference-engine/tests/functional/plugin/shared/CMakeLists.txt
+1
View File
@@ -27,6 +27,7 @@ addIeTarget(
${PUBLIC_HEADERS_DIR}
LINK_LIBRARIES
PUBLIC
pugixml::static
${EXPORT_DEPENDENCIES}
PRIVATE
inference_engine_transformations
inference-engine/tests/functional/shared_test_classes/CMakeLists.txt
+1
View File
@@ -23,6 +23,7 @@ addIeTarget(
${CMAKE_CURRENT_SOURCE_DIR}/src
LINK_LIBRARIES
PRIVATE
pugixml::static
${EXPORT_DEPENDENCIES}
EXPORT_DEPENDENCIES
${EXPORT_DEPENDENCIES}
inference-engine/tests/functional/shared_test_classes/src/read_ir/read_ir.cpp
+1
View File
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//
#include <pugixml.hpp>
#include "common_test_utils/file_utils.hpp"
#include "functional_test_utils/core_config.hpp"
#include "functional_test_utils/layer_test_utils/op_info.hpp"
inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
+1 -9
View File
@@ -5,12 +5,6 @@
function(add_common_utils ADD_TARGET_NAME)
list(APPEND EXPORT_DEPENDENCIES gtest gtest_main)
if(MSVC)
set(PUGI pugixml_mt)
else()
set(PUGI pugixml)
endif()
# create target
addIeTarget(
NAME ${ADD_TARGET_NAME}
@@ -25,8 +19,7 @@ function(add_common_utils ADD_TARGET_NAME)
${EXPORT_DEPENDENCIES}
LINK_LIBRARIES
PUBLIC
${PUGI}
${NGRAPH_LIBRARIES}
ngraph
${EXPORT_DEPENDENCIES}
inference_engine_transformations
)
@@ -63,7 +56,6 @@ function(add_common_utils ADD_TARGET_NAME)
PUBLIC
${IE_TESTS_ROOT}/ie_test_utils
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
PRIVATE
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt
+1
View File
@@ -28,6 +28,7 @@ addIeTarget(
inference_engine
PRIVATE
ngraphFunctions
pugixml::static
INCLUDES
PUBLIC
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/layer_test_utils/environment.hpp
-1
View File
@@ -4,7 +4,6 @@
#pragma once
#include <pugixml.hpp>
#include <gtest/gtest.h>
#include "ngraph/ngraph.hpp"
inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/layer_test_utils/summary.hpp
-2
View File
@@ -7,8 +7,6 @@
#include <map>
#include <fstream>
#include <pugixml.hpp>
#include "ngraph/ngraph.hpp"
#include "common_test_utils/test_constants.hpp"
inference-engine/tests/ie_test_utils/functional_test_utils/src/layer_test_utils/summary.cpp
+5 -5
View File
@@ -2,6 +2,8 @@
// SPDX-License-Identifier: Apache-2.0
//
#include <pugixml.hpp>
#include "functional_test_utils/layer_test_utils/summary.hpp"
#include "common_test_utils/file_utils.hpp"
@@ -177,8 +179,7 @@ void Summary::saveReport() {
pugi::xml_document doc;
std::ifstream file;
file.open(outputFilePath);
const bool fileExists = CommonTestUtils::fileExists(outputFilePath);
time_t rawtime;
struct tm *timeinfo;
@@ -191,7 +192,7 @@ void Summary::saveReport() {
strftime(timeNow, sizeof(timeNow), "%d-%m-%Y %H:%M:%S", timeinfo);
pugi::xml_node root;
if (file) {
if (fileExists) {
doc.load_file(outputFilePath.c_str());
root = doc.child("report");
//Ugly but shorter than to write predicate for find_atrribute() to update existing one
@@ -227,7 +228,7 @@ void Summary::saveReport() {
entry.append_attribute("passrate").set_value(it.second.getPassrate());
}
if (extendReport && file) {
if (extendReport && fileExists) {
auto opStataFromReport = summary.getOpStatisticFromReport();
for (auto &item : opStataFromReport) {
pugi::xml_node entry;
@@ -267,5 +268,4 @@ void Summary::saveReport() {
} else {
isReported = true;
}
file.close();
}
inference-engine/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt
+3 -4
View File
@@ -5,7 +5,6 @@
set(TARGET_NAME ngraphFunctions)
list(APPEND EXPORT_DEPENDENCIES
${NGRAPH_LIBRARIES}
ngraph_backend
interpreter_backend
)
@@ -22,9 +21,9 @@ addIeTarget(
ADDITIONAL_SOURCE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/src
LINK_LIBRARIES
PUBLIC
${NGRAPH_LIBRARIES}
ngraph_backend
PUBLIC
ngraph
# ngraph_backend
interpreter_backend
ADD_CPPLINT
DEVELOPER_PACKAGE
inference-engine/tests/unit/vpu/CMakeLists.txt
+1 -2
View File
@@ -13,7 +13,6 @@ addIeTargetTest(
# because ngraphFunctions sources need to be compiled with LTO as well
"${IE_TESTS_ROOT}/ngraph_helpers/ngraph_functions/src"
INCLUDES
"${IE_MAIN_SOURCE_DIR}/src/vpu/myriad_plugin"
"${XLINK_INCLUDE}"
"${XLINK_PLATFORM_INCLUDE}"
"${CMAKE_CURRENT_SOURCE_DIR}/base"
@@ -22,7 +21,7 @@ addIeTargetTest(
vpu_graph_transformer_test_static
unitTestUtils
mvnc
${NGRAPH_LIBRARIES}
ngraph
ngraph_backend
interpreter_backend
inference_engine_lp_transformations # for ngraphFunctions
inference-engine/tests_deprecated/behavior/vpu/CMakeLists.txt
-1
View File
@@ -57,7 +57,6 @@ function(enable_vpu TARGET_NAME FLAG_NAME PLUGIN_NAME)
target_include_directories(${TARGET_NAME} PRIVATE
$<TARGET_PROPERTY:vpu_graph_transformer,INTERFACE_INCLUDE_DIRECTORIES>
${CMAKE_CURRENT_SOURCE_DIR}/myriad_tests
${IE_MAIN_SOURCE_DIR}/thirdparty/movidius
${IE_MAIN_SOURCE_DIR}/src/inference_engine
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE})
inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include <behavior_test_plugin.h>
#include <XLink.h>
#include <mvnc.h>
#include <mvnc/include/ncPrivateTypes.h>
#include <ncPrivateTypes.h>
#include <watchdog.h>
#include <watchdogPrivate.hpp>
#include <thread>
inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@
set(TARGET_NAME IESharedTests)
list(APPEND SHARED_LIBRARIES
${NGRAPH_LIBRARIES}
ngraph
commonTestUtils
ngraphFunctions
ieTestHelpers
inference-engine/tests_deprecated/helpers/CMakeLists.txt
+1 -1
View File
@@ -22,7 +22,7 @@ function(add_helpers target_name)
target_include_directories(${target_name}
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
$<TARGET_PROPERTY:ie_samples_utils,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml::static,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
inference-engine/tests_deprecated/unit/CMakeLists.txt
-1
View File
@@ -68,7 +68,6 @@ if (ENABLE_MYRIAD)
include_directories(
engines/vpu/myriad_tests/helpers
${IE_MAIN_SOURCE_DIR}/src/vpu/myriad_plugin
${IE_MAIN_SOURCE_DIR}/thirdparty/movidius
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE})
inference-engine/tests_deprecated/unit/engines/vpu/mvnc/xlink_device_tests.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include <gmock/gmock.h>
#include <tests_common.hpp>
#include <watchdog/xlink_device.h>
#include <mvnc/include/ncPrivateTypes.h>
#include <ncPrivateTypes.h>
using namespace ::testing;
using namespace InferenceEngine;
inference-engine/thirdparty/CMakeLists.txt
Vendored
+4 -27
View File
@@ -2,6 +2,10 @@
# SPDX-License-Identifier: Apache-2.0
#
if(ENABLE_MYRIAD)
add_subdirectory(movidius)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unknown-warning-option -Wno-error=inconsistent-missing-override -Wno-error=pass-failed")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unknown-warning-option -Wno-error=inconsistent-missing-override -Wno-error=pass-failed")
@@ -38,33 +42,6 @@ if (ENABLE_CLDNN)
add_subdirectory(clDNN)
endif()
function(ie_build_pugixml)
set(BUILD_TESTS_current ${BUILD_TESTS})
set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(pugixml EXCLUDE_FROM_ALL)
set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE)
endfunction()
if (USE_SYSTEM_PUGIXML)
find_package(PugiXML REQUIRED)
set_property(TARGET pugixml PROPERTY IMPORTED_GLOBAL TRUE)
else()
ie_build_pugixml()
target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
endif()
# developer package
if (NOT USE_SYSTEM_PUGIXML)
set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS pugixml)
if(TARGET pugixml_mt)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS pugixml_mt)
set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty)
endif()
endif()
if(ENABLE_MKL_DNN)
set(DNNL_ENABLE_CONCURRENT_EXEC ON CACHE BOOL "" FORCE)
set(DNNL_ENABLE_PRIMITIVE_CACHE OFF CACHE BOOL "" FORCE) ## TODO: try it later
inference-engine/thirdparty/movidius/mvnc/CMakeLists.txt
Vendored
+2
View File
@@ -2,6 +2,8 @@
# SPDX-License-Identifier: Apache-2.0
#
project(mvnc LANGUAGES C)
set(TARGET_NAME "mvnc")
include(${XLINK_DIR}/XLink.cmake)
inference-engine/thirdparty/pugixml/CMakeLists.txt
Vendored
-88
View File
@@ -1,88 +0,0 @@
project(pugixml)
cmake_minimum_required(VERSION 2.6)
option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
option(BUILD_TESTS "Build tests" OFF)
option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)
set(BUILD_DEFINES "" CACHE STRING "Build defines")
if(MSVC)
option(STATIC_CRT "Use static CRT libraries" OFF)
# Rewrite command line flags to use /MT if necessary
if(STATIC_CRT)
foreach(flag_var
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
if(${flag_var} MATCHES "/MD")
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
endif(${flag_var} MATCHES "/MD")
endforeach(flag_var)
endif()
endif()
# Pre-defines standard install locations on *nix systems.
include(GNUInstallDirs)
mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR)
set(HEADERS src/pugixml.hpp src/pugiconfig.hpp)
set(SOURCES ${HEADERS} src/pugixml.cpp)
if(DEFINED BUILD_DEFINES)
foreach(DEFINE ${BUILD_DEFINES})
add_definitions("-D" ${DEFINE})
endforeach()
endif()
if(BUILD_SHARED_LIBS)
add_library(pugixml SHARED ${SOURCES})
else()
add_library(pugixml STATIC ${SOURCES})
if (MSVC)
add_library(pugixml_mt STATIC ${SOURCES})
#if (WIN32)
# set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
# set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
#endif()
endif()
endif()
# Enable C++11 long long for compilers that are capable of it
if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;")
target_compile_features(pugixml PUBLIC cxx_long_long_type)
endif()
set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1)
get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
if(BUILD_PKGCONFIG)
# Install library into its own directory under LIBDIR
set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
endif()
install(TARGETS pugixml EXPORT pugixml-config
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
if(BUILD_PKGCONFIG)
configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
endif()
if(BUILD_TESTS)
file(GLOB TEST_SOURCES tests/*.cpp)
file(GLOB FUZZ_SOURCES tests/fuzz_*.cpp)
list(REMOVE_ITEM TEST_SOURCES ${FUZZ_SOURCES})
add_executable(check ${TEST_SOURCES})
target_link_libraries(check pugixml)
endif()
if(BUILD_TESTS AND RUN_TESTS)
add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif()
inference-engine/thirdparty/pugixml/src/pugiconfig.hpp
Vendored
-74
View File
@@ -1,74 +0,0 @@
/**
* pugixml parser - version 1.7
* --------------------------------------------------------
* Copyright (C) 2006-2016, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
* Report bugs and download new versions at http://pugixml.org/
*
* This library is distributed under the MIT License. See notice at the end
* of this file.
*
* This work is based on the pugxml parser, which is:
* Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
*/
#ifndef HEADER_PUGICONFIG_HPP
#define HEADER_PUGICONFIG_HPP
// Uncomment this to enable wchar_t mode
// #define PUGIXML_WCHAR_MODE
// Uncomment this to enable compact mode
// #define PUGIXML_COMPACT
// Uncomment this to disable XPath
// #define PUGIXML_NO_XPATH
// Uncomment this to disable STL
// #define PUGIXML_NO_STL
// Uncomment this to disable exceptions
// #define PUGIXML_NO_EXCEPTIONS
// Set this to control attributes for public classes/functions, i.e.:
// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
// Tune these constants to adjust memory-related behavior
// #define PUGIXML_MEMORY_PAGE_SIZE 32768
// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
// Uncomment this to switch to header-only version
// #define PUGIXML_HEADER_ONLY
// Uncomment this to enable long long support
// #define PUGIXML_HAS_LONG_LONG
#endif
/**
* Copyright (c) 2006-2016 Arseny Kapoulkine
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
inference-engine/thirdparty/pugixml/src/pugixml.cpp
Vendored
-12635
View File
File diff suppressed because it is too large. Load diff
inference-engine/thirdparty/pugixml/src/pugixml.hpp
Vendored
-1413
View File
File diff suppressed because it is too large. Load diff
ngraph/CMakeLists.txt
+1 -1
View File
@@ -143,7 +143,7 @@ if(BUILD_SHARED_LIBS)
COMPONENT ngraph_dev)
endif()
configure_package_config_file(${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/ngraphConfig.cmake.in
configure_package_config_file(${OpenVINO_SOURCE_DIR}/cmake/templates/ngraphConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
INSTALL_DESTINATION cmake)
ngraph/python/CMakeLists.txt
+4 -4
View File
@@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 3.13)
project (pyngraph)
if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
if(NOT DEFINED OpenVINO_SOURCE_DIR)
find_package(InferenceEngineDeveloperPackage QUIET)
find_package(ngraph REQUIRED)
endif()
@@ -34,7 +34,7 @@ set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
message("Python version=${PYTHON_VERSION}")
set(LIBRARY_OUTPUT_DIRECTORY_BIN ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
if(OpenVINO_MAIN_SOURCE_DIR)
if(OpenVINO_SOURCE_DIR)
if(WIN32)
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/${PYTHON_VERSION}/)
else()
@@ -94,14 +94,14 @@ if(NGRAPH_UNIT_TEST_ENABLE)
endif()
# perform copy
if(OpenVINO_MAIN_SOURCE_DIR)
if(OpenVINO_SOURCE_DIR)
add_custom_command(TARGET _${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/src/ngraph ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngraph
)
endif()
if(OpenVINO_MAIN_SOURCE_DIR OR InferenceEngineDeveloperPackage_FOUND)
if(OpenVINO_SOURCE_DIR OR InferenceEngineDeveloperPackage_FOUND)
if(COMMAND ie_python_minimal_api)
ie_python_minimal_api(_${PROJECT_NAME})
endif()
ngraph/test/util/CMakeLists.txt
+2 -1
View File
@@ -26,7 +26,8 @@ if(COMMAND ie_faster_build)
)
endif()
target_include_directories(ngraph_test_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${IE_MAIN_SOURCE_DIR}/include)
target_include_directories(ngraph_test_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>)
target_link_libraries(ngraph_test_util PUBLIC ngraph ngraph_backend gtest gmock)
if (NGRAPH_ONNX_IMPORT_ENABLE)
target_link_libraries(ngraph_test_util PRIVATE onnx_common)
scripts/CMakeLists.txt
+8 -8
View File
@@ -6,17 +6,17 @@
# Shellcheck
#
ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
SKIP "${OpenVINO_MAIN_SOURCE_DIR}/bin"
"${OpenVINO_MAIN_SOURCE_DIR}/build"
"${OpenVINO_MAIN_SOURCE_DIR}/thirdparty"
ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
SKIP "${OpenVINO_SOURCE_DIR}/bin"
"${OpenVINO_SOURCE_DIR}/build"
"${OpenVINO_SOURCE_DIR}/thirdparty"
"${IE_MAIN_SOURCE_DIR}/thirdparty"
"${TEMP}"
# TODO fix and enable back:
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/scripts/dependencies.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/scripts/install_dependencies/install_NEO_OCL_driver.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/scripts/install_dependencies/install_openvino_dependencies.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/ngraph/python/tests/test_onnx/model_zoo_preprocess.sh"
"${OpenVINO_SOURCE_DIR}/inference-engine/scripts/dependencies.sh"
"${OpenVINO_SOURCE_DIR}/scripts/install_dependencies/install_NEO_OCL_driver.sh"
"${OpenVINO_SOURCE_DIR}/scripts/install_dependencies/install_openvino_dependencies.sh"
"${OpenVINO_SOURCE_DIR}/ngraph/python/tests/test_onnx/model_zoo_preprocess.sh"
)
#
tests/fuzz/CMakeLists.txt
+2 -2
View File
@@ -11,11 +11,11 @@ if (CMAKE_BUILD_TYPE STREQUAL "")
set(CMAKE_BUILD_TYPE "Release")
endif()
set(OpenVINO_MAIN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
set(OpenVINO_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
if (NOT TARGET IE::inference_engine)
find_package(IEDevScripts REQUIRED
PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
PATHS "${OpenVINO_SOURCE_DIR}/cmake/developer_package"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
endif()
tests/stress_tests/CMakeLists.txt
+3 -3
View File
@@ -11,9 +11,9 @@ endif()
find_package(InferenceEngineDeveloperPackage REQUIRED)
set(OpenVINO_MAIN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
set(OpenVINO_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags")
if(EXISTS "${OpenVINO_SOURCE_DIR}/thirdparty/gflags")
function(add_gflags)
set(GFLAGS_IS_SUBPROJECT TRUE)
set(HAVE_SYS_STAT_H 1)
@@ -21,7 +21,7 @@ if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags")
set(INTTYPES_FORMAT C99)
set(BUILD_TESTING OFF)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags
add_subdirectory(${OpenVINO_SOURCE_DIR}/thirdparty/gflags
${CMAKE_CURRENT_BINARY_DIR}/gflags_build
EXCLUDE_FROM_ALL)
set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
tests/time_tests/CMakeLists.txt
+2 -2
View File
@@ -8,11 +8,11 @@ set (CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the build type")
project(time_tests)
set(OpenVINO_MAIN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
set(OpenVINO_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
# Search OpenVINO Inference Engine via InferenceEngine_DIR
find_package(IEDevScripts REQUIRED
PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
PATHS "${OpenVINO_SOURCE_DIR}/cmake/developer_package"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
tests/time_tests/src/timetests_helper/CMakeLists.txt
+2 -2
View File
@@ -8,7 +8,7 @@ file (GLOB SRC *.cpp)
add_library(${TARGET_NAME} STATIC ${SRC})
target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_SOURCE_DIR}/include")
if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags")
if(EXISTS "${OpenVINO_SOURCE_DIR}/thirdparty/gflags")
function(add_gflags)
set(GFLAGS_IS_SUBPROJECT TRUE)
set(HAVE_SYS_STAT_H 1)
@@ -16,7 +16,7 @@ if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags")
set(INTTYPES_FORMAT C99)
set(BUILD_TESTING OFF)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags
add_subdirectory(${OpenVINO_SOURCE_DIR}/thirdparty/gflags
${CMAKE_CURRENT_BINARY_DIR}/gflags_build
EXCLUDE_FROM_ALL)
set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
thirdparty/CMakeLists.txt
Vendored
+19
View File
@@ -15,6 +15,25 @@ add_subdirectory(ocl EXCLUDE_FROM_ALL)
add_subdirectory(xbyak EXCLUDE_FROM_ALL)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak)
#
# Pugixml
#
if(ENABLE_SYSTEM_PUGIXML)
find_package(PugiXML REQUIRED)
set_property(TARGET pugixml PROPERTY IMPORTED_GLOBAL TRUE)
add_library(pugixml::static ALIAS pugixml)
else()
function(ie_build_pugixml)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(pugixml EXCLUDE_FROM_ALL)
set_property(TARGET pugixml-static PROPERTY EXPORT_NAME pugixml)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS pugixml::static)
endfunction()
ie_build_pugixml()
endif()
#
# Fluid, G-API, OpenCV HAL
#
thirdparty/pugixml
Vendored Submodule
+1
Submodule thirdparty/pugixml added at 08b3433180.
tools/CMakeLists.txt
+2 -2
View File
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13)
project(python_tools)
if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
if(NOT DEFINED OpenVINO_SOURCE_DIR)
find_package(InferenceEngineDeveloperPackage QUIET)
endif()
@@ -23,7 +23,7 @@ if(ENABLE_PYTHON)
# creates a copy inside bin directory for developers to have ability running python benchmark_app
add_custom_target(${TARGET_NAME} ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}/tools
COMMAND ${CMAKE_COMMAND} -E copy_directory ${OpenVINO_MAIN_SOURCE_DIR}/tools/benchmark ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}/tools/benchmark
COMMAND ${CMAKE_COMMAND} -E copy_directory ${OpenVINO_SOURCE_DIR}/tools/benchmark ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}/tools/benchmark
)
ie_cpack_add_component(python_tools_${PYTHON_VERSION})