Release notes: https://software.intel.com/en-us/articles/OpenVINO-RelNotes
Signed-off-by: Anuj Mittal <[email protected]> --- ...3.1.bb => dldt-inference-engine_2020r1.bb} | 68 ++- .../0001-Installation-and-build-fixes.patch | 448 ++++++++++++++++++ .../opencv/files/0001-R2-Build-fixes.patch | 235 --------- ...nstall-DLDT-headers-libs-sample-Apps.patch | 267 ----------- .../0003-use-GNUInstallDirs-on-nix.patch | 81 ---- .../opencv/files/0004-disable-werror.patch | 97 ---- ...o-correct-location-of-ngraph-headers.patch | 42 -- ...clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch | 27 -- ...-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch | 24 - ...implify-searching-for-firmware-files.patch | 104 ---- 10 files changed, 479 insertions(+), 914 deletions(-) rename dynamic-layers/openembedded-layer/recipes-support/opencv/{dldt-inference-engine_2019r3.1.bb => dldt-inference-engine_2020r1.bb} (53%) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb similarity index 53% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb index 1074cf6d..d13752b0 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb @@ -4,55 +4,49 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ deep learning models through a high-level C++ Inference Engine API \ integrated with application logic." -SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \ - https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2450_759W.zip;name=ma2450 \ - https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2x8x_mdk_R9.8.zip;name=ma2x8x \ - https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_mv0262_mdk_R9.8.zip;name=mv0262 \ - 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://0004-disable-werror.patch;patchdir=.. \ - file://0005-point-to-correct-location-of-ngraph-headers.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://0008-Simplify-searching-for-firmware-files.patch;patchdir=.. \ +SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2020 \ + https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2450_942_R10.15.zip;name=ma2450 \ + https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_pcie-ma248x_942_R10.15.zip;name=ma248x \ + https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2x8x_942_R10.15.zip;name=ma2x8x \ + file://0001-Installation-and-build-fixes.patch \ file://run-ptest \ " -SRCREV = "fe3f978b98c86eaeed3cbdc280e1ffd0bc50d278" -SRC_URI[ma2450.md5sum] = "852f80c3248c451a6c8bfd96d871318f" -SRC_URI[ma2450.sha256sum] = "ba1b23b45cd8e548ead77af49b0e378100cf4f8dcda41a491868d3d4e7bf8cba" +SRCREV = "b2140c083a068a63591e8c2e9b5f6b240790519d" -SRC_URI[ma2x8x.md5sum] = "2d9ca6894cdd25e9b10f7908c415dbc9" -SRC_URI[ma2x8x.sha256sum] = "961ce4c7b14823a528185f5e75b3b6898a7e8f866b4b5b8af5f4f05f72226909" +SRC_URI[ma2450.sha256sum] = "32747515f0a387a8f878a88670aefe2788132fa24828b3775df791144627d9f6" +SRC_URI[ma248x.sha256sum] = "f32cd6396d0e6f0e4b24c8ee15e9f0b1b493ebbfc0f03371ca732f75b763d4a2" +SRC_URI[ma2x8x.sha256sum] = "c00f77692bfdccf92f32233b3dd1189f51dee73c15d79f35a612c7ba841d9c8d" -SRC_URI[mv0262.md5sum] = "c495f0ee0313e9d8d993e846a7868c4f" -SRC_URI[mv0262.sha256sum] = "0c0c8d7782f49dd4928837b52b4b6f25c1b088bfee23e464729057a28323ab77" - -LICENSE = "Apache-2.0 & ISSL" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://../../ISSL.txt;md5=ab31aad35d740d800ae1e332d6290f50 \ +LICENSE = "Apache-2.0 & ISSL & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \ + file://inference-engine/tests/libs/gtest/googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ + file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ + file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \ " LICENSE_${PN}-vpu-firmware = "ISSL" inherit cmake ptest python3native -S = "${WORKDIR}/git/inference-engine" +S = "${WORKDIR}/git" EXTRA_OECMAKE += " \ -DENABLE_OPENCV=0 \ - -DENABLE_SAMPLES_CORE=1 \ -DENABLE_PLUGIN_RPATH=0 \ -DENABLE_GNA=0 \ -DPYTHON_EXECUTABLE=${PYTHON} \ - -DTHREADING=TBB \ -DCMAKE_BUILD_TYPE=DebugWithRelInfo \ - -DNGRAPH_INCLUDES=${STAGING_INCDIR}/ngraph \ + -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \ -DBUILD_GMOCK=1 \ -DBUILD_GTEST=0 \ -DINSTALL_GMOCK=0 \ -DINSTALL_GTEST=0 \ + -DENABLE_SAMPLES=0 \ + -DENABLE_NGRAPH=ON \ + -DENABLE_MKL_DNN=ON \ + -DIE_CPACK_IE_DIR=${prefix} \ " DEPENDS += "libusb1 \ @@ -68,22 +62,20 @@ COMPATIBLE_HOST = '(x86_64).*-linux' COMPATIBLE_HOST_libc-musl = "null" PACKAGECONFIG ?= "vpu" -PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, opencl-icd-loader, opencl-icd-loader intel-compute-runtime" +PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, opencl-icd-loader libva, intel-compute-runtime" PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3" -PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_MA2450_FILE=../mvnc/MvNCAPI-ma2450.mvcmd -DVPU_FIRMWARE_MA2X8X_FILE=../mvnc/MvNCAPI-ma2x8x.mvcmd -DVPU_FIRMWARE_MV0262_FILE=../mvnc/MvNCAPI-mv0262.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" +PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2450_FILE=../mvnc/usb-ma2450.mvcmd -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA248X_FILE=../mvnc/pcie-ma248x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then - install -m0644 ${WORKDIR}/mvnc/MvNCAPI-ma2450.mvcmd ${D}${libdir} - install -m0644 ${WORKDIR}/mvnc/MvNCAPI-ma2x8x.mvcmd ${D}${libdir} - install -m0644 ${WORKDIR}/mvnc/MvNCAPI-mv0262.mvcmd ${D}${libdir} - - install -D -m0644 ${S}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules ${D}${sysconfdir}/udev/rules.d/97-myriad-usbboot.rules + install -m0644 ${WORKDIR}/mvnc/usb-ma2450.mvcmd ${D}${libdir}/ + install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ + install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/ fi if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then - cp -r ${S}/src/cldnn_engine/cldnn_global_custom_kernels ${D}${libdir}/ + cp -r ${S}/inference-engine/src/cldnn_engine/cldnn_global_custom_kernels ${D}${libdir}/ fi } @@ -102,18 +94,20 @@ SSTATE_SCAN_FILES_append = " *.cmake" FILES_${PN}-dev = "${includedir} \ ${libdir}/cmake \ - ${libdir}/libinference_engine.so \ " FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ ${datadir}/openvino \ ${libdir}/cldnn_global_custom_kernels \ + ${libdir}/custom_kernels \ + ${libdir}/plugins.xml \ + ${libdir}/cache.json \ " # Move inference engine samples into a separate package PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" -FILES_${PN}-samples = "${bindir}" +FILES_${PN}-samples = "${datadir}/inference_engine" FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd" # Package for inference engine python API diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch new file mode 100644 index 00000000..79173ad0 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch @@ -0,0 +1,448 @@ +From 295d119e12d22919fdc305470cd07973ba02f162 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Fri, 10 Apr 2020 09:29:35 +0800 +Subject: [PATCH] Installation and build fixes + +- Install libs, samples and binaries at appropriate places. +- Use system installed pugixml, ade, gflags, ngraph, opencl-headers +and icd-loader. +- Disable usage of Werror. +- Use find_library to look for tbb instead of looking for cmake module. + +Upstream-Status: Inappropriate [OS-specific] + +Signed-off-by: Anuj Mittal <[email protected]> +--- + CMakeLists.txt | 2 -- + cmake/developer_package.cmake | 8 +++++--- + cmake/os_flags.cmake | 1 - + inference-engine/CMakeLists.txt | 20 +++++++++---------- + inference-engine/cmake/ie_parallel.cmake | 10 ++-------- + .../ie_bridges/python/CMakeLists.txt | 4 ++-- + .../openvino/inference_engine/CMakeLists.txt | 18 +---------------- + .../include/gpu/gpu_ocl_wrapper.hpp | 2 +- + inference-engine/samples/CMakeLists.txt | 6 +----- + .../src/cldnn_engine/CMakeLists.txt | 1 + + .../src/inference_engine/CMakeLists.txt | 17 +--------------- + .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- + .../tests/mock_engine/CMakeLists.txt | 2 ++ + inference-engine/tests/unit/CMakeLists.txt | 2 ++ + inference-engine/thirdparty/CMakeLists.txt | 4 +--- + .../clDNN/CMakeCompilerLinkerOpts.txt | 2 -- + .../thirdparty/clDNN/CMakeLists.txt | 1 - + .../common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +- + .../tools/compile_tool/CMakeLists.txt | 2 +- + .../tools/vpu/vpu_compile/CMakeLists.txt | 4 ++-- + .../tools/vpu/vpu_perfcheck/CMakeLists.txt | 2 +- + 21 files changed, 34 insertions(+), 78 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e48cee57..e9598455 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,8 +120,6 @@ function(build_ngraph) + endif() + + ie_cpack_add_component(ngraph) +- +- add_subdirectory(ngraph) + endfunction() + + build_ngraph() +diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake +index e59edb2b..35672cac 100644 +--- a/cmake/developer_package.cmake ++++ b/cmake/developer_package.cmake +@@ -5,7 +5,9 @@ + include(CPackComponent) + unset(IE_CPACK_COMPONENTS_ALL CACHE) + +-set(IE_CPACK_IE_DIR deployment_tools/inference_engine) ++if (NOT DEFINED IE_CPACK_IE_DIR) ++ set(IE_CPACK_IE_DIR deployment_tools/inference_engine) ++endif() + + function(ie_cpack_set_library_dir) + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} ARCH) +@@ -18,7 +20,7 @@ function(ie_cpack_set_library_dir) + if(WIN32) + set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/$<CONFIG>/${ARCH} PARENT_SCOPE) + else() +- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) ++ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) + endif() + endfunction() + +@@ -99,7 +101,7 @@ if(UNIX) + SET(LIB_DL ${CMAKE_DL_LIBS}) + endif() + +-set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) ++set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) + + # Enable postfixes for Debug/Release builds + set(IE_DEBUG_POSTFIX_WIN "d") +diff --git a/cmake/os_flags.cmake b/cmake/os_flags.cmake +index 6f70768f..40141aca 100644 +--- a/cmake/os_flags.cmake ++++ b/cmake/os_flags.cmake +@@ -139,7 +139,6 @@ if(WIN32) + else() + # TODO: enable for C sources as well + # ie_add_compiler_flags(-Werror) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + ie_add_compiler_flags(-ffunction-sections -fdata-sections) + ie_add_compiler_flags(-fvisibility=hidden) + ie_add_compiler_flags(-fdiagnostics-show-option) +diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt +index d5feedb4..4cf5fb3d 100644 +--- a/inference-engine/CMakeLists.txt ++++ b/inference-engine/CMakeLists.txt +@@ -86,13 +86,13 @@ ie_cpack_add_component(cpp_samples REQUIRED DEPENDS core) + + if(UNIX) + install(DIRECTORY samples/ +- DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp ++ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/ + COMPONENT cpp_samples + USE_SOURCE_PERMISSIONS + PATTERN *.bat EXCLUDE) + elseif(WIN32) + install(DIRECTORY samples +- DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp ++ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/ + COMPONENT cpp_samples + USE_SOURCE_PERMISSIONS + PATTERN *.sh EXCLUDE) +@@ -104,30 +104,32 @@ ie_cpack_add_component(c_samples REQUIRED DEPENDS core) + + if(UNIX) + install(PROGRAMS samples/build_samples.sh +- DESTINATION ${IE_CPACK_IE_DIR}/samples/c ++ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/c + COMPONENT c_samples) + elseif(WIN32) + install(PROGRAMS samples/build_samples_msvc.bat +- DESTINATION ${IE_CPACK_IE_DIR}/samples/c ++ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/c + COMPONENT c_samples) + endif() + + install(DIRECTORY ie_bridges/c/samples/ +- DESTINATION ${IE_CPACK_IE_DIR}/samples/c ++ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/c + COMPONENT c_samples + PATTERN ie_bridges/c/samples/CMakeLists.txt EXCLUDE) + + install(FILES samples/CMakeLists.txt +- DESTINATION ${IE_CPACK_IE_DIR}/samples/c ++ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/c + COMPONENT c_samples) + + # install Python samples + ++if (ENABLE_PYTHON) + ie_cpack_add_component(python_samples REQUIRED DEPENDS core) + + install(DIRECTORY ${ie_python_api_SOURCE_DIR}/sample/ +- DESTINATION ${IE_CPACK_IE_DIR}/samples/python ++ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/python + COMPONENT python_samples) ++endif() + + # Custom target to build only Inference Engine Developer Package targets + +@@ -136,10 +138,6 @@ add_custom_target(ie_dev_targets ALL DEPENDS inference_engine HeteroPlugin) + # Developer package + ie_developer_export_targets(format_reader) + +-if (ENABLE_NGRAPH) +- ie_developer_export_targets(${NGRAPH_LIBRARIES}) +-endif() +- + export(TARGETS ${IEDeveloperPackageTargets} NAMESPACE IE:: + APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") + +diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake +index 9ea885be..71733fd9 100644 +--- a/inference-engine/cmake/ie_parallel.cmake ++++ b/inference-engine/cmake/ie_parallel.cmake +@@ -42,14 +42,8 @@ function(set_ie_threading_interface_for TARGET_NAME) + set(IE_THREAD_DEFINE "IE_THREAD_SEQ") + + if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") +- find_package(TBB COMPONENTS tbb tbbmalloc) +- if (TBB_FOUND) +- set(IE_THREAD_DEFINE "IE_THREAD_TBB") +- ie_target_link_libraries(${TARGET_NAME} PUBLIC ${TBB_IMPORTED_TARGETS}) +- else () +- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ +- SEQ method will be used for ${TARGET_NAME}") +- endif () ++ set(IE_THREAD_DEFINE "IE_THREAD_TBB") ++ target_link_libraries(${TARGET_NAME} PUBLIC tbb tbbmalloc) + elseif (THREADING STREQUAL "OMP") + if (WIN32) + set(omp_lib_name libiomp5md) +diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt +index b9492dfe..933b3c04 100644 +--- a/inference-engine/ie_bridges/python/CMakeLists.txt ++++ b/inference-engine/ie_bridges/python/CMakeLists.txt +@@ -52,11 +52,11 @@ add_subdirectory (src/openvino/inference_engine) + ie_cpack_add_component(${PYTHON_VERSION} REQUIRED) + + install(FILES requirements.txt +- DESTINATION python/${PYTHON_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PYTHON_VERSION}/site-packages/openvino/ + COMPONENT ${PYTHON_VERSION}) + + install(PROGRAMS src/openvino/__init__.py +- DESTINATION python/${PYTHON_VERSION}/openvino ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PYTHON_VERSION}/site-packages/openvino/ + COMPONENT ${PYTHON_VERSION}) + + ie_cpack(${PYTHON_VERSION}) +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 72175b33..0f2425dc 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 +@@ -32,20 +32,4 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + target_compile_options(${TARGET_NAME} PRIVATE "-Wno-error=register") + endif() + +-# perform copy +-add_custom_command(TARGET ${TARGET_NAME} +- POST_BUILD +- 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 +-) +- +-# install +- +-install(TARGETS ${TARGET_NAME} +- DESTINATION python/${PYTHON_VERSION}/openvino/inference_engine +- COMPONENT ${PYTHON_VERSION}) +- +-install(PROGRAMS __init__.py +- DESTINATION python/${PYTHON_VERSION}/openvino/inference_engine +- COMPONENT ${PYTHON_VERSION}) ++install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PYTHON_VERSION}/site-packages/) +diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp +index fce7d8f1..827e5764 100644 +--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp ++++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp +@@ -21,4 +21,4 @@ + # pragma GCC system_header + #endif + +-#include <CL/cl2.hpp> ++#include <cl2.hpp> +diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt +index f355e7b9..351fb9cd 100644 +--- a/inference-engine/samples/CMakeLists.txt ++++ b/inference-engine/samples/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + + if(IE_MAIN_SOURCE_DIR) + # in case if samples are built from IE repo +- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR}) ++ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) + # hint for find_package(InferenceEngine in the samples folder) + set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") + else() +@@ -91,10 +91,6 @@ set (HAVE_INTTYPES_H 1) + set (INTTYPES_FORMAT C99) + set (BUILD_TESTING OFF) + +-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") +- add_subdirectory(thirdparty/gflags) +-endif() +- + if (CMAKE_CXX_COMPILER_ID STREQUAL GNU) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + endif() +diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt +index 43344e7f..50beda23 100644 +--- a/inference-engine/src/cldnn_engine/CMakeLists.txt ++++ b/inference-engine/src/cldnn_engine/CMakeLists.txt +@@ -32,6 +32,7 @@ target_include_directories(${TARGET_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CLDNN__IOCL_ICD_INCDIRS} + ${CLDNN_TOP_FOLDER} ++ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp + ${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src) + + # copy default global xml file describing the custom kernels and the *.cl files +diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt +index 54e264c8..e3809654 100644 +--- a/inference-engine/src/inference_engine/CMakeLists.txt ++++ b/inference-engine/src/inference_engine/CMakeLists.txt +@@ -292,20 +292,6 @@ if(threading_tbb) + ie_cpack_add_component(tbb REQUIRED) + list(APPEND core_components tbb) + +- install(DIRECTORY "${TBB}/include" +- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb +- COMPONENT tbb) +- install(DIRECTORY "${TBB}/lib" +- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb +- COMPONENT tbb) +- if(EXISTS "${TBB}/bin") +- install(DIRECTORY "${TBB}/bin" +- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb +- COMPONENT tbb) +- endif() +- install(FILES "${TBB}/LICENSE" +- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb +- COMPONENT tbb) + endif() + + ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) +@@ -318,10 +304,9 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} + COMPONENT core) + install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" +- "${OpenVINO_BINARY_DIR}/share/ie_rh_decoder.cmake" + "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" + "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" +- DESTINATION ${IE_CPACK_IE_DIR}/share ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine + COMPONENT core) + install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml + DESTINATION ${IE_CPACK_LIBRARY_PATH} +diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt +index 32cb534a..858ffefc 100644 +--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt ++++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt +@@ -41,5 +41,5 @@ target_link_libraries(${TARGET_NAME} + # install + + install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules +- DESTINATION deployment_tools/inference_engine/external ++ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d + COMPONENT myriad) +diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt +index f3fb53e1..09fb66ce 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_PLU + 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}) +diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt +index a5c945ae..eabe70d3 100644 +--- a/inference-engine/tests/unit/CMakeLists.txt ++++ b/inference-engine/tests/unit/CMakeLists.txt +@@ -187,3 +187,5 @@ add_test(NAME ${TARGET_NAME} + COMMAND ${TARGET_NAME}) + + add_dependencies(${TARGET_NAME} mock_engine) ++ ++install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt +index ec22761d..3962d924 100644 +--- a/inference-engine/thirdparty/CMakeLists.txt ++++ b/inference-engine/thirdparty/CMakeLists.txt +@@ -35,14 +35,12 @@ function(build_with_lto) + add_subdirectory(clDNN) + endif() + +- add_subdirectory(pugixml) + add_subdirectory(stb_lib) +- add_subdirectory(ade) + add_subdirectory(fluid/modules/gapi) + + # developer package + +- ie_developer_export_targets(ade fluid pugixml) ++ ie_developer_export_targets(fluid) + if(TARGET pugixml_mt) + ie_developer_export_targets(pugixml_mt) + endif() +diff --git a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt +index 6b799cdd..91755b35 100644 +--- a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt ++++ b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt +@@ -206,7 +206,6 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + ALIAS RttiDisabled "-fno-rtti" + ALIAS RttiEnabled "-frtti" + ALIAS TreatWarnAsErrorDisabled TreatWarnAsError REMOVE_GROUP +- ALIAS TreatWarnAsErrorEnabled "-Werror" "-pedantic-errors" + ALIAS WarnLevel0 "-w" + ALIAS WarnLevel1 WarnLevels REMOVE_GROUP + ALIAS WarnLevel2 "-Wall" +@@ -290,7 +289,6 @@ elseif((CMAKE_C_COMPILER_ID MATCHES "^Clang$") OR (CMAKE_CXX_COMPILER_ID MATCHES + ALIAS RttiDisabled "-fno-rtti" + ALIAS RttiEnabled Rtti REMOVE_GROUP + ALIAS TreatWarnAsErrorDisabled TreatWarnAsError REMOVE_GROUP +- ALIAS TreatWarnAsErrorEnabled "-Werror" + ALIAS WarnLevel0 "-w" + ALIAS WarnLevel1 WarnLevels REMOVE_GROUP + ALIAS WarnLevel2 "-Wall" +diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt +index b08c2744..42ca79e6 100644 +--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt ++++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt +@@ -767,7 +767,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/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp +index a9e379bd..8b822223 100644 +--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp ++++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp +@@ -30,7 +30,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; + typedef cl_va_api_device_source_intel cl_device_source_intel; + typedef cl_va_api_device_set_intel cl_device_set_intel; + #endif +-#include <CL/cl_intel_planar_yuv.h> ++#include <CL/cl_ext_intel.h> + + namespace cl { + typedef CL_API_ENTRY cl_int(CL_API_CALL *PFN_clEnqueueAcquireMediaSurfacesINTEL)( +diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt +index 25168bac..1c57116f 100644 +--- a/inference-engine/tools/compile_tool/CMakeLists.txt ++++ b/inference-engine/tools/compile_tool/CMakeLists.txt +@@ -48,5 +48,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) + # install + + install(TARGETS compile_tool +- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH} ++ RUNTIME DESTINATION bin + COMPONENT core) +diff --git a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt +index 4123de6f..52179fac 100644 +--- a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt ++++ b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt +@@ -50,5 +50,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) + # install + + install(TARGETS ${TARGET_NAME} +- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH} +- COMPONENT myriad) +\ No newline at end of file ++ RUNTIME DESTINATION bin ++ COMPONENT myriad) +diff --git a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt +index a7a801d4..b8f9e26f 100644 +--- a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt ++++ b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt +@@ -55,6 +55,6 @@ if(ENABLE_MYRIAD) + add_perfcheck_target(myriad_perfcheck myriadPlugin) + + install(TARGETS myriad_perfcheck +- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH} ++ RUNTIME DESTINATION bin + COMPONENT myriad) + endif() +-- +2.25.2 + 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 <[email protected]> -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 <[email protected]> -Signed-off-by: Chin Huat Ang <[email protected]> ---- - 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/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 b89964b1..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 518cd8afb38810924371209416fd5b5d2c23a92e Mon Sep 17 00:00:00 2001 -From: Erin Park <[email protected]> -Date: Wed, 11 Sep 2019 10:33:58 -0700 -Subject: [PATCH] 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 ${libdir}/python<version>/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 <[email protected]> -Signed-off-by: Chin Huat Ang <[email protected]> ---- - 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..952c173 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 ${CMAKE_INSTALL_LIBDIR}/${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..350e3f5 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/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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -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 <[email protected]> -Signed-off-by: Chin Huat Ang <[email protected]> ---- - 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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -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 <[email protected]> ---- - 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() - -- 2.25.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6471): https://lists.yoctoproject.org/g/meta-intel/message/6471 Mute This Topic: https://lists.yoctoproject.org/mt/72913418/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
