File fix-install-paths.patch of Package dldt

Overview Repositories Revisions Requests Users Attributes Meta

File fix-install-paths.patch of Package dldt (Revision 5caad9378ae3a0f099996a2e4e1dbf9e)

Currently displaying revision 5caad9378ae3a0f099996a2e4e1dbf9e , Show latest

diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
index e59edb2b..0c0653f2 100644
--- a/cmake/developer_package.cmake
+++ b/cmake/developer_package.cmake
@@ -5,7 +5,7 @@
 include(CPackComponent)
 unset(IE_CPACK_COMPONENTS_ALL CACHE)
 
-set(IE_CPACK_IE_DIR       deployment_tools/inference_engine)
+set(IE_CPACK_IE_DIR       share/doc/inference_engine)
 
 function(ie_cpack_set_library_dir)
     string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} ARCH)
@@ -18,7 +18,7 @@ function(ie_cpack_set_library_dir)
     if(WIN32)
         set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/$<CONFIG>/${ARCH} PARENT_SCOPE)
     else()
-        set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
+        set(IE_CPACK_LIBRARY_PATH lib64 PARENT_SCOPE)
     endif()
 endfunction()
 
@@ -83,7 +83,7 @@ if(OS_FOLDER)
 		set(BIN_FOLDER "bin/${OS_FOLDER}/${ARCH_FOLDER}")
 	endif()
 else()
-    set(BIN_FOLDER "bin/${ARCH_FOLDER}")
+    set(BIN_FOLDER "bin")
 endif()
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
index b9492dfe..f82fb684 100644
--- a/inference-engine/ie_bridges/python/CMakeLists.txt
+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
@@ -51,12 +51,8 @@ add_subdirectory (src/openvino/inference_engine)
 
 ie_cpack_add_component(${PYTHON_VERSION} REQUIRED)
 
-install(FILES requirements.txt
-        DESTINATION python/${PYTHON_VERSION}
-        COMPONENT ${PYTHON_VERSION})
-
 install(PROGRAMS src/openvino/__init__.py
-        DESTINATION python/${PYTHON_VERSION}/openvino
+        DESTINATION lib64/${PYTHON_VERSION}/site-packages/openvino
         COMPONENT ${PYTHON_VERSION})
 
 ie_cpack(${PYTHON_VERSION})
diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
index 72175b33..85000514 100644
--- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
+++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
@@ -43,9 +43,9 @@ add_custom_command(TARGET ${TARGET_NAME}
 # install
 
 install(TARGETS ${TARGET_NAME}
-        DESTINATION python/${PYTHON_VERSION}/openvino/inference_engine
+        DESTINATION lib64/${PYTHON_VERSION}/site-packages/openvino/inference_engine
         COMPONENT ${PYTHON_VERSION})
 
 install(PROGRAMS __init__.py
-        DESTINATION python/${PYTHON_VERSION}/openvino/inference_engine
+        DESTINATION lib64/${PYTHON_VERSION}/site-packages/openvino/inference_engine
         COMPONENT ${PYTHON_VERSION})
diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
index 54e264c8..26114cc4 100644
--- a/inference-engine/src/inference_engine/CMakeLists.txt
+++ b/inference-engine/src/inference_engine/CMakeLists.txt
@@ -318,7 +318,6 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder
         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH}
         COMPONENT core)
 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
-              "${OpenVINO_BINARY_DIR}/share/ie_rh_decoder.cmake"
               "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
               "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
         DESTINATION ${IE_CPACK_IE_DIR}/share
diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
index 32cb534a..63d4fc66 100644
--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
@@ -41,5 +41,5 @@ target_link_libraries(${TARGET_NAME}
 # install
 
 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
-        DESTINATION deployment_tools/inference_engine/external
+        DESTINATION lib/udev/rules.d
         COMPONENT myriad)
diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
index 25168bac..1c57116f 100644
--- a/inference-engine/tools/compile_tool/CMakeLists.txt
+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
@@ -48,5 +48,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
 # install
 
 install(TARGETS compile_tool
-        RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
+        RUNTIME DESTINATION bin
         COMPONENT core)
diff --git a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
index 4123de6f..52179fac 100644
--- a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
+++ b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
@@ -50,5 +50,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
 # install
 
 install(TARGETS ${TARGET_NAME}
-        RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
-        COMPONENT myriad)
\ No newline at end of file
+        RUNTIME DESTINATION bin
+        COMPONENT myriad)
diff --git a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
index a7a801d4..b8f9e26f 100644
--- a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
+++ b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
@@ -55,6 +55,6 @@ if(ENABLE_MYRIAD)
     add_perfcheck_target(myriad_perfcheck myriadPlugin)
 
     install(TARGETS myriad_perfcheck
-            RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
+            RUNTIME DESTINATION bin
             COMPONENT myriad)
 endif()
diff --git a/inference-engine/cmake/share/InferenceEngineConfig.cmake.in b/inference-engine/cmake/share/InferenceEngineConfig.cmake.in
index e64a66aa..572fc67d 100644
--- a/inference-engine/cmake/share/InferenceEngineConfig.cmake.in
+++ b/inference-engine/cmake/share/InferenceEngineConfig.cmake.in
@@ -34,6 +34,7 @@ macro(ext_message TRACE_LEVEL)
 endmacro()
 
 set(InferenceEngine_FOUND FALSE)
+set(IE_ROOT_DIR "/usr")
 
 if(TARGET IE::inference_engine)
     set(InferenceEngine_FOUND TRUE)
@@ -74,9 +75,9 @@ else()
         ext_message(FATAL_ERROR "inference_engine root directory is not found")
     endif()
 
-    find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include" NO_DEFAULT_PATH)
+    find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include/inference_engine" NO_DEFAULT_PATH)
 
-    set(IE_LIB_DIR "${IE_ROOT_DIR}/lib/${_ARCH}")
+    set(IE_LIB_DIR "${IE_ROOT_DIR}/lib64")
     set(IE_LIB_REL_DIR "${IE_LIB_DIR}/Release")
     set(IE_LIB_DBG_DIR "${IE_LIB_DIR}/Debug")
 
@@ -164,6 +165,6 @@ else()
         set(InferenceEngine_LIBRARIES IE::inference_engine_c_api IE::inference_engine_nn_builder IE::inference_engine)
 
         set(IE_EXTERNAL_DIR "${IE_ROOT_DIR}/external")
-        include("${IE_ROOT_DIR}/share/ie_parallel.cmake")
+	include("${IE_ROOT_DIR}/lib64/cmake/InferenceEngine/ie_parallel.cmake")
     endif()
 endif()

Places

File fix-install-paths.patch of Package dldt (Revision 5caad9378ae3a0f099996a2e4e1dbf9e)

Places