mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
610cdb495c
Release notes: https://github.com/openvinotoolkit/openvino/releases/tag/2021.3 Remove a patch that isn't needed anymore and refresh the rest. Remove dependency on onednn as it's using a forked version. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
194 lines
8.1 KiB
Diff
194 lines
8.1 KiB
Diff
From ca4a2b824de61c182b46e28fce875370ce46d4e1 Mon Sep 17 00:00:00 2001
|
|
From: Anuj Mittal <anuj.mittal@intel.com>
|
|
Date: Thu, 8 Apr 2021 14:19:51 +0800
|
|
Subject: [PATCH] inference-engine: use system installed packages
|
|
|
|
Use installed versions of ade, protobuf and tbb.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
---
|
|
cmake/dependencies.cmake | 19 -----------
|
|
inference-engine/CMakeLists.txt | 2 +-
|
|
inference-engine/cmake/dependencies.cmake | 34 -------------------
|
|
inference-engine/cmake/ie_parallel.cmake | 2 +-
|
|
inference-engine/samples/CMakeLists.txt | 2 +-
|
|
.../common_test_utils/CMakeLists.txt | 4 +--
|
|
.../unit_test_utils/CMakeLists.txt | 3 +-
|
|
inference-engine/thirdparty/CMakeLists.txt | 5 ++-
|
|
8 files changed, 7 insertions(+), 64 deletions(-)
|
|
|
|
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
|
|
index aed7614734..f5baa6f86b 100644
|
|
--- a/cmake/dependencies.cmake
|
|
+++ b/cmake/dependencies.cmake
|
|
@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
|
|
if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
|
|
set(protoc_version "3.7.1")
|
|
|
|
- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
|
|
- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
|
|
- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
|
|
- SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8"
|
|
- )
|
|
- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
|
|
-
|
|
- reset_deps_cache(SYSTEM_PROTOC)
|
|
-
|
|
- 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 95c657222e..20cbd5000b 100644
|
|
--- a/inference-engine/CMakeLists.txt
|
|
+++ b/inference-engine/CMakeLists.txt
|
|
@@ -20,7 +20,7 @@ function(ie_developer_export_targets)
|
|
endfunction()
|
|
|
|
function(ie_developer_export)
|
|
- set(all_dev_targets gflags ie_libraries)
|
|
+ set(all_dev_targets ie_libraries)
|
|
foreach(component IN LISTS openvino_export_components)
|
|
export(TARGETS ${${component}} NAMESPACE IE::
|
|
APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
|
|
diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
|
|
index 6fdfc6f3cd..c07bf0f3c8 100644
|
|
--- a/inference-engine/cmake/dependencies.cmake
|
|
+++ b/inference-engine/cmake/dependencies.cmake
|
|
@@ -138,40 +138,6 @@ endif ()
|
|
if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
|
|
reset_deps_cache(TBBROOT TBB_DIR)
|
|
|
|
- if (WIN32 AND X86_64)
|
|
- #TODO: add target_path to be platform specific as well, to avoid following if
|
|
- RESOLVE_DEPENDENCY(TBB
|
|
- ARCHIVE_WIN "tbb2020_20200415_win.zip"
|
|
- TARGET_PATH "${TEMP}/tbb"
|
|
- ENVIRONMENT "TBBROOT"
|
|
- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
|
|
- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
|
|
- RESOLVE_DEPENDENCY(TBB
|
|
- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
|
|
- TARGET_PATH "${TEMP}/tbb"
|
|
- ENVIRONMENT "TBBROOT"
|
|
- SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
|
|
- elseif(LINUX AND X86_64)
|
|
- RESOLVE_DEPENDENCY(TBB
|
|
- ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
|
|
- TARGET_PATH "${TEMP}/tbb"
|
|
- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
|
|
- elseif(LINUX AND AARCH64)
|
|
- RESOLVE_DEPENDENCY(TBB
|
|
- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
|
|
- TARGET_PATH "${TEMP}/tbb_yocto"
|
|
- ENVIRONMENT "TBBROOT"
|
|
- SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
|
|
- elseif(APPLE AND X86_64)
|
|
- RESOLVE_DEPENDENCY(TBB
|
|
- ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
|
|
- TARGET_PATH "${TEMP}/tbb"
|
|
- ENVIRONMENT "TBBROOT"
|
|
- SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
|
|
- else()
|
|
- message(FATAL_ERROR "TBB is not available on current platform")
|
|
- endif()
|
|
-
|
|
update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
|
|
update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder")
|
|
|
|
diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
|
|
index f8988aa105..42fedd10c5 100644
|
|
--- a/inference-engine/cmake/ie_parallel.cmake
|
|
+++ b/inference-engine/cmake/ie_parallel.cmake
|
|
@@ -6,7 +6,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
|
|
if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
|
|
find_package(TBB COMPONENTS tbb tbbmalloc)
|
|
set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE)
|
|
- set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
|
|
+ set("TBB_IMPORTED_TARGETS" "tbb;tbbmalloc" PARENT_SCOPE)
|
|
set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE)
|
|
if (TBB_FOUND)
|
|
if (TBB_VERSION VERSION_LESS 2020)
|
|
diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
|
|
index dfe9f2303d..6bc44019fe 100644
|
|
--- a/inference-engine/samples/CMakeLists.txt
|
|
+++ b/inference-engine/samples/CMakeLists.txt
|
|
@@ -126,7 +126,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
|
|
add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
|
|
set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
|
|
endfunction()
|
|
- add_gflags()
|
|
+ #add_gflags()
|
|
endif()
|
|
|
|
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
|
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 6e09201f1e..2d2e3524a5 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
|
|
@@ -43,7 +43,7 @@ function(add_gtest_libraries)
|
|
PROPERTIES FOLDER thirdparty)
|
|
endfunction()
|
|
|
|
-add_gtest_libraries()
|
|
+#add_gtest_libraries()
|
|
|
|
if (MSVC)
|
|
set(PUGI pugixml_mt)
|
|
@@ -52,8 +52,6 @@ else ()
|
|
endif ()
|
|
|
|
list(APPEND EXPORT_DEPENDENCIES
|
|
- gtest
|
|
- gtest_main
|
|
)
|
|
|
|
set(TARGET_NAME commonTestUtils)
|
|
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 ab956218aa..233eb5ea46 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
|
|
@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
|
|
|
|
list(APPEND EXPORT_DEPENDENCIES
|
|
commonTestUtils_s
|
|
- inference_engine_s
|
|
- gmock)
|
|
+ inference_engine_s)
|
|
|
|
addIeTarget(
|
|
NAME ${TARGET_NAME}
|
|
diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
|
|
index 9a6a9209f1..eda6a64161 100644
|
|
--- a/inference-engine/thirdparty/CMakeLists.txt
|
|
+++ b/inference-engine/thirdparty/CMakeLists.txt
|
|
@@ -62,14 +62,13 @@ else()
|
|
target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
|
|
endif()
|
|
|
|
-add_subdirectory(ade EXCLUDE_FROM_ALL)
|
|
add_subdirectory(fluid/modules/gapi)
|
|
|
|
-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
|
|
+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
|
|
|
|
# developer package
|
|
|
|
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
|
|
+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
|
|
|
|
if (NOT USE_SYSTEM_PUGIXML)
|
|
set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
|
|
--
|
|
2.29.0
|
|
|