Moved QueryNetworkResult to ie_common.h (#1648)

diff --git a/inference-engine/include/ie_common.h b/inference-engine/include/ie_common.h
index 63617e6..4149e96 100644 (file)
--- a/inference-engine/include/ie_common.h
+++ b/inference-engine/include/ie_common.h
@@ -15,6 +15,7 @@
 #include <ostream>
 #include <string>
 #include <vector>
+#include <map>
 
 namespace InferenceEngine {
 /**
@@ -234,6 +235,29 @@ struct ResponseDesc {
     char msg[4096] = {};
 };
 
+
+/**
+ * @brief Responce structure encapsulating information about supported layer
+ */
+struct QueryNetworkResult {
+    /**
+     * @brief A map of supported layers:
+     * - key - a layer name
+     * - value - a device name on which layer is assigned
+     */
+    std::map<std::string, std::string> supportedLayersMap;
+
+    /**
+     * @brief A status code
+     */
+    StatusCode rc = OK;
+
+    /**
+     * @brief Response message
+     */
+    ResponseDesc resp;
+};
+
 /** @brief This class represents StatusCode::GENERIC_ERROR exception */
 class GeneralError : public std::logic_error {
     using std::logic_error::logic_error;

diff --git a/inference-engine/include/ie_core.hpp b/inference-engine/include/ie_core.hpp
index 52cedc6..a0b70c8 100644 (file)
--- a/inference-engine/include/ie_core.hpp
+++ b/inference-engine/include/ie_core.hpp
@@ -23,28 +23,6 @@
 namespace InferenceEngine {
 
 /**
- * @brief Responce structure encapsulating information about supported layer
- */
-struct QueryNetworkResult {
-    /**
-     * @brief A map of supported layers:
-     * - key - a layer name
-     * - value - a device name on which layer is assigned
-     */
-    std::map<std::string, std::string> supportedLayersMap;
-
-    /**
-     * @brief A status code
-     */
-    StatusCode rc = OK;
-
-    /**
-     * @brief Response message
-     */
-    ResponseDesc resp;
-};
-
-/**
  * @brief This class represents Inference Engine Core entity.
  *
  * It can throw exceptions safely for the application, where it is properly handled.

diff --git a/inference-engine/src/plugin_api/cpp_interfaces/interface/ie_plugin.hpp b/inference-engine/src/plugin_api/cpp_interfaces/interface/ie_plugin.hpp
index 38d3a04..324d2ef 100644 (file)
--- a/inference-engine/src/plugin_api/cpp_interfaces/interface/ie_plugin.hpp
+++ b/inference-engine/src/plugin_api/cpp_interfaces/interface/ie_plugin.hpp
@@ -11,7 +11,6 @@
 
 #include <ie_iextension.h>
 #include <ie_icnn_network.hpp>
-#include <ie_core.hpp>
 #include <ie_icore.hpp>
 
 #include <map>

diff --git a/inference-engine/src/plugin_api/ie_icore.hpp b/inference-engine/src/plugin_api/ie_icore.hpp
index b569a36..5b06d60 100644 (file)
--- a/inference-engine/src/plugin_api/ie_icore.hpp
+++ b/inference-engine/src/plugin_api/ie_icore.hpp
@@ -16,7 +16,6 @@
 #include <ie_parameter.hpp>
 #include <cpp/ie_cnn_network.h>
 #include <cpp/ie_executable_network.hpp>
-#include <ie_core.hpp>  // for QueryNetworkResult
 
 #include "threading/ie_itask_executor.hpp"