Install location for plugins and python

2021-12-27 18:34:20 +03:00
parent 1ae71e993d
commit e603fcf8af
18 changed files with 51 additions and 32 deletions
--- a/cmake/developer_package/frontends/frontends.cmake
+++ b/cmake/developer_package/frontends/frontends.cmake
@@ -218,10 +218,11 @@ macro(ov_add_frontend)
        if(BUILD_SHARED_LIBS)
            if(OV_FRONTEND_LINKABLE_FRONTEND)
                set(export_set EXPORT OpenVINOTargets)
+                set(archive_dest ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core)
            endif()
            install(TARGETS ${TARGET_NAME} ${export_set}
                    RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
-                    ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
+                    ${archive_dest}
                    LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
                    NAMELINK_COMPONENT core_dev)
        else()
--- a/cmake/developer_package/packaging.cmake
+++ b/cmake/developer_package/packaging.cmake
@@ -16,15 +16,20 @@ function(ie_cpack_set_library_dir)
        set(IE_CPACK_LIBRARY_PATH lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
        set(IE_CPACK_RUNTIME_PATH bin/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
        set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
+        set(IE_CPACK_PLUGIN_PATH lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
    else()
        if(CPACK_GENERATOR STREQUAL "DEB")
            set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
            set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
            set(IE_CPACK_ARCHIVE_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
+            set(IE_CPACK_PLUGIN_PATH
+                ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE}/openvino${OpenVINO_VERSION}
+                PARENT_SCOPE)
        else()
            set(IE_CPACK_LIBRARY_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
            set(IE_CPACK_RUNTIME_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
            set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
+            set(IE_CPACK_PLUGIN_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
        endif()
    endif()
 endfunction()
--- a/cmake/developer_package/plugins/plugins.cmake
+++ b/cmake/developer_package/plugins/plugins.cmake
@@ -139,9 +139,8 @@ function(ie_add_plugin)
                # TODO: install for openvino<ver> folder for side by side installation
                # since the plugins (CMake MODULEs) cannot be versioned
                install(TARGETS ${IE_PLUGIN_NAME}
-                        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
-                        COMPONENT ${install_component}
-                        NAMELINK_SKIP)
+                        LIBRARY DESTINATION ${IE_CPACK_PLUGIN_PATH}
+                        COMPONENT ${install_component})
            else()
                ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component})
            endif()
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -38,8 +38,14 @@ if(NOT ENABLE_DOCKER)

    foreach(target ov_template_plugin template_extension ov_template_extension)
        if(TARGET ${target})
+            if(target MATCHES ".*_plugin$")
+                set(dest_location ${IE_CPACK_PLUGIN_PATH})
+            else()
+                set(dest_location ${IE_CPACK_RUNTIME_PATH})
+            endif()
+
            install(TARGETS ${target}
-                    LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
+                    LIBRARY DESTINATION ${dest_location}
                    COMPONENT tests
                    EXCLUDE_FROM_ALL)
        endif()
--- a/inference-engine/cmake/vpu_dependencies.cmake
+++ b/inference-engine/cmake/vpu_dependencies.cmake
@@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
        VERBATIM)

    install(FILES ${${var_name}}
-            DESTINATION ${IE_CPACK_RUNTIME_PATH}
+            DESTINATION ${IE_CPACK_PLUGIN_PATH}
            COMPONENT myriad)

    if(ENABLE_MYRIAD AND ENABLE_BEH_TESTS)
--- a/inference-engine/ie_bridges/python/CMakeLists.txt
+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()

 option(ENABLE_CONDA_FOLDER "Create output folder with conda python bindings" OFF)

-set(PYTHON_BRIDGE_CPACK_PATH "python")
+set(PYTHON_BRIDGE_CPACK_PATH ${IE_CPACK_PLUGIN_PATH})

 if(UNIX)
    # cython generated files requires public visibility. Force visibility required.
--- a/inference-engine/ie_bridges/python/wheel/CMakeLists.txt
+++ b/inference-engine/ie_bridges/python/wheel/CMakeLists.txt
@@ -45,6 +45,7 @@ add_custom_command(OUTPUT ${openvino_wheel_path}
    COMMAND ${CMAKE_COMMAND} -E env WHEEL_VERSION=${WHEEL_VERSION}
        WHEEL_BUILD=${WHEEL_BUILD}
        CMAKE_BUILD_DIR=${CMAKE_BINARY_DIR}
+        # TODO: check whether need to add plugins path
        OV_RUNTIME_LIBS_DIR=${IE_CPACK_RUNTIME_PATH}
        TBB_LIBS_DIR=${TBB_LIBS_DIR}
        PY_PACKAGES_DIR=${PY_PACKAGES_DIR}
--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
@@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
 # install
 if (LINUX)
    install(FILES ${mvnc_SOURCE_DIR}/src/97-myriad-usbboot.rules
-        DESTINATION runtime/3rdparty
-        COMPONENT myriad)
+            DESTINATION share/openvino${OpenVINO_VERSION}/install_dependencies
+            COMPONENT myriad)
 endif()
--- a/inference-engine/thirdparty/clDNN/kernel_selector/CMakeLists.txt
+++ b/inference-engine/thirdparty/clDNN/kernel_selector/CMakeLists.txt
@@ -87,7 +87,7 @@ add_custom_command(
    COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json)

 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json
-        DESTINATION ${IE_CPACK_RUNTIME_PATH}
+        DESTINATION ${IE_CPACK_PLUGIN_PATH}
        COMPONENT gpu)

 ov_install_static_lib(${TARGET_NAME} gpu)
--- a/scripts/install_dependencies/install_NCS_udev_rules.sh
+++ b/scripts/install_dependencies/install_NCS_udev_rules.sh
@@ -3,17 +3,14 @@
 # Copyright (C) 2018-2021 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0

+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" >/dev/null 2>&1 && pwd )"
+
 echo "Updating udev rules..."

-if [ -z "$INTEL_OPENVINO_DIR" ]; then
-    echo "Please set up your environment. Run 'source <OPENVINO_INSTALLDIR>/setupvars.sh'."
-    exit -1
-fi
-
-if [ -f "$INTEL_OPENVINO_DIR/runtime/3rdparty/97-myriad-usbboot.rules" ]; then
+if [ -f "$SCRIPT_DIR/97-myriad-usbboot.rules" ]; then
    sudo usermod -a -G users "$(whoami)"

-    sudo cp "$INTEL_OPENVINO_DIR/runtime/3rdparty/97-myriad-usbboot.rules" /etc/udev/rules.d/
+    sudo cp "$SCRIPT_DIR/97-myriad-usbboot.rules" /etc/udev/rules.d/
    sudo udevadm control --reload-rules
    sudo udevadm trigger
    sudo ldconfig
--- a/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt
+++ b/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt
@@ -71,11 +71,11 @@ if(OpenVINO_SOURCE_DIR OR InferenceEngineDeveloperPackage_FOUND)
    ie_cpack_add_component(${OV_COMP_PYTHON_NGRAPH}_${PYTHON_VERSION})

    install(TARGETS _${PROJECT_NAME}
-            DESTINATION python/${PYTHON_VERSION}
+            DESTINATION ${IE_CPACK_PLUGIN_PATH}/${PYTHON_VERSION}
            COMPONENT ${OV_COMP_PYTHON_NGRAPH}_${PYTHON_VERSION})

    install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../ngraph
-            DESTINATION python/${PYTHON_VERSION}
+            DESTINATION ${IE_CPACK_PLUGIN_PATH}/${PYTHON_VERSION}
            COMPONENT ${OV_COMP_PYTHON_NGRAPH}_${PYTHON_VERSION}
            USE_SOURCE_PERMISSIONS)

