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

Merge branch 'tf-brick-3' into debian-packages

Browse Source
This commit is contained in:
Ilya Lavrenov 2022-02-18 19:29:31 +03:00
commit 1f4f71a498
2 changed files with 19 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/developer_package/packaging/debian.cmake
View File

@ -98,9 +98,10 @@ set(def_postinst "${OpenVINO_BINARY_DIR}/_CPack_Packages/postinst")
set(def_postrm "${OpenVINO_BINARY_DIR}/_CPack_Packages/postrm")
set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers/${package_name}/triggers")
set(triggers_content "activate-noawait ldconfig\n")
set(triggers_content "activate-noawait ldconfig\n\n")
set(post_content "#!/bin/sh\n\nset -e\n\n")
file(REMOVE ${def_postinst} ${def_postrm} ${def_triggers})
file(WRITE "${def_postinst}" "${post_content}")
file(WRITE "${def_postrm}" "${post_content}")
file(WRITE "${def_triggers}" "${triggers_content}")
@ -293,6 +294,7 @@ macro(ov_debian_components)
set(CPACK_COMPONENT_PYTHON_PYTHON3.8_DEPENDS "core")
endif()
set(CPACK_DEBIAN_PYTHON_PYTHON3.8_PACKAGE_NAME "libopenvino-python${cpack_ver_mm}")
set(CPACK_DEBIAN_PYTHON_PYTHON3.8_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}")
#
# Samples
@ -345,18 +347,14 @@ macro(ov_debian_components)
# copyright
# install(FILES "${OpenVINO_SOURCE_DIR}/LICENSE"
# DESTINATION share/doc/${package_name}/
# DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/${package_name}/
# COMPONENT ${comp}
# RENAME copyright)
# TODO: install changelog
# install triggers
set(triggers_content "activate-noawait ldconfig")
set(triggers_file "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers/${package_name}/triggers")
file(REMOVE ${triggers_file})
file(WRITE ${triggers_file} ${triggers_content})
install(FILES ${triggers_file}
install(FILES ${def_triggers}
DESTINATION ../DEBIAN/
COMPONENT ${comp})
endforeach()

65
src/frontends/tensorflow/CMakeLists.txt
View File

@ -5,61 +5,24 @@
ov_add_frontend(NAME tensorflow
LINKABLE_FRONTEND
SHUTDOWN_PROTOBUF
SKIP_INSTALL
FILEDESCRIPTION "FrontEnd to load and convert TensorFlow file format"
LINK_LIBRARIES openvino::util openvino::runtime::dev)
#
# Temporary install steps
#
# give a different name during installation to OpenVINO package
set_target_properties(openvino_tensorflow_frontend PROPERTIES OUTPUT_NAME openvino_tensorflow_fe)
set(TARGET_NAME openvino_tensorflow_frontend)
set(TARGET_NAME_IRC openvino_tensorflow_fe)
function(ov_frontend_get_file_name target_name library_name)
set(LIB_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
set(LIB_SUFFIX "${IE_BUILD_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME frontend::tensorflow)
export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")
set("${library_name}" "${LIB_PREFIX}${target_name}${LIB_SUFFIX}" PARENT_SCOPE)
endfunction()
ov_frontend_get_file_name(openvino_tensorflow_frontend output_name)
# install with original name for tests component
install(TARGETS ${TARGET_NAME}
RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT tests EXCLUDE_FROM_ALL)
if(BUILD_SHARED_LIBS)
function(ov_shared_library_name target_name library_name)
set(LIB_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
set(LIB_SUFFIX "${IE_BUILD_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
set("${library_name}" "${LIB_PREFIX}${target_name}${LIB_SUFFIX}" PARENT_SCOPE)
endfunction()
function(ov_lib_file_name target_name library_name)
set(LIB_PREFIX "${CMAKE_STATIC_LIBRARY_PREFIX}")
set(LIB_SUFFIX "${IE_BUILD_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
set("${library_name}" "${LIB_PREFIX}${target_name}${LIB_SUFFIX}" PARENT_SCOPE)
endfunction()
ov_shared_library_name(${TARGET_NAME_IRC} shared_library_name)
# rename targets files to avoid auto-loading by FEM
install(FILES $<TARGET_FILE:${TARGET_NAME}>
DESTINATION ${OV_CPACK_RUNTIMEDIR}
COMPONENT ${OV_CPACK_COMP_CORE}
RENAME ${shared_library_name})
if(WIN32)
ov_lib_file_name(${TARGET_NAME_IRC} lib_file_name)
# need to install renamed .lib file as well
install(FILES $<TARGET_LINKER_FILE:${TARGET_NAME}>
DESTINATION ${OV_CPACK_LIBRARYDIR}
COMPONENT ${OV_CPACK_COMP_CORE}
RENAME ${lib_file_name})
endif()
endif()
# install -dev part
install(DIRECTORY ${${TARGET_NAME}_INCLUDE_DIR}/openvino
DESTINATION ${FRONTEND_INSTALL_INCLUDE}/
COMPONENT ${OV_CPACK_COMP_CORE_DEV}
FILES_MATCHING PATTERN "*.hpp")
install(FILES $<TARGET_FILE:openvino_tensorflow_frontend>
DESTINATION ${OV_CPACK_RUNTIMEDIR}
COMPONENT tests
RENAME ${output_name}
EXCLUDE_FROM_ALL)