[VPU] Rename INTEL_VPU to INTEL_MYRIAD, move thirdparty and vpu_dependencies (#9827)

* Rename INTEL_VPU to INTEL_MYRIAD, move thirdparty and vpu_dependencies

* Fix thirdparty

* Rename HDDL

* Remove unused files

* Fix HDDL

* Add path to mvnc

* Fix installation on Linux

* Remove thirdparty dir from codeowners

* Move new files

* Remove IE_MAIN_SOURCE_DIR dependencies

Co-authored-by: Maksim Doronin <maksim.doronin@intel.com>

.ci/azure/android_arm64.yml

@@ -103,7 +103,7 @@ jobs:
         -DENABLE_OPENCV=OFF
         -DENABLE_TESTS=ON
         -DENABLE_SAMPLES=ON
-        -DENABLE_INTEL_VPU=OFF
+        -DENABLE_INTEL_MYRIAD=OFF
         -DBUILD_java_api=ON
         -DTHREADING=SEQ
         -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules

.ci/azure/linux_arm64.yml

@@ -117,7 +117,7 @@ jobs:
         -DENABLE_TESTS=ON
         -DENABLE_SAMPLES=ON
         -DBUILD_java_api=OFF
-        -DENABLE_INTEL_VPU=OFF
+        -DENABLE_INTEL_MYRIAD=OFF
         -DTHREADING=SEQ
         -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache

.ci/azure/linux_onnxruntime.yml

@@ -93,7 +93,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DENABLE_PYTHON=ON
         -DPYTHON_EXECUTABLE=/usr/bin/python3.8
-        -DENABLE_INTEL_VPU=OFF
+        -DENABLE_INTEL_MYRIAD_COMMON=OFF
         -DENABLE_INTEL_GNA=OFF
         -DENABLE_OPENCV=OFF
         -DENABLE_CPPLINT=OFF

.ci/openvino-onnx/Dockerfile

@@ -57,7 +57,7 @@ WORKDIR /openvino/build
 RUN cmake .. \
     -G Ninja \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-    -DENABLE_INTEL_VPU=OFF \
+    -DENABLE_INTEL_MYRIAD_COMMON=OFF \
     -DENABLE_INTEL_GNA=OFF \
     -DENABLE_OPENCV=OFF \
     -DENABLE_CPPLINT=OFF \

.github/workflows/code_style.yml

@@ -66,7 +66,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DENABLE_INTEL_VPU=OFF ..
+          cmake -DENABLE_INTEL_MYRIAD_COMMON=OFF ..
 
       - name: ShellCheck
         run: cmake --build . --target ie_shellcheck -j8
@@ -91,7 +91,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DENABLE_INTEL_VPU=OFF ..
+          cmake -DENABLE_INTEL_MYRIAD_COMMON=OFF ..
 
       - name: Naming convention check
         run: cmake --build . --target ncc_all -j8

CMakeLists.txt

@@ -91,7 +91,6 @@ endfunction()
 include(cmake/test_model_zoo.cmake)
 
 add_subdirectory(thirdparty)
-add_subdirectory(inference-engine/thirdparty)
 add_subdirectory(src)
 add_subdirectory(samples)
 

CODEOWNERS

@@ -49,9 +49,8 @@ Jenkinsfile  @openvinotoolkit/openvino-admins
 /src/plugins/intel_gpu/  @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers
 
 # IE VPU:
-/src/plugins/intel_vpu  @openvinotoolkit/openvino-ie-vpu-maintainers
+/src/plugins/intel_myriad  @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
 /src/tests_deprecated/functional/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers
 /src/tests_deprecated/behavior/vpu/  @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers

cmake/dependencies.cmake

@@ -51,8 +51,8 @@ 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_INTEL_VPU)
-    include(${IE_MAIN_SOURCE_DIR}/cmake/vpu_dependencies.cmake)
+if(ENABLE_INTEL_MYRIAD)
+    include(${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/myriad_dependencies.cmake)
 endif()
 
 ## Intel OMP package

cmake/features.cmake

@@ -106,15 +106,17 @@ ie_option (ENABLE_HETERO "Enables Hetero Device Plugin" ON)
 
 ie_option (ENABLE_TEMPLATE "Enable template plugin" ON)
 
-ie_dependent_option (ENABLE_INTEL_VPU "vpu targeted plugins for inference engine" ON "NOT WINDOWS_PHONE;NOT WINDOWS_STORE" OFF)
+ie_dependent_option (ENABLE_INTEL_MYRIAD_COMMON "common part of myriad plugin" ON "NOT WINDOWS_PHONE;NOT WINDOWS_STORE" OFF)
 
-ie_dependent_option (ENABLE_MYRIAD_NO_BOOT "myriad plugin will skip device boot" OFF "ENABLE_INTEL_VPU" OFF)
+ie_dependent_option (ENABLE_INTEL_MYRIAD "myriad targeted plugin for inference engine" ON "ENABLE_INTEL_MYRIAD_COMMON" OFF)
+
+ie_dependent_option (ENABLE_MYRIAD_NO_BOOT "myriad plugin will skip device boot" OFF "ENABLE_INTEL_MYRIAD" 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_INTEL_VPU" OFF)
+ie_dependent_option (ENABLE_MYRIAD_MVNC_TESTS "functional and behavior tests for mvnc api" OFF "ENABLE_TESTS;ENABLE_INTEL_MYRIAD" OFF)
 
 ie_dependent_option (ENABLE_DATA "fetch models from testdata repo" ON "ENABLE_FUNCTIONAL_TESTS;NOT ANDROID" OFF)
 
@@ -179,7 +181,11 @@ if (ENABLE_PROFILING_RAW)
     add_definitions(-DENABLE_PROFILING_RAW=1)
 endif()
 
-if (ENABLE_MYRIAD_NO_BOOT AND ENABLE_INTEL_VPU)
+if (ENABLE_INTEL_MYRIAD)
+    add_definitions(-DENABLE_INTEL_MYRIAD=1)
+endif()
+
+if (ENABLE_MYRIAD_NO_BOOT AND ENABLE_INTEL_MYRIAD)
     add_definitions(-DENABLE_MYRIAD_NO_BOOT=1)
 endif()
 

cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in

@@ -9,7 +9,6 @@ include(CMakeFindDependencyMacro)
 # TODO: remove after changing [private plugins]
 set_and_check(OpenVINO_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # KMB
 set_and_check(OpenVINO_MAIN_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # KMB
-set_and_check(IE_MAIN_SOURCE_DIR "@IE_MAIN_SOURCE_DIR@") # HDDL
 
 # Variables to export in plugin's projects
 

cmake/toolchains/ia32.linux.toolchain.cmake

@@ -21,4 +21,4 @@ endmacro()
 _set_if_not_defined(FORCE_32 ON)
 
 # need libusb 32-bits version
-_set_if_not_defined(ENABLE_INTEL_VPU OFF)
+_set_if_not_defined(ENABLE_INTEL_MYRIAD_COMMON OFF)

inference-engine/thirdparty/CMakeLists.txt

@@ -1,18 +0,0 @@
-# Copyright (C) 2018-2022 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-if(ENABLE_INTEL_VPU)
-    add_subdirectory(movidius)
-endif()
-
-if((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND (MSVC_VERSION VERSION_GREATER_EQUAL "1910"))
-    # 1910 version of Visual Studio 2017
-    # This flagis needed for enabling SIMD vectorization with command '#pragma omp simd'.
-    # Compilation with '/openmp:experimental' key allow us to enable vectorizatikon capability in MSVC.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp:experimental")
-endif()
-
-if(ENABLE_LTO)
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON)
-endif()

scripts/CMakeLists.txt

@@ -13,7 +13,6 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
                            "${OpenVINO_SOURCE_DIR}/src/plugins/intel_cpu/thirdparty"
                            "${OpenVINO_SOURCE_DIR}/src/plugins/intel_gpu/thirdparty"
                            "${OpenVINO_SOURCE_DIR}/src/bindings/python/thirdparty/pybind11"
-                           "${IE_MAIN_SOURCE_DIR}/thirdparty"
                            "${OpenVINO_SOURCE_DIR}/tools/pot/thirdparty"
                            "${TEMP}"
                            # TODO fix and enable back:

src/bindings/python/BUILDING.md

@@ -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_INTEL_VPU=OFF \
+        -DENABLE_INTEL_MYRIAD_COMMON=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_INTEL_VPU=OFF ^
+    -DENABLE_INTEL_MYRIAD_COMMON=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"

src/cmake/ov_runtime.cmake

@@ -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_auto_batch_plugin ov_hetero_plugin ov_intel_gpu_plugin ov_intel_gna_plugin ov_intel_cpu_plugin ov_intel_vpu_plugin)
+                    POSSIBLE_PLUGINS ov_auto_plugin ov_auto_batch_plugin ov_hetero_plugin ov_intel_gpu_plugin ov_intel_gna_plugin ov_intel_cpu_plugin ov_intel_myriad_plugin)
 
 # Export for build tree
 

src/inference/include/ie/vpu/hddl_config.hpp

@@ -85,7 +85,7 @@ DECLARE_METRIC_KEY(HDDL_DEVICE_TOTAL_NUM, int);
 }  // namespace Metrics
 
 /**
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: Arbitrary non-empty string. If empty (""), equals no set, default: "";
  * This option allows to specify the number of MYX devices used for inference a specific Executable network.
  * Note: Only one network would be allocated to one device.
@@ -103,7 +103,7 @@ DECLARE_METRIC_KEY(HDDL_DEVICE_TOTAL_NUM, int);
 DECLARE_VPU_CONFIG(HDDL_GRAPH_TAG);
 
 /**
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: Arbitrary non-empty string. If empty (""), equals no set, default: "";
  * This config makes the executable networks to be allocated on one certain device (instead of multiple devices).
  * And all inference through this executable network, will be done on this device.
@@ -119,7 +119,7 @@ DECLARE_VPU_CONFIG(HDDL_GRAPH_TAG);
 DECLARE_VPU_CONFIG(HDDL_STREAM_ID);
 
 /**
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: Arbitrary non-empty string. If empty (""), equals no set, default: "";
  * This config allows user to control device flexibly. This config gives a "tag" for a certain device while
  * allocating a network to it. Afterward, user can allocating/deallocating networks to this device with this "tag".
@@ -135,7 +135,7 @@ DECLARE_VPU_CONFIG(HDDL_STREAM_ID);
 DECLARE_VPU_CONFIG(HDDL_DEVICE_TAG);
 
 /**
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: "YES/NO", default is "NO".
  * This config is a sub-config of DEVICE_TAG, and only available when "DEVICE_TAG" is set. After a user load a
  * network, the user got a handle for the network.
@@ -148,7 +148,7 @@ DECLARE_VPU_CONFIG(HDDL_DEVICE_TAG);
 DECLARE_VPU_CONFIG(HDDL_BIND_DEVICE);
 
 /**
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: A signed int wrapped in a string, default is "0".
  * This config is a sub-config of DEVICE_TAG, and only available when "DEVICE_TAG" is set and "BIND_DEVICE" is "False".
  * When there are multiple devices running a certain network (a same network running on multiple devices in Bypass
@@ -158,7 +158,7 @@ DECLARE_VPU_CONFIG(HDDL_BIND_DEVICE);
 DECLARE_VPU_CONFIG(HDDL_RUNTIME_PRIORITY);
 
 /**
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: "YES/NO", default is "NO".
  * SGAD is short for "Single Graph All Device". With this scheduler, once application allocates 1 network, all devices
  * (managed by SGAD scheduler) will be loaded with this graph. The number of network that can be loaded to one device
@@ -167,7 +167,7 @@ DECLARE_VPU_CONFIG(HDDL_RUNTIME_PRIORITY);
 DECLARE_VPU_CONFIG(HDDL_USE_SGAD);
 
 /**
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: A signed int wrapped in a string, default is "0".
  * This config gives a "group id" for a certain device when this device has been reserved for certain client, client
  * can use this device grouped by calling this group id while other client can't use this device

src/inference/include/ie/vpu/hddl_plugin_config.hpp

@@ -146,7 +146,7 @@ namespace VPUConfigParams {
 
 /**
  * @deprecated Use InferenceEngine::HDDL_GRAPH_TAG instead
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: Arbitrary non-empty string. If empty (""), equals no set, default: "";
  * This option allows to specify the number of MYX devices used for inference a specific Executable network.
  * Note: Only one network would be allocated to one device.
@@ -166,7 +166,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(GRAPH_TAG);
 
 /**
  * @deprecated Use InferenceEngine::HDDL_STREAM_ID instead
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: Arbitrary non-empty string. If empty (""), equals no set, default: "";
  * This config makes the executable networks to be allocated on one certain device (instead of multiple devices).
  * And all inference through this executable network, will be done on this device.
@@ -184,7 +184,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(STREAM_ID);
 
 /**
  * @deprecated Use InferenceEngine::HDDL_DEVICE_TAG instead
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: Arbitrary non-empty string. If empty (""), equals no set, default: "";
  * This config allows user to control device flexibly. This config gives a "tag" for a certain device while
  * allocating a network to it. Afterward, user can allocating/deallocating networks to this device with this "tag".
@@ -202,7 +202,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(DEVICE_TAG);
 
 /**
  * @deprecated Use InferenceEngine::HDDL_BIND_DEVICE instead
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: "YES/NO", default is "NO".
  * This config is a sub-config of DEVICE_TAG, and only available when "DEVICE_TAG" is set. After a user load a
  * network, the user got a handle for the network.
@@ -217,7 +217,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(BIND_DEVICE);
 
 /**
  * @deprecated Use InferenceEngine::HDDL_RUNTIME_PRIORITY instead
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: A signed int wrapped in a string, default is "0".
  * This config is a sub-config of DEVICE_TAG, and only available when "DEVICE_TAG" is set and "BIND_DEVICE" is "False".
  * When there are multiple devices running a certain network (a same network running on multiple devices in Bypass
@@ -229,7 +229,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(RUNTIME_PRIORITY);
 
 /**
  * @deprecated Use InferenceEngine::HDDL_USE_SGAD instead
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: "YES/NO", default is "NO".
  * SGAD is short for "Single Graph All Device". With this scheduler, once application allocates 1 network, all devices
  * (managed by SGAD scheduler) will be loaded with this graph. The number of network that can be loaded to one device
@@ -240,7 +240,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(USE_SGAD);
 
 /**
  * @deprecated Use InferenceEngine::HDDL_GROUP_DEVICE instead
- * @brief [Only for HDDLPlugin]
+ * @brief [Only for ov_intel_hddl_plugin]
  * Type: A signed int wrapped in a string, default is "0".
  * This config gives a "group id" for a certain device when this device has been reserved for certain client, client
  * can use this device grouped by calling this group id while other client can't use this device

src/plugins/CMakeLists.txt

@@ -18,8 +18,8 @@ if(ENABLE_INTEL_GNA)
     add_subdirectory(intel_gna)
 endif()
 
-if(ENABLE_INTEL_VPU)
-    add_subdirectory(intel_vpu)
+if(ENABLE_INTEL_MYRIAD_COMMON)
+    add_subdirectory(intel_myriad)
 endif()
 
 if(ENABLE_AUTO OR ENABLE_MULTI)

src/plugins/intel_myriad/CMakeLists.txt

@@ -12,9 +12,10 @@ endif()
 
 add_subdirectory(common)
 
-if(ENABLE_INTEL_VPU)
+if(ENABLE_INTEL_MYRIAD)
     add_subdirectory(graph_transformer)
     add_subdirectory(myriad_plugin)
+    add_subdirectory(third_party)
 
     if(DEFINED VPU_CLC_MA2X8X_ROOT)
         install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/custom_kernels/