--- a/src/bindings/python/src/pyopenvino/CMakeLists.txt
+++ b/src/bindings/python/src/pyopenvino/CMakeLists.txt
@@ -80,12 +80,12 @@ if(OpenVINO_SOURCE_DIR OR InferenceEngineDeveloperPackage_FOUND)
    ie_cpack_add_component(${OV_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION})

    install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../openvino
-            DESTINATION python/${PYTHON_VERSION}
+            DESTINATION ${IE_CPACK_PLUGIN_PATH}/${PYTHON_VERSION}
            COMPONENT ${OV_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION}
            USE_SOURCE_PERMISSIONS)

    install(TARGETS ${PROJECT_NAME}
-            DESTINATION python/${PYTHON_VERSION}/openvino
+            DESTINATION ${IE_CPACK_PLUGIN_PATH}/${PYTHON_VERSION}/openvino
            COMPONENT ${OV_COMP_PYTHON_OPENVINO}_${PYTHON_VERSION})
 endif()

--- a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt
+++ b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt
@@ -16,5 +16,5 @@ target_link_libraries(${PYBIND_FE_NAME} PRIVATE ${TARGET_FE_NAME} frontend_commo
 add_clang_format_target(${PYBIND_FE_NAME}_clang FOR_TARGETS ${PYBIND_FE_NAME})

 install(TARGETS ${PYBIND_FE_NAME}
-        DESTINATION python/${PYTHON_VERSION}
+        DESTINATION ${IE_CPACK_PLUGIN_PATH}/${PYTHON_VERSION}
        COMPONENT tests EXCLUDE_FROM_ALL)
--- a/src/cmake/ov_runtime.cmake
+++ b/src/cmake/ov_runtime.cmake
@@ -98,13 +98,13 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})

 if(BUILD_SHARED_LIBS)
    install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
