IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed OV_FRONTEND_PATH from 'setupvars' scripts (#9396)

Browse Source 
* Removed OV_FRONTEND_PATH from 'setupvars' scripts

* Update linux.yml

* Change mock frontend's install dir for static builds

* revert linux.yml
This commit is contained in:
Mikhail Nosov
2021-12-24 13:01:51 +03:00
committed by GitHub
parent 49b5e5728b
commit 9cc4504b78
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/setupvars/setupvars.bat
View File

@@ -45,7 +45,6 @@ set "ngraph_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake"
set "OpenVINO_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake"
set "HDDL_INSTALL_DIR=%INTEL_OPENVINO_DIR%\runtime\3rdparty\hddl"
set "OPENVINO_LIB_PATHS=%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Release;%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Debug;%HDDL_INSTALL_DIR%\bin;%OPENVINO_LIB_PATHS%"
set "OV_FRONTEND_PATH=%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Release;%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Debug;%OV_FRONTEND_PATH%"
:: TBB
if exist %INTEL_OPENVINO_DIR%\runtime\3rdparty\tbb (

1
scripts/setupvars/setupvars.sh
View File

@@ -31,7 +31,6 @@ if [ -e "$INSTALLDIR/runtime" ]; then
system_type=$(ls "$INSTALLDIR/runtime/lib/")
IE_PLUGINS_PATH=$INSTALLDIR/runtime/lib/$system_type
export OV_FRONTEND_PATH=${IE_PLUGINS_PATH}${OV_FRONTEND_PATH:+:$OV_FRONTEND_PATH}
export HDDL_INSTALL_DIR=$INSTALLDIR/runtime/3rdparty/hddl
if [[ "$OSTYPE" == "darwin"* ]]; then

2
src/core/tests/frontend/CMakeLists.txt
View File

@@ -28,7 +28,7 @@ add_dependencies(ov_core_unit_tests ${MOCK1_FE_NAME})
add_clang_format_target(${MOCK1_FE_NAME}_clang FOR_TARGETS ${MOCK1_FE_NAME})
if(BUILD_SHARED_LIBS OR NOT WIN32)
if(BUILD_SHARED_LIBS)
install(TARGETS ${MOCK1_FE_NAME}
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL)

13
tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt
View File

@@ -19,6 +19,13 @@ target_link_libraries(${TARGET_FE_NAME} PUBLIC openvino::runtime PRIVATE ngraph:
add_clang_format_target(${TARGET_FE_NAME}_clang FOR_TARGETS ${TARGET_FE_NAME})
install(TARGETS ${TARGET_FE_NAME}
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
if(BUILD_SHARED_LIBS)
install(TARGETS ${TARGET_FE_NAME}
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
else()
set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
install(TARGETS ${TARGET_FE_NAME}
RUNTIME DESTINATION python/${PYTHON_VERSION}/openvino COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION python/${PYTHON_VERSION}/openvino COMPONENT tests EXCLUDE_FROM_ALL)
endif()