From 83a7d9bda3ac7d1bc350e0441a3b5a9baba5975f Mon Sep 17 00:00:00 2001 From: "Wang, Yang" Date: Mon, 6 Dec 2021 10:58:05 +0800 Subject: [PATCH] [AUTO Plugin] Rename Multi plugin to ov_multi_plugin and move the src files to new (#8885) place. Signed-off-by: Wang, Yang --- cmake/coverage.cmake | 6 +++--- cmake/features.cmake | 3 ++- docs/IE_DG/Deep_Learning_Inference_Engine_DevGuide.md | 3 ++- docs/IE_DG/inference_engine_intro.md | 3 ++- inference-engine/src/CMakeLists.txt | 6 +----- .../tests/functional/inference_engine/CMakeLists.txt | 4 ++-- .../include/api_conformance_helpers.hpp | 4 ++-- .../tests/functional/plugin/shared/CMakeLists.txt | 4 ++-- inference-engine/tests/unit/CMakeLists.txt | 4 +++- .../tests/unit/{multi => auto}/CMakeLists.txt | 6 +++--- .../{multi => auto}/auto_select_device_failed_test.cpp | 2 +- .../tests/unit/{multi => auto}/log_utils_test.cpp | 0 .../plugin/mock_auto_device_plugin.hpp} | 2 +- .../tests/unit/{multi => auto}/plugin/mock_log_utils.hpp | 0 .../tests_deprecated/behavior/shared_tests/CMakeLists.txt | 4 ++-- .../functional/shared_tests/CMakeLists.txt | 4 ++-- src/bindings/c/tests/CMakeLists.txt | 4 ++-- src/inference/CMakeLists.txt | 2 +- src/plugins/CMakeLists.txt | 4 ++++ .../src/multi_device => src/plugins/auto}/CMakeLists.txt | 4 ++-- .../plugins/auto/async_infer_request.cpp | 4 ++-- .../plugins/auto/async_infer_request.hpp | 4 ++-- .../plugins/auto/executable_network.cpp | 8 ++++---- .../plugins/auto/executable_network.hpp | 0 .../plugins/auto/infer_request.cpp | 2 +- .../plugins/auto/infer_request.hpp | 0 .../multi_itt.hpp => src/plugins/auto/itt.hpp | 0 .../plugins/auto/plugin.cpp | 4 ++-- .../plugins/auto/plugin.hpp | 2 +- .../src/multi_device => src/plugins/auto}/utils/log.cpp | 0 .../src/multi_device => src/plugins/auto}/utils/log.hpp | 0 .../multi_device => src/plugins/auto}/utils/log_util.hpp | 0 .../plugins/auto}/utils/non_copyable.hpp | 0 .../multi_device => src/plugins/auto}/utils/singleton.hpp | 0 .../plugins/auto}/utils/thread_utils.cpp | 0 .../plugins/auto}/utils/thread_utils.hpp | 0 .../plugins/auto}/utils/time_utils.cpp | 0 .../plugins/auto}/utils/time_utils.hpp | 0 tools/deployment_manager/configs/darwin.json | 2 +- tools/deployment_manager/configs/linux.json | 2 +- tools/deployment_manager/configs/windows.json | 2 +- 41 files changed, 52 insertions(+), 47 deletions(-) rename inference-engine/tests/unit/{multi => auto}/CMakeLists.txt (74%) rename inference-engine/tests/unit/{multi => auto}/auto_select_device_failed_test.cpp (99%) rename inference-engine/tests/unit/{multi => auto}/log_utils_test.cpp (100%) rename inference-engine/tests/unit/{multi/plugin/mock_multi_device_plugin.hpp => auto/plugin/mock_auto_device_plugin.hpp} (95%) rename inference-engine/tests/unit/{multi => auto}/plugin/mock_log_utils.hpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/CMakeLists.txt (88%) rename inference-engine/src/multi_device/multi_device_async_infer_request.cpp => src/plugins/auto/async_infer_request.cpp (97%) rename inference-engine/src/multi_device/multi_device_async_infer_request.hpp => src/plugins/auto/async_infer_request.hpp (95%) rename inference-engine/src/multi_device/multi_device_exec_network.cpp => src/plugins/auto/executable_network.cpp (99%) rename inference-engine/src/multi_device/multi_device_exec_network.hpp => src/plugins/auto/executable_network.hpp (100%) rename inference-engine/src/multi_device/multi_device_infer_request.cpp => src/plugins/auto/infer_request.cpp (98%) rename inference-engine/src/multi_device/multi_device_infer_request.hpp => src/plugins/auto/infer_request.hpp (100%) rename inference-engine/src/multi_device/multi_itt.hpp => src/plugins/auto/itt.hpp (100%) rename inference-engine/src/multi_device/multi_device_plugin.cpp => src/plugins/auto/plugin.cpp (99%) rename inference-engine/src/multi_device/multi_device_plugin.hpp => src/plugins/auto/plugin.hpp (98%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/log.cpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/log.hpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/log_util.hpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/non_copyable.hpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/singleton.hpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/thread_utils.cpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/thread_utils.hpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/time_utils.cpp (100%) rename {inference-engine/src/multi_device => src/plugins/auto}/utils/time_utils.hpp (100%) diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index ff913b8a92c..1b620452945 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -28,9 +28,9 @@ ie_coverage_extract(INPUT "openvino" OUTPUT "ov_hetero_plugin" ie_coverage_genhtml(INFO_FILE "ov_hetero_plugin" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") -ie_coverage_extract(INPUT "openvino" OUTPUT "multi_device" - PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/inference-engine/src/multi_device/*") -ie_coverage_genhtml(INFO_FILE "multi_device" +ie_coverage_extract(INPUT "openvino" OUTPUT "ov_auto_plugin" + PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/auto/*") +ie_coverage_genhtml(INFO_FILE "ov_auto_plugin" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") ie_coverage_extract(INPUT "openvino" OUTPUT "preprocessing" diff --git a/cmake/features.cmake b/cmake/features.cmake index 4e17d853d3f..16a38b5d8a2 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -112,7 +112,8 @@ ie_option (ENABLE_IR_V7_READER "Enables IR v7 reader" ${ENABLE_IR_V7_READER_DEFA ie_option (ENABLE_GAPI_PREPROCESSING "Enables G-API preprocessing" ON) -ie_option (ENABLE_MULTI "Enables Multi Device Plugin" ON) +ie_option (ENABLE_MULTI "Enables MULTI Device Plugin" ON) +ie_option (ENABLE_AUTO "Enables AUTO Device Plugin" ON) ie_option (ENABLE_HETERO "Enables Hetero Device Plugin" ON) diff --git a/docs/IE_DG/Deep_Learning_Inference_Engine_DevGuide.md b/docs/IE_DG/Deep_Learning_Inference_Engine_DevGuide.md index 9a01e5121a6..09cdd2d6240 100644 --- a/docs/IE_DG/Deep_Learning_Inference_Engine_DevGuide.md +++ b/docs/IE_DG/Deep_Learning_Inference_Engine_DevGuide.md @@ -71,7 +71,8 @@ The table below shows the plugin libraries and additional dependencies for Linux | 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 | `libGNAPlugin.so` | `libgna.so`, | `GNAPlugin.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 | -| MULTI | `libMultiDevicePlugin.so` | Same as for selected plugins | `MultiDevicePlugin.dll` | Same as for selected plugins | `libMultiDevicePlugin.so` | Same as for selected plugins | +| MULTI | `libov_auto_plugin.so` | Same as for selected plugins | `ov_auto_plugin.dll` | Same as for selected plugins | `libov_auto_plugin.so` | Same as for selected plugins | +| AUTO | `libov_auto_plugin.so` | Same as for selected plugins | `ov_auto_plugin.dll` | Same as for selected plugins | `libov_auto_plugin.so` | Same as for selected plugins | > **NOTE**: All plugin libraries also depend on core Inference Engine libraries. diff --git a/docs/IE_DG/inference_engine_intro.md b/docs/IE_DG/inference_engine_intro.md index d84c3e9c3ca..f2ae00094a3 100644 --- a/docs/IE_DG/inference_engine_intro.md +++ b/docs/IE_DG/inference_engine_intro.md @@ -76,7 +76,8 @@ The table below shows the plugin libraries and additional dependencies for Linux | 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 | `libGNAPlugin.so` | `libgna.so`, | `GNAPlugin.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 | -| MULTI | `libMultiDevicePlugin.so` | Same as for selected plugins | `MultiDevicePlugin.dll` | Same as for selected plugins | `libMultiDevicePlugin.so` | Same as for selected plugins | +| MULTI | `libov_auto_plugin.so` | Same as for selected plugins | `ov_auto_plugin.dll` | Same as for selected plugins | `libov_auto_plugin.so` | Same as for selected plugins | +| AUTO | `libov_auto_plugin.so` | Same as for selected plugins | `ov_auto_plugin.dll` | Same as for selected plugins | `libov_auto_plugin.so` | Same as for selected plugins | > **NOTE**: All plugin libraries also depend on core Inference Engine libraries. diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt index 38c0419f70b..14cf506e99c 100644 --- a/inference-engine/src/CMakeLists.txt +++ b/inference-engine/src/CMakeLists.txt @@ -19,8 +19,4 @@ endif() if(ENABLE_GNA) add_subdirectory(gna_plugin) -endif() - -if(ENABLE_MULTI) - add_subdirectory(multi_device) -endif() +endif() \ No newline at end of file diff --git a/inference-engine/tests/functional/inference_engine/CMakeLists.txt b/inference-engine/tests/functional/inference_engine/CMakeLists.txt index f5cb873d067..59f964bc2a1 100644 --- a/inference-engine/tests/functional/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/functional/inference_engine/CMakeLists.txt @@ -44,8 +44,8 @@ if(ENABLE_HETERO) list(APPEND DEPENDENCIES ov_hetero_plugin) endif() -if(ENABLE_MULTI) - list(APPEND DEPENDENCIES MultiDevicePlugin) +if(ENABLE_AUTO OR ENABLE_MULTI) + list(APPEND DEPENDENCIES ov_auto_plugin) endif() if (NOT NGRAPH_ONNX_FRONTEND_ENABLE) diff --git a/inference-engine/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp b/inference-engine/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp index 38347421c67..18013ac3a5d 100644 --- a/inference-engine/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp +++ b/inference-engine/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp @@ -19,12 +19,12 @@ inline const std::string getPluginLibNameByDevice(const std::string& deviceName) { "AUTO", "AutoPlugin" }, { "HDDL", "HDDLPlugin" }, { "VPUX", "VPUXPlugin" }, - { "AUTO", "MultiDevicePlugin" }, + { "AUTO", "ov_auto_plugin" }, { "CPU", "MKLDNNPlugin" }, { "GNA", "GNAPlugin" }, { "GPU", "ov_intel_gpu_plugin" }, { "HETERO", "ov_hetero_plugin" }, - { "MULTI", "MultiDevicePlugin" }, + { "MULTI", "ov_multi_plugin" }, { "MYRIAD", "myriadPlugin" }, { "TEMPLATE", "templatePlugin" }, }; diff --git a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt index 47a0700a820..abbdb505f99 100644 --- a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt +++ b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt @@ -12,8 +12,8 @@ if(ENABLE_HETERO) list(APPEND DEPENDENCIES ov_hetero_plugin) endif() -if(ENABLE_MULTI) - list(APPEND DEPENDENCIES MultiDevicePlugin) +if(ENABLE_AUTO OR ENABLE_MULTI) + list(APPEND DEPENDENCIES ov_auto_plugin) endif() # remove once CVS-69781 is fixed diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt index 7c29c1ba891..2d7c8b8a9ed 100644 --- a/inference-engine/tests/unit/CMakeLists.txt +++ b/inference-engine/tests/unit/CMakeLists.txt @@ -28,4 +28,6 @@ if(NGRAPH_ONNX_FRONTEND_ENABLE) add_subdirectory(frontends/onnx_import) endif() -add_subdirectory(multi) +if (ENABLE_AUTO OR ENABLE_MULTI) + add_subdirectory(auto) +endif() diff --git a/inference-engine/tests/unit/multi/CMakeLists.txt b/inference-engine/tests/unit/auto/CMakeLists.txt similarity index 74% rename from inference-engine/tests/unit/multi/CMakeLists.txt rename to inference-engine/tests/unit/auto/CMakeLists.txt index 4456c3100f9..9fb4cbf66bb 100644 --- a/inference-engine/tests/unit/multi/CMakeLists.txt +++ b/inference-engine/tests/unit/auto/CMakeLists.txt @@ -5,15 +5,15 @@ set(TARGET_NAME ieMultiPluginUnitTests) set(CI_BUILD_NUMBER "unittest") -addVersionDefines(${IE_MAIN_SOURCE_DIR}/src/multi_device/multi_device_plugin.cpp CI_BUILD_NUMBER) +addVersionDefines(${OpenVINO_SOURCE_DIR}/src/plugins/auto/plugin.cpp CI_BUILD_NUMBER) add_definitions(-DMULTIUNITTEST) addIeTargetTest( NAME ${TARGET_NAME} ROOT ${CMAKE_CURRENT_SOURCE_DIR} - ADDITIONAL_SOURCE_DIRS ${IE_MAIN_SOURCE_DIR}/src/multi_device ${IE_MAIN_SOURCE_DIR}/src/multi_device/utils + ADDITIONAL_SOURCE_DIRS ${OpenVINO_SOURCE_DIR}/src/plugins/auto ${OpenVINO_SOURCE_DIR}/src/plugins/auto/utils INCLUDES - ${IE_MAIN_SOURCE_DIR}/src/multi_device ${CMAKE_CURRENT_SOURCE_DIR} + ${OpenVINO_SOURCE_DIR}/src/plugins/auto ${CMAKE_CURRENT_SOURCE_DIR} LINK_LIBRARIES inference_engine_lp_transformations ngraphFunctions diff --git a/inference-engine/tests/unit/multi/auto_select_device_failed_test.cpp b/inference-engine/tests/unit/auto/auto_select_device_failed_test.cpp similarity index 99% rename from inference-engine/tests/unit/multi/auto_select_device_failed_test.cpp rename to inference-engine/tests/unit/auto/auto_select_device_failed_test.cpp index 98aefa36eb3..521bd6efe6e 100644 --- a/inference-engine/tests/unit/multi/auto_select_device_failed_test.cpp +++ b/inference-engine/tests/unit/auto/auto_select_device_failed_test.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "plugin/mock_multi_device_plugin.hpp" +#include "plugin/mock_auto_device_plugin.hpp" #include "cpp/ie_plugin.hpp" using ::testing::MatcherCast; diff --git a/inference-engine/tests/unit/multi/log_utils_test.cpp b/inference-engine/tests/unit/auto/log_utils_test.cpp similarity index 100% rename from inference-engine/tests/unit/multi/log_utils_test.cpp rename to inference-engine/tests/unit/auto/log_utils_test.cpp diff --git a/inference-engine/tests/unit/multi/plugin/mock_multi_device_plugin.hpp b/inference-engine/tests/unit/auto/plugin/mock_auto_device_plugin.hpp similarity index 95% rename from inference-engine/tests/unit/multi/plugin/mock_multi_device_plugin.hpp rename to inference-engine/tests/unit/auto/plugin/mock_auto_device_plugin.hpp index d133e7b6683..883a5f581a8 100644 --- a/inference-engine/tests/unit/multi/plugin/mock_multi_device_plugin.hpp +++ b/inference-engine/tests/unit/auto/plugin/mock_auto_device_plugin.hpp @@ -5,7 +5,7 @@ #pragma once #include #include "ie_icore.hpp" -#include "multi_device_plugin.hpp" +#include "plugin.hpp" #include using namespace MockMultiDevicePlugin; diff --git a/inference-engine/tests/unit/multi/plugin/mock_log_utils.hpp b/inference-engine/tests/unit/auto/plugin/mock_log_utils.hpp similarity index 100% rename from inference-engine/tests/unit/multi/plugin/mock_log_utils.hpp rename to inference-engine/tests/unit/auto/plugin/mock_log_utils.hpp diff --git a/inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt b/inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt index b66da71d4bd..cbbd7da9cf0 100644 --- a/inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt +++ b/inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt @@ -10,8 +10,8 @@ file(GLOB_RECURSE SHARED_TESTS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp add_library(${TARGET_NAME} STATIC ${SHARED_TESTS_SRC}) add_dependencies(${TARGET_NAME} inference_engine_preproc) -if(ENABLE_MULTI) - add_dependencies(${TARGET_NAME} MultiDevicePlugin) +if(ENABLE_AUTO OR ENABLE_MULTI) + add_dependencies(${TARGET_NAME} ov_auto_plugin) endif() target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/plugin_tests") diff --git a/inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt b/inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt index 951a288c291..1040ee56f07 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt +++ b/inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt @@ -21,8 +21,8 @@ add_library(${TARGET_NAME} STATIC ${SHARED_TESTS_SRC}) add_dependencies(${TARGET_NAME} inference_engine_preproc mock_engine) -if(ENABLE_MULTI) - add_dependencies(${TARGET_NAME} MultiDevicePlugin) +if(ENABLE_AUTO OR ENABLE_MULTI) + add_dependencies(${TARGET_NAME} ov_auto_plugin) endif() set_ie_threading_interface_for(${TARGET_NAME}) diff --git a/src/bindings/c/tests/CMakeLists.txt b/src/bindings/c/tests/CMakeLists.txt index 188c7840a85..60f0c139ac6 100644 --- a/src/bindings/c/tests/CMakeLists.txt +++ b/src/bindings/c/tests/CMakeLists.txt @@ -22,8 +22,8 @@ target_compile_definitions(${TARGET_NAME} DATA_PATH=\"${DATA_PATH}\" MODELS_PATH=\"${MODELS_PATH}\" ) -if(ENABLE_MULTI) - add_dependencies(${TARGET_NAME} MultiDevicePlugin) +if(ENABLE_AUTO OR ENABLE_MULTI) + add_dependencies(${TARGET_NAME} ov_auto_plugin) endif() if(ENABLE_MKL_DNN) diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt index 4ea7aae927c..681652d7928 100644 --- a/src/inference/CMakeLists.txt +++ b/src/inference/CMakeLists.txt @@ -200,7 +200,7 @@ endif() target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) ie_register_plugins(MAIN_TARGET ${TARGET_NAME} - POSSIBLE_PLUGINS MultiDevicePlugin ov_hetero_plugin ov_intel_gpu_plugin GNAPlugin MKLDNNPlugin myriadPlugin) + POSSIBLE_PLUGINS ov_auto_plugin ov_hetero_plugin ov_intel_gpu_plugin GNAPlugin MKLDNNPlugin myriadPlugin) ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 24b0bb6bfc2..6efc58c3c44 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -9,3 +9,7 @@ endif() if(ENABLE_INTEL_GPU) add_subdirectory(intel_gpu) endif() + +if(ENABLE_AUTO OR ENABLE_MULTI) + add_subdirectory(auto) +endif() diff --git a/inference-engine/src/multi_device/CMakeLists.txt b/src/plugins/auto/CMakeLists.txt similarity index 88% rename from inference-engine/src/multi_device/CMakeLists.txt rename to src/plugins/auto/CMakeLists.txt index a23919651e2..f693139be8d 100644 --- a/inference-engine/src/multi_device/CMakeLists.txt +++ b/src/plugins/auto/CMakeLists.txt @@ -2,14 +2,14 @@ # SPDX-License-Identifier: Apache-2.0 # -set (TARGET_NAME "MultiDevicePlugin") +set (TARGET_NAME "ov_auto_plugin") file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/utils/*.cpp) ie_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "MULTI" SOURCES ${SOURCES} - VERSION_DEFINES_FOR multi_device_plugin.cpp) + VERSION_DEFINES_FOR plugin.cpp) ie_add_plugin(NAME ${TARGET_NAME} DEVICE_NAME "AUTO" diff --git a/inference-engine/src/multi_device/multi_device_async_infer_request.cpp b/src/plugins/auto/async_infer_request.cpp similarity index 97% rename from inference-engine/src/multi_device/multi_device_async_infer_request.cpp rename to src/plugins/auto/async_infer_request.cpp index a0f4a0776fe..6b01ff9650e 100644 --- a/inference-engine/src/multi_device/multi_device_async_infer_request.cpp +++ b/src/plugins/auto/async_infer_request.cpp @@ -8,7 +8,7 @@ #include #include -#include "multi_device_async_infer_request.hpp" +#include "async_infer_request.hpp" #include #include #include @@ -57,7 +57,7 @@ MultiDeviceAsyncInferRequest::MultiDeviceAsyncInferRequest( "initialized) supports a remote blob created on the device named " << name; } else { - // it is ok to take the c_str() here (as pointed in the multi_device_exec_network.hpp we need to use const char*) + // it is ok to take the c_str() here (as pointed in the executable_network.hpp we need to use const char*) // as the original strings are from the "persistent" vector (with the right lifetime) _multiDeviceExecutableNetwork->_thisPreferredDeviceName = res->deviceName.c_str(); break; diff --git a/inference-engine/src/multi_device/multi_device_async_infer_request.hpp b/src/plugins/auto/async_infer_request.hpp similarity index 95% rename from inference-engine/src/multi_device/multi_device_async_infer_request.hpp rename to src/plugins/auto/async_infer_request.hpp index c6c0759e43b..76a4544b1d0 100644 --- a/inference-engine/src/multi_device/multi_device_async_infer_request.hpp +++ b/src/plugins/auto/async_infer_request.hpp @@ -12,8 +12,8 @@ #include #include -#include "multi_device_infer_request.hpp" -#include "multi_device_exec_network.hpp" +#include "infer_request.hpp" +#include "executable_network.hpp" #ifdef MULTIUNITTEST #define MOCKTESTMACRO virtual diff --git a/inference-engine/src/multi_device/multi_device_exec_network.cpp b/src/plugins/auto/executable_network.cpp similarity index 99% rename from inference-engine/src/multi_device/multi_device_exec_network.cpp rename to src/plugins/auto/executable_network.cpp index c7dab36dfb7..9945087c3d8 100644 --- a/inference-engine/src/multi_device/multi_device_exec_network.cpp +++ b/src/plugins/auto/executable_network.cpp @@ -14,15 +14,15 @@ #include "ie_icore.hpp" #include "ie_metric_helpers.hpp" #include -#include "multi_device_exec_network.hpp" -#include "multi_device_async_infer_request.hpp" -#include "multi_device_plugin.hpp" +#include "executable_network.hpp" +#include "async_infer_request.hpp" +#include "plugin.hpp" #include "ngraph/opsets/opset1.hpp" #include "transformations/utils/utils.hpp" #include "utils/log_util.hpp" -#include "multi_itt.hpp" +#include "itt.hpp" // ------------------------------MultiDeviceExecutableNetwork---------------------------- namespace MultiDevicePlugin { using namespace InferenceEngine; diff --git a/inference-engine/src/multi_device/multi_device_exec_network.hpp b/src/plugins/auto/executable_network.hpp similarity index 100% rename from inference-engine/src/multi_device/multi_device_exec_network.hpp rename to src/plugins/auto/executable_network.hpp diff --git a/inference-engine/src/multi_device/multi_device_infer_request.cpp b/src/plugins/auto/infer_request.cpp similarity index 98% rename from inference-engine/src/multi_device/multi_device_infer_request.cpp rename to src/plugins/auto/infer_request.cpp index d96754ecdb6..ea097da6fe0 100644 --- a/inference-engine/src/multi_device/multi_device_infer_request.cpp +++ b/src/plugins/auto/infer_request.cpp @@ -4,7 +4,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -#include "multi_device_infer_request.hpp" +#include "infer_request.hpp" #include #include #include diff --git a/inference-engine/src/multi_device/multi_device_infer_request.hpp b/src/plugins/auto/infer_request.hpp similarity index 100% rename from inference-engine/src/multi_device/multi_device_infer_request.hpp rename to src/plugins/auto/infer_request.hpp diff --git a/inference-engine/src/multi_device/multi_itt.hpp b/src/plugins/auto/itt.hpp similarity index 100% rename from inference-engine/src/multi_device/multi_itt.hpp rename to src/plugins/auto/itt.hpp diff --git a/inference-engine/src/multi_device/multi_device_plugin.cpp b/src/plugins/auto/plugin.cpp similarity index 99% rename from inference-engine/src/multi_device/multi_device_plugin.cpp rename to src/plugins/auto/plugin.cpp index 95a421b2764..4416d707e62 100644 --- a/inference-engine/src/multi_device/multi_device_plugin.cpp +++ b/src/plugins/auto/plugin.cpp @@ -16,11 +16,11 @@ #include #include #include -#include "multi_device_plugin.hpp" +#include "plugin.hpp" #include #include -#include "multi_itt.hpp" +#include "itt.hpp" // ------------------------------MultiDeviceInferencePlugin---------------------------- namespace MultiDevicePlugin { using namespace InferenceEngine; diff --git a/inference-engine/src/multi_device/multi_device_plugin.hpp b/src/plugins/auto/plugin.hpp similarity index 98% rename from inference-engine/src/multi_device/multi_device_plugin.hpp rename to src/plugins/auto/plugin.hpp index 90063335eb4..dfa03f93af8 100644 --- a/inference-engine/src/multi_device/multi_device_plugin.hpp +++ b/src/plugins/auto/plugin.hpp @@ -11,7 +11,7 @@ #include #include -#include "multi_device_exec_network.hpp" +#include "executable_network.hpp" #include "utils/log_util.hpp" #ifdef MULTIUNITTEST diff --git a/inference-engine/src/multi_device/utils/log.cpp b/src/plugins/auto/utils/log.cpp similarity index 100% rename from inference-engine/src/multi_device/utils/log.cpp rename to src/plugins/auto/utils/log.cpp diff --git a/inference-engine/src/multi_device/utils/log.hpp b/src/plugins/auto/utils/log.hpp similarity index 100% rename from inference-engine/src/multi_device/utils/log.hpp rename to src/plugins/auto/utils/log.hpp diff --git a/inference-engine/src/multi_device/utils/log_util.hpp b/src/plugins/auto/utils/log_util.hpp similarity index 100% rename from inference-engine/src/multi_device/utils/log_util.hpp rename to src/plugins/auto/utils/log_util.hpp diff --git a/inference-engine/src/multi_device/utils/non_copyable.hpp b/src/plugins/auto/utils/non_copyable.hpp similarity index 100% rename from inference-engine/src/multi_device/utils/non_copyable.hpp rename to src/plugins/auto/utils/non_copyable.hpp diff --git a/inference-engine/src/multi_device/utils/singleton.hpp b/src/plugins/auto/utils/singleton.hpp similarity index 100% rename from inference-engine/src/multi_device/utils/singleton.hpp rename to src/plugins/auto/utils/singleton.hpp diff --git a/inference-engine/src/multi_device/utils/thread_utils.cpp b/src/plugins/auto/utils/thread_utils.cpp similarity index 100% rename from inference-engine/src/multi_device/utils/thread_utils.cpp rename to src/plugins/auto/utils/thread_utils.cpp diff --git a/inference-engine/src/multi_device/utils/thread_utils.hpp b/src/plugins/auto/utils/thread_utils.hpp similarity index 100% rename from inference-engine/src/multi_device/utils/thread_utils.hpp rename to src/plugins/auto/utils/thread_utils.hpp diff --git a/inference-engine/src/multi_device/utils/time_utils.cpp b/src/plugins/auto/utils/time_utils.cpp similarity index 100% rename from inference-engine/src/multi_device/utils/time_utils.cpp rename to src/plugins/auto/utils/time_utils.cpp diff --git a/inference-engine/src/multi_device/utils/time_utils.hpp b/src/plugins/auto/utils/time_utils.hpp similarity index 100% rename from inference-engine/src/multi_device/utils/time_utils.hpp rename to src/plugins/auto/utils/time_utils.hpp diff --git a/tools/deployment_manager/configs/darwin.json b/tools/deployment_manager/configs/darwin.json index 6efba1e28bb..ff23ac25590 100644 --- a/tools/deployment_manager/configs/darwin.json +++ b/tools/deployment_manager/configs/darwin.json @@ -21,7 +21,7 @@ "runtime/lib/intel64/libinference_engine_preproc.so", "runtime/lib/intel64/libinference_engine_c_api.dylib", "runtime/lib/intel64/libov_hetero_plugin.so", - "runtime/lib/intel64/libMultiDevicePlugin.so", + "runtime/lib/intel64/libov_auto_plugin.so", "runtime/lib/intel64/libngraph.dylib", "runtime/lib/intel64/libfrontend_common.dylib", "runtime/lib/intel64/libir_ov_frontend.dylib", diff --git a/tools/deployment_manager/configs/linux.json b/tools/deployment_manager/configs/linux.json index bef7e0c0516..92ed40cdc3d 100644 --- a/tools/deployment_manager/configs/linux.json +++ b/tools/deployment_manager/configs/linux.json @@ -27,7 +27,7 @@ "runtime/lib/intel64/libinference_engine_preproc.so", "runtime/lib/intel64/libinference_engine_c_api.so", "runtime/lib/intel64/libov_hetero_plugin.so", - "runtime/lib/intel64/libMultiDevicePlugin.so", + "runtime/lib/intel64/libov_auto_plugin.so", "runtime/lib/intel64/libngraph.so", "runtime/lib/intel64/libfrontend_common.so", "runtime/lib/intel64/libir_ov_frontend.so", diff --git a/tools/deployment_manager/configs/windows.json b/tools/deployment_manager/configs/windows.json index ce81c1a8332..acbdc5a8709 100644 --- a/tools/deployment_manager/configs/windows.json +++ b/tools/deployment_manager/configs/windows.json @@ -21,7 +21,7 @@ "runtime/bin/intel64/Release/inference_engine_preproc.dll", "runtime/bin/intel64/Release/inference_engine_c_api.dll", "runtime/bin/intel64/Release/ov_hetero_plugin.dll", - "runtime/bin/intel64/Release/MultiDevicePlugin.dll", + "runtime/bin/intel64/Release/ov_auto_plugin.dll", "runtime/bin/intel64/Release/ngraph.dll", "runtime/bin/intel64/Release/frontend_common.dll", "runtime/bin/intel64/Release/ir_ov_frontend.dll",