[IE][VPU] Rename and move VPU plugin to src/plugins (#9110)
* [IE][VPU] Rename and move VPU plugin to src/plugins * Update some dependencies * Change .md * Update some dependencies * Update some dependencies (again) * I'll rename this one * Remove ENABLE_MYRIAD arg * Update XLink.cmake * Update thirdparty CMakeList * Minor fixes
This commit is contained in:
Anton Dudchenko
GitHub
parent
bd97d1edc6
commit
eb299f819e
|
|
@ -93,7 +93,7 @@ jobs:
|
|||
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
|
||||
-DENABLE_PYTHON=ON
|
||||
-DPYTHON_EXECUTABLE=/usr/bin/python3.8
|
||||
-DENABLE_VPU=OFF
|
||||
-DENABLE_INTEL_VPU=OFF
|
||||
-DENABLE_INTEL_GNA=OFF
|
||||
-DENABLE_OPENCV=OFF
|
||||
-DENABLE_CPPLINT=OFF
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ COPY . /openvino/
|
|||
WORKDIR /openvino/build
|
||||
RUN cmake .. \
|
||||
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
|
||||
-DENABLE_VPU=OFF \
|
||||
-DENABLE_INTEL_VPU=OFF \
|
||||
-DENABLE_INTEL_GNA=OFF \
|
||||
-DENABLE_OPENCV=OFF \
|
||||
-DENABLE_CPPLINT=OFF \
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ jobs:
|
|||
run: |
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DENABLE_VPU=OFF ..
|
||||
cmake -DENABLE_INTEL_VPU=OFF ..
|
||||
|
||||
- name: ShellCheck
|
||||
run: cmake --build . --target ie_shellcheck -j8
|
||||
|
|
@ -91,7 +91,7 @@ jobs:
|
|||
run: |
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DENABLE_VPU=OFF ..
|
||||
cmake -DENABLE_INTEL_VPU=OFF ..
|
||||
|
||||
- name: Naming convention check
|
||||
run: cmake --build . --target ncc_all -j8
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ Jenkinsfile @openvinotoolkit/openvino-admins
|
|||
/src/plugins/intel_gpu/ @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
|
||||
|
||||
# IE VPU:
|
||||
/inference-engine/src/vpu/ @openvinotoolkit/openvino-ie-vpu-maintainers
|
||||
/src/plugins/intel_vpu @openvinotoolkit/openvino-ie-vpu-maintainers
|
||||
/src/inference/include/ie/vpu/ @openvinotoolkit/openvino-ie-vpu-maintainers
|
||||
/inference-engine/thirdparty/movidius/ @openvinotoolkit/openvino-ie-vpu-maintainers
|
||||
/src/tests_deprecated/unit/engines/vpu/ @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_
|
|||
update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
|
||||
endif()
|
||||
|
||||
if(ENABLE_MYRIAD)
|
||||
if(ENABLE_INTEL_VPU)
|
||||
include(${IE_MAIN_SOURCE_DIR}/cmake/vpu_dependencies.cmake)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -106,17 +106,15 @@ ie_option (ENABLE_HETERO "Enables Hetero Device Plugin" ON)
|
|||
|
||||
ie_option (ENABLE_TEMPLATE "Enable template plugin" ON)
|
||||
|
||||
ie_dependent_option (ENABLE_VPU "vpu targeted plugins for inference engine" ON "NOT WINDOWS_PHONE;NOT WINDOWS_STORE" OFF)
|
||||
ie_dependent_option (ENABLE_INTEL_VPU "vpu targeted plugins for inference engine" ON "NOT WINDOWS_PHONE;NOT WINDOWS_STORE" OFF)
|
||||
|
||||
ie_dependent_option (ENABLE_MYRIAD "myriad targeted plugin for inference engine" ON "ENABLE_VPU" OFF)
|
||||
|
||||
ie_dependent_option (ENABLE_MYRIAD_NO_BOOT "myriad plugin will skip device boot" OFF "ENABLE_MYRIAD" OFF)
|
||||
ie_dependent_option (ENABLE_MYRIAD_NO_BOOT "myriad plugin will skip device boot" OFF "ENABLE_INTEL_VPU" OFF)
|
||||
|
||||
ie_dependent_option (ENABLE_GAPI_TESTS "tests for GAPI kernels" ON "ENABLE_GAPI_PREPROCESSING;ENABLE_TESTS" OFF)
|
||||
|
||||
ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_GAPI_TESTS" OFF)
|
||||
|
||||
ie_dependent_option (ENABLE_MYRIAD_MVNC_TESTS "functional and behavior tests for mvnc api" OFF "ENABLE_TESTS;ENABLE_MYRIAD" OFF)
|
||||
ie_dependent_option (ENABLE_MYRIAD_MVNC_TESTS "functional and behavior tests for mvnc api" OFF "ENABLE_TESTS;ENABLE_INTEL_VPU" OFF)
|
||||
|
||||
ie_dependent_option (ENABLE_DATA "fetch models from testdata repo" ON "ENABLE_FUNCTIONAL_TESTS;NOT ANDROID" OFF)
|
||||
|
||||
|
|
@ -181,11 +179,7 @@ if (ENABLE_PROFILING_RAW)
|
|||
add_definitions(-DENABLE_PROFILING_RAW=1)
|
||||
endif()
|
||||
|
||||
if (ENABLE_MYRIAD)
|
||||
add_definitions(-DENABLE_MYRIAD=1)
|
||||
endif()
|
||||
|
||||
if (ENABLE_MYRIAD_NO_BOOT AND ENABLE_MYRIAD )
|
||||
if (ENABLE_MYRIAD_NO_BOOT AND ENABLE_INTEL_VPU)
|
||||
add_definitions(-DENABLE_MYRIAD_NO_BOOT=1)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ endmacro()
|
|||
_set_if_not_defined(FORCE_32 ON)
|
||||
|
||||
# need libusb 32-bits version
|
||||
_set_if_not_defined(ENABLE_VPU OFF)
|
||||
_set_if_not_defined(ENABLE_INTEL_VPU OFF)
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ InferenceEngine:
|
|||
|
||||
API version ............ 0.1
|
||||
Build .................. ###
|
||||
Description ....... myriadPlugin
|
||||
Description ....... ov_intel_vpu_plugin
|
||||
|
||||
|
||||
API version ............ 1.0
|
||||
|
|
@ -167,7 +167,7 @@ InferenceEngine:
|
|||
|
||||
API version ............ 0.1
|
||||
Build .................. custom_releases/cvsdk-2018-r2_e28ec0278fb749d6b999c688a8e90a8a25c0f2b5
|
||||
Description ....... myriadPlugin
|
||||
Description ....... ov_intel_vpu_plugin
|
||||
|
||||
[ INFO ] Inputs detected: <list_of_input_layers>
|
||||
[ INFO ] Statistics will be dumped for X layers: <comma_separated_list_of_layers>
|
||||
|
|
@ -199,7 +199,7 @@ InferenceEngine:
|
|||
|
||||
API version ............ 0.1
|
||||
Build .................. ###
|
||||
Description ....... myriadPlugin
|
||||
Description ....... ov_intel_vpu_plugin
|
||||
|
||||
[ INFO ] Inputs detected: <list_of_input_layers>
|
||||
[ INFO ] Statistics will be dumped for X layers: <layer_1_name>, <layer_2_name>, ... , <layer_X_name>
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ The table below shows the plugin libraries and additional dependencies for Linux
|
|||
|--------|-----------------------------|-------------------------------------------------------------|--------------------------|--------------------------------------------------------------------------------------------------------|------------------------------|---------------------------------------------|
|
||||
| CPU | `libov_intel_cpu_plugin.so` | | `ov_intel_cpu_plugin.dll` | | `libov_intel_cpu_plugin.so` | |
|
||||
| GPU | `libov_intel_gpu_plugin.so` | `libOpenCL.so` | `ov_intel_gpu_plugin.dll` | `OpenCL.dll` | Is not supported | - |
|
||||
| MYRIAD | `libmyriadPlugin.so` | `libusb.so`, | `myriadPlugin.dll` | `usb.dll` | `libmyriadPlugin.so` | `libusb.dylib` |
|
||||
| MYRIAD | `libov_intel_vpu_plugin.so` | `libusb.so` | `ov_intel_vpu_plugin.dll`| `usb.dll` | `libov_intel_vpu_plugin.so` | `libusb.dylib` |
|
||||
| HDDL | `libHDDLPlugin.so` | `libbsl.so`, `libhddlapi.so`, `libmvnc-hddl.so` | `HDDLPlugin.dll` | `bsl.dll`, `hddlapi.dll`, `json-c.dll`, `libcrypto-1_1-x64.dll`, `libssl-1_1-x64.dll`, `mvnc-hddl.dll` | Is not supported | - |
|
||||
| GNA | `libov_intel_gna_plugin.so` | `libgna.so`, | `ov_intel_gna_plugin.dll` | `gna.dll` | Is not supported | - |
|
||||
| HETERO | `libov_hetero_plugin.so` | Same as for selected plugins | `ov_hetero_plugin.dll` | Same as for selected plugins | `libov_hetero_plugin.so` | Same as for selected plugins |
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
|
|||
DESTINATION ${IE_CPACK_RUNTIME_PATH}
|
||||
COMPONENT myriad)
|
||||
|
||||
if(ENABLE_MYRIAD AND ENABLE_BEH_TESTS)
|
||||
if(ENABLE_INTEL_VPU AND ENABLE_BEH_TESTS)
|
||||
# for MyriadBehaviorTests
|
||||
install(FILES ${${var_name}}
|
||||
DESTINATION tests
|
||||
|
|
|
|||
|
|
@ -6,7 +6,3 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
|||
ie_add_compiler_flags(-Wall)
|
||||
ie_add_compiler_flags(-Wmissing-declarations)
|
||||
endif()
|
||||
|
||||
if(ENABLE_VPU)
|
||||
add_subdirectory(vpu)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
if(ENABLE_MYRIAD)
|
||||
if(ENABLE_INTEL_VPU)
|
||||
add_subdirectory(movidius)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
if (ENABLE_MYRIAD)
|
||||
if (ENABLE_INTEL_VPU)
|
||||
add_definitions(-DXLINK_USE_BUS)
|
||||
|
||||
if(CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ set the mentioned flags to `ON`. Note the `CMAKE_INSTALL_PREFIX`, which defaults
|
|||
cmake .. \
|
||||
-DENABLE_INTEL_GPU=OFF \
|
||||
-DENABLE_OPENCV=OFF \
|
||||
-DENABLE_VPU=OFF \
|
||||
-DENABLE_INTEL_VPU=OFF \
|
||||
-DENABLE_PYTHON=ON \
|
||||
-DENABLE_OV_ONNX_FRONTEND=ON \
|
||||
-DCMAKE_INSTALL_PREFIX="${OPENVINO_BASEDIR}/openvino_dist"
|
||||
|
|
@ -109,7 +109,7 @@ cmake .. ^
|
|||
-DCMAKE_INSTALL_PREFIX="%OPENVINO_BASEDIR%/openvino_dist" ^
|
||||
-DENABLE_INTEL_GPU=OFF ^
|
||||
-DENABLE_OPENCV=OFF ^
|
||||
-DENABLE_VPU=OFF ^
|
||||
-DENABLE_INTEL_VPU=OFF ^
|
||||
-DENABLE_OV_ONNX_FRONTEND=ON ^
|
||||
-DENABLE_PYTHON=ON ^
|
||||
-DCMAKE_CXX_COMPILER="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.27.29110\bin\Hostx64\x64"
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ ie_mark_target_as_cc(${TARGET_NAME})
|
|||
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
|
||||
|
||||
ie_register_plugins(MAIN_TARGET ${TARGET_NAME}
|
||||
POSSIBLE_PLUGINS ov_auto_plugin ov_hetero_plugin ov_intel_gpu_plugin ov_intel_gna_plugin ov_intel_cpu_plugin myriadPlugin)
|
||||
POSSIBLE_PLUGINS ov_auto_plugin ov_hetero_plugin ov_intel_gpu_plugin ov_intel_gna_plugin ov_intel_cpu_plugin ov_intel_vpu_plugin)
|
||||
|
||||
# Export for build tree
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,10 @@ if(ENABLE_INTEL_GNA)
|
|||
add_subdirectory(intel_gna)
|
||||
endif()
|
||||
|
||||
if(ENABLE_INTEL_VPU)
|
||||
add_subdirectory(intel_vpu)
|
||||
endif()
|
||||
|
||||
if(ENABLE_AUTO OR ENABLE_MULTI)
|
||||
add_subdirectory(auto)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ endif()
|
|||
|
||||
add_subdirectory(common)
|
||||
|
||||
if(ENABLE_MYRIAD)
|
||||
if(ENABLE_INTEL_VPU)
|
||||
add_subdirectory(graph_transformer)
|
||||
add_subdirectory(myriad_plugin)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue