From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 10 Jun 2020 09:43:55 +0800 Subject: [PATCH] inference-engine: use system installed packages Use installed versions of pugixml, ade, protobuf and tbb. Upstream-Status: Pending Signed-off-by: Anuj Mittal --- cmake/dependencies.cmake | 17 -------------- inference-engine/CMakeLists.txt | 2 +- inference-engine/cmake/ie_parallel.cmake | 7 +----- .../src/inference_engine/CMakeLists.txt | 23 +------------------ .../src/legacy_api/CMakeLists.txt | 3 +-- .../src/vpu/graph_transformer/CMakeLists.txt | 1 - .../common_test_utils/CMakeLists.txt | 7 ++---- .../unit_test_utils/CMakeLists.txt | 3 +-- .../tests_deprecated/helpers/CMakeLists.txt | 1 - inference-engine/thirdparty/CMakeLists.txt | 14 +---------- 10 files changed, 8 insertions(+), 70 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 2a5a74db6..9cc9a6c94 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) set(protoc_version "3.7.1") if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux) - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64") - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) else() message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation") endif() - reset_deps_cache(SYSTEM_PROTOC) - - message("${SYSTEM_PROTOC_ROOT}/bin") - find_program( - SYSTEM_PROTOC - NAMES protoc - PATHS "${SYSTEM_PROTOC_ROOT}/bin" - NO_DEFAULT_PATH) - if(NOT SYSTEM_PROTOC) - message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary") - endif() - - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") endif() diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt index 7f45ab021..db85e8690 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt @@ -57,7 +57,7 @@ function(ie_developer_export) APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") # Custom target to build only Inference Engine Developer Package targets - add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags + add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} inference_engine_ir_reader inference_engine_ir_v7_reader) endfunction() diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake index 7fd77ccc0..143dcf669 100644 --- a/inference-engine/cmake/ie_parallel.cmake +++ b/inference-engine/cmake/ie_parallel.cmake @@ -62,13 +62,8 @@ function(set_ie_threading_interface_for TARGET_NAME) set(IE_THREAD_DEFINE "IE_THREAD_SEQ") if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") - if (TBB_FOUND) set(IE_THREAD_DEFINE "IE_THREAD_TBB") - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) - else () - ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ - SEQ method will be used for ${TARGET_NAME}") - endif () + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) elseif (THREADING STREQUAL "OMP") if (WIN32) set(omp_lib_name libiomp5md) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index 9ab888983..105e666a3 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE $) target_include_directories(${TARGET_NAME}_common_obj SYSTEM PRIVATE - $ $) # Create object library @@ -139,8 +138,7 @@ add_library(${TARGET_NAME}_obj OBJECT target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $ - $) +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $) target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp @@ -233,25 +231,6 @@ list(APPEND core_components ngraph) if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") ie_cpack_add_component(tbb REQUIRED) list(APPEND core_components tbb) - - install(DIRECTORY "${TBB}/include" - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb - COMPONENT tbb) - install(DIRECTORY "${TBB}/lib" - 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) - endif() - install(FILES "${TBB}/LICENSE" - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb - COMPONENT tbb) - install(FILES "${TBB}/cmake/TBBConfig.cmake" - "${TBB}/cmake/TBBConfigVersion.cmake" - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake - COMPONENT tbb) endif() ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt index ed87a073a..adc970a09 100644 --- a/inference-engine/src/legacy_api/CMakeLists.txt +++ b/inference-engine/src/legacy_api/CMakeLists.txt @@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl $ $ - $ - $) + $) # Create shared library diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt index a45437453..7a67a8226 100644 --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) target_include_directories(${TARGET_NAME} SYSTEM PUBLIC - $ $ "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include") diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt index efead7271..732abee2d 100644 --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt @@ -23,7 +23,7 @@ function(add_gtest_libraries) PROPERTIES FOLDER thirdparty) endfunction() -add_gtest_libraries() +#add_gtest_libraries() if (MSVC) set(PUGI pugixml_mt) @@ -32,10 +32,7 @@ else () endif () list(APPEND EXPORT_DEPENDENCIES - ${PUGI} ${NGRAPH_LIBRARIES} - gtest - gtest_main ) set(TARGET_NAME commonTestUtils) @@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME) PUBLIC ${IE_TESTS_ROOT}/ie_test_utils $ - $ PRIVATE $ ) @@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME) target_link_libraries(${ADD_TARGET_NAME} PUBLIC ${EXPORT_DEPENDENCIES} + pugixml ) endfunction() diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt index dbb0f4e5b..9586d651d 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt @@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine) list(APPEND EXPORT_DEPENDENCIES commonTestUtils_s inference_engine_s - inference_engine_lp_transformations - gmock) + inference_engine_lp_transformations) addIeTarget( NAME ${TARGET_NAME} diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt index 2bc668965..e44ab9d5d 100644 --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt @@ -22,7 +22,6 @@ function(add_helpers target_name) target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${IE_MAIN_SOURCE_DIR}/src/inference_engine" $ - $ "${IE_MAIN_SOURCE_DIR}/src/vpu/" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt index a2550bfaa..0eb616415 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt @@ -51,28 +51,16 @@ function(build_with_lto) function(ie_build_pugixml) set(BUILD_TESTS_current ${BUILD_TESTS}) set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) - add_subdirectory(pugixml) set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE) endfunction() ie_build_pugixml() add_subdirectory(stb_lib) - add_subdirectory(ade) add_subdirectory(fluid/modules/gapi) - target_include_directories(pugixml INTERFACE "$") - - set_target_properties(pugixml ade fluid stb_image + set_target_properties(fluid stb_image PROPERTIES FOLDER thirdparty) - # developer package - - ie_developer_export_targets(ade fluid pugixml) - if(TARGET pugixml_mt) - ie_developer_export_targets(pugixml_mt) - set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) - endif() - if(ENABLE_MKL_DNN) set(SDL_cmake_included ON) include(mkldnn.cmake) -- 2.26.2