From eff93c1db6cf796a26261e9c7f0ed28d9e66f176 Mon Sep 17 00:00:00 2001 From: Chin Huat Ang Date: Wed, 16 Oct 2019 14:34:48 +0800 Subject: dldt-inference-engine: fix ptest failures Package libmock_engine.so as part of dldt-inference-engine-ptest and update run-ptest to set LD_LIBRARY_PATH to fix the following InferenceEngineUnitTests failures: FAIL: 12 tests, listed below: FAIL: PluginTest.canCreatePlugin FAIL: PluginTest.canCreatePluginUsingSmartPtr FAIL: PluginTest.shouldThrowExceptionIfPluginNotExist FAIL: PluginTest.canCallErrorHandlerIfNecessary FAIL: PluginTest.canForwardPluginEnginePtr FAIL: PluginTest.canSetConfiguration FAIL: PluginDispatcherTests.canLoadMockPlugin FAIL: PluginDispatcherTests.returnsIfLoadSuccessfull FAIL: SharedObjectLoaderTests.canLoadExistedPlugin FAIL: SharedObjectLoaderTests.canFindExistedMethod FAIL: SharedObjectLoaderTests.throwIfMethodNofFoundInLibrary FAIL: SharedObjectLoaderTests.canCallExistedMethod Signed-off-by: Chin Huat Ang Signed-off-by: Anuj Mittal --- .../opencv/dldt-inference-engine_2019r2.bb | 2 ++ ...ck_engine-install-to-CMAKE_INSTALL_LIBDIR.patch | 24 ++++++++++++++++++++++ .../recipes-support/opencv/files/run-ptest | 8 ++++++++ 3 files changed, 34 insertions(+) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch (limited to 'dynamic-layers') 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 b8d5d3d5..562bd740 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 @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \ file://0004-disable-werror.patch;patchdir=../ \ file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \ file://0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ + file://0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ file://run-ptest \ " SRCREV = "ba6e22b1b5ee4cbefcc30e8d9493cddb0bb3dfdf" @@ -73,6 +74,7 @@ do_install_ptest_base_prepend() { # Create a dummy Makefile so installation doesn't fail. touch ${WORKDIR}/Makefile mv ${D}${bindir}/InferenceEngineUnitTests ${D}${PTEST_PATH}/ + mv ${D}${libdir}/libmock_engine.so ${D}${PTEST_PATH}/ } FILES_${PN}-dev = "${includedir} \ diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch new file mode 100644 index 00000000..74c260ab --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch @@ -0,0 +1,24 @@ +From 34f3eb50ad5063bbf00ade1e9281e3c238d3216e Mon Sep 17 00:00:00 2001 +From: Chin Huat Ang +Date: Wed, 16 Oct 2019 13:06:26 +0800 +Subject: [PATCH] mock_engine: install to CMAKE_INSTALL_LIBDIR + +Upstream-Status: Pending +Signed-off-by: Chin Huat Ang +--- + 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..753c901 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/run-ptest b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest index 77310f9f..92f238a9 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest @@ -1,5 +1,13 @@ #!/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|' -- cgit v1.2.3-54-g00ecf