Fixed ngraph unit tests in Debug (#6470)

* Added compile_tool to PATH

* Installed benchmark_app

* Fixed ngraph unit tests in Debug

* Install of VPU_FIRMWARE to <root>/tests folder

* Conditional installation of benchmark_app
This commit is contained in:
Ilya Lavrenov authored and GitHub committed 2021-06-30 20:57:01 +03:00
1 parent 6d5e6de895
commit dd2ea02d3a
5 files changed
+23 -1

No files matched your search

+5
View File
@@ -52,6 +52,11 @@ install(TARGETS format_reader
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
if(TARGET benchmark_app)
install(TARGETS benchmark_app
RUNTIME DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL)
endif()
# install C samples
ie_cpack_add_component(c_samples DEPENDS core_c)
@@ -83,6 +83,14 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
install(FILES ${${var_name}}
DESTINATION ${IE_CPACK_RUNTIME_PATH}
COMPONENT myriad)
if(ENABLE_MYRIAD AND ENABLE_BEH_TESTS)
# for MyriadBehaviorTests
install(FILES ${${var_name}}
DESTINATION tests
COMPONENT tests
EXCLUDE_FROM_ALL)
endif()
endforeach()
add_custom_target(vpu_copy_firmware
+1 -1
View File
@@ -32,7 +32,7 @@ std::string runtime::Backend::s_backend_shared_library_search_directory;
static string find_my_pathname()
{
#ifdef _WIN32
HMODULE hModule = GetModuleHandleW(L"ngraph.dll");
HMODULE hModule = GetModuleHandleW(SHARED_LIB_PREFIX L"ngraph" SHARED_LIB_SUFFIX);
WCHAR wpath[MAX_PATH];
GetModuleFileNameW(hModule, wpath, MAX_PATH);
wstring ws(wpath);
+5
View File
@@ -70,6 +70,11 @@ set "OPENVINO_LIB_PATHS=%INTEL_OPENVINO_DIR%\deployment_tools\ngraph\lib;%OPENVI
set "ngraph_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\ngraph\cmake"
)
:: Compile tool
if exist %INTEL_OPENVINO_DIR%\deployment_tools\tools\compile_tool (
set "PATH=%INTEL_OPENVINO_DIR%\deployment_tools\tools\compile_tool;%PATH%"
)
:: Add libs dirs to the PATH
set "PATH=%OPENVINO_LIB_PATHS%;%PATH%"
+4
View File
@@ -61,6 +61,10 @@ if [ -e "$INSTALLDIR/deployment_tools/inference_engine/external/tbb" ]; then
export TBB_DIR=$INSTALLDIR/deployment_tools/inference_engine/external/tbb/cmake
fi
if [ -e "$INSTALLDIR/deployment_tools/tools/compile_tool" ]; then
export LD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/tools/compile_tool${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
fi
if [ -e "$INSTALLDIR/deployment_tools/ngraph" ]; then
export LD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/ngraph/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export ngraph_DIR=$INSTALLDIR/deployment_tools/ngraph/cmake