-            DESTINATION ${IE_CPACK_RUNTIME_PATH}
+            DESTINATION ${IE_CPACK_PLUGIN_PATH}
            COMPONENT core)

    # for InferenceEngineUnitTest
    # For public tests
    install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
-        DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL)
+            DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL)
    # For private tests
    if (NOT WIN32)
        install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
--- a/src/common/preprocessing/CMakeLists.txt
+++ b/src/common/preprocessing/CMakeLists.txt
@@ -202,8 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})

 if(BUILD_SHARED_LIBS)
    install(TARGETS ${TARGET_NAME}
-            LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
-            NAMELINK_COMPONENT core_dev)
+            LIBRARY DESTINATION ${IE_CPACK_PLUGIN_PATH}/ COMPONENT core)
 else()
    ov_install_static_lib(${TARGET_NAME} core)
 endif()
--- a/src/plugins/intel_gna/CMakeLists.txt
+++ b/src/plugins/intel_gna/CMakeLists.txt
@@ -71,7 +71,18 @@ set_target_properties(${TARGET_NAME} ${TARGET_NAME}_test_static

 # install

-file(GLOB_RECURSE source_list "${libGNA_LIBRARIES_BASE_PATH}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
-install(FILES ${source_list}
-        DESTINATION ${IE_CPACK_RUNTIME_PATH}
-        COMPONENT gna)
+file(GLOB_RECURSE gna_libraries "${libGNA_LIBRARIES_BASE_PATH}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
+set(gna_library_installed OFF)
+
+foreach(lib IN LISTS gna_libraries)
+    if(lib MATCHES "^.*${CMAKE_SHARED_LIBRARY_SUFFIX}\.[0-9]+$")
+        install(FILES ${lib}
+                DESTINATION ${IE_CPACK_RUNTIME_PATH}
+                COMPONENT gna)
+        set(gna_library_installed ON)
+    endif()
+endforeach()
+
+if(NOT gna_library_installed)
+    message(FATAL_ERROR "Failed to install GNA library (available libraries: ${gna_libraries})")
+endif()
--- a/src/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt
+++ b/src/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/CMakeLists.txt
@@ -40,4 +40,4 @@ target_link_libraries(${TARGET_NAME} PRIVATE inference_engine)
 target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN)

 install(TARGETS ${TARGET_NAME}
-        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
+        LIBRARY DESTINATION ${IE_CPACK_PLUGIN_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
--- a/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt
+++ b/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt
@@ -60,7 +60,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})

 # for ieFuncTests
 install(TARGETS ${TARGET_NAME}
-        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
+        LIBRARY DESTINATION ${IE_CPACK_PLUGIN_PATH} COMPONENT tests EXCLUDE_FROM_ALL)

 # for InferenceEngineUnitTest
 # For public CI