Fix rebase issue

Signed-off-by: Shoujiang Ma <[email protected]>
openvinotoolkit · May 19, 2021 · 4e1bed6 · 4e1bed6
1 parent e1d9cdc
commit 4e1bed6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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.cpp b/inference-engine/src/auto_plugin/auto_plugin.cpp
@@ -64,6 +64,8 @@ IE::ExecutableNetworkInternal::Ptr AutoInferencePlugin::LoadExeNetworkImpl(const
     return LoadNetworkImpl(network, config, networkPrecision);
 }
 
+
+
 IE::QueryNetworkResult AutoInferencePlugin::QueryNetwork(const IE::CNNNetwork& network, const ConfigType& config) const {
     IE::QueryNetworkResult queryResult = {};
     if (GetCore() == nullptr) {

diff --git 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 <typename T>
-    IE::ExecutableNetworkInternal::Ptr LoadNetworkImpl(const T &param, const ConfigType &config, const std::string &networkPrecision = METRIC_VALUE(FP32)) {
+    std::shared_ptr<AutoExecutableNetwork> LoadNetworkImpl(const T &param, 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
@@ -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"