From 97684e507bfe474e7ed540592b87f6c13ca988dd Mon Sep 17 00:00:00 2001 From: Shoujiang Ma Date: Wed, 19 May 2021 20:03:25 +0800 Subject: [PATCH] Fix rebase issue Signed-off-by: Shoujiang Ma --- inference-engine/src/auto_plugin/auto_exec_network.cpp | 1 + inference-engine/src/auto_plugin/auto_plugin.hpp | 5 ++--- inference-engine/src/inference_engine/ie_core.cpp | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/inference-engine/src/auto_plugin/auto_exec_network.cpp b/inference-engine/src/auto_plugin/auto_exec_network.cpp index b06be93e901959..f181f45745480a 100644 --- a/inference-engine/src/auto_plugin/auto_exec_network.cpp +++ b/inference-engine/src/auto_plugin/auto_exec_network.cpp @@ -13,6 +13,7 @@ #include "auto_infer_request.hpp" namespace AutoPlugin { +using namespace InferenceEngine; AutoExecutableNetwork::AutoExecutableNetwork(const SoExecutableNetworkInternal& network) : _network(network) { diff --git a/inference-engine/src/auto_plugin/auto_plugin.hpp b/inference-engine/src/auto_plugin/auto_plugin.hpp index e592ced71e3a3e..8fae37870fffa6 100644 --- a/inference-engine/src/auto_plugin/auto_plugin.hpp +++ b/inference-engine/src/auto_plugin/auto_plugin.hpp @@ -36,15 +36,14 @@ class AutoInferencePlugin : public IE::InferencePluginInternal { static ConfigType mergeConfigs(ConfigType config, const ConfigType& local); template - IE::ExecutableNetworkInternal::Ptr LoadNetworkImpl(const T ¶m, const ConfigType &config, const std::string &networkPrecision = METRIC_VALUE(FP32)) { + std::shared_ptr LoadNetworkImpl(const T ¶m, const ConfigType &config, const std::string &networkPrecision = METRIC_VALUE(FP32)) { if (GetCore() == nullptr) { IE_THROW() << "Please, work with AUTO device via InferencEngine::Core object"; } - auto fullConfig = mergeConfigs(_config, config); auto metaDevices = GetDeviceChoice(fullConfig); DeviceInformation selectedDevice; - IE::ExecutableNetwork executableNetwork; + IE::SoExecutableNetworkInternal executableNetwork; while (!metaDevices.empty()) { selectedDevice = SelectDevice(metaDevices, networkPrecision); try { diff --git a/inference-engine/src/inference_engine/ie_core.cpp b/inference-engine/src/inference_engine/ie_core.cpp index 3f5bd5128c6c3f..eafa43318d0a43 100644 --- a/inference-engine/src/inference_engine/ie_core.cpp +++ b/inference-engine/src/inference_engine/ie_core.cpp @@ -26,7 +26,6 @@ #include "ie_itt.hpp" #include "ie_network_reader.hpp" #include "ie_plugin_config.hpp" -#include "ie_plugin_cpp.hpp" #include "xml_parse_utils.h" #include "cpp_interfaces/interface/ie_internal_plugin_config.hpp" #include "cpp_interfaces/interface/ie_iexecutable_network_internal.hpp"