1 files changed, 42 insertions, 36 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
index 3fff5607..bbf186df 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
@@ -1,4 +1,4 @@
-From cc44429f0e55efa0fa142cc043e83123e3b376e4 Mon Sep 17 00:00:00 2001
+From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 10 Jun 2020 09:43:55 +0800
 Subject: [PATCH] inference-engine: use system installed packages
@@ -11,15 +11,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
  cmake/dependencies.cmake                      | 17 --------------
  inference-engine/CMakeLists.txt               |  2 +-
- inference-engine/cmake/ie_parallel.cmake      | 10 ++-------
- .../src/inference_engine/CMakeLists.txt       | 22 +------------------
+ 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, 9 insertions(+), 71 deletions(-)
+ 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
@@ -52,54 +52,60 @@ index 2a5a74db6..9cc9a6c94 100644
 -    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 39ff413bc..ba8ed354c 100644
+index 7f45ab021..db85e8690 100644
 --- a/inference-engine/CMakeLists.txt
 +++ b/inference-engine/CMakeLists.txt
-@@ -54,7 +54,7 @@ function(ie_developer_export)
-             APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
+@@ -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 ${IEDeveloperPackageTargets} gflags)
-+    add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets})
+-    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()
  
- add_subdirectory(thirdparty)
 diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
-index 0f3c41e0a..b3b2dfdab 100644
+index 7fd77ccc0..143dcf669 100644
 --- a/inference-engine/cmake/ie_parallel.cmake
 +++ b/inference-engine/cmake/ie_parallel.cmake
-@@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
+@@ -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")
--        find_package(TBB COMPONENTS tbb tbbmalloc)
 -        if (TBB_FOUND)
--            set(IE_THREAD_DEFINE "IE_THREAD_TBB")
+             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 ()
-+        set(IE_THREAD_DEFINE "IE_THREAD_TBB")
-+       target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc)
++           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 4ae0d5607..4106cf8b4 100644
+index 9ab888983..105e666a3 100644
 --- a/inference-engine/src/inference_engine/CMakeLists.txt
 +++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE)
-     target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE)
- endif()
+@@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE
+     $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
+ 
+ target_include_directories(${TARGET_NAME}_common_obj SYSTEM PRIVATE
+-    $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
+     $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
+ 
+ # 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_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
 -                                                             $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
 +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
  
  target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
-                                                       $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES>
-@@ -233,25 +232,6 @@ list(APPEND core_components ngraph)
+                                                       "${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)
@@ -126,10 +132,10 @@ index 4ae0d5607..4106cf8b4 100644
  
  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 85524310b..dc25cae2f 100644
+index ed87a073a..adc970a09 100644
 --- a/inference-engine/src/legacy_api/CMakeLists.txt
 +++ b/inference-engine/src/legacy_api/CMakeLists.txt
-@@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM
+@@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE
      ${IE_MAIN_SOURCE_DIR}/src/inference_engine                                          # For CNNNetworkNGraphImpl
      $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
      $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
@@ -140,7 +146,7 @@ index 85524310b..dc25cae2f 100644
  # Create shared library
  
 diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
-index 982d3c7fa..db881246c 100644
+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)
@@ -192,36 +198,36 @@ index efead7271..732abee2d 100644
  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 df611c700..06bd911ae 100644
+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
-@@ -10,8 +10,7 @@ list(APPEND EXPORT_DEPENDENCIES
+@@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine)
+ list(APPEND EXPORT_DEPENDENCIES
          commonTestUtils_s
          inference_engine_s
-         inference_engine_lp_transformations
--        inference_engine_ir_reader
+-        inference_engine_lp_transformations
 -        gmock)
-+        inference_engine_ir_reader)
++        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 bf915e52d..9e7173db6 100644
+index 2bc668965..e44ab9d5d 100644
 --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt
 +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
-@@ -23,7 +23,6 @@ function(add_helpers target_name)
+@@ -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"
-                                                      $<TARGET_PROPERTY:inference_engine_ir_reader,INTERFACE_INCLUDE_DIRECTORIES>
                                                       $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
 -                                                     $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
                                                       "${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 f94453e06..b3c25daf4 100644
+index a2550bfaa..0eb616415 100644
 --- a/inference-engine/thirdparty/CMakeLists.txt
 +++ b/inference-engine/thirdparty/CMakeLists.txt
-@@ -38,28 +38,16 @@ function(build_with_lto)
+@@ -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)