diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
12 files changed, 164 insertions, 890 deletions
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 deleted file mode 100644 index 39d40983..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch +++ /dev/null @@ -1,235 +0,0 @@ -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 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 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 | 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 f41d9df..a282cb4 100644 ---- a/inference-engine/CMakeLists.txt -+++ b/inference-engine/CMakeLists.txt -@@ -62,6 +62,10 @@ add_cpplint_target(sample_cpplint - EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*") - - if (ENABLE_PYTHON) -+ set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") -+ -+ #to be able to link -+ set (LIB_FOLDER ${IE_MAIN_SOURCE_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) - add_subdirectory(ie_bridges/python) - endif() - -diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake -index 682f2e5..36c3f4d 100644 ---- a/inference-engine/cmake/dependencies.cmake -+++ b/inference-engine/cmake/dependencies.cmake -@@ -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 -@@ -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 a27143d..950ccf4 100644 ---- a/inference-engine/cmake/developer_package.cmake -+++ b/inference-engine/cmake/developer_package.cmake -@@ -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}/${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 97e8c5e..9b03652 100644 ---- a/inference-engine/cmake/ie_parallel.cmake -+++ b/inference-engine/cmake/ie_parallel.cmake -@@ -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_RELEASE ${omp_lib_name}) - ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}") - 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 -+++ b/inference-engine/cmake/linux_name.cmake -@@ -5,7 +5,7 @@ - if (LINUX) - function(get_linux_name res_var) - if (NOT EXISTS "/etc/lsb-release") -- execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \; -+ execute_process(COMMAND find /usr/lib/ /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \; - OUTPUT_VARIABLE release_data RESULT_VARIABLE result) - 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 d3a094c..884b0a6 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE) - set (HAVE_SYS_STAT_H 1) - set (HAVE_INTTYPES_H 1) - --add_subdirectory(thirdparty/gflags) -- - if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) - 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 f4b34ad..2604c32 100644 ---- a/inference-engine/src/inference_engine/CMakeLists.txt -+++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -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") -+include_directories(${TARGET_NAME} "/usr/include/ngraph") - - 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}) -+set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} SOVERSION 1) - - # Static library used for unit tests which are always built - -@@ -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) -+set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s SOVERSION 1) - - 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 54de20f..4ea20f5 100644 ---- a/inference-engine/thirdparty/CMakeLists.txt -+++ b/inference-engine/thirdparty/CMakeLists.txt -@@ -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") -- - 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) - - add_subdirectory(stb_lib) - -- add_subdirectory(ade) -- export(TARGETS ade NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") -- -- include(ngraph.cmake) -- - add_subdirectory(fluid/modules/gapi) - export(TARGETS fluid NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") - endfunction() --- -2.7.4 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch new file mode 100644 index 00000000..7f5b46c6 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch @@ -0,0 +1,86 @@ +From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Wed, 29 Nov 2023 12:42:57 +0530 +Subject: [PATCH] cmake: yocto specific tweaks to the build process + +* Dont try to detect glibc version as that doesn't work when cross compiling. +* Dont try to detect CXX11_ABI +* Install sample binaries as well. +* Dont try to write triggers for CPack. We package ourselves. +* Fix the installation path for Python modules when baselib = lib64. + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- + cmake/developer_package/target_flags.cmake | 4 ++-- + samples/cpp/CMakeLists.txt | 6 +++--- + src/bindings/python/CMakeLists.txt | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake +index 99f11730983..1a1f61fcd3d 100644 +--- a/cmake/developer_package/packaging/rpm/rpm.cmake ++++ b/cmake/developer_package/packaging/rpm/rpm.cmake +@@ -156,7 +156,7 @@ ov_rpm_specific_settings() + # needed to add triggers for packages with libraries + set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") + set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") +-file(WRITE "${def_triggers}" "${triggers_content}") ++#file(WRITE "${def_triggers}" "${triggers_content}") + + # + # Functions helpful for packaging your modules with RPM cpack +diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake +index d047a1aebd9..4e8ca68c60f 100644 +--- a/cmake/developer_package/target_flags.cmake ++++ b/cmake/developer_package/target_flags.cmake +@@ -149,7 +149,7 @@ function(ov_glibc_version) + endif() + endfunction() + +-ov_glibc_version() ++#ov_glibc_version() + + # + # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler +@@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi) + endif() + endmacro() + +-ov_get_glibcxx_use_cxx11_abi() ++#ov_get_glibcxx_use_cxx11_abi() +diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt +index 4d33bff944e..3e7f1458578 100644 +--- a/samples/cpp/CMakeLists.txt ++++ b/samples/cpp/CMakeLists.txt +@@ -206,9 +206,9 @@ macro(ov_add_sample) + target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES}) + + install(TARGETS ${SAMPLE_NAME} +- RUNTIME DESTINATION samples_bin/ +- COMPONENT samples_bin +- EXCLUDE_FROM_ALL) ++ DESTINATION ${CMAKE_INSTALL_BINDIR} ++ COMPONENT samples_bin) ++ + + # create global target with all samples / demo apps + if(NOT TARGET ov_samples) +diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt +index 6cf43ec3fed..d539b9d003f 100644 +--- a/src/bindings/python/CMakeLists.txt ++++ b/src/bindings/python/CMakeLists.txt +@@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING) + # install OpenVINO Python API + + set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") +- set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") ++ set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") + set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") + set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO") + +-- +2.34.1 + 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 deleted file mode 100644 index 8b563b1c..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch +++ /dev/null @@ -1,267 +0,0 @@ -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 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 --Sample Apps source code to /usr/share/doc/inference_engine --Python library to /usr/lib/python3.7/site-packages --plugins.xml to /usr/share/openvino/inference-engine --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 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 +------- - .../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 | 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, 49 insertions(+), 19 deletions(-) - -diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt -index a282cb4..abb4de4 100644 ---- a/inference-engine/CMakeLists.txt -+++ b/inference-engine/CMakeLists.txt -@@ -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 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) - set(InferenceEngine_LIBRARIES inference_engine) - else() - include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake") -+ include("${CMAKE_CURRENT_LIST_DIR}/targets_cpu_extension.cmake") - 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 bba853f..444cce9 100644 ---- a/inference-engine/ie_bridges/python/CMakeLists.txt -+++ b/inference-engine/ie_bridges/python/CMakeLists.txt -@@ -53,4 +53,4 @@ endif() - - set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) - add_subdirectory (src/openvino/inference_engine) --add_subdirectory (src/openvino/tools/statistics_collector) -+#add_subdirectory (src/openvino/tools/statistics_collector) -diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt -index 1f46013..d6cd112 100644 ---- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt -+++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt -@@ -29,4 +29,6 @@ ADD_CUSTOM_COMMAND (TARGET ${TARGET_NAME} - COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/inference_engine/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py - COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/requirements.txt ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../../requirements.txt - COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../__init__.py --) -\ No newline at end of file -+) -+ -+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 884b0a6..25f9f23 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -39,14 +39,6 @@ if(NOT(UNIX)) - set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}) - set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${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 ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) -- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) -- set (CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) -- set (CMAKE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) -- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) -- set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) -- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib) - endif() - - if (WIN32) -@@ -188,6 +180,7 @@ macro(ie_add_sample) - if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT) - add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}) - endif() -+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) - endmacro() - - -diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt -index a8c9caf..dffa8cb 100644 ---- a/inference-engine/samples/common/format_reader/CMakeLists.txt -+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt -@@ -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 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) - function(set_target_cpu_flags TARGET_NAME) - endfunction() - --add_subdirectory(extension EXCLUDE_FROM_ALL) -+add_subdirectory(extension) - add_library(IE::ie_cpu_extension ALIAS ie_cpu_extension) - - file(GLOB_RECURSE EXTENSION_SOURCES extension/*.cpp extension/*.hpp extension/*.h) - add_cpplint_target(ie_cpu_extension_cpplint FOR_SOURCES ${EXTENSION_SOURCES}) -+ -+install(DIRECTORY extension DESTINATION include/inference_engine) -diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt -index 799a62d..fb14ebe 100644 ---- a/inference-engine/src/extension/CMakeLists.txt -+++ b/inference-engine/src/extension/CMakeLists.txt -@@ -49,7 +49,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "cpu_extension") - - target_link_libraries(${TARGET_NAME} PRIVATE ${InferenceEngine_LIBRARIES}) - --target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -+target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) - set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) - - set_target_cpu_flags(${TARGET_NAME}) -@@ -61,3 +61,6 @@ if (IE_MAIN_SOURCE_DIR) - export(TARGETS ${TARGET_NAME} NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") - endif() - -+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine) -+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 fdb1b0f..4955dc9 100644 ---- a/inference-engine/src/hetero_plugin/CMakeLists.txt -+++ b/inference-engine/src/hetero_plugin/CMakeLists.txt -@@ -21,3 +21,5 @@ target_include_directories(${TARGET_NAME} PRIVATE - ) - - 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 2604c32..54d3828 100644 ---- a/inference-engine/src/inference_engine/CMakeLists.txt -+++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -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") - - 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 --target_include_directories(${TARGET_NAME}_s PUBLIC "${PUBLIC_HEADERS_DIR}" -+target_include_directories(${TARGET_NAME}_s PUBLIC -+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include> -+ $<INSTALL_INTERFACE:include/${TARGET_NAME}> - PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" - PRIVATE "${IE_MAIN_SOURCE_DIR}/src/dumper") - -@@ -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 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") -@@ -204,3 +210,14 @@ configure_file( - "${CMAKE_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in" - "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake" - COPYONLY) -+ -+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine) -+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets.cmake) -+install(DIRECTORY ${PUBLIC_HEADERS_DIR}/ DESTINATION include/${TARGET_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") -+install(FILES -+ "${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake" -+ "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" -+ DESTINATION ${ConfigPackageLocation}) -+ -+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 1a2f078..b2668a9 100644 ---- a/inference-engine/src/inference_engine/ie_util_internal.cpp -+++ b/inference-engine/src/inference_engine/ie_util_internal.cpp -@@ -760,9 +760,10 @@ std::string getIELibraryPath() { - GetModuleFileNameA(hm, (LPSTR)ie_library_path, sizeof(ie_library_path)); - return getPathName(ie_library_path); - #else -- Dl_info info; -- dladdr(reinterpret_cast<void *>(getIELibraryPath), &info); -- return getPathName(info.dli_fname); -+ //Dl_info info; -+ //dladdr(reinterpret_cast<void *>(getIELibraryPath), &info); -+ //return getPathName(info.dli_fname); -+ return "/usr/share/openvino/inference-engine"; - #endif - } - -diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt -index d767724..80d33e6 100644 ---- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt -+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt -@@ -69,3 +69,4 @@ target_compile_definitions(test_${TARGET_NAME} PUBLIC -DMKLDNN_THR=${MKLDNN_THR} - target_link_libraries(test_${TARGET_NAME} PRIVATE inference_engine_s mkldnn) - - 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 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 @@ 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 8180802..2d37b1e 100644 ---- a/inference-engine/tests/unit/CMakeLists.txt -+++ b/inference-engine/tests/unit/CMakeLists.txt -@@ -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/0002-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch new file mode 100644 index 00000000..8a1464d5 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch @@ -0,0 +1,33 @@ +From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Wed, 29 Nov 2023 12:49:35 +0530 +Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error + +* Remove -Werror for: +|git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=] +| 129 | virtual JitDefinitions GetDefinitions() const = 0; +| | + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + src/plugins/intel_gpu/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt +index 2f3d9127dde..2fd4f5c1b3c 100644 +--- a/src/plugins/intel_gpu/CMakeLists.txt ++++ b/src/plugins/intel_gpu/CMakeLists.txt +@@ -47,7 +47,7 @@ add_subdirectory(thirdparty) + include(thirdparty/cmake/rapidjson.cmake) + + if(CMAKE_COMPILER_IS_GNUCXX) +- ov_add_compiler_flags(-Werror) ++ #ov_add_compiler_flags(-Werror) + endif() + + add_subdirectory(src/runtime) +-- +2.34.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch new file mode 100644 index 00000000..bbdeaa2a --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch @@ -0,0 +1,45 @@ +From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Wed, 29 Nov 2023 12:55:19 +0530 +Subject: [PATCH 3/3] protobuf: allow target protoc to be built + +We can run target binaries using a qemu wrapper so allow these to be +built and run. + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + cmake/developer_package/frontends/frontends.cmake | 2 +- + thirdparty/protobuf/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake +index f3b5520d6d2..7579f638c5a 100644 +--- a/cmake/developer_package/frontends/frontends.cmake ++++ b/cmake/developer_package/frontends/frontends.cmake +@@ -163,7 +163,7 @@ macro(ov_add_frontend) + set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) + add_custom_command( + OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" +- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} ++ COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} + DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} + COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" + VERBATIM +diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt +index 15f32601f23..36853caf7dc 100644 +--- a/thirdparty/protobuf/CMakeLists.txt ++++ b/thirdparty/protobuf/CMakeLists.txt +@@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE) + if(CMAKE_CROSSCOMPILING OR + (APPLE AND (HOST_X86_64 AND AARCH64)) OR + (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) +- set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE) ++ set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) + else() + set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) + endif() +-- +2.34.1 + 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 deleted file mode 100644 index c6371181..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch +++ /dev/null @@ -1,81 +0,0 @@ -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 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> ---- - 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 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") - # Build targets settings. - - # Path which points to default root directory for compilation output. --set(CLDNN_BUILD__DEFAULT_OUT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/build/out") -+set(CLDNN_BUILD__DEFAULT_OUT_ROOT "${CMAKE_BINARY_DIR}") -+set(CLDNN__OUTPUT_DIR, "${CMAKE_BINARY_DIR}") - - # 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 99e947e..fb25578 100644 ---- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt -+++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt -@@ -206,17 +206,39 @@ target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRAR - - # ========================================== Installation ============================================== - -+if(UNIX) -+ include(GNUInstallDirs) -+endif(UNIX) -+ -+ - # API headers. --install(DIRECTORY "${CLDNN__API_DIR}/" -+if(UNIX) -+ install(DIRECTORY "${CLDNN__API_DIR}/" -+ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/clDNN" -+ FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ -+ ) -+else() -+ install(DIRECTORY "${CLDNN__API_DIR}/" - DESTINATION "include/clDNN" - FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ - ) -+endif(UNIX) -+ - # Binaries. --install(TARGETS "${CLDNN_BUILD__PROJ}" -- ARCHIVE DESTINATION "lib" -- LIBRARY DESTINATION "lib" -- RUNTIME DESTINATION "bin" -- INCLUDES DESTINATION "include/clDNN" -- ) -+if(UNIX) -+ install(TARGETS "${CLDNN_BUILD__PROJ}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" -+ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" -+ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/clDNN" -+ ) -+else() -+ install(TARGETS "${CLDNN_BUILD__PROJ}" -+ ARCHIVE DESTINATION "lib" -+ LIBRARY DESTINATION "lib" -+ RUNTIME DESTINATION "bin" -+ INCLUDES DESTINATION "include/clDNN" -+ ) -+endif(UNIX) - - # ====================================================================================================== --- -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 deleted file mode 100644 index ca912fdf..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch +++ /dev/null @@ -1,97 +0,0 @@ -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 4/7] disable werror - -This shouldn't be enabled and leads to multiple errors when compiling -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 - - inference-engine/src/extension/CMakeLists.txt | 1 - - inference-engine/thirdparty/clDNN/CMakeLists.txt | 2 -- - inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 - - inference-engine/tools/CMakeLists.txt | 1 - - 6 files changed, 7 deletions(-) - -diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake -index ad15859..d471246 100644 ---- a/inference-engine/cmake/os_flags.cmake -+++ b/inference-engine/cmake/os_flags.cmake -@@ -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") - 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 25f9f23..9aa5d5a 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -59,7 +59,6 @@ if (WIN32) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings - endif() - else() -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") #treating warnings as errors - if (APPLE) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") - elseif(UNIX) -diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt -index fb14ebe..228bb8c 100644 ---- a/inference-engine/src/extension/CMakeLists.txt -+++ b/inference-engine/src/extension/CMakeLists.txt -@@ -25,7 +25,6 @@ if (WIN32) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings - endif() - else() -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - endif() - - if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) -diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt -index 03e5bad..b9a3f5d 100644 ---- a/inference-engine/thirdparty/clDNN/CMakeLists.txt -+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt -@@ -760,8 +760,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") - MultiProcessorCompilation - DeadCodeEliminate - ExtensionsEnabled -- TreatWarnAsErrorEnabled -- WarnLevel4 - NoFastMath - StackProtector - ) -diff --git a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake -index a541215..bed8a59 100644 ---- a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake -+++ b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake -@@ -63,7 +63,6 @@ if(MSVC) - endif() - elseif(UNIX OR MINGW) - append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas") -- append_if_product(CMAKE_CCXX_FLAGS "-Werror") - append(CMAKE_CCXX_FLAGS "-fvisibility=internal") - 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 3d80df3..b6cb7d8 100644 ---- a/inference-engine/tools/CMakeLists.txt -+++ b/inference-engine/tools/CMakeLists.txt -@@ -24,7 +24,6 @@ endif() - if (WIN32) - # add_compile_options("/WX") - else() -- add_compile_options("-Werror") - 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 deleted file mode 100644 index 0a01f5ac..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 5/7] point to correct location of ngraph headers - -Upstream-Status: Pending -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - inference-engine/src/inference_engine/CMakeLists.txt | 2 +- - inference-engine/tests/unit/CMakeLists.txt | 3 ++- - 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 54d3828..4a9bedf 100644 ---- a/inference-engine/src/inference_engine/CMakeLists.txt -+++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -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") --include_directories(${TARGET_NAME} "/usr/include/ngraph") -+include_directories(${TARGET_NAME} "${NGRAPH_INCLUDES}") - - 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 2d37b1e..b98d5a6 100644 ---- a/inference-engine/tests/unit/CMakeLists.txt -+++ b/inference-engine/tests/unit/CMakeLists.txt -@@ -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 -- "${CMAKE_CURRENT_SOURCE_DIR}/mocks") -+ "${CMAKE_CURRENT_SOURCE_DIR}/mocks" -+ ${NGRAPH_INCLUDES}) - - 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/0006-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 deleted file mode 100644 index b0c0a5d4..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 6/7] Install clDNN plugin to CMAKE_INSTALL_LIBDIR - -Upstream-Status: Pending -Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> ---- - inference-engine/src/cldnn_engine/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt -index b618084..7bdb311 100644 ---- a/inference-engine/src/cldnn_engine/CMakeLists.txt -+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt -@@ -22,6 +22,8 @@ target_include_directories(${TARGET_NAME} PRIVATE - ${IE_MAIN_SOURCE_DIR}/src/inference_engine - ${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src) - -+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ - # copy default global xml file describing the custom kernels and the *.cl files - - add_custom_command(TARGET ${TARGET_NAME} POST_BUILD --- -2.7.4 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index 2a2b1ba3..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 7/7] Install mock_engine to CMAKE_INSTALL_LIBDIR - -Upstream-Status: Pending -Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> ---- - inference-engine/tests/mock_engine/CMakeLists.txt | 2 ++ - 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..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 - set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 11) - set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) - set_property(TARGET ${TARGET_NAME} PROPERTY COMPILE_PDB_NAME ${TARGET_NAME}) -+ -+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- -2.7.4 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch deleted file mode 100644 index a4c75ff3..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 1f6f05ae4d3fba95ccc34a4622d06b9d2bf88e80 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Fri, 27 Sep 2019 11:34:36 +0800 -Subject: [PATCH] Simplify searching for firmware files - -Disable runtime fetching when VPU_FIRMWARE_*_FILE variables are defined -and point to already fetched firmware instead. - -Do it all in one foreach loop. - -Upstream-Status: Submitted [https://github.com/opencv/dldt/pull/302] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - inference-engine/cmake/vpu_dependencies.cmake | 63 ++++++------------- - 1 file changed, 20 insertions(+), 43 deletions(-) - -diff --git a/inference-engine/cmake/vpu_dependencies.cmake b/inference-engine/cmake/vpu_dependencies.cmake -index 1550163d..e0bc844e 100644 ---- a/inference-engine/cmake/vpu_dependencies.cmake -+++ b/inference-engine/cmake/vpu_dependencies.cmake -@@ -4,52 +4,29 @@ - - set(VPU_SUPPORTED_SOC ma2450 ma2x8x mv0262) - --# --# Default firmware packages --# -- --RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2450 -- ARCHIVE_UNIFIED firmware_ma2450_759W.zip -- TARGET_PATH "${TEMP}/vpu/firmware/ma2450" -- ENVIRONMENT "VPU_FIRMWARE_MA2450" -- FOLDER) --debug_message(STATUS "ma2450=" ${VPU_FIRMWARE_MA2450}) -- --RESOLVE_DEPENDENCY(VPU_FIRMWARE_MV0262 -- ARCHIVE_UNIFIED firmware_mv0262_mdk_R9.8.zip -- TARGET_PATH "${TEMP}/vpu/firmware/mv0262" -- ENVIRONMENT "VPU_FIRMWARE_MV0262" -- FOLDER) --debug_message(STATUS "mv0262=" ${VPU_FIRMWARE_MV0262}) -- --RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2X8X -- ARCHIVE_UNIFIED firmware_ma2x8x_mdk_R9.8.zip -- TARGET_PATH "${TEMP}/vpu/firmware/ma2x8x" -- ENVIRONMENT "VPU_FIRMWARE_MA2X8X" -- FOLDER) --debug_message(STATUS "ma2x8x=" ${VPU_FIRMWARE_MA2X8X}) -- --# --# CMake variables to override default firmware files --# -- - foreach(soc IN LISTS VPU_SUPPORTED_SOC) - string(TOUPPER "${soc}" soc_upper) -- set(var_name VPU_FIRMWARE_${soc_upper}_FILE) -+ set(var_name_file VPU_FIRMWARE_${soc_upper}_FILE) -+ set(var_name VPU_FIRMWARE_${soc_upper}) -+ set(var_name_zip firmware_${soc}_mdk_R9.8.zip) -+ if(${soc} STREQUAL "ma2450") -+ set(var_name_zip firmware_${soc}_759W.zip) -+ endif() - -- find_file(${var_name} MvNCAPI-${soc}.mvcmd "${VPU_FIRMWARE_${soc_upper}}/mvnc") -- if(NOT ${var_name}) -- message(FATAL_ERROR "[VPU] Missing ${soc} firmware") -+ if(NOT DEFINED ${var_name_file}) -+ RESOLVE_DEPENDENCY(${var_name} -+ ARCHIVE_UNIFIED ${var_name_zip} -+ TARGET_PATH "${TEMP}/vpu/firmware/${soc}" -+ ENVIRONMENT "${var_name}" -+ FOLDER) -+ find_file(${var_name_file} NAMES "MvNCAPI-${soc}.mvcmd" PATHS "${VPU_FIRMWARE_${soc_upper}}/mvnc" NO_CMAKE_FIND_ROOT_PATH) - endif() --endforeach() - --# --# `vpu_copy_firmware` CMake target --# -+ if(NOT ${var_name_file}) -+ message(FATAL_ERROR "[VPU] Missing ${soc} firmware, MvNCAPI-${soc}.mvcmd not found in ${VPU_FIRMWARE_${soc_upper}}/mvnc env $ENV{${var_name}} ") -+ endif() - --foreach(soc IN LISTS VPU_SUPPORTED_SOC) -- string(TOUPPER "${soc}" soc_upper) -- set(var_name VPU_FIRMWARE_${soc_upper}_FILE) -+ debug_message(STATUS "${soc}=" ${${var_name_file}}) - - set(firmware_out_file "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/MvNCAPI-${soc}.mvcmd") - list(APPEND all_firmware_files ${firmware_out_file}) -@@ -57,9 +34,9 @@ foreach(soc IN LISTS VPU_SUPPORTED_SOC) - add_custom_command( - OUTPUT ${firmware_out_file} - COMMAND -- ${CMAKE_COMMAND} -E copy ${${var_name}} ${firmware_out_file} -- MAIN_DEPENDENCY ${${var_name}} -- COMMENT "[VPU] Copy ${${var_name}} to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" -+ ${CMAKE_COMMAND} -E copy ${${var_name_file}} ${firmware_out_file} -+ MAIN_DEPENDENCY ${${var_name_file}} -+ COMMENT "[VPU] Copy ${${var_name_file}} to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" - VERBATIM) - endforeach() - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest deleted file mode 100644 index 92f238a9..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# InferenceEngineUnitTests requires libmock_engine.so, since they are -# installed in the same directory we will need to set LD_LIBRARY_PATH -# so that libmock_engine.so is picked up correctly. We also assume that -# this script is only execute within the same directory where it is -# installed. - -export LD_LIBRARY_PATH=. - -./InferenceEngineUnitTests |sed \ - -e 's|\[.*OK.*\]\(.*\)|PASS:\1|' \ - -e 's|\[.*FAILED.*\]\(.*\)|FAIL:\1|' |