mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
78386dd80b
* Point to the renamed repository and change the project name to openvino-inference-engine. * Include ngraph as a submodule instead of using it as a separate project. * Use the new unit tests, the old ones have been deprecated. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
205 lines
8.1 KiB
Diff
205 lines
8.1 KiB
Diff
From 0838608d9c2b09a845efbdde88a09e151ac9ff7d Mon Sep 17 00:00:00 2001
|
|
From: Anuj Mittal <anuj.mittal@intel.com>
|
|
Date: Thu, 11 Jun 2020 14:24:04 +0800
|
|
Subject: [PATCH] fixes
|
|
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
---
|
|
CMakeLists.txt | 14 --------------
|
|
cmake/developer_package.cmake | 10 ++++++----
|
|
inference-engine/samples/CMakeLists.txt | 8 +++-----
|
|
.../samples/common/format_reader/CMakeLists.txt | 2 ++
|
|
.../src/inference_engine/CMakeLists.txt | 4 ++--
|
|
.../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
|
|
inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++-
|
|
.../tests/unit/inference_engine/CMakeLists.txt | 4 +++-
|
|
inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++-
|
|
9 files changed, 23 insertions(+), 29 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 902d3289..f1bfb3f5 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -123,12 +123,8 @@ add_subdirectory(docs)
|
|
|
|
# install setupvars
|
|
|
|
-ie_cpack_add_component(setupvars REQUIRED)
|
|
|
|
if(UNIX)
|
|
- install(PROGRAMS scripts/setupvars/setupvars.sh
|
|
- DESTINATION bin
|
|
- COMPONENT setupvars)
|
|
elseif(WIN32)
|
|
install(PROGRAMS scripts/setupvars/setupvars.bat
|
|
DESTINATION bin
|
|
@@ -138,22 +134,12 @@ endif()
|
|
# install install_dependencies
|
|
|
|
if(UNIX)
|
|
- ie_cpack_add_component(install_dependencies REQUIRED)
|
|
- install(DIRECTORY scripts/install_dependencies/
|
|
- DESTINATION install_dependencies
|
|
- COMPONENT install_dependencies)
|
|
endif()
|
|
|
|
# install files for demo
|
|
|
|
-ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core)
|
|
|
|
if(UNIX)
|
|
- install(DIRECTORY scripts/demo/
|
|
- DESTINATION deployment_tools/demo
|
|
- COMPONENT demo_scripts
|
|
- USE_SOURCE_PERMISSIONS
|
|
- PATTERN *.bat EXCLUDE)
|
|
elseif(WIN32)
|
|
install(DIRECTORY scripts/demo/
|
|
DESTINATION deployment_tools/demo
|
|
diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
|
|
index 23cd9b2d..24c33711 100644
|
|
--- a/cmake/developer_package.cmake
|
|
+++ b/cmake/developer_package.cmake
|
|
@@ -7,7 +7,9 @@ set(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake/download" ${CMAKE_MODUL
|
|
include(CPackComponent)
|
|
unset(IE_CPACK_COMPONENTS_ALL CACHE)
|
|
|
|
-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
|
|
+if (NOT DEFINED IE_CPACK_IE_DIR)
|
|
+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
|
|
+endif()
|
|
|
|
# Search packages for the host system instead of packages for the target system
|
|
# in case of cross compilation these macros should be defined by the toolchain file
|
|
@@ -40,8 +42,8 @@ function(ie_cpack_set_library_dir)
|
|
set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
|
|
set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
|
|
else()
|
|
- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
|
|
- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
|
|
+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
|
|
+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
|
|
set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
|
|
endif()
|
|
endfunction()
|
|
@@ -143,7 +145,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
|
|
set(CMAKE_BUILD_TYPE "Release")
|
|
endif()
|
|
|
|
-set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
|
|
+set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
# Enable postfixes for Debug/Release builds
|
|
set(IE_DEBUG_POSTFIX_WIN "d")
|
|
diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
|
|
index 033a8aab..4a871ca6 100644
|
|
--- a/inference-engine/samples/CMakeLists.txt
|
|
+++ b/inference-engine/samples/CMakeLists.txt
|
|
@@ -28,7 +28,7 @@ endif()
|
|
|
|
if(IE_MAIN_SOURCE_DIR)
|
|
# in case if samples are built from IE repo
|
|
- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
|
|
+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
|
|
# hint for find_package(InferenceEngine in the samples folder)
|
|
set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
|
|
else()
|
|
@@ -110,10 +110,6 @@ set (HAVE_INTTYPES_H 1)
|
|
set (INTTYPES_FORMAT C99)
|
|
set (BUILD_TESTING OFF)
|
|
|
|
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
|
|
- add_subdirectory(thirdparty/gflags)
|
|
-endif()
|
|
-
|
|
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
|
endif()
|
|
@@ -222,6 +218,8 @@ macro(ie_add_sample)
|
|
if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT)
|
|
add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME})
|
|
endif()
|
|
+
|
|
+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
|
|
endmacro()
|
|
|
|
# collect all samples subdirectories
|
|
diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
|
|
index 6d935135..fe12eeb7 100644
|
|
--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
|
|
+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
|
|
@@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/..")
|
|
|
|
set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
|
|
+
|
|
+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
|
|
index c8cd4b27..babe8ff5 100644
|
|
--- a/inference-engine/src/inference_engine/CMakeLists.txt
|
|
+++ b/inference-engine/src/inference_engine/CMakeLists.txt
|
|
@@ -289,8 +289,8 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder
|
|
install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
|
|
"${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
|
|
"${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
|
|
- DESTINATION ${IE_CPACK_IE_DIR}/share
|
|
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
|
|
COMPONENT core)
|
|
install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
|
|
- DESTINATION ${IE_CPACK_RUNTIME_PATH}
|
|
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
COMPONENT core)
|
|
diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
|
|
index b35910f6..304d6d40 100644
|
|
--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
|
|
+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
|
|
@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME}
|
|
# install
|
|
|
|
install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
|
|
- DESTINATION ${IE_CPACK_IE_DIR}/external
|
|
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
|
|
COMPONENT myriad)
|
|
diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
|
|
index 9ec5ad02..45c62571 100644
|
|
--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
|
|
+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
|
|
@@ -22,4 +22,6 @@ addIeTargetTest(
|
|
ADD_CPPLINT
|
|
LABELS
|
|
CPU
|
|
-)
|
|
\ No newline at end of file
|
|
+)
|
|
+
|
|
+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
|
|
index 55e52b59..9d383d74 100644
|
|
--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
|
|
+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
|
|
@@ -12,4 +12,6 @@ addIeTargetTest(
|
|
ADD_CPPLINT
|
|
LABELS
|
|
INFERENCE_ENGINE
|
|
-)
|
|
\ No newline at end of file
|
|
+)
|
|
+
|
|
+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
|
|
index 39fb1d5a..5ce82b5f 100644
|
|
--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
|
|
+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
|
|
@@ -23,4 +23,6 @@ addIeTargetTest(
|
|
LABELS
|
|
VPU
|
|
MYRIAD
|
|
-)
|
|
\ No newline at end of file
|
|
+)
|
|
+
|
|
+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
--
|
|
2.25.4
|
|
|