diff options
9 files changed, 215 insertions, 246 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb index 3e3dd667..21b5198d 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb @@ -8,14 +8,13 @@ SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \ file://0001-R2-Build-fixes.patch;patchdir=../ \ file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=../ \ file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=../ \ - file://0003-Supply-firmware-at-build-time.patch;patchdir=../ \ file://0004-disable-werror.patch;patchdir=../ \ file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \ - file://0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ - file://0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ + file://0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ + file://0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ file://run-ptest \ " -SRCREV = "ba6e22b1b5ee4cbefcc30e8d9493cddb0bb3dfdf" +SRCREV = "1c794d971cdd3c94de5ea4a6c9588eac63f4cc57" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch index 38de10f4..39d40983 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch @@ -1,31 +1,33 @@ -From 3d7373487eacf4e3283183bbc9a771cb4b97c7ab Mon Sep 17 00:00:00 2001 +From 8a5804c723c5bd396e5029f254f866f19a679cc5 Mon Sep 17 00:00:00 2001 From: Erin Park <erin.park@intel.com> Date: Wed, 11 Sep 2019 09:04:23 -0700 -Subject: [PATCH] R2 Build fixes +Subject: [PATCH 1/7] R2 Build fixes +-Update to R3 -linux os-release name search -Use system libraries for (OMP/TBB) -Use system libraries for ngraph, ade, puigxml, gflags -Turn on ENABLE_PYTHON -Upstream-Status: Pending [Taken from Clear Linux] +Upstream-Status: Pending [Taken from Clear Linux and updated to R3] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> --- - inference-engine/CMakeLists.txt | 4 +++ - inference-engine/cmake/dependencies.cmake | 32 +++++++++++-------- - .../cmake/developer_package.cmake | 12 +++---- - inference-engine/cmake/ie_parallel.cmake | 10 +++--- - inference-engine/cmake/linux_name.cmake | 2 +- - inference-engine/samples/CMakeLists.txt | 2 -- - .../src/inference_engine/CMakeLists.txt | 5 +-- - inference-engine/thirdparty/CMakeLists.txt | 7 ---- - 8 files changed, 38 insertions(+), 36 deletions(-) + inference-engine/CMakeLists.txt | 4 +++ + inference-engine/cmake/dependencies.cmake | 30 ++++++++++++---------- + inference-engine/cmake/developer_package.cmake | 12 ++++----- + inference-engine/cmake/ie_parallel.cmake | 6 ++--- + inference-engine/cmake/linux_name.cmake | 2 +- + inference-engine/samples/CMakeLists.txt | 2 -- + .../src/inference_engine/CMakeLists.txt | 5 ++-- + inference-engine/thirdparty/CMakeLists.txt | 9 ------- + 8 files changed, 34 insertions(+), 36 deletions(-) diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt -index 0d449c9..5ee8f53 100644 +index f41d9df..a282cb4 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt -@@ -59,6 +59,10 @@ add_cpplint_target(sample_cpplint +@@ -62,6 +62,10 @@ add_cpplint_target(sample_cpplint EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*") if (ENABLE_PYTHON) @@ -37,120 +39,114 @@ index 0d449c9..5ee8f53 100644 endif() diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake -index 00a5b8e..d493426 100644 +index 682f2e5..36c3f4d 100644 --- a/inference-engine/cmake/dependencies.cmake +++ b/inference-engine/cmake/dependencies.cmake -@@ -71,11 +71,11 @@ if (WIN32) - ENVIRONMENT "OMP" - VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") - elseif(LINUX) -- RESOLVE_DEPENDENCY(OMP -- ARCHIVE_LIN "iomp.tgz" -- TARGET_PATH "${TEMP}/omp" -- ENVIRONMENT "OMP" -- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") -+# RESOLVE_DEPENDENCY(OMP -+# ARCHIVE_LIN "iomp.tgz" -+# TARGET_PATH "${TEMP}/omp" -+# ENVIRONMENT "OMP" -+# VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") - else(APPLE) - RESOLVE_DEPENDENCY(OMP - ARCHIVE_MAC "iomp_20190130_mac.tgz" -@@ -83,8 +83,11 @@ else(APPLE) - ENVIRONMENT "OMP" - VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") - endif() --log_rpath_from_dir(OMP "${OMP}/lib") --debug_message(STATUS "intel_omp=" ${OMP}) -+ -+if (OMP) -+ log_rpath_from_dir(OMP "${OMP}/lib") -+ debug_message(STATUS "intel_omp=" ${OMP}) -+endif () +@@ -51,11 +51,11 @@ if (THREADING STREQUAL "OMP") + ENVIRONMENT "OMP" + VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") + elseif(LINUX) +- RESOLVE_DEPENDENCY(OMP +- ARCHIVE_LIN "iomp.tgz" +- TARGET_PATH "${TEMP}/omp" +- ENVIRONMENT "OMP" +- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") ++ #RESOLVE_DEPENDENCY(OMP ++ # ARCHIVE_LIN "iomp.tgz" ++ # TARGET_PATH "${TEMP}/omp" ++ # ENVIRONMENT "OMP" ++ # VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") + else(APPLE) + RESOLVE_DEPENDENCY(OMP + ARCHIVE_MAC "iomp_20190130_mac.tgz" +@@ -63,8 +63,10 @@ if (THREADING STREQUAL "OMP") + ENVIRONMENT "OMP" + VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") + endif() +- log_rpath_from_dir(OMP "${OMP}/lib") +- debug_message(STATUS "intel_omp=" ${OMP}) ++ if (NOT LINUX) ++ log_rpath_from_dir(OMP "${OMP}/lib") ++ debug_message(STATUS "intel_omp=" ${OMP}) ++ endif () endif () ## TBB package -@@ -97,10 +100,10 @@ if (WIN32) - ENVIRONMENT "TBBROOT" - VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") - elseif(LINUX) -- RESOLVE_DEPENDENCY(TBB -- ARCHIVE_LIN "tbb2019_20181010_lin.tgz" -- TARGET_PATH "${TEMP}/tbb" -- ENVIRONMENT "TBBROOT") -+# RESOLVE_DEPENDENCY(TBB -+# ARCHIVE_LIN "tbb2019_20181010_lin.tgz" -+# TARGET_PATH "${TEMP}/tbb" -+# ENVIRONMENT "TBBROOT") - else(APPLE) - RESOLVE_DEPENDENCY(TBB - ARCHIVE_MAC "tbb2019_20190414_mac.tgz" -@@ -108,8 +111,11 @@ else(APPLE) - ENVIRONMENT "TBBROOT" - VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") - endif() --log_rpath_from_dir(TBB "${TBB}/lib") --debug_message(STATUS "tbb=" ${TBB}) -+ -+if (TBB) -+ log_rpath_from_dir(TBB "${TBB}/lib") -+ debug_message(STATUS "tbb=" ${TBB}) -+endif () +@@ -77,10 +79,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") + ENVIRONMENT "TBBROOT" + VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") + elseif(LINUX) +- RESOLVE_DEPENDENCY(TBB +- ARCHIVE_LIN "tbb2019_20181010_lin.tgz" +- TARGET_PATH "${TEMP}/tbb" +- ENVIRONMENT "TBBROOT") ++ #RESOLVE_DEPENDENCY(TBB ++ # ARCHIVE_LIN "tbb2019_20181010_lin.tgz" ++ # TARGET_PATH "${TEMP}/tbb" ++ # ENVIRONMENT "TBBROOT") + else(APPLE) + RESOLVE_DEPENDENCY(TBB + ARCHIVE_MAC "tbb2019_20190414_v1_mac.tgz" +@@ -88,8 +90,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") + ENVIRONMENT "TBBROOT" + VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") + endif() +- log_rpath_from_dir(TBB "${TBB}/lib") +- debug_message(STATUS "tbb=" ${TBB}) ++ if (NOT LINUX) ++ log_rpath_from_dir(TBB "${TBB}/lib") ++ debug_message(STATUS "tbb=" ${TBB}) ++ endif () endif () if (ENABLE_OPENCV) diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake -index 52e0fef..06ba167 100644 +index a27143d..950ccf4 100644 --- a/inference-engine/cmake/developer_package.cmake +++ b/inference-engine/cmake/developer_package.cmake -@@ -95,12 +95,12 @@ if(NOT UNIX) +@@ -93,12 +93,12 @@ if(NOT UNIX) set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY else() -- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) -- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) -- set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -- set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -- set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) -+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) -+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) -+ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -+ set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -+ set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) +- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) +- set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) +- set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) +- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) +- set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) ++ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) ++ set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) ++ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) ++ set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib) endif() diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake -index 8265701..9d4a884 100644 +index 97e8c5e..9b03652 100644 --- a/inference-engine/cmake/ie_parallel.cmake +++ b/inference-engine/cmake/ie_parallel.cmake -@@ -22,9 +22,9 @@ function(set_ie_threading_interface_for TARGET_NAME) - endif () - - if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE) -- find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH) -- find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH) -- find_library(TBB_LIBRARIES_DEBUG tbb_debug ${lib_dbg_path} NO_DEFAULT_PATH) -+ find_path(TBB_INCLUDE_DIRS tbb/tbb.h) -+ find_library(TBB_LIBRARIES_RELEASE tbb) -+ find_library(TBB_LIBRARIES_DEBUG tbb) - ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}") - ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}") - ext_message(STATUS "TBB Debug lib: ${TBB_LIBRARIES_DEBUG}") -@@ -78,8 +78,8 @@ function(set_ie_threading_interface_for TARGET_NAME) +@@ -36,8 +36,8 @@ function(set_ie_threading_interface_for TARGET_NAME) + endif () + + if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE) +- find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH) +- find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH) ++ find_path(TBB_INCLUDE_DIRS tbb/tbb.h) ++ find_library(TBB_LIBRARIES_RELEASE tbb) + ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}") + ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}") + if (NOT LINUX) +@@ -98,7 +98,7 @@ function(set_ie_threading_interface_for TARGET_NAME) endif () if (NOT OMP_LIBRARIES_RELEASE) - find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH) -- find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH) + find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name}) -+ find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name}) ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}") - ext_message(STATUS "OMP Debug lib: ${OMP_LIBRARIES_DEBUG}") - endif () + if (NOT LINUX) + find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH) diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake index 6713808..7e5e47a 100644 --- a/inference-engine/cmake/linux_name.cmake @@ -165,7 +161,7 @@ index 6713808..7e5e47a 100644 set(name_regex "NAME=\"([^ \"\n]*).*\"\n") set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"") diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index d354f64..3802624 100644 +index d3a094c..884b0a6 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE) @@ -178,10 +174,10 @@ index d354f64..3802624 100644 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") endif() diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index f3514ed..37a0744 100644 +index f4b34ad..2604c32 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -97,12 +97,13 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} +@@ -116,6 +116,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src") target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src") target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv") @@ -189,6 +185,8 @@ index f3514ed..37a0744 100644 if(ENABLE_MKL_DNN) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak") +@@ -125,7 +126,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT) + target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_UNICODE_PATH_SUPPORT) endif() -set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) @@ -196,8 +194,8 @@ index f3514ed..37a0744 100644 # Static library used for unit tests which are always built -@@ -132,7 +133,7 @@ if(WIN32) - target_compile_definitions(${TARGET_NAME}_s PRIVATE -DNOMINMAX) +@@ -159,7 +160,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT) + target_compile_definitions(${TARGET_NAME}_s PUBLIC ENABLE_UNICODE_PATH_SUPPORT) endif() -set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s) @@ -206,31 +204,32 @@ index f3514ed..37a0744 100644 target_link_libraries(${TARGET_NAME}_s PRIVATE fluid PRIVATE ngraph diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt -index 5a4b259..7208a0f 100644 +index 54de20f..4ea20f5 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt -@@ -7,12 +7,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override -Wno-pass-failed") - endif() +@@ -35,10 +35,6 @@ function(build_with_lto) + set(CMAKE_RANLIB "gcc-ranlib") + endif() --add_subdirectory(pugixml) --export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") --export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") +- add_subdirectory(pugixml) +- export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") +- export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") - - add_subdirectory(stb_lib) --add_subdirectory(ade) + if (TARGET pugixml_mt) + export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") + export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") +@@ -46,11 +42,6 @@ function(build_with_lto) - if (ENABLE_CLDNN) - set(CLDNN__OUTPUT_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) -@@ -40,8 +35,6 @@ if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release") - add_definitions(-fvisibility=default) - endif() + add_subdirectory(stb_lib) --include(ngraph.cmake) +- add_subdirectory(ade) +- export(TARGETS ade NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") +- +- include(ngraph.cmake) - - if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release") - remove_definitions(-fvisibility=default) - add_definitions(-fvisibility=hidden) + add_subdirectory(fluid/modules/gapi) + export(TARGETS fluid NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") + endfunction() -- -2.23.0 +2.7.4 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch index 01b6ade5..7fab7799 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch @@ -1,8 +1,9 @@ -From d751c5330eb512c0deb49d640b50d921b7466f89 Mon Sep 17 00:00:00 2001 +From d73cd3c504e1409861da0b6879ea0dbd4572e706 Mon Sep 17 00:00:00 2001 From: Erin Park <erin.park@intel.com> Date: Wed, 11 Sep 2019 10:33:58 -0700 -Subject: [PATCH] R2 Install DLDT headers, libs, sample Apps +Subject: [PATCH 2/7] R2 Install DLDT headers, libs, sample Apps +-Update to R3 -Libraries to /usr/lib64 -Headers to /usr/include -Sample Apps executable to /usr/bin @@ -12,38 +13,38 @@ Subject: [PATCH] R2 Install DLDT headers, libs, sample Apps -Create targets_cpu_extension.cmake Upstream-Status: Pending [Taken from Clear Linux with changes to install -libs at CMAKE_INSTALL_LIBDIR instead of hardcoded lib64] +libs at CMAKE_INSTALL_LIBDIR instead of hardcoded lib64 and update to R3] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> - +Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> --- inference-engine/CMakeLists.txt | 2 ++ inference-engine/cmake/config.cmake.in | 1 + inference-engine/ie_bridges/python/CMakeLists.txt | 2 +- .../src/openvino/inference_engine/CMakeLists.txt | 4 +++- - inference-engine/samples/CMakeLists.txt | 9 +-------- + inference-engine/samples/CMakeLists.txt | 9 +------- .../samples/common/format_reader/CMakeLists.txt | 2 ++ inference-engine/src/CMakeLists.txt | 4 +++- inference-engine/src/extension/CMakeLists.txt | 5 ++++- - inference-engine/src/hetero_plugin/CMakeLists.txt | 1 + - .../src/inference_engine/CMakeLists.txt | 22 +++++++++++++++++++--- - .../src/inference_engine/ie_util_internal.cpp | 7 ++++--- + inference-engine/src/hetero_plugin/CMakeLists.txt | 2 ++ + .../src/inference_engine/CMakeLists.txt | 25 ++++++++++++++++++---- + .../src/inference_engine/ie_util_internal.cpp | 7 +++--- inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 + .../src/vpu/myriad_plugin/CMakeLists.txt | 2 ++ inference-engine/tests/unit/CMakeLists.txt | 2 ++ - 14 files changed, 46 insertions(+), 18 deletions(-) + 14 files changed, 49 insertions(+), 19 deletions(-) diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt -index 5ee8f53..734fb45 100644 +index a282cb4..abb4de4 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt -@@ -67,3 +67,5 @@ if (ENABLE_PYTHON) +@@ -70,3 +70,5 @@ if (ENABLE_PYTHON) endif() add_cpplint_report_target() + +install(DIRECTORY samples DESTINATION share/doc/inference_engine) diff --git a/inference-engine/cmake/config.cmake.in b/inference-engine/cmake/config.cmake.in -index d9a6918..8e406be 100644 +index ebe82ee..0d7e6a4 100644 --- a/inference-engine/cmake/config.cmake.in +++ b/inference-engine/cmake/config.cmake.in @@ -7,6 +7,7 @@ if(DEFINED IE_MAIN_SOURCE_DIR AND TARGET inference_engine) @@ -51,14 +52,14 @@ index d9a6918..8e406be 100644 else() include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/targets_cpu_extension.cmake") - get_target_property(InferenceEngine_INCLUDE_DIRS IE::inference_engine INTERFACE_INCLUDE_DIRECTORIES) - set(InferenceEngine_LIBRARIES IE::inference_engine) - endif() + if(NOT WIN32) + set_target_properties(IE::inference_engine PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-error=deprecated-declarations") + endif() diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt -index 9fca214..1d21443 100644 +index bba853f..444cce9 100644 --- a/inference-engine/ie_bridges/python/CMakeLists.txt +++ b/inference-engine/ie_bridges/python/CMakeLists.txt -@@ -49,4 +49,4 @@ find_package (InferenceEngine REQUIRED) +@@ -53,4 +53,4 @@ endif() set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) add_subdirectory (src/openvino/inference_engine) @@ -78,7 +79,7 @@ index 1f46013..d6cd112 100644 + +install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION lib/${PYTHON_VERSION}/site-packages/) diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index 3802624..dd7b679 100644 +index 884b0a6..25f9f23 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -39,14 +39,6 @@ if(NOT(UNIX)) @@ -105,17 +106,17 @@ index 3802624..dd7b679 100644 diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt -index c4011c4..2322c3c 100644 +index a8c9caf..dffa8cb 100644 --- a/inference-engine/samples/common/format_reader/CMakeLists.txt +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt -@@ -43,3 +43,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) +@@ -40,3 +40,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) export(TARGETS ${TARGET_NAME} NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") + +install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt -index bd1793f..986040c 100644 +index 63fda2a..3a4bc48 100644 --- a/inference-engine/src/CMakeLists.txt +++ b/inference-engine/src/CMakeLists.txt @@ -37,8 +37,10 @@ set(InferenceEngine_SRC_DIRS ${CMAKE_SOURCE_DIR}/src) @@ -151,30 +152,34 @@ index 799a62d..fb14ebe 100644 +install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets_cpu_extension.cmake) diff --git a/inference-engine/src/hetero_plugin/CMakeLists.txt b/inference-engine/src/hetero_plugin/CMakeLists.txt -index 91eb189..abc0748 100644 +index fdb1b0f..4955dc9 100644 --- a/inference-engine/src/hetero_plugin/CMakeLists.txt +++ b/inference-engine/src/hetero_plugin/CMakeLists.txt -@@ -21,3 +21,4 @@ target_link_libraries(${TARGET_NAME} PRIVATE inference_engine) - set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) +@@ -21,3 +21,5 @@ target_include_directories(${TARGET_NAME} PRIVATE + ) - add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) + target_link_libraries(${TARGET_NAME} PRIVATE inference_engine ade) ++ +install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index 37a0744..c0c803d 100644 +index 2604c32..54d3828 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -90,7 +90,9 @@ if(WIN32) +@@ -110,8 +110,11 @@ if(WIN32) endif() # Properties->C/C++->General->Additional Include Directories -target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} +- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") +target_include_directories(${TARGET_NAME} PUBLIC + $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include> + $<INSTALL_INTERFACE:include/${TARGET_NAME}> - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" - "${IE_MAIN_SOURCE_DIR}/src/dumper") ++ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" ++ "${IE_MAIN_SOURCE_DIR}/src/dumper") -@@ -114,7 +116,9 @@ add_library(${TARGET_NAME}_s STATIC + target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src") + target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src") +@@ -137,7 +140,9 @@ add_library(${TARGET_NAME}_s STATIC set_ie_threading_interface_for(${TARGET_NAME}_s) # Properties->C/C++->General->Additional Include Directories @@ -185,17 +190,17 @@ index 37a0744..c0c803d 100644 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" PRIVATE "${IE_MAIN_SOURCE_DIR}/src/dumper") -@@ -146,7 +150,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid +@@ -173,7 +178,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) ie_register_plugins(MAIN_TARGET ${TARGET_NAME} -- POSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin) +- POSSIBLE_PLUGINS MultiDevicePlugin HeteroPlugin clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin HDDLPlugin) + P $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include> ++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>OSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin) # export targets export(TARGETS ${TARGET_NAME} NAMESPACE IE:: FILE "${CMAKE_BINARY_DIR}/targets.cmake") -@@ -177,3 +182,14 @@ configure_file( +@@ -204,3 +210,14 @@ configure_file( "${CMAKE_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake" COPYONLY) @@ -211,10 +216,10 @@ index 37a0744..c0c803d 100644 + +install(FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml" DESTINATION /usr/share/openvino/inference-engine) diff --git a/inference-engine/src/inference_engine/ie_util_internal.cpp b/inference-engine/src/inference_engine/ie_util_internal.cpp -index 489ab24..2defd56 100644 +index 1a2f078..b2668a9 100644 --- a/inference-engine/src/inference_engine/ie_util_internal.cpp +++ b/inference-engine/src/inference_engine/ie_util_internal.cpp -@@ -755,9 +755,10 @@ std::string getIELibraryPath() { +@@ -760,9 +760,10 @@ std::string getIELibraryPath() { GetModuleFileNameA(hm, (LPSTR)ie_library_path, sizeof(ie_library_path)); return getPathName(ie_library_path); #else @@ -238,22 +243,25 @@ index d767724..80d33e6 100644 set_target_properties(test_${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME test_${TARGET_NAME}) +install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -index b51f1a6..c005473 100644 +index 7023513..b533f07 100644 --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -@@ -36,3 +36,5 @@ if (LINUX) - COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../vpu_custom_kernels - $<TARGET_FILE_DIR:${TARGET_NAME}>/vpu_custom_kernels) - endif() +@@ -36,3 +36,5 @@ endif() + target_link_libraries(${TARGET_NAME} + PRIVATE + ${INTEL_ITT_LIBS} inference_engine vpu_graph_transformer mvnc) + +install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt -index d83e088..641bef7 100644 +index 8180802..2d37b1e 100644 --- a/inference-engine/tests/unit/CMakeLists.txt +++ b/inference-engine/tests/unit/CMakeLists.txt -@@ -116,3 +116,5 @@ add_test(NAME ${TARGET_NAME} +@@ -122,3 +122,5 @@ add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME}) add_dependencies(${TARGET_NAME} mock_engine) + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) +-- +2.7.4 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch deleted file mode 100644 index 09107391..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f4533f5bfce9daee08a4fea61736315fbe4ad6db Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Fri, 27 Sep 2019 11:34:36 +0800 -Subject: [PATCH] Supply firmware at build time - -We'd like to supply firmware when fetching the sources. Disable runtime -fetching and point to fetched firmware instead. - -Upstream-Status: Submitted - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - inference-engine/cmake/dependencies.cmake | 18 ------------------ - 1 file changed, 18 deletions(-) - -diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake -index d493426..666ace6 100644 ---- a/inference-engine/cmake/dependencies.cmake -+++ b/inference-engine/cmake/dependencies.cmake -@@ -22,24 +22,6 @@ if(COMMAND get_linux_name) - get_linux_name(LINUX_OS_NAME) - endif() - --if (ENABLE_MYRIAD) -- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2450 -- ARCHIVE_UNIFIED firmware_ma2450_676.zip -- TARGET_PATH "${TEMP}/vpu/firmware/ma2450" -- ENVIRONMENT "VPU_FIRMWARE_MA2450" -- FOLDER) -- debug_message(STATUS "ma2450=" ${VPU_FIRMWARE_MA2450}) --endif () -- --if (ENABLE_MYRIAD) -- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2X8X -- ARCHIVE_UNIFIED firmware_ma2x8x_mdk_R8_9.zip -- TARGET_PATH "${TEMP}/vpu/firmware/ma2x8x" -- ENVIRONMENT "VPU_FIRMWARE_MA2X8X" -- FOLDER) -- debug_message(STATUS "ma2x8x=" ${VPU_FIRMWARE_MA2X8X}) --endif () -- - ## enable cblas_gemm from OpenBLAS package - if (GEMM STREQUAL "OPENBLAS") - if(NOT BLAS_LIBRARIES OR NOT BLAS_INCLUDE_DIRS) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch index ec8b9fea..c6371181 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch @@ -1,18 +1,18 @@ -From 970443ce6bf31128c3517374e2890a93518d988e Mon Sep 17 00:00:00 2001 +From 32c30549fa821b0df3f5f7fdf33d7989a9f1a776 Mon Sep 17 00:00:00 2001 From: Kevron Rees <kevron.m.rees@intel.com> Date: Wed, 3 Apr 2019 09:20:48 -0700 -Subject: [PATCH] use GNUInstallDirs on *nix +Subject: [PATCH 3/7] use GNUInstallDirs on *nix Upstream-Status: Submitted [Patch taken from Clear Linux and has been submitted upstream] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- - .../thirdparty/clDNN/CMakeLists.txt | 3 +- - .../thirdparty/clDNN/src/CMakeLists.txt | 36 +++++++++++++++---- + inference-engine/thirdparty/clDNN/CMakeLists.txt | 3 +- + .../thirdparty/clDNN/src/CMakeLists.txt | 36 +++++++++++++++++----- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt -index 624d95c..5957791 100644 +index c39fe5c..03e5bad 100644 --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt @@ -93,7 +93,8 @@ set(CLDNN__GTEST_DIR "${CLDNN__COMMON_DIR}/googletest-fused") @@ -26,10 +26,10 @@ index 624d95c..5957791 100644 # Prefix for all targets in internal pass. set(CLDNN_BUILD__PROJ_NAME_PREFIX "") diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt -index 132c6e4..cc88535 100644 +index 99e947e..fb25578 100644 --- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt -@@ -247,17 +247,39 @@ target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRAR +@@ -206,17 +206,39 @@ target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRAR # ========================================== Installation ============================================== @@ -77,5 +77,5 @@ index 132c6e4..cc88535 100644 # ====================================================================================================== -- -2.23.0 +2.7.4 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch index b5f52d56..ca912fdf 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch @@ -1,7 +1,7 @@ -From 68d6b80eb9cc87ff3598958b8a7f52b688b9436f Mon Sep 17 00:00:00 2001 +From 1ca4d5de754c6ee90f685f2706f657800cad8386 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <anuj.mittal@intel.com> Date: Fri, 27 Sep 2019 20:32:08 +0800 -Subject: [PATCH] disable werror +Subject: [PATCH 4/7] disable werror This shouldn't be enabled and leads to multiple errors when compiling cldnn and samples. @@ -9,6 +9,7 @@ cldnn and samples. Upstream-Status: Pending Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> --- inference-engine/cmake/os_flags.cmake | 1 - inference-engine/samples/CMakeLists.txt | 1 - @@ -19,19 +20,19 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 6 files changed, 7 deletions(-) diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake -index 6a5442f..a14a1ae 100644 +index ad15859..d471246 100644 --- a/inference-engine/cmake/os_flags.cmake +++ b/inference-engine/cmake/os_flags.cmake -@@ -48,7 +48,6 @@ if (WIN32) +@@ -47,7 +47,6 @@ if (WIN32) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}") endif() else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ") if (APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") - elseif(UNIX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function") diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index dd7b679..828abe6 100644 +index 25f9f23..9aa5d5a 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -59,7 +59,6 @@ if (WIN32) @@ -55,10 +56,10 @@ index fb14ebe..228bb8c 100644 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt -index 5957791..6007be4 100644 +index 03e5bad..b9a3f5d 100644 --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt -@@ -758,8 +758,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") +@@ -760,8 +760,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") MultiProcessorCompilation DeadCodeEliminate ExtensionsEnabled @@ -80,7 +81,7 @@ index a541215..bed8a59 100644 append(CMAKE_C_FLAGS "-std=c99") append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden") diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt -index fddfa28..a714fc1 100644 +index 3d80df3..b6cb7d8 100644 --- a/inference-engine/tools/CMakeLists.txt +++ b/inference-engine/tools/CMakeLists.txt @@ -24,7 +24,6 @@ endif() @@ -91,3 +92,6 @@ index fddfa28..a714fc1 100644 endif() if (ENABLE_OPENCV) +-- +2.7.4 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch index f335d247..0a01f5ac 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch @@ -1,7 +1,7 @@ -From 8335bac5c53b6cfe611a1c4987ca47aa6a60549f Mon Sep 17 00:00:00 2001 +From c17cee8005b9635699feea98bfc34ede340daf07 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <anuj.mittal@intel.com> Date: Fri, 27 Sep 2019 23:06:18 +0800 -Subject: [PATCH] point to correct location of ngraph headers +Subject: [PATCH 5/7] point to correct location of ngraph headers Upstream-Status: Pending Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> @@ -11,10 +11,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index c0c803d..a4425fd 100644 +index 54d3828..4a9bedf 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -99,7 +99,7 @@ target_include_directories(${TARGET_NAME} PUBLIC +@@ -119,7 +119,7 @@ target_include_directories(${TARGET_NAME} PUBLIC target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src") target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src") target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv") @@ -24,10 +24,10 @@ index c0c803d..a4425fd 100644 if(ENABLE_MKL_DNN) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak") diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt -index d83e088..29115d2 100644 +index 2d37b1e..b98d5a6 100644 --- a/inference-engine/tests/unit/CMakeLists.txt +++ b/inference-engine/tests/unit/CMakeLists.txt -@@ -85,7 +85,8 @@ target_include_directories(${TARGET_NAME} PRIVATE +@@ -83,7 +83,8 @@ target_include_directories(${TARGET_NAME} PRIVATE ${IE_MAIN_SOURCE_DIR}/src/extension ${IE_MAIN_SOURCE_DIR}/src/extension/common ${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src @@ -37,3 +37,6 @@ index d83e088..29115d2 100644 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) +-- +2.7.4 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch index 24feee25..b0c0a5d4 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch @@ -1,7 +1,7 @@ -From 1cc6ee3a1df0133e2ea7a4442bd05598a89958f6 Mon Sep 17 00:00:00 2001 +From e41aafcd133ecf7215e941e01a58fcacd5c91bd7 Mon Sep 17 00:00:00 2001 From: Chin Huat Ang <chin.huat.ang@intel.com> Date: Mon, 30 Sep 2019 13:50:45 +0800 -Subject: [PATCH] Install clDNN plugin to CMAKE_INSTALL_LIBDIR +Subject: [PATCH 6/7] Install clDNN plugin to CMAKE_INSTALL_LIBDIR Upstream-Status: Pending Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> @@ -10,10 +10,10 @@ Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> 1 file changed, 2 insertions(+) diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt -index 211f660..76c8086 100644 +index b618084..7bdb311 100644 --- a/inference-engine/src/cldnn_engine/CMakeLists.txt +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt -@@ -23,6 +23,8 @@ target_include_directories(${TARGET_NAME} PRIVATE +@@ -22,6 +22,8 @@ target_include_directories(${TARGET_NAME} PRIVATE ${IE_MAIN_SOURCE_DIR}/src/inference_engine ${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch index 74c260ab..2a2b1ba3 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch @@ -1,7 +1,7 @@ -From 34f3eb50ad5063bbf00ade1e9281e3c238d3216e Mon Sep 17 00:00:00 2001 +From 41c81231a9f3222423510f2b6b10f4e7024150de Mon Sep 17 00:00:00 2001 From: Chin Huat Ang <chin.huat.ang@intel.com> Date: Wed, 16 Oct 2019 13:06:26 +0800 -Subject: [PATCH] mock_engine: install to CMAKE_INSTALL_LIBDIR +Subject: [PATCH 7/7] Install mock_engine to CMAKE_INSTALL_LIBDIR Upstream-Status: Pending Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> @@ -10,7 +10,7 @@ Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> 1 file changed, 2 insertions(+) diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt -index a0f77cf..753c901 100644 +index a0f77cf..e23b93a 100644 --- a/inference-engine/tests/mock_engine/CMakeLists.txt +++ b/inference-engine/tests/mock_engine/CMakeLists.txt @@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_API |