aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChin Huat Ang <chin.huat.ang@intel.com>2019-09-30 16:36:57 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2019-09-30 22:28:09 +0800
commit611a83130669abca3cdd3ab1a51d30daab0f1699 (patch)
tree659d38842f7beb80a52ccd42edc5538b711d49bd
parent90b225ce8a00aafd94d0aef5f85e73adce91d5f2 (diff)
downloadmeta-intel-611a83130669abca3cdd3ab1a51d30daab0f1699.tar.gz
meta-intel-611a83130669abca3cdd3ab1a51d30daab0f1699.tar.bz2
meta-intel-611a83130669abca3cdd3ab1a51d30daab0f1699.zip
dldt-inference-engine: fix clDNN install directory
Install clDNN to /usr/lib to resolve the following inference engine error when running with GPU plugin: [ ERROR ] Failed to create plugin libclDNNPlugin.so for device GPU Please, check your environment Cannot load library 'libclDNNPlugin.so': libclDNNPlugin.so: cannot open shared object file: No such file or directory /usr/src/debug/dldt-inference-engine/2019r2-r0/git/inference-engine/include/details/os/lin_shared_object_loader.h:36 /usr/src/debug/dldt-inference-engine/2019r2-r0/git/inference-engine/src/inference_engine/ie_core.cpp:277 Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb1
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch27
2 files changed, 28 insertions, 0 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb
index 207b206e..a7db09ae 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \
file://0003-Supply-firmware-at-build-time.patch;patchdir=../ \
file://0004-disable-werror.patch;patchdir=../ \
file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \
+ file://0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \
file://run-ptest \
"
SRCREV = "ba6e22b1b5ee4cbefcc30e8d9493cddb0bb3dfdf"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch
new file mode 100644
index 00000000..24feee25
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch
@@ -0,0 +1,27 @@
+From 1cc6ee3a1df0133e2ea7a4442bd05598a89958f6 Mon Sep 17 00:00:00 2001
+From: Chin Huat Ang <chin.huat.ang@intel.com>
+Date: Mon, 30 Sep 2019 13:50:45 +0800
+Subject: [PATCH] Install clDNN plugin to CMAKE_INSTALL_LIBDIR
+
+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 211f660..76c8086 100644
+--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
++++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
+@@ -23,6 +23,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
+ ${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